diff --git a/src/input/mpegts/dvb_support.c b/src/input/mpegts/dvb_support.c
index 431e1934..023d3000 100644
--- a/src/input/mpegts/dvb_support.c
+++ b/src/input/mpegts/dvb_support.c
@@ -652,7 +652,7 @@ dvb_mux_conf_load ( fe_type_t type, dvb_mux_conf_t *dmc, htsmsg_t *m )
   str = htsmsg_get_str(m, "delsys");
   if (!str || (r = dvb_str2delsys(str)) < 0) {
          if (type == FE_OFDM) r = SYS_DVBT;
-    else if (type == FE_QAM)  r = SYS_DVBC_ANNEX_B;
+    else if (type == FE_QAM)  r = SYS_DVBC_ANNEX_AC;
     else if (type == FE_QPSK) r = SYS_DVBS;
     else if (type == FE_ATSC) r = SYS_ATSC;
     else
diff --git a/src/input/mpegts/iptv/iptv.c b/src/input/mpegts/iptv/iptv.c
index a6214d39..bad1cbab 100644
--- a/src/input/mpegts/iptv/iptv.c
+++ b/src/input/mpegts/iptv/iptv.c
@@ -144,6 +144,7 @@ const idclass_t iptv_input_class = {
   .ic_caption    = "IPTV Input",
   .ic_get_title  = iptv_input_class_get_title,
   .ic_properties = (const property_t[]){
+    {}
   }
 };
 
@@ -298,6 +299,7 @@ const idclass_t iptv_network_class = {
   .ic_class      = "iptv_network",
   .ic_caption    = "IPTV Network",
   .ic_properties = (const property_t[]){
+    {}
   }
 };
 
diff --git a/src/input/mpegts/iptv/iptv_mux.c b/src/input/mpegts/iptv/iptv_mux.c
index d0dd2062..86b288e2 100644
--- a/src/input/mpegts/iptv/iptv_mux.c
+++ b/src/input/mpegts/iptv/iptv_mux.c
@@ -38,6 +38,7 @@ const idclass_t iptv_mux_class =
     { PROPDEF1("iptv_interface", "Interface",
                PT_STR, iptv_mux_t, mm_iptv_interface) },
 #endif
+    {}
   }
 };
 
diff --git a/src/input/mpegts/linuxdvb/linuxdvb_mux.c b/src/input/mpegts/linuxdvb/linuxdvb_mux.c
index 02905c73..40ea6835 100644
--- a/src/input/mpegts/linuxdvb/linuxdvb_mux.c
+++ b/src/input/mpegts/linuxdvb/linuxdvb_mux.c
@@ -178,7 +178,7 @@ const idclass_t linuxdvb_mux_dvbt_class =
     {
       .type     = PT_U32,
       .id       = "frequency",
-      .name     = "Frequency (MHz)",
+      .name     = "Frequency (Hz)",
       .opts     = PO_WRONCE,
       .off      = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_params.frequency),
     },
@@ -245,14 +245,14 @@ const idclass_t linuxdvb_mux_dvbc_class =
     {
       .type     = PT_U32,
       .id       = "frequency",
-      .name     = "Frequency (MHz)",
+      .name     = "Frequency (Hz)",
       .opts     = PO_WRONCE,
       .off      = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_params.frequency),
     },
     {
       .type     = PT_U32,
       .id       = "symbolrate",
-      .name     = "Symbol Rate",
+      .name     = "Symbol Rate (Sym/s)",
       .opts     = PO_WRONCE,
       .off      = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_params.u.qam.symbol_rate),
     },
@@ -329,14 +329,14 @@ const idclass_t linuxdvb_mux_dvbs_class =
     {
       .type     = PT_U32,
       .id       = "frequency",
-      .name     = "Frequency (MHz)",
+      .name     = "Frequency (kHz)",
       .opts     = PO_WRONCE,
       .off      = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_params.frequency),
     },
     {
       .type     = PT_U32,
       .id       = "symbolrate",
-      .name     = "Symbol Rate",
+      .name     = "Symbol Rate (Sym/s)",
       .opts     = PO_WRONCE,
       .off      = offsetof(linuxdvb_mux_t, lm_tuning.dmc_fe_params.u.qpsk.symbol_rate),
     },
diff --git a/src/input/mpegts/mpegts_input.c b/src/input/mpegts/mpegts_input.c
index e862e7e5..7054bf7a 100644
--- a/src/input/mpegts/mpegts_input.c
+++ b/src/input/mpegts/mpegts_input.c
@@ -174,7 +174,7 @@ mpegts_input_stopped_mux
   ( mpegts_input_t *mi, mpegts_mux_instance_t *mmi )
 {
   char buf[256];
-  service_t *s, *t;
+  service_t *s;
   mmi->mmi_mux->mm_active = NULL;
   LIST_REMOVE(mmi, mmi_active_link);
 
@@ -182,11 +182,9 @@ mpegts_input_stopped_mux
   tvhtrace("mpegts", "%s - flush subscribers", buf);
   s = LIST_FIRST(&mi->mi_transports);
   while (s) {
-    t = s;
-    s = LIST_NEXT(t, s_active_link);
-    if (((mpegts_service_t*)s)->s_dvb_mux != mmi->mmi_mux)
-      continue;
-    service_remove_subscriber(s, NULL, SM_CODE_SUBSCRIPTION_OVERRIDDEN);
+    if (((mpegts_service_t*)s)->s_dvb_mux == mmi->mmi_mux)
+      service_remove_subscriber(s, NULL, SM_CODE_SUBSCRIPTION_OVERRIDDEN);
+    s = LIST_NEXT(s, s_active_link);
   }
 }