diff --git a/src/input.c b/src/input.c
deleted file mode 100644
index 38ce1dd6..00000000
--- a/src/input.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *  Tvheadend
- *  Copyright (C) 2013 Adam Sutton
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "input.h"
-
-void input_init ( void )
-{
-#if ENABLE_MPEGTS
-#if ENABLE_IPTV
-  iptv_input_init();
-#endif
-#endif
-}
diff --git a/src/input/mpegts/mpegts_table.c b/src/input/mpegts/mpegts_table.c
index 2c1fd552..bec3235d 100644
--- a/src/input/mpegts/mpegts_table.c
+++ b/src/input/mpegts/mpegts_table.c
@@ -75,11 +75,11 @@ mpegts_table_dispatch
   
   /* Pass with tableid / len in data */
   if (mt->mt_flags & MT_FULL)
-    ret = mt->mt_callback(mt, sec, len, tid);
+    ret = mt->mt_callback(mt, sec, len+3, tid);
 
   /* Pass w/out tableid/len in data */
   else
-    ret = mt->mt_callback(mt, sec+3, len-3, tid);
+    ret = mt->mt_callback(mt, sec+3, len, tid);
   
   /* Good */
   if(ret == 0)