Fix more warnings from tools/check_typed_item_calls.py

13 files changed, 114 insertions, 113 deletions

diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 60e6306708..c5e19d2fcc 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -8840,12 +8840,12 @@ proto_register_cip(void)
       { &hf_time_sync_gm_clock_offset_scaled_log_variance, { "Offset Scaled Log Variance", "cip.time_sync.gm_clock.offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_gm_clock_current_utc_offset, { "Current UTC Offset", "cip.time_sync.gm_clock.current_utc_offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_gm_clock_time_property_flags, { "Time Property Flags", "cip.time_sync.gm_clock.time_property_flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.gm_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.gm_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.gm_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x04, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.gm_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x08, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.gm_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x10, NULL, HFILL }},
-      { &hf_time_sync_gm_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.gm_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x20, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.gm_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0001, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.gm_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0002, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.gm_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0004, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.gm_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0008, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.gm_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0010, NULL, HFILL }},
+      { &hf_time_sync_gm_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.gm_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0020, NULL, HFILL }},
       { &hf_time_sync_gm_clock_time_source, { "Time Source", "cip.time_sync.gm_clock.time_source", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_source_vals), 0, NULL, HFILL }},
       { &hf_time_sync_gm_clock_priority1, { "Priority1", "cip.time_sync.gm_clock.priority1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_gm_clock_priority2, { "Priority2", "cip.time_sync.gm_clock.priority2", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -8859,12 +8859,12 @@ proto_register_cip(void)
       { &hf_time_sync_local_clock_offset_scaled_log_variance, { "Offset Scaled Log Variance", "cip.time_sync.local_clock.offset_scaled_log_variance", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_local_clock_current_utc_offset, { "Current UTC Offset", "cip.time_sync.local_clock.current_utc_offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_local_clock_time_property_flags, { "Time Property Flags", "cip.time_sync.local_clock.time_property_flags", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.local_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x01, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.local_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x02, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.local_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x04, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.local_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x08, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.local_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x10, NULL, HFILL }},
-      { &hf_time_sync_local_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.local_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x20, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_leap61, { "Leap indicator 61", "cip.time_sync.local_clock.time_property_flags.leap61", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0001, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_leap59, { "Leap indicator 59", "cip.time_sync.local_clock.time_property_flags.leap59", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0002, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_current_utc_valid, { "Current UTC Offset Valid", "cip.time_sync.local_clock.time_property_flags.current_utc_valid", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0004, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_ptp_timescale, { "PTP Timescale", "cip.time_sync.local_clock.time_property_flags.ptp_timescale", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0008, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_time_traceable, { "Time traceable", "cip.time_sync.local_clock.time_property_flags.time_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0010, NULL, HFILL }},
+      { &hf_time_sync_local_clock_time_property_flags_freq_traceable, { "Frequency traceable", "cip.time_sync.local_clock.time_property_flags.freq_traceable", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x0020, NULL, HFILL }},
       { &hf_time_sync_local_clock_time_source, { "Time Source", "cip.time_sync.local_clock.time_source", FT_UINT16, BASE_DEC, VALS(cip_time_sync_time_source_vals), 0, NULL, HFILL }},
       { &hf_time_sync_num_ports, { "Port Number", "cip.time_sync.port_number", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_time_sync_port_state_info_num_ports, { "Number of Ports", "cip.time_sync.port_state_info.num_ports", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-dis.c b/epan/dissectors/packet-dis.c
index bd516e30ac..cc56137dca 100644
--- a/epan/dissectors/packet-dis.c
+++ b/epan/dissectors/packet-dis.c
@@ -10071,7 +10071,7 @@ void proto_register_dis(void)
                 NULL, HFILL},
             },
             { &hf_dis_signal_link16_stn,
-              { "Source Track Number", "dis.signal.link16.stn", FT_UINT32, BASE_OCT, NULL, 0x7FFF0,
+              { "Source Track Number", "dis.signal.link16.stn", FT_UINT32, BASE_OCT, NULL, 0x0007FFF0,
                 NULL, HFILL },
             },
             { &hf_dis_signal_link16_sdusn,
@@ -10835,22 +10835,22 @@ void proto_register_dis(void)
             },
             { &hf_dis_iff_mode_code_element_1,
               { "Code Element 1",  "dis.iff.mode_code.element_1",
-                FT_UINT16, BASE_OCT, NULL, 0x7,
+                FT_UINT16, BASE_OCT, NULL, 0x0007,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_code_element_2,
               { "Code Element 2",  "dis.iff.mode_code.element_2",
-                FT_UINT16, BASE_OCT, NULL, 0x38,
+                FT_UINT16, BASE_OCT, NULL, 0x0038,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_code_element_3,
               { "Code Element 3",  "dis.iff.mode_code.element_3",
-                FT_UINT16, BASE_OCT, NULL, 0x1C0,
+                FT_UINT16, BASE_OCT, NULL, 0x01C0,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_code_element_4,
               { "Code Element 4",  "dis.iff.mode_code.element_4",
-                FT_UINT16, BASE_OCT, NULL, 0xE00,
+                FT_UINT16, BASE_OCT, NULL, 0x0E00,
                 NULL, HFILL }
             },
             { &hf_dis_iff_rrb,
@@ -10860,12 +10860,12 @@ void proto_register_dis(void)
             },
             { &hf_dis_iff_rrb_rrb_code,
               { "RRB Code",  "dis.iff.rrb.rrb_code",
-                FT_UINT16, BASE_DEC, NULL, 0x1F,
+                FT_UINT16, BASE_DEC, NULL, 0x001F,
                 NULL, HFILL }
             },
             { &hf_dis_iff_rrb_power_reduction_indicator,
               { "Power Reduction Indicator",  "dis.iff.rrb.power_reduction_indicator",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x800,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffOffOn_Strings), 0x0800,
                 NULL, HFILL }
             },
             { &hf_dis_iff_rrb_radar_enhancement_indicator,
@@ -10880,17 +10880,17 @@ void proto_register_dis(void)
             },
             { &hf_dis_iff_mode_s_interrogator_identifier_primary_ic_type,
               { "Primary IC Type",  "dis.iff.mode_s_interrogator_identifier.primary_ic_type",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeSInterrogatorIdentifierICType_Strings), 0x1,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeSInterrogatorIdentifierICType_Strings), 0x0001,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_s_interrogator_identifier_primary_ic_code,
               { "Primary IC Code",  "dis.iff.mode_s_interrogator_identifier.primary_ic_code",
-                 FT_UINT16, BASE_DEC, NULL, 0xFE,
+                 FT_UINT16, BASE_DEC, NULL, 0x00FE,
                  NULL, HFILL }
             },
             { &hf_dis_iff_mode_s_interrogator_identifier_secondary_ic_type,
               { "Secondary IC Type",  "dis.iff.mode_s_interrogator_identifier.secondary_ic_type",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeSInterrogatorIdentifierICType_Strings), 0x100,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeSInterrogatorIdentifierICType_Strings), 0x0100,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_s_interrogator_identifier_secondary_ic_code,
@@ -10900,17 +10900,17 @@ void proto_register_dis(void)
             },
             { &hf_dis_iff_mode_4,
               { "Mode 4 Code",  "dis.iff.mode_4",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffMode4_Strings), 0xFFF,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffMode4_Strings), 0x0FFF,
                 NULL, HFILL }
             },
             { &hf_dis_iff_mode_c_altitude_indicator,
               { "Altitude Indicator",  "dis.iff.mode_c.altitude_indicator",
-               FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeCAltitudeIndicator_Strings), 0x1,
+               FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeCAltitudeIndicator_Strings), 0x0001,
                NULL, HFILL }
             },
             { &hf_dis_iff_mode_c_altitude,
               { "Mode C Altitude",  "dis.iff.mode_c.altitude",
-               FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeC_Strings), 0xFFE,
+               FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffModeC_Strings), 0x0FFE,
                NULL, HFILL }
             },
             { &hf_dis_iff_tcas_acas,
@@ -10920,22 +10920,22 @@ void proto_register_dis(void)
             },
             { &hf_dis_iff_tcas_acas_basic_advanced_indicator,
               { "Basic/Advanced",  "dis.iff.tcas_acas.basic_advanced_indicator",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASBasicAdvanced_Strings), 0x1,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASBasicAdvanced_Strings), 0x0001,
                 NULL, HFILL }
             },
             { &hf_dis_iff_tcas_acas_tcas_acas_indicator,
               { "TCAS/ACAS",  "dis.iff.tcas_acas.tcas_acas_indicator",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASIndicator_Strings), 0x2,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASIndicator_Strings), 0x0002,
                 NULL, HFILL }
             },
             { &hf_dis_iff_tcas_acas_software_version,
               { "Software Version",  "dis.iff.tcas_acas.software_version",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASSoftwareVersion_Strings), 0x1C,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASSoftwareVersion_Strings), 0x001C,
                 NULL, HFILL }
             },
             { &hf_dis_iff_tcas_acas_tcas_acas_type,
               { "TCAS/ACAS Type",  "dis.iff.tcas_acas.tcas_acas_type",
-                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASType_Strings), 0xE00,
+                FT_UINT16, BASE_DEC, VALS(DIS_PDU_IffTCASACASType_Strings), 0x0E00,
                 NULL, HFILL }
             },
             { &hf_dis_iff_tcas_acas_tcas_type,
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 11795f59fe..96eefee05f 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -835,7 +835,7 @@ proto_register_fcsbccs (void)
 
         { &hf_sbccs_dib_qtu,
           { "Queue-Time Unit", "fcsb3.qtu",
-            FT_UINT16, BASE_DEC, NULL, 0xFFF,
+            FT_UINT16, BASE_DEC, NULL, 0x0FFF,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_dtuf,
@@ -845,7 +845,7 @@ proto_register_fcsbccs (void)
 
         { &hf_sbccs_dib_dtu,
           { "Defer-Time Unit", "fcsb3.dtu",
-            FT_UINT16, BASE_DEC, NULL, 0xFFF,
+            FT_UINT16, BASE_DEC, NULL, 0x0FFF,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_ctlfn,
@@ -1065,17 +1065,17 @@ proto_register_fcsbccs (void)
 
         { &hf_sbccs_dib_ctlparam_rc,
           { "RC", "fcsb3.ctlparam.rc",
-            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x80,
+            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x000080,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_ctlparam_ru,
           { "RU", "fcsb3.ctlparam.ru",
-            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x10,
+            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x000010,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_ctlparam_ro,
           { "RO", "fcsb3.ctlparam.ro",
-            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x08,
+            FT_BOOLEAN, 24, TFS(&tfs_set_notset), 0x000008,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_linkctlinfo,
@@ -1085,12 +1085,12 @@ proto_register_fcsbccs (void)
 
         { &hf_sbccs_dib_linkctlinfo_ctcconn,
           { "CTC Conn", "fcsb3.linkctlinfo.ctc_conn",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x80,
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0080,
             NULL, HFILL}},
 
         { &hf_sbccs_dib_linkctlinfo_ecrcg,
           { "Enhanced CRC Generation", "fcsb3.linkctlinfo.ecrcg",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x01,
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0001,
             NULL, HFILL}},
 
         { &hf_sbccs_logical_path,
diff --git a/epan/dissectors/packet-gsm_abis_om2000.c b/epan/dissectors/packet-gsm_abis_om2000.c
index 8d0e2d7c88..37f8d25c8f 100644
--- a/epan/dissectors/packet-gsm_abis_om2000.c
+++ b/epan/dissectors/packet-gsm_abis_om2000.c
@@ -1602,12 +1602,12 @@ proto_register_abis_om2000(void)
 		},
 		{ &hf_om2k_isl_icp1,
 		  { "ICP1", "gsm_abis_om2000.is_list.icp1",
-		    FT_UINT16, BASE_DEC, NULL, 0x7ff,
+		    FT_UINT16, BASE_DEC, NULL, 0x07ff,
 		    NULL, HFILL }
 		},
 		{ &hf_om2k_isl_icp2,
 		  { "ICP2", "gsm_abis_om2000.is_list.icp2",
-		    FT_UINT16, BASE_DEC, NULL, 0x7ff,
+		    FT_UINT16, BASE_DEC, NULL, 0x07ff,
 		    NULL, HFILL }
 		},
 		{ &hf_om2k_isl_ci,
@@ -1632,7 +1632,7 @@ proto_register_abis_om2000(void)
 		},
 		{ &hf_om2k_conl_ccp,
 		  { "CON Connection Point", "gsm_abis_om2000.con_list.cpp",
-		    FT_UINT16, BASE_DEC, NULL, 0x7ff,
+            FT_UINT16, BASE_DEC, NULL, 0x07ff,
 		    NULL, HFILL }
 		},
 		{ &hf_om2k_conl_ci,
diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c
index 78c1faf768..0571ccde77 100644
--- a/epan/dissectors/packet-homeplug-av.c
+++ b/epan/dissectors/packet-homeplug-av.c
@@ -6019,15 +6019,15 @@ proto_register_homeplug_av(void)
         },
         { &hf_homeplug_av_mmhdr_mmtype_general,
           { "Type", "homeplug_av.mmhdr.mmtype",
-            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_general_vals_ext, 0x0000, NULL, HFILL }
+            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_general_vals_ext, 0x0, NULL, HFILL }
         },
         { &hf_homeplug_av_mmhdr_mmtype_qualcomm,
           { "Type", "homeplug_av.mmhdr.mmtype.qualcomm",
-            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_qualcomm_vals_ext, 0x0000, NULL, HFILL }
+            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_qualcomm_vals_ext, 0x0, NULL, HFILL }
         },
         { &hf_homeplug_av_mmhdr_mmtype_st,
           { "Type", "homeplug_av.mmhdr.mmtype.st",
-            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_st_iotecha_vals_ext, 0x0000, NULL, HFILL }
+            FT_UINT16, BASE_HEX | BASE_EXT_STRING, &homeplug_av_mmtype_st_iotecha_vals_ext, 0x0, NULL, HFILL }
         },
         { &hf_homeplug_av_mmhdr_mmtype_lsb,
           { "LSB", "homeplug_av.mmhdr.mmtype.lsb",
@@ -7614,11 +7614,11 @@ proto_register_homeplug_av(void)
         },
         { &hf_homeplug_av_tone_map_tx_cnf_slot,
           { "Slot", "homeplug_av.tone_map_tx_cnf.slot",
-            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
+            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_homeplug_av_tone_map_tx_cnf_num_tms,
           { "Number of Tone Maps in use", "homeplug_av.tone_map_tx_cnf.num_tms",
-            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
+            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_homeplug_av_tone_map_tx_cnf_num_act,
           { "Tone map number of active carriers", "homeplug_av.tone_map_tx_cnf.num_act",
diff --git a/epan/dissectors/packet-ieee1722.c b/epan/dissectors/packet-ieee1722.c
index 70d0bacb47..f51717b81d 100644
--- a/epan/dissectors/packet-ieee1722.c
+++ b/epan/dissectors/packet-ieee1722.c
@@ -929,7 +929,7 @@ void proto_register_1722(void)
         },
         { &hf_1722_subtype,
             { "AVTP Subtype", "ieee1722.subtype",
-              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(subtype_range_rvals), 0x0, NULL, HFILL }
         },
         { &hf_1722_svfield,
             { "AVTP Stream ID Valid", "ieee1722.svfield",
@@ -1162,7 +1162,7 @@ static int dissect_1722_61883(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre
         else
         {
             ti_cip_fdf = proto_tree_add_item(ti_61883_tree, hf_1722_61883_cip_fdf_no_syt, tvb, offset, 3, ENC_BIG_ENDIAN);
-            if (((tvb_get_guint8(tvb, offset) & 0x007fffff) != 0))
+            if (((tvb_get_ntoh24(tvb, offset) & 0x7fffff) != 0))
             {
                 expert_add_info(pinfo, ti_cip_fdf, &ei_1722_61883_incorrect_cip_fdf);
             }
@@ -1276,7 +1276,7 @@ void proto_register_1722_61883(void)
             },
         { &hf_1722_61883_seqnum,
             { "Sequence Number", "iec61883.seqnum",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_tufield,
             { "Timestamp Uncertain", "iec61883.tufield",
@@ -1284,19 +1284,19 @@ void proto_register_1722_61883(void)
         },
         { &hf_1722_61883_stream_id,
             { "Stream ID", "iec61883.stream_id",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_avtp_timestamp,
             { "AVTP Timestamp", "iec61883.avtp_timestamp",
-              FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_gateway_info,
             { "Gateway Info", "iec61883.gateway_info",
-              FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_stream_data_length,
             { "1394 Stream Data Length", "iec61883.stream_data_len",
-              FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x00, NULL, HFILL }
+              FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_tag,
             { "1394 Packet Format Tag", "iec61883.tag",
@@ -1324,7 +1324,7 @@ void proto_register_1722_61883(void)
         },
         { &hf_1722_61883_cip_dbs,
             { "CIP Data Block Size", "iec61883.dbs",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_cip_fn,
             { "CIP Fraction Number", "iec61883.fn",
@@ -1340,7 +1340,7 @@ void proto_register_1722_61883(void)
         },
         { &hf_1722_61883_cip_dbc,
             { "CIP Data Block Continuity", "iec61883.dbc",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_cip_qi2,
             { "CIP Quadlet Indicator 2", "iec61883.qi2",
@@ -1352,7 +1352,7 @@ void proto_register_1722_61883(void)
         },
         { &hf_1722_61883_cip_fdf_no_syt,
             { "CIP Format Dependent Field", "iec61883.fdf_no_syt",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_cip_fdf_tsf,
             { "Time shift flag", "iec61883.fdf_tsf",
@@ -1364,27 +1364,27 @@ void proto_register_1722_61883(void)
         },
         { &hf_1722_61883_cip_syt,
             { "CIP SYT", "iec61883.syt",
-              FT_UINT16, BASE_HEX | BASE_RANGE_STRING, RVALS(syt_rvals), 0x00, NULL, HFILL }
+              FT_UINT16, BASE_HEX | BASE_RANGE_STRING, RVALS(syt_rvals), 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_audio_data,
             { "Audio Data", "iec61883.audiodata",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+              FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_label,
             { "Label", "iec61883.audiodata.sample.label",
-              FT_UINT8, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_sample,
             { "Sample", "iec61883.audiodata.sample.sampledata",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+              FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_video_data,
             { "Video Data", "iec61883.videodata",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+              FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_61883_source_packet_header_timestamp,
             { "Source Packet Header Timestamp", "iec61883.spht",
-              FT_UINT32, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
         }
     };
 
@@ -1962,15 +1962,15 @@ void proto_register_1722_crf(void)
         },
         { &hf_1722_crf_seqnum,
             { "Sequence Number", "crf.seqnum",
-              FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_type,
             { "Type", "crf.type",
-              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(crf_type_range_rvals), 0x00, NULL, HFILL }
+              FT_UINT8, BASE_HEX | BASE_RANGE_STRING, RVALS(crf_type_range_rvals), 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_stream_id,
             { "Stream ID", "crf.stream_id",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_pull,
             { "Pull", "crf.pull",
@@ -1982,19 +1982,19 @@ void proto_register_1722_crf(void)
         },
         { &hf_1722_crf_data_length,
             { "Data Length", "crf.data_len",
-              FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x00, NULL, HFILL }
+              FT_UINT16, BASE_DEC|BASE_UNIT_STRING, &units_byte_bytes, 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_timestamp_interval,
             { "Timestamp Interval", "crf.timestamp_interval",
-              FT_UINT16, BASE_DEC, NULL, 0x00, NULL, HFILL }
+              FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_timestamp_data,
             { "Timestamp Data", "crf.timestamp_data",
-              FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }
+              FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_crf_timestamp,
             { "Data", "crf.timestamp",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
         }
     };
 
@@ -2116,11 +2116,11 @@ void proto_register_1722_ntscf(void)
         },
         { &hf_1722_ntscf_seqnum,
             { "Sequence Number", "ntscf.seqnum",
-              FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
+              FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
         },
         { &hf_1722_ntscf_stream_id,
             { "Stream ID", "ntscf.stream_id",
-              FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
+              FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
         }
     };
 
diff --git a/epan/dissectors/packet-ieee1905.c b/epan/dissectors/packet-ieee1905.c
index 2dd0d30a13..283a7ac580 100644
--- a/epan/dissectors/packet-ieee1905.c
+++ b/epan/dissectors/packet-ieee1905.c
@@ -9216,19 +9216,19 @@ proto_register_ieee1905(void)
 
         { &hf_ieee1905_vht_support_80plus_mhz_flag,
           { "VHT support for 80+80 MHz", "ieee1905.ap_vht.vht_80plus_mhz",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x80, NULL, HFILL}},
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0080, NULL, HFILL}},
 
         { &hf_ieee1905_vht_support_160_mhz_flag,
           { "VHT support for 160 MHz", "ieee1905.ap_vht.vht_160mhz",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x40, NULL, HFILL}},
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0040, NULL, HFILL}},
 
         { &hf_ieee1905_su_beamformer_capable_flag,
           { "SU beamformer capable", "ieee1905.ap_vht.su_beamformer",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x20, NULL, HFILL}},
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0020, NULL, HFILL}},
 
         { &hf_ieee1905_mu_beamformer_capable_flag,
           { "MU beamformer capable", "ieee1905.ap_vht.mu_beamformer",
-            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x10, NULL, HFILL}},
+            FT_BOOLEAN, 16, TFS(&tfs_supported_not_supported), 0x0010, NULL, HFILL}},
 
         { &hf_ieee1905_ap_vht_capabilities_radio_id,
           { "Radio unique ID", "ieee1905.ap_vht.radio_id",
@@ -10101,7 +10101,7 @@ proto_register_ieee1905(void)
 
         { &hf_ieee1905_channel_scan_result_neigh_num,
           { "Number of Neighbors", "ieee1905.channel_scan_result.number_of_neighbors",
-            FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+            FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
         { &hf_ieee1905_channel_scan_result_bssid,
           { "BSSID", "ieee1905.channel_scan_result.bssid",
diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 6068d08760..a4e6824eca 100644
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -4298,64 +4298,64 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_xchannel_flags_turbo,
 		 {"Turbo", "radiotap.xchannel.flags.turbo",
-		  FT_BOOLEAN, 24, NULL, 0x0010,
+		  FT_BOOLEAN, 24, NULL, 0x000010,
 		  "Channel Flags Turbo", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_cck,
 		 {"Complementary Code Keying (CCK)", "radiotap.xchannel.flags.cck",
-		  FT_BOOLEAN, 24, NULL, 0x0020,
+		  FT_BOOLEAN, 24, NULL, 0x000020,
 		  "Channel Flags Complementary Code Keying (CCK) Modulation", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_ofdm,
 		 {"Orthogonal Frequency-Division Multiplexing (OFDM)", "radiotap.xchannel.flags.ofdm",
-		  FT_BOOLEAN, 24, NULL, 0x0040,
+		  FT_BOOLEAN, 24, NULL, 0x000040,
 		  "Channel Flags Orthogonal Frequency-Division Multiplexing (OFDM)", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_2ghz,
 		 {"2 GHz spectrum", "radiotap.xchannel.flags.2ghz",
-		  FT_BOOLEAN, 24, NULL, 0x0080,
+		  FT_BOOLEAN, 24, NULL, 0x000080,
 		  "Channel Flags 2 GHz spectrum", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_5ghz,
 		 {"5 GHz spectrum", "radiotap.xchannel.flags.5ghz",
-		  FT_BOOLEAN, 24, NULL, 0x0100,
+		  FT_BOOLEAN, 24, NULL, 0x000100,
 		  "Channel Flags 5 GHz spectrum", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_passive,
 		 {"Passive", "radiotap.channel.xtype.passive",
-		  FT_BOOLEAN, 24, NULL, 0x0200,
+		  FT_BOOLEAN, 24, NULL, 0x000200,
 		  "Channel Flags Passive", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_dynamic,
 		 {"Dynamic CCK-OFDM", "radiotap.xchannel.flags.dynamic",
-		  FT_BOOLEAN, 24, NULL, 0x0400,
+		  FT_BOOLEAN, 24, NULL, 0x000400,
 		  "Channel Flags Dynamic CCK-OFDM Channel", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_gfsk,
 		 {"Gaussian Frequency Shift Keying (GFSK)",
 		  "radiotap.xchannel.flags.gfsk",
-		  FT_BOOLEAN, 24, NULL, 0x0800,
+		  FT_BOOLEAN, 24, NULL, 0x000800,
 		  "Channel Flags Gaussian Frequency Shift Keying (GFSK) Modulation",
 		  HFILL}},
 
 		{&hf_radiotap_xchannel_flags_gsm,
 		 {"GSM (900MHz)", "radiotap.xchannel.flags.gsm",
-		  FT_BOOLEAN, 24, NULL, 0x1000,
+		  FT_BOOLEAN, 24, NULL, 0x001000,
 		  "Channel Flags GSM", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_sturbo,
 		 {"Static Turbo", "radiotap.xchannel.flags.sturbo",
-		  FT_BOOLEAN, 24, NULL, 0x2000,
+		  FT_BOOLEAN, 24, NULL, 0x002000,
 		  "Channel Flags Status Turbo", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_half,
 		 {"Half Rate Channel (10MHz Channel Width)", "radiotap.xchannel.flags.half",
-		  FT_BOOLEAN, 24, NULL, 0x4000,
+		  FT_BOOLEAN, 24, NULL, 0x004000,
 		  "Channel Flags Half Rate", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_quarter,
 		 {"Quarter Rate Channel (5MHz Channel Width)", "radiotap.xchannel.flags.quarter",
-		  FT_BOOLEAN, 24, NULL, 0x8000,
+		  FT_BOOLEAN, 24, NULL, 0x008000,
 		  "Channel Flags Quarter Rate", HFILL}},
 
 		{&hf_radiotap_xchannel_flags_ht20,
@@ -4370,7 +4370,7 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_xchannel_flags_ht40d,
 		 {"HT Channel (40MHz Channel Width with Extension channel below)", "radiotap.xchannel.flags.ht40d",
-		  FT_BOOLEAN, 24, NULL, 0x40000,
+		  FT_BOOLEAN, 24, NULL, 0x040000,
 		  "Channel Flags HT/40-", HFILL}},
 #if 0
 		{&hf_radiotap_xchannel_maxpower,
@@ -4592,7 +4592,7 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_vht_known,
 		 {"Known VHT information", "radiotap.vht.known",
-		  FT_UINT8, BASE_HEX, NULL, 0x0,
+		  FT_UINT16, BASE_HEX, NULL, 0x0,
 		  "Bit mask indicating what VHT information is present", HFILL}},
 
 		{&hf_radiotap_vht_user,
@@ -5865,6 +5865,7 @@ void proto_register_radiotap(void)
 
 		{&hf_radiotap_s1g_ndp_ps_poll_udi_2m,
 		 {"UDI", "radiotap.s1g.ndp.ps_poll.udi",
+		  /* TODO: not sure this mask is correct.. */
 		  FT_UINT40, BASE_HEX, NULL, 0x1FFE00000, NULL, HFILL }},
 
 		{&hf_radiotap_s1g_ndp_ps_poll_ack_1m,
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index 3f8298ef53..6183b83daa 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -1894,15 +1894,15 @@ proto_register_isi(void)
 		{ &hf_isi_sim_secondary_cause,
 		  { "Secondary Cause", "isi.sim.secondary_cause", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &isi_sim_cause_ext, 0x0, NULL, HFILL }},
 		{&hf_isi_sim_subblock_count,
-		  { "Subblock Count", "isi.sim.subblock_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Subblock Count", "isi.sim.subblock_count", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{&hf_isi_sim_subblock_size,
-		  { "Subblock Size", "isi.sim.subblock_size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Subblock Size", "isi.sim.subblock_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_isi_sim_pb_subblock,
 		  { "Subblock", "isi.sim.pb.subblock", FT_UINT8, BASE_HEX, VALS(isi_sim_pb_subblock), 0x0, NULL, HFILL }},
 		{ &hf_isi_sim_pb_type,
 		  { "Phonebook Type", "isi.sim.pb.type", FT_UINT8, BASE_HEX, VALS(isi_sim_pb_type), 0x0, NULL, HFILL }},
 		{&hf_isi_sim_pb_location,
-		  { "Phonebook Location", "isi.sim.pb.location", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Phonebook Location", "isi.sim.pb.location", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{&hf_isi_sim_pb_tag_count,
 		  { "Tag Count", "isi.sim.pb.tag.count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_isi_sim_pb_tag,
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index 8977328ba9..d78f5138e1 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -1584,7 +1584,7 @@ proto_register_isis_hello(void)
       { &hf_isis_hello_clv_nlpid_nlpid, { "NLPID", "isis.hello.clv_nlpid.nlpid", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
       { &hf_isis_hello_clv_ip_authentication, { "NLPID", "isis.hello.clv_ip_authentication", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_isis_hello_authentication, { "Authentication", "isis.hello.clv_authentication", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-      { &hf_isis_hello_mtid, { "Topology ID", "isis.hello.mtid", FT_UINT16, BASE_DEC|BASE_RANGE_STRING, RVALS(mtid_strings), 0xfff, NULL, HFILL }},
+      { &hf_isis_hello_mtid, { "Topology ID", "isis.hello.mtid", FT_UINT16, BASE_DEC|BASE_RANGE_STRING, RVALS(mtid_strings), 0x0fff, NULL, HFILL }},
       { &hf_isis_hello_trill_neighbor_sf, { "Smallest flag", "isis.hello.trill_neighbor.sf", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x80, NULL, HFILL }},
       { &hf_isis_hello_trill_neighbor_lf, { "Largest flag", "isis.hello.trill_neighbor.lf", FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x40, NULL, HFILL }},
       { &hf_isis_hello_trill_neighbor_size, { "SNPA Size", "isis.hello.trill_neighbor.size", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
@@ -1605,15 +1605,15 @@ proto_register_isis_hello(void)
       { &hf_isis_hello_vlan_flags_ac, { "Access Port", "isis.hello.vlan_flags.ac", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x4000, NULL, HFILL }},
       { &hf_isis_hello_vlan_flags_vm, { "VLAN Mapping Detected", "isis.hello.vlan_flags.vm", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x2000, NULL, HFILL }},
       { &hf_isis_hello_vlan_flags_by, { "Bypass Pseudonode", "isis.hello.vlan_flags.by", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x1000, NULL, HFILL }},
-      { &hf_isis_hello_vlan_flags_outer_vlan, { "Outer VLAN", "isis.hello.vlan_flags.outer_vlan", FT_UINT16, BASE_DEC, NULL, 0xfff, NULL, HFILL }},
+      { &hf_isis_hello_vlan_flags_outer_vlan, { "Outer VLAN", "isis.hello.vlan_flags.outer_vlan", FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL }},
       { &hf_isis_hello_vlan_flags_tr, { "Trunk Port", "isis.hello.vlan_flags.tr", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x8000, NULL, HFILL }},
       { &hf_isis_hello_vlan_flags_reserved, { "Reserved", "isis.hello.vlan_flags.reserved", FT_BOOLEAN, 16, TFS(&tfs_set_notset), 0x7000, NULL, HFILL }},
-      { &hf_isis_hello_vlan_flags_designated_vlan, { "Designated VLAN", "isis.hello.vlan_flags.designated_vlan", FT_UINT16, BASE_DEC, NULL, 0xfff, NULL, HFILL }},
+      { &hf_isis_hello_vlan_flags_designated_vlan, { "Designated VLAN", "isis.hello.vlan_flags.designated_vlan", FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL }},
       { &hf_isis_hello_enabled_vlans, { "Enabled VLANs", "isis.hello.enabled_vlans", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_isis_hello_appointed_vlans, { "Appointed VLANs", "isis.hello.appointed_vlans", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_isis_hello_af_nickname, { "Nickname", "isis.hello.af.nickname", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
-      { &hf_isis_hello_af_start_vlan, { "Start VLAN", "isis.hello.af.start_vlan", FT_UINT16, BASE_DEC, NULL, 0xfff, NULL, HFILL }},
-      { &hf_isis_hello_af_end_vlan, { "End VLAN", "isis.hello.af.end_vlan", FT_UINT16, BASE_DEC, NULL, 0xfff, NULL, HFILL }},
+      { &hf_isis_hello_af_start_vlan, { "Start VLAN", "isis.hello.af.start_vlan", FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL }},
+      { &hf_isis_hello_af_end_vlan, { "End VLAN", "isis.hello.af.end_vlan", FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL }},
       { &hf_isis_hello_trill_version, { "Maximum version", "isis.hello.trill.maximum_version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_isis_hello_trill_hello_reduction, { "Hello Reduction", "isis.hello.trill.hello_reduction", FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), 0x80000000, NULL, HFILL }},
       { &hf_isis_hello_trill_unassigned_1, { "Unassigned", "isis.hello.trill.unassigned_1", FT_BOOLEAN, 32, TFS(&tfs_set_notset), 0x60000000, NULL, HFILL }},
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index c7fd1a9361..0d650af787 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -5057,7 +5057,7 @@ proto_register_isis_lsp(void)
 
         { &hf_isis_lsp_sid_sli_label,
             { "SID/Label/Index", "isis.lsp.sid.sli_label",
-              FT_UINT24, BASE_DEC, NULL, 0xFFFFF,
+              FT_UINT24, BASE_DEC, NULL, 0x0FFFFF,
               NULL, HFILL }
         },
 
@@ -5970,7 +5970,7 @@ proto_register_isis_lsp(void)
         },
         { &hf_isis_lsp_mt_cap_spsourceid,
             { "SPSourceId", "isis.lsp.mt_cap.spsourceid",
-              FT_UINT32, BASE_HEX_DEC, NULL, 0xfffff,
+              FT_UINT32, BASE_HEX_DEC, NULL, 0x000fffff,
               NULL, HFILL }
         },
         { &hf_isis_lsp_mt_cap_overload,
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c
index c235a45405..00933fe749 100644
--- a/epan/dissectors/packet-ixveriwave.c
+++ b/epan/dissectors/packet-ixveriwave.c
@@ -3402,7 +3402,7 @@ void proto_register_ixveriwave(void)
 
     { &hf_ixveriwave_vw_l4id,
         { "Layer 4 ID", "ixveriwave.layer4id",
-        FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+        FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
 
     /* Ethernet fields */
 
@@ -3448,50 +3448,50 @@ framing signal deasserted.  this is caused by software setting the drain all reg
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_alignment_error,
         { "Alignment error", "ixveriwave.eth_error.rx_alignment_error",
-        FT_BOOLEAN, 12, NULL, 0x0001, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x001, NULL, HFILL } },
     /* rx and tx */
     { &hf_ixveriwave_vw_error_1_packet_fcs_error,
         { "Packet FCS error", "ixveriwave.eth_error.rx_packet_fcs_error",
-        FT_BOOLEAN, 12, NULL, 0x0002, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x002, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_bad_magic_byte_signature,
         { "Bad magic byte signature", "ixveriwave.eth_error.rx_bad_magic_byte_signature",
-        FT_BOOLEAN, 12, NULL, 0x0004, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x004, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_bad_payload_checksum,
         { "Bad payload checksum", "ixveriwave.eth_error.rx_bad_payload_checksum",
-        FT_BOOLEAN, 12, NULL, 0x0008, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x008, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_frame_too_long,
         { "Frame too long error", "ixveriwave.eth_error.rx_frame_too_long",
-        FT_BOOLEAN, 12, NULL, 0x0010, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x010, NULL, HFILL } },
     /* rx and tx */
     { &hf_ixveriwave_vw_error_1_ip_checksum_error,
         { "IP checksum error", "ixveriwave.eth_error.rx_ip_checksum_error",
-        FT_BOOLEAN, 12, NULL, 0x0020, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x020, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_l4_checksum_error,
         { "L4 (TCP/ICMP/IGMP/UDP) checksum error", "ixveriwave.eth_error.rx_l4_checksum_error",
-        FT_BOOLEAN, 12, NULL, 0x0040, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x040, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_id_mismatch,
         { "ID mismatch(for fpga510012)", "ixveriwave.eth_error.rx_id_mismatch",
-        FT_BOOLEAN, 12, NULL, 0x0080, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x080, NULL, HFILL } },
     /* rx-only */
     { &hf_ixveriwave_vw_error_1_length_error,
         { "Length error", "ixveriwave.eth_error.rx_length_error",
-        FT_BOOLEAN, 12, NULL, 0x0100, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x100, NULL, HFILL } },
     /* rx and tx */
     { &hf_ixveriwave_vw_error_1_underflow,
         { "Underflow", "ixveriwave.eth_error.rx_underflow",
-        FT_BOOLEAN, 12, NULL, 0x0200, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x200, NULL, HFILL } },
     /* tx-only */
     { &hf_ixveriwave_vw_error_1_late_collision,
         { "Late collision", "ixveriwave.eth_error.late_collision",
-        FT_BOOLEAN, 12, NULL, 0x0400, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x400, NULL, HFILL } },
     { &hf_ixveriwave_vw_error_1_excessive_collisions,
         { "Excessive collisions", "ixveriwave.eth_error.excessive_collisions",
-        FT_BOOLEAN, 12, NULL, 0x0800, NULL, HFILL } },
+        FT_BOOLEAN, 12, NULL, 0x800, NULL, HFILL } },
     /*all other bits are reserved */
 
     /* WLAN fields */
@@ -3834,7 +3834,7 @@ framing signal deasserted.  this is caused by software setting the drain all reg
         FT_UINT24, BASE_DEC, VALS(fec_encoding_vals), 0x000040, NULL, HFILL } },
     { &hf_radiotap_ht_short_gi,
         { "Short GI", "ixveriwave.ht.short_gi",
-        FT_BOOLEAN, 24, NULL, 0x0000080, NULL, HFILL } },
+        FT_BOOLEAN, 24, NULL, 0x000080, NULL, HFILL } },
     { &hf_radiotap_ht_ness,
         { "Number of Extension Spatial Streams", "ixveriwave.ness",
         FT_UINT24, BASE_DEC, NULL, 0x000300, NULL, HFILL } },
diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c
index d58ae19702..fabf9ce0f9 100644
--- a/epan/dissectors/packet-rtitcp.c
+++ b/epan/dissectors/packet-rtitcp.c
@@ -780,7 +780,7 @@ proto_register_rtitcp(void)
 
         { &hf_rtitcp_header_control_byte, {
             "Control Byte", "rtitcp.header.control_byte",
-            FT_UINT8, BASE_HEX, NULL, 0,
+            FT_UINT16, BASE_HEX, NULL, 0,
             0, HFILL }
         },