3 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-opa-mad.c b/epan/dissectors/packet-opa-mad.c
index 84923ed11b..ed4abfc984 100644
--- a/epan/dissectors/packet-opa-mad.c
+++ b/epan/dissectors/packet-opa-mad.c
@@ -8980,7 +8980,7 @@ void proto_register_opa_mad(void)
         /* Trap 128 */
         { &hf_opa_Trap_LID, {
                 "LIDADDR", "opa.trap.lidaddr",
-                FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
+                FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
         },
 
         /* Trap 129, 130, 131 */
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index db02253aa2..87af040d91 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -11959,7 +11959,7 @@ proto_register_smb2(void)
 		},
 
 		{ &hf_smb2_negotiate_context_offset,
-			{ "NegotiateContextOffset", "smb2.negotiate_context.offset", FT_UINT16, BASE_HEX,
+			{ "NegotiateContextOffset", "smb2.negotiate_context.offset", FT_UINT32, BASE_HEX,
 			NULL, 0, NULL, HFILL }
 		},
 
@@ -12894,7 +12894,7 @@ proto_register_smb2(void)
 		},
 
 		{ &hf_smb2_output_buffer_len,
-			{ "Output Buffer Length", "smb2.output_buffer_len", FT_UINT16, BASE_DEC,
+			{ "Output Buffer Length", "smb2.output_buffer_len", FT_UINT32, BASE_DEC,
 			NULL, 0, NULL, HFILL }
 		},
 
diff --git a/epan/dissectors/packet-usb-hub.c b/epan/dissectors/packet-usb-hub.c
index 48fc795ce2..e2d934a732 100644
--- a/epan/dissectors/packet-usb-hub.c
+++ b/epan/dissectors/packet-usb-hub.c
@@ -712,11 +712,11 @@ proto_register_usb_hub(void)
 		  NULL, HFILL }},
 
 		{ &hf_usb_hub_descriptor_length,
-		{ "DescriptorLength", "usbhub.setup.DescriptorLength", FT_UINT8, BASE_DEC, NULL, 0x0,
+		{ "DescriptorLength", "usbhub.setup.DescriptorLength", FT_UINT16, BASE_DEC, NULL, 0x0,
 		  NULL, HFILL }},
 
 		{ &hf_usb_hub_zero,
-		{ "(zero)", "usbhub.setup.zero", FT_UINT8, BASE_DEC, NULL, 0x0,
+		{ "(zero)", "usbhub.setup.zero", FT_UINT16, BASE_DEC, NULL, 0x0,
 		  NULL, HFILL }},
 
 		{ &hf_usb_hub_tt_flags,