diff --git a/src/input/mpegts.h b/src/input/mpegts.h
index 611f5e7d..0ebdc0c7 100644
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -179,9 +179,9 @@ struct mpegts_network
   /*
    * Configuration
    */
-  uint32_t mn_nid;
-  uint32_t mn_autodiscovery;
-  uint32_t mn_skipinitscan;
+  uint16_t mn_nid;
+  int      mn_autodiscovery;
+  int      mn_skipinitscan;
 };
 
 /* Multiplex */
@@ -195,8 +195,8 @@ struct mpegts_mux
   
   LIST_ENTRY(mpegts_mux)  mm_network_link;
   mpegts_network_t        *mm_network;
-  uint32_t                mm_onid;
-  uint32_t                mm_tsid;
+  uint16_t                mm_onid;
+  uint16_t                mm_tsid;
 
   /*
    * Services
diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
index c31df8c8..05a91d0b 100644
--- a/src/input/mpegts/mpegts_mux.c
+++ b/src/input/mpegts/mpegts_mux.c
@@ -75,9 +75,9 @@ const idclass_t mpegts_mux_class =
     {  PROPDEF1("enabled", "Enabled",
                 PT_BOOL, mpegts_mux_t, mm_enabled) },
     {  PROPDEF1("onid", "Original Network ID",
-                PT_INT, mpegts_mux_t, mm_onid) },
+                PT_U16, mpegts_mux_t, mm_onid) },
     {  PROPDEF1("tsid", "Transport Stream ID",
-                PT_INT, mpegts_mux_t, mm_tsid) },
+                PT_U16, mpegts_mux_t, mm_tsid) },
     {  PROPDEF2("crid_authority", "CRID Authority",
                 PT_STR, mpegts_mux_t, mm_crid_authority, 1) },
     {  PROPDEF2("init_scan_done", "Initial Scan Complete",
diff --git a/src/input/mpegts/mpegts_network.c b/src/input/mpegts/mpegts_network.c
index 9b9b9f2c..8ebd1c5d 100644
--- a/src/input/mpegts/mpegts_network.c
+++ b/src/input/mpegts/mpegts_network.c
@@ -41,7 +41,7 @@ const idclass_t mpegts_network_class =
     { PROPDEF1("networkname", "Network Name",
                PT_STR, mpegts_network_t, mn_network_name) },
     { PROPDEF1("nid", "Network ID (limit scanning)",
-               PT_INT, mpegts_network_t, mn_nid) },
+               PT_U16, mpegts_network_t, mn_nid) },
     { PROPDEF1("autodiscovery", "Network Discovery",
                PT_BOOL, mpegts_network_t, mn_autodiscovery) },
     { PROPDEF1("skipinitscan", "Skip Initial Scan",