diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
index f69e2d07..98299782 100644
--- a/src/epggrab/module/eit.c
+++ b/src/epggrab/module/eit.c
@@ -595,10 +595,12 @@ _eit_callback
   } else {
     if (mm->mm_tsid != tsid ||
         mm->mm_onid != onid) {
-      tvhwarn("eit",
-              "invalid tsid found tid 0x%02X, onid:tsid %d:%d != %d:%d",
-              tableid, mm->mm_onid, mm->mm_tsid, onid, tsid);
-      //dm = NULL;
+      if (mm->mm_onid != MPEGTS_ONID_NONE &&
+          mm->mm_tsid != MPEGTS_TSID_NONE)
+        tvhwarn("eit",
+                "invalid tsid found tid 0x%02X, onid:tsid %d:%d != %d:%d",
+                tableid, mm->mm_onid, mm->mm_tsid, onid, tsid);
+      mm = NULL;
     }
   }
   if(!mm)
diff --git a/src/epggrab/otamux.c b/src/epggrab/otamux.c
index dd0cdd64..fc90e18f 100644
--- a/src/epggrab/otamux.c
+++ b/src/epggrab/otamux.c
@@ -136,7 +136,7 @@ epggrab_ota_start ( epggrab_ota_mux_t *om )
     epggrab_ota_active_timer_cb(NULL);
   LIST_FOREACH(map, &om->om_modules, om_link) {
     map->om_complete = 0;
-    tvhinfo(map->om_module->id, "grab started");
+    tvhdebug(map->om_module->id, "grab started");
   }
 }
 
@@ -242,7 +242,7 @@ epggrab_ota_complete
 {
   int done = 1;
   epggrab_ota_map_t *map;
-  tvhinfo(mod->id, "grab complete");
+  tvhdebug(mod->id, "grab complete");
 
   /* Test for completion */
   LIST_FOREACH(map, &ota->om_modules, om_link) {