From Kovarththanan Rajaratnam via bug 3548:

(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770

682 files changed, 22492 insertions, 22553 deletions

diff --git a/epan/dissectors/packet-2dparityfec.c b/epan/dissectors/packet-2dparityfec.c
index 2c24863331..ee9750b0d8 100644
--- a/epan/dissectors/packet-2dparityfec.c
+++ b/epan/dissectors/packet-2dparityfec.c
@@ -307,7 +307,7 @@ static hf_register_info hf[] = {
 		{  "FEC Payload",
 			"2dparityfec.payload",
 			FT_BYTES,
-			BASE_HEX,
+			BASE_NONE,
 			NULL,
 			0x0,
 			NULL,
diff --git a/epan/dissectors/packet-3com-njack.c b/epan/dissectors/packet-3com-njack.c
index 2e0e08ccbc..41c75b9a63 100644
--- a/epan/dissectors/packet-3com-njack.c
+++ b/epan/dissectors/packet-3com-njack.c
@@ -683,7 +683,7 @@ proto_register_njack(void)
 
 	/* NJACK header */
 		{ &hf_njack_magic,
-		{ "Magic",	"njack.magic", FT_STRING, BASE_DEC, NULL,
+		{ "Magic",	"njack.magic", FT_STRING, BASE_NONE, NULL,
 			0x0, NULL, HFILL }},
 
 		{ &hf_njack_type,
@@ -725,7 +725,7 @@ proto_register_njack(void)
                         0x0, NULL, HFILL }},
 
                 { &hf_njack_tlv_typestring,
-                { "TlvTypeString",   "njack.tlv.typestring", FT_STRING, BASE_DEC, NULL,
+                { "TlvTypeString",   "njack.tlv.typestring", FT_STRING, BASE_NONE, NULL,
                         0x0, NULL, HFILL }},
 
 		/* 1st tab */
diff --git a/epan/dissectors/packet-3com-xns.c b/epan/dissectors/packet-3com-xns.c
index 2ea3b00540..3952fbf550 100644
--- a/epan/dissectors/packet-3com-xns.c
+++ b/epan/dissectors/packet-3com-xns.c
@@ -102,11 +102,11 @@ proto_register_3com_xns(void)
 		/* registered here but handled in ethertype.c */
 		{ &hf_3com_xns_type_ethertype,
 		{ "Type", "3comxns.type", FT_UINT16, BASE_HEX,
-			VALS(etype_vals), 0x0, "", HFILL }},
+			VALS(etype_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_3com_xns_type_retix_bpdu,
 		{ "Type", "3comxns.type", FT_UINT16, BASE_HEX,
-			VALS(retix_bpdu_type_vals), 0x0, "", HFILL }},
+			VALS(retix_bpdu_type_vals), 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] ={
diff --git a/epan/dissectors/packet-3g-a11.c b/epan/dissectors/packet-3g-a11.c
index fb55d84965..80354a1fee 100644
--- a/epan/dissectors/packet-3g-a11.c
+++ b/epan/dissectors/packet-3g-a11.c
@@ -1743,7 +1743,7 @@ proto_register_a11(void)
 	  { &hf_a11_flags,
 		{"Flags", "a11.flags",
 		 FT_UINT8, BASE_HEX, NULL, 0x0,
-		 "", HFILL}
+		 NULL, HFILL}
 	  },
 	  { &hf_a11_s,
 		 {"Simultaneous Bindings",           "a11.s",
@@ -1774,7 +1774,7 @@ proto_register_a11(void)
 	  { &hf_a11_v,
 		 { "Van Jacobson",           "a11.v",
 		   FT_BOOLEAN, 8, NULL, 4,
-		   "Van Jacobson", HFILL }
+		   NULL, HFILL }
 	  },
 	  { &hf_a11_t,
 		 { "Reverse Tunneling",           "a11.t",
@@ -1834,8 +1834,8 @@ proto_register_a11(void)
 	  },
 	  { &hf_a11_ext,
 		 { "Extension",                      "a11.extension",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Extension", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 	  },
 	  { &hf_a11_aext_spi,
 		 { "SPI",                      "a11.auth.spi",
@@ -1850,7 +1850,7 @@ proto_register_a11(void)
 	  { &hf_a11_next_nai,
 		 { "NAI",                      "a11.nai",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"NAI", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_a11_ses_key,
 		 { "Key",                      "a11.ext.key",
@@ -1860,12 +1860,12 @@ proto_register_a11(void)
 	  { &hf_a11_ses_sidver,
 		{ "Session ID Version",         "a11.ext.sidver",
 			FT_UINT8, BASE_DEC, NULL, 3,
-			"Session ID Version", HFILL}
+			NULL, HFILL}
 	  },
 	  { &hf_a11_ses_mnsrid,
 		 { "MNSR-ID",                      "a11.ext.mnsrid",
 			FT_UINT16, BASE_HEX, NULL, 0,
-			"MNSR-ID", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_a11_ses_msid_type,
 		 { "MSID Type",                      "a11.ext.msid_type",
@@ -1924,13 +1924,13 @@ proto_register_a11(void)
 	  },
 	  { &hf_a11_vse_panid,
 		 { "PANID",                      "a11.ext.panid",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"PANID", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 	  },
 	  { &hf_a11_vse_canid,
 		 { "CANID",                      "a11.ext.canid",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"CANID", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 	  },
 	  { &hf_a11_vse_qosmode,
 		 { "QoS Mode",       "a11.ext.qosmode",
diff --git a/epan/dissectors/packet-9p.c b/epan/dissectors/packet-9p.c
index aeebfc5efe..e01e9e5ace 100644
--- a/epan/dissectors/packet-9p.c
+++ b/epan/dissectors/packet-9p.c
@@ -690,7 +690,7 @@ void proto_register_9P(void)
 		  "9P Tag", HFILL}},
 		{&hf_9P_oldtag,
 		 {"Old tag", "9p.oldtag", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Old tag", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_parmsz,
 		 {"Param length", "9p.paramsz", FT_UINT16, BASE_DEC, NULL, 0x0,
 		  "Parameter length", HFILL}},
@@ -705,43 +705,43 @@ void proto_register_9P(void)
 		  "Number of Qid results", HFILL}},
 		{&hf_9P_mode,
 		 {"Mode", "9p.mode", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  "Mode", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_mode_rwx,
 		 {"Open/Create Mode", "9p.mode.rwx", FT_UINT8, BASE_DEC,VALS(ninep_mode_vals),P9_MODEMASK,
-		  "Open/Create Mode", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_mode_t,
 		 {"Trunc", "9p.mode.trunc", FT_BOOLEAN, 8, TFS(&flags_set_truth), P9_OTRUNC,
 		  "Truncate", HFILL}},
 		{&hf_9P_mode_c,
 		 {"Remove on close", "9p.mode.orclose", FT_BOOLEAN, 8, TFS(&flags_set_truth), P9_ORCLOSE,
-		  "", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_iounit,
 		 {"I/O Unit", "9p.iounit", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "I/O Unit", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_count,
 		 {"Count", "9p.count", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Count", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_offset,
 		 {"Offset", "9p.offset", FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "Offset", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_perm,
 		 {"Permissions", "9p.perm", FT_UINT32, BASE_OCT, NULL, 0x0,
 		  "Permission bits", HFILL}},
 		{&hf_9P_qidpath,
 		 {"Qid path", "9p.qidpath", FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "Qid path", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_qidvers,
 		 {"Qid version", "9p.qidvers", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Qid version", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_qidtype,
 		 {"Qid type", "9p.qidtype", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  "Qid type", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_statmode,
 		 {"Mode", "9p.statmode", FT_UINT32, BASE_OCT, NULL, 0x0,
 		  "File mode flags", HFILL}},
 		{&hf_9P_stattype,
 		 {"Type", "9p.stattype", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Type", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_atime,
 		 {"Atime", "9p.atime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
 		  "Access Time", HFILL}},
@@ -753,13 +753,13 @@ void proto_register_9P(void)
 		  "File Length", HFILL}},
 		{&hf_9P_dev,
 		 {"Dev", "9p.dev", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_wname,
 		 {"Wname", "9p.wname", FT_STRING, BASE_NONE, NULL, 0x0,
 		  "Path Name Element", HFILL}},
 		{&hf_9P_version,
 		 {"Version", "9p.version", FT_STRING, BASE_NONE, NULL, 0x0,
-		  "Version", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_afid,
 		 {"Afid", "9p.fid", FT_UINT32, BASE_DEC, NULL, 0x0,
 		  "Authenticating FID", HFILL}},
@@ -777,10 +777,10 @@ void proto_register_9P(void)
 		  "Name of file", HFILL}},
 		{&hf_9P_sdlen,
 		 {"Stat data length", "9p.sdlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Stat data length", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_filename,
 		 {"File name", "9p.filename", FT_STRING, BASE_NONE, NULL, 0x0,
-		  "File name", HFILL}},
+		  NULL, HFILL}},
 		{&hf_9P_uid,
 		 {"Uid", "9p.uid", FT_STRING, BASE_NONE, NULL, 0x0,
 		  "User id", HFILL}},
diff --git a/epan/dissectors/packet-aarp.c b/epan/dissectors/packet-aarp.c
index 5162de4448..0ea0451e32 100644
--- a/epan/dissectors/packet-aarp.c
+++ b/epan/dissectors/packet-aarp.c
@@ -275,67 +275,67 @@ proto_register_aarp(void)
     { &hf_aarp_hard_type,
       { "Hardware type",		"aarp.hard.type",
 	FT_UINT16,	BASE_HEX,	VALS(hrd_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_proto_type,
       { "Protocol type",		"aarp.proto.type",
 	FT_UINT16,	BASE_HEX, 	VALS(etype_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_hard_size,
       { "Hardware size",		"aarp.hard.size",
 	FT_UINT8,	BASE_DEC, 	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_proto_size,
       { "Protocol size",		"aarp.proto.size",
 	FT_UINT8,	BASE_DEC, 	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_opcode,
       { "Opcode",			"aarp.opcode",
 	FT_UINT16,	BASE_DEC,	VALS(op_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_src_hw,
       { "Sender hardware address",	"aarp.src.hw",
 	FT_BYTES,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_src_hw_mac,
       { "Sender MAC address",		"aarp.src.hw_mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_src_proto,
       { "Sender protocol address",	"aarp.src.proto",
 	FT_BYTES,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_src_proto_id,
       { "Sender ID",			"aarp.src.proto_id",
-	FT_BYTES,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
+      	NULL, HFILL }},
 
     { &hf_aarp_dst_hw,
       { "Target hardware address",	"aarp.dst.hw",
 	FT_BYTES,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_dst_hw_mac,
       { "Target MAC address",		"aarp.dst.hw_mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_aarp_dst_proto,
       { "Target protocol address",	"aarp.dst.proto",
 	FT_BYTES,	BASE_NONE,	NULL,	0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_aarp_dst_proto_id,
       { "Target ID",			"aarp.dst.proto_id",
-	FT_BYTES,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_aarp,
diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index e71a648b02..d6703f8301 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -2663,7 +2663,7 @@ void proto_register_acn(void)
     /* DMP data */
     { &hf_acn_data,
       { "Data", "acn.dmp_data",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }
     },
     { &hf_acn_data8,
@@ -2689,7 +2689,7 @@ void proto_register_acn(void)
 
     { &hf_acn_dmp_address_data_pairs,
       { "Address-Data Pairs", "acn.dmp_address_data_pairs",
-        FT_BYTES, BASE_DEC, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "More address-data pairs", HFILL }
     },
 
diff --git a/epan/dissectors/packet-acp133.c b/epan/dissectors/packet-acp133.c
index a12c28e8e3..af3e2ff492 100644
--- a/epan/dissectors/packet-acp133.c
+++ b/epan/dissectors/packet-acp133.c
@@ -1045,7 +1045,7 @@ void proto_register_acp133(void) {
         "acp133.Community", HFILL }},
     { &hf_acp133_OnSupported_PDU,
       { "OnSupported", "acp133.OnSupported",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.OnSupported", HFILL }},
     { &hf_acp133_ACPLegacyFormat_PDU,
       { "ACPLegacyFormat", "acp133.ACPLegacyFormat",
@@ -1065,7 +1065,7 @@ void proto_register_acp133(void) {
         "acp133.DistributionCode", HFILL }},
     { &hf_acp133_JPEG_PDU,
       { "JPEG", "acp133.JPEG",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.JPEG", HFILL }},
     { &hf_acp133_MonthlyUKMs_PDU,
       { "MonthlyUKMs", "acp133.MonthlyUKMs",
@@ -1081,7 +1081,7 @@ void proto_register_acp133(void) {
         "acp133.RIParameters", HFILL }},
     { &hf_acp133_Kmid_PDU,
       { "Kmid", "acp133.Kmid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.Kmid", HFILL }},
     { &hf_acp133_MLReceiptPolicy_PDU,
       { "MLReceiptPolicy", "acp133.MLReceiptPolicy",
@@ -1121,7 +1121,7 @@ void proto_register_acp133(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_acp133_encrypted,
       { "encrypted", "acp133.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.BIT_STRING", HFILL }},
     { &hf_acp133_Remarks_item,
       { "Remarks item", "acp133.Remarks_item",
@@ -1137,7 +1137,7 @@ void proto_register_acp133(void) {
         "acp133.T_rIType", HFILL }},
     { &hf_acp133_minimize,
       { "minimize", "acp133.minimize",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_sHD,
       { "sHD", "acp133.sHD",
@@ -1153,11 +1153,11 @@ void proto_register_acp133(void) {
         "acp133.PairwiseTag", HFILL }},
     { &hf_acp133_ukm,
       { "ukm", "acp133.ukm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.OCTET_STRING", HFILL }},
     { &hf_acp133_kmid,
       { "kmid", "acp133.kmid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acp133.Kmid", HFILL }},
     { &hf_acp133_edition,
       { "edition", "acp133.edition",
@@ -1241,11 +1241,11 @@ void proto_register_acp133(void) {
         "acp133.T_conversion_with_loss_prohibited", HFILL }},
     { &hf_acp133_further_dl_expansion_allowed,
       { "further-dl-expansion-allowed", "acp133.further_dl_expansion_allowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_originator_requested_alternate_recipient_removed,
       { "originator-requested-alternate-recipient-removed", "acp133.originator_requested_alternate_recipient_removed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "acp133.BOOLEAN", HFILL }},
     { &hf_acp133_proof_of_delivery,
       { "proof-of-delivery", "acp133.proof_of_delivery",
@@ -1330,15 +1330,15 @@ void proto_register_acp133(void) {
     { &hf_acp133_OnSupported_acp127_nn,
       { "acp127-nn", "acp133.acp127-nn",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_OnSupported_acp127_pn,
       { "acp127-pn", "acp133.acp127-pn",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acp133_OnSupported_acp127_tn,
       { "acp127-tn", "acp133.acp127-tn",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-acp133-hfarr.c ---*/
 #line 71 "packet-acp133-template.c"
diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index ff30c540e2..6deca1ce5e 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1776,11 +1776,11 @@ void proto_register_acse(void) {
         "acse.T_single_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_octet_aligned", HFILL }},
     { &hf_acse_arbitrary,
       { "arbitrary", "acse.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_aarq,
       { "aarq", "acse.aarq",
@@ -1816,7 +1816,7 @@ void proto_register_acse(void) {
         "acse.ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARQ_protocol_version", HFILL }},
     { &hf_acse_aARQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1856,7 +1856,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_sender_acse_requirements,
       { "sender-acse-requirements", "acse.sender_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_mechanism_name,
       { "mechanism-name", "acse.mechanism_name",
@@ -1892,7 +1892,7 @@ void proto_register_acse(void) {
         "acse.Association_data", HFILL }},
     { &hf_acse_aARE_protocol_version,
       { "protocol-version", "acse.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.T_AARE_protocol_version", HFILL }},
     { &hf_acse_aARE_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
@@ -1924,7 +1924,7 @@ void proto_register_acse(void) {
         "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_responder_acse_requirements,
       { "responder-acse-requirements", "acse.responder_acse_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ACSE_requirements", HFILL }},
     { &hf_acse_responding_authentication_value,
       { "responding-authentication-value", "acse.responding_authentication_value",
@@ -2016,7 +2016,7 @@ void proto_register_acse(void) {
         "acse.ASO_qualifier_form3", HFILL }},
     { &hf_acse_aso_qualifier_form_any_octets,
       { "aso-qualifier-form-any-octets", "acse.aso_qualifier_form_any_octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.ASO_qualifier_form_octets", HFILL }},
     { &hf_acse_ae_title_form1,
       { "ae-title-form1", "acse.ae_title_form1",
@@ -2112,7 +2112,7 @@ void proto_register_acse(void) {
         "acse.EXTERNALt", HFILL }},
     { &hf_acse_simply_encoded_data,
       { "simply-encoded-data", "acse.simply_encoded_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.Simply_encoded_data", HFILL }},
     { &hf_acse_fully_encoded_data,
       { "fully-encoded-data", "acse.fully_encoded_data",
@@ -2132,7 +2132,7 @@ void proto_register_acse(void) {
         "acse.T_simple_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned_01,
       { "octet-aligned", "acse.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.OCTET_STRING", HFILL }},
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
@@ -2148,7 +2148,7 @@ void proto_register_acse(void) {
         "acse.GraphicString", HFILL }},
     { &hf_acse_bitstring,
       { "bitstring", "acse.bitstring",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "acse.BIT_STRING", HFILL }},
     { &hf_acse_external,
       { "external", "acse.external",
@@ -2161,27 +2161,27 @@ void proto_register_acse(void) {
     { &hf_acse_T_AARQ_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_T_AARE_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_authentication,
       { "authentication", "acse.authentication",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_aSO_context_negotiation,
       { "aSO-context-negotiation", "acse.aSO-context-negotiation",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_higher_level_association,
       { "higher-level-association", "acse.higher-level-association",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_acse_ACSE_requirements_nested_association,
       { "nested-association", "acse.nested-association",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-acse-hfarr.c ---*/
 #line 252 "packet-acse-template.c"
diff --git a/epan/dissectors/packet-actrace.c b/epan/dissectors/packet-actrace.c
index bf6d12a89e..0eb9ae6c7a 100644
--- a/epan/dissectors/packet-actrace.c
+++ b/epan/dissectors/packet-actrace.c
@@ -727,48 +727,48 @@ void proto_register_actrace(void)
               "Capture Time", HFILL }},
 		{ &hf_actrace_cas_source,
 			{ "Source", "actrace.cas.source", FT_INT32, BASE_DEC, VALS(actrace_cas_source_vals), 0x0,
-              "Source", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_current_state,
 			{ "Current State", "actrace.cas.curr_state", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Current State", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_event,
 			{ "Event", "actrace.cas.event", FT_INT32, BASE_DEC, VALS(actrace_cas_event_vals), 0x0,
               "New Event", HFILL }},
 		{ &hf_actrace_cas_next_state,
 			{ "Next State", "actrace.cas.next_state", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Next State", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_function,
 			{ "Function", "actrace.cas.function", FT_INT32, BASE_DEC, VALS(actrace_cas_function_vals), 0x0,
-              "Function", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_par0,
 			{ "Parameter 0", "actrace.cas.par0", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 0", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_par1,
 			{ "Parameter 1", "actrace.cas.par1", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 1", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_par2,
 			{ "Parameter 2", "actrace.cas.par2", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Parameter 2", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_trunk,
 			{ "Trunk Number", "actrace.cas.trunk", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Trunk Number", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_bchannel,
 			{ "BChannel", "actrace.cas.bchannel", FT_INT32, BASE_DEC, NULL, 0x0,
-              "BChannel", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_cas_connection_id,
 			{ "Connection ID", "actrace.cas.conn_id", FT_INT32, BASE_DEC, NULL, 0x0,
-              "Connection ID", HFILL }},
+              NULL, HFILL }},
 
 		/* ISDN */
 		{ &hf_actrace_isdn_trunk,
 			{ "Trunk Number", "actrace.isdn.trunk", FT_INT16, BASE_DEC, NULL, 0x0,
-              "Trunk Number", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_isdn_direction,
 			{ "Direction", "actrace.isdn.dir", FT_INT32, BASE_DEC, VALS(actrace_isdn_direction_vals), 0x0,
-              "Direction", HFILL }},
+              NULL, HFILL }},
 		{ &hf_actrace_isdn_length,
 			{ "Length", "actrace.isdn.length", FT_INT16, BASE_DEC, NULL, 0x0,
-              "Length", HFILL }},  
+              NULL, HFILL }},  
     };
 
     static gint *ett[] =
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index ea71a489f4..f0c5406067 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -4469,7 +4469,7 @@ proto_register_afp(void)
     { &hf_afp_user,
       { "User",         "afp.user",
 		FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"User", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_user_type,
       { "Type",         "afp.user_type",
@@ -4487,11 +4487,11 @@ proto_register_afp(void)
     { &hf_afp_passwd,
       { "Password",     "afp.passwd",
 		FT_STRINGZ, BASE_NONE, NULL, 0x0,
-      	"Password", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_random,
       { "Random number",         "afp.random",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"UAM random number", HFILL }},
 
     { &hf_afp_response_to,
@@ -4567,12 +4567,12 @@ proto_register_afp(void)
     { &hf_afp_vol_attribute_NoNetworkUserID,
       { "No Network User ID",         "afp.vol_attribute.network_user_id",
 		 FT_BOOLEAN, 16, NULL, kNoNetworkUserIDs,
-      	"No Network User ID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_vol_attribute_DefaultPrivsFromParent,
       { "Inherit parent privileges",         "afp.vol_attribute.inherit_parent_privs",
 		 FT_BOOLEAN, 16, NULL, kDefaultPrivsFromParent,
-      	"Inherit parent privileges", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_vol_attribute_NoExchangeFiles,
       { "No exchange files",         "afp.vol_attribute.no_exchange_files",
@@ -4752,12 +4752,12 @@ proto_register_afp(void)
     { &hf_afp_dir_attribute_RenameInhibit,
       { "Rename inhibit",         "afp.dir_attribute.rename_inhibit",
 	    FT_BOOLEAN, 16, NULL,  kFPRenameInhibitBit,
-      	"Rename inhibit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_attribute_DeleteInhibit,
       { "Delete inhibit",         "afp.dir_attribute.delete_inhibit",
 	    FT_BOOLEAN, 16, NULL,  kFPDeleteInhibitBit,
-      	"Delete inhibit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_attribute_SetClear,
       { "Set",         "afp.dir_attribute.set_clear",
@@ -4873,7 +4873,7 @@ proto_register_afp(void)
     { &hf_afp_file_attribute_WriteInhibit,
       { "Write inhibit",         "afp.file_attribute.write_inhibit",
 	    FT_BOOLEAN, 16, NULL,  kFPWriteInhibitBit,
-      	"Write inhibit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_attribute_BackUpNeeded,
       { "Backup needed",         "afp.file_attribute.backup_needed",
@@ -4919,7 +4919,7 @@ proto_register_afp(void)
     { &hf_afp_vol_id,
       { "Volume id",         "afp.vol_id",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"Volume id", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_vol_signature,
       { "Signature",         "afp.vol_signature",
@@ -4979,7 +4979,7 @@ proto_register_afp(void)
     { &hf_afp_dir_bitmap,
       { "Directory bitmap",         "afp.dir_bitmap",
 		FT_UINT16, BASE_HEX, NULL, 0x0,
-      	"Directory bitmap", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_offspring,
       { "Offspring",         "afp.dir_offspring",
@@ -4999,22 +4999,22 @@ proto_register_afp(void)
     { &hf_afp_creation_date,
       { "Creation date",         "afp.creation_date",
 		FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-      	"Creation date", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_modification_date,
       { "Modification date",         "afp.modification_date",
 		FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-      	"Modification date", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_backup_date,
       { "Backup date",         "afp.backup_date",
 		FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-      	"Backup date", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_finder_info,
       { "Finder info",         "afp.finder_info",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Finder info", HFILL }},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_afp_long_name_offset,
       { "Long name offset",    "afp.long_name_offset",
@@ -5044,12 +5044,12 @@ proto_register_afp(void)
     { &hf_afp_unix_privs_permissions,
       { "Permissions",     "afp.unix_privs.permissions",
 		FT_UINT32, BASE_OCT, NULL, 0x0,
-      	"Permissions", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_unix_privs_ua_permissions,
       { "User's access rights",     "afp.unix_privs.ua_permissions",
 		FT_UINT32, BASE_HEX, NULL, 0x0,
-      	"User's access rights", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_id,
       { "File ID",         "afp.file_id",
@@ -5059,12 +5059,12 @@ proto_register_afp(void)
     { &hf_afp_file_DataForkLen,
       { "Data fork size",         "afp.data_fork_len",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"Data fork size", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_RsrcForkLen,
       { "Resource fork size",         "afp.resource_fork_len",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"Resource fork size", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_ExtDataForkLen,
       { "Extended data fork size",         "afp.ext_data_fork_len",
@@ -5079,7 +5079,7 @@ proto_register_afp(void)
     { &hf_afp_file_bitmap,
       { "File bitmap",         "afp.file_bitmap",
 		FT_UINT16, BASE_HEX, NULL, 0x0,
-      	"File bitmap", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_req_count,
       { "Req count",         "afp.req_count",
@@ -5094,7 +5094,7 @@ proto_register_afp(void)
     { &hf_afp_max_reply_size,
       { "Reply size",         "afp.reply_size",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"Reply size", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_start_index32,
       { "Start index",         "afp.start_index32",
@@ -5104,7 +5104,7 @@ proto_register_afp(void)
     { &hf_afp_max_reply_size32,
       { "Reply size",         "afp.reply_size32",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"Reply size", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_flag,
       { "Dir",         "afp.file_flag",
@@ -5184,12 +5184,12 @@ proto_register_afp(void)
     { &hf_afp_request_bitmap_PartialNames,
       	{ "Match on partial names",         "afp.request_bitmap.partial_names",
 	    FT_BOOLEAN, 32, NULL,  0x80000000,
-      	"Match on partial names", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_request_bitmap,
       { "Request bitmap",         "afp.request_bitmap",
 		FT_UINT32, BASE_HEX, NULL, 0x0,
-      	"Request bitmap", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_struct_size,
       { "Struct size",         "afp.struct_size",
@@ -5219,7 +5219,7 @@ proto_register_afp(void)
     { &hf_afp_offset,
       { "Offset",         "afp.offset",
 		FT_INT32, BASE_DEC, NULL, 0x0,
-      	"Offset", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_rw_count,
       { "Count",         "afp.rw_count",
@@ -5249,7 +5249,7 @@ proto_register_afp(void)
     { &hf_afp_ofork_len,
       { "New length",         "afp.ofork_len",
 		FT_INT32, BASE_DEC, NULL, 0x0,
-      	"New length", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_path_type,
       { "Type",         "afp.path_type",
@@ -5269,7 +5269,7 @@ proto_register_afp(void)
     { &hf_afp_path_unicode_hint,
       { "Unicode hint",  "afp.path_unicode_hint",
 		FT_UINT32, BASE_HEX, VALS(unicode_hint_vals), 0x0,
-      	"Unicode hint", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_path_name,
       { "Name",  "afp.path_name",
@@ -5299,12 +5299,12 @@ proto_register_afp(void)
     { &hf_afp_access_deny_read,
       { "Deny read",         "afp.access.deny_read",
     	FT_BOOLEAN, 8, NULL,  0x10,
-      	"Deny read", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_access_deny_write,
       { "Deny write",         "afp.access.deny_write",
     	FT_BOOLEAN, 8, NULL,  0x20,
-      	"Deny write", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_comment,
       { "Comment",         "afp.comment",
@@ -5314,17 +5314,17 @@ proto_register_afp(void)
     { &hf_afp_file_creator,
       { "File creator",         "afp.file_creator",
 		FT_STRING, BASE_NONE, NULL, 0x0,
-      	"File creator", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_file_type,
       { "File type",         "afp.file_type",
 		FT_STRING, BASE_NONE, NULL, 0x0,
-      	"File type", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_icon_type,
       { "Icon type",         "afp.icon_type",
 		FT_UINT8, BASE_HEX, NULL , 0,
-      	"Icon type", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_icon_length,
       { "Size",         "afp.icon_length",
@@ -5384,67 +5384,67 @@ proto_register_afp(void)
     { &hf_afp_dir_ar_o_search,
       { "Owner has search access",      "afp.dir_ar.o_search",
 		FT_BOOLEAN, 32, NULL, AR_O_SEARCH,
-      	"Owner has search access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_o_read,
       { "Owner has read access",        "afp.dir_ar.o_read",
 		FT_BOOLEAN, 32, NULL, AR_O_READ,
-      	"Owner has read access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_o_write,
       { "Owner has write access",       "afp.dir_ar.o_write",
 		FT_BOOLEAN, 32, NULL, AR_O_WRITE,
-      	"Owner has write access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_search,
       { "Group has search access",      "afp.dir_ar.g_search",
 		FT_BOOLEAN, 32, NULL, AR_G_SEARCH,
-      	"Group has search access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_read,
       { "Group has read access",        "afp.dir_ar.g_read",
 		FT_BOOLEAN, 32, NULL, AR_G_READ,
-      	"Group has read access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_g_write,
       { "Group has write access",       "afp.dir_ar.g_write",
 		FT_BOOLEAN, 32, NULL, AR_G_WRITE,
-      	"Group has write access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_search,
       { "Everyone has search access",   "afp.dir_ar.e_search",
 		FT_BOOLEAN, 32, NULL, AR_E_SEARCH,
-      	"Everyone has search access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_read,
       { "Everyone has read access",     "afp.dir_ar.e_read",
 		FT_BOOLEAN, 32, NULL, AR_E_READ,
-      	"Everyone has read access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_e_write,
       { "Everyone has write access",    "afp.dir_ar.e_write",
 		FT_BOOLEAN, 32, NULL, AR_E_WRITE,
-      	"Everyone has write access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_search,
       { "User has search access",   "afp.dir_ar.u_search",
 		FT_BOOLEAN, 32, NULL, AR_U_SEARCH,
-      	"User has search access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_read,
       { "User has read access",     "afp.dir_ar.u_read",
 		FT_BOOLEAN, 32, NULL, AR_U_READ,
-      	"User has read access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_write,
       { "User has write access",     "afp.dir_ar.u_write",
 		FT_BOOLEAN, 32, NULL, AR_U_WRITE,
-      	"User has write access", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_blank,
       { "Blank access right",     "afp.dir_ar.blank",
 		FT_BOOLEAN, 32, NULL, AR_BLANK,
-      	"Blank access right", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_dir_ar_u_own,
       { "User is the owner",     "afp.dir_ar.u_owner",
@@ -5454,7 +5454,7 @@ proto_register_afp(void)
     { &hf_afp_server_time,
       { "Server time",         "afp.server_time",
 		FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-      	"Server time", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_cat_req_matches,
       { "Max answers",         "afp.cat_req_matches",
@@ -5463,8 +5463,8 @@ proto_register_afp(void)
 
     { &hf_afp_reserved,
       { "Reserved",         "afp.reserved",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Reserved", HFILL }},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_afp_cat_count,
       { "Cat count",         "afp.cat_count",
@@ -5473,7 +5473,7 @@ proto_register_afp(void)
 
     { &hf_afp_cat_position,
       { "Position",         "afp.cat_position",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Reserved", HFILL }},
 
     { &hf_afp_map_name_type,
@@ -5555,7 +5555,7 @@ proto_register_afp(void)
 
     { &hf_afp_session_token,
       { "Token",         "afp.session_token",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Session token", HFILL }},
 
     { &hf_afp_user_flag,
@@ -5566,21 +5566,21 @@ proto_register_afp(void)
     { &hf_afp_user_ID,
       { "User ID",         "afp.user_ID",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"User ID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_group_ID,
       { "Group ID",         "afp.group_ID",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"Group ID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_UUID,
       { "UUID",         "afp.uuid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"UUID", HFILL }},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_afp_GRPUUID,
       { "GRPUUID",         "afp.grpuuid",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Group UUID", HFILL }},
 
     { &hf_afp_user_bitmap,
@@ -5591,17 +5591,17 @@ proto_register_afp(void)
     { &hf_afp_user_bitmap_UID,
       { "User ID",         "afp.user_bitmap.UID",
 		FT_BOOLEAN, 16, NULL, 0x01,
-      	"User ID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_user_bitmap_GID,
       { "Primary group ID",         "afp.user_bitmap.GID",
 		FT_BOOLEAN, 16, NULL, 0x02,
-      	"Primary group ID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_user_bitmap_UUID,
       { "UUID",         "afp.user_bitmap.UUID",
 		FT_BOOLEAN, 16, NULL, 0x04,
-      	"UUID", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_message_type,
       { "Type",         "afp.message_type",
@@ -5621,7 +5621,7 @@ proto_register_afp(void)
     { &hf_afp_message_bitmap_UTF,
       { "Message is UTF8",         "afp.message_bitmap.utf8",
 		FT_BOOLEAN, 16, NULL, 0x02,
-        "Message is UTF8", HFILL }},
+        NULL, HFILL }},
 
     { &hf_afp_message_len,
       { "Len",         "afp.message_length",
@@ -5631,7 +5631,7 @@ proto_register_afp(void)
     { &hf_afp_message,
       { "Message",  "afp.message",
 		FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Message", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_reqcount64,
       { "Count",         "afp.reqcount64",
@@ -5675,7 +5675,7 @@ proto_register_afp(void)
 
     { &hf_afp_extattr_data,
       { "Data",         "afp.extattr.data",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Extended attribute data", HFILL }},
 
     { &hf_afp_extattr_req_count,
@@ -5691,7 +5691,7 @@ proto_register_afp(void)
     { &hf_afp_extattr_reply_size,
       { "Reply size",         "afp.extattr.reply_size",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"Reply size", HFILL }},
+      	NULL, HFILL }},
 
 	/* ACL control list bitmap */
     { &hf_afp_access_bitmap,
@@ -5717,12 +5717,12 @@ proto_register_afp(void)
     { &hf_afp_acl_list_bitmap_ACL,
       { "ACL",         "afp.acl_list_bitmap.ACL",
 		FT_BOOLEAN, 16, NULL, kFileSec_ACL,
-      	"ACL", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_list_bitmap_REMOVEACL,
       { "Remove ACL",         "afp.acl_list_bitmap.REMOVEACL",
 		FT_BOOLEAN, 16, NULL, kFileSec_REMOVEACL,
-      	"Remove ACL", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_list_bitmap_Inherit,
       { "Inherit",         "afp.acl_list_bitmap.Inherit",
@@ -5737,11 +5737,11 @@ proto_register_afp(void)
     { &hf_afp_acl_flags,
       { "ACL flags",         "afp.acl_flags",
 		FT_UINT32, BASE_HEX, NULL, 0,
-      	"ACL flags", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_applicable,
       { "ACE",         "afp.ace_applicable",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
       	"ACE applicable", HFILL }},
 
     { &hf_afp_ace_rights,
@@ -5772,7 +5772,7 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_delete,
       { "Delete",         "afp.acl_access_bitmap.delete",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_DELETE,
-      	"Delete", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_append_data,
       { "Append data/create subdir",         "afp.acl_access_bitmap.append_data",
@@ -5787,22 +5787,22 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_read_attrs,
       { "Read attributes",         "afp.acl_access_bitmap.read_attrs",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_READ_ATTRIBUTES,
-      	"Read attributes", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_write_attrs,
       { "Write attributes",         "afp.acl_access_bitmap.write_attrs",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_WRITE_ATTRIBUTES,
-      	"Write attributes", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_read_extattrs,
       { "Read extended attributes", "afp.acl_access_bitmap.read_extattrs",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_READ_EXTATTRIBUTES,
-      	"Read extended attributes", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_write_extattrs,
       { "Write extended attributes", "afp.acl_access_bitmap.write_extattrs",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_WRITE_EXTATTRIBUTES,
-      	"Write extended attributes", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_read_security,
       { "Read security",         "afp.acl_access_bitmap.read_security",
@@ -5817,32 +5817,32 @@ proto_register_afp(void)
     { &hf_afp_acl_access_bitmap_change_owner,
       { "Change owner",         "afp.acl_access_bitmap.change_owner",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_CHANGE_OWNER,
-      	"Change owner", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_synchronize,
       { "Synchronize",         "afp.acl_access_bitmap.synchronize",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_SYNCHRONIZE,
-      	"Synchronize", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_all,
       { "Generic all",         "afp.acl_access_bitmap.generic_all",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_ALL,
-      	"Generic all", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_execute,
       { "Generic execute",         "afp.acl_access_bitmap.generic_execute",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_EXECUTE,
-      	"Generic execute", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_write,
       { "Generic write",         "afp.acl_access_bitmap.generic_write",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_WRITE,
-      	"Generic write", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_acl_access_bitmap_generic_read,
       { "Generic read",         "afp.acl_access_bitmap.generic_read",
 		FT_BOOLEAN, 32, NULL, KAUTH_VNODE_GENERIC_READ,
-      	"Generic read", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_flags,
       { "Flags",         "afp.ace_flags",
@@ -5862,32 +5862,32 @@ proto_register_afp(void)
     { &hf_afp_ace_flags_inherited,
       { "Inherited",         "afp.ace_flags.inherited",
 		FT_BOOLEAN, 32, NULL, ACE_INHERITED,
-      	"Inherited", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_flags_fileinherit,
       { "File inherit",         "afp.ace_flags.file_inherit",
 		FT_BOOLEAN, 32, NULL, ACE_FILE_INHERIT,
-      	"File inherit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_flags_dirinherit,
       { "Dir inherit",         "afp.ace_flags.directory_inherit",
 		FT_BOOLEAN, 32, NULL, ACE_DIR_INHERIT,
-      	"Dir inherit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_flags_limitinherit,
       { "Limit inherit",         "afp.ace_flags.limit_inherit",
 		FT_BOOLEAN, 32, NULL, ACE_LIMIT_INHERIT,
-      	"Limit inherit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_ace_flags_onlyinherit,
       { "Only inherit",         "afp.ace_flags.only_inherit",
 		FT_BOOLEAN, 32, NULL, ACE_ONLY_INHERIT,
-      	"Only inherit", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_afp_unknown,
       { "Unknown parameter",         "afp.unknown",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Unknown parameter", HFILL }},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-afs.c b/epan/dissectors/packet-afs.c
index c49df61003..bc5fcd0ed4 100644
--- a/epan/dissectors/packet-afs.c
+++ b/epan/dissectors/packet-afs.c
@@ -2990,68 +2990,68 @@ proto_register_afs(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_afs_fs, {	"File Server", "afs.fs",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "File Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_cb, {	"Callback", "afs.cb",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Callback", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_prot, { "Protection", "afs.prot",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Protection Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Protection Server", HFILL }},
 	{ &hf_afs_vldb, { "VLDB", "afs.vldb",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Location Database Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Volume Location Database Server", HFILL }},
 	{ &hf_afs_kauth, { "KAuth", "afs.kauth",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Kerberos Auth Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Kerberos Auth Server", HFILL }},
 	{ &hf_afs_vol, { "Volume Server", "afs.vol",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Volume Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_error, { "Error", "afs.error",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Error", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_bos, { "BOS", "afs.bos",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Basic Oversee Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Basic Oversee Server", HFILL }},
 	{ &hf_afs_update, { "Update", "afs.update",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Update Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Update Server", HFILL }},
 	{ &hf_afs_rmtsys, { "Rmtsys", "afs.rmtsys",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Rmtsys", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_ubik, { "Ubik", "afs.ubik",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Ubik", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, NULL, HFILL }},
 	{ &hf_afs_backup, { "Backup", "afs.backup",
-		FT_BOOLEAN, BASE_NONE, 0, 0, "Backup Server", HFILL }},
+		FT_BOOLEAN, BASE_NONE, 0, 0x0, "Backup Server", HFILL }},
 
 	{ &hf_afs_fs_opcode, { "Operation", "afs.fs.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(fs_req), 0, "Operation", HFILL }},
+	VALS(fs_req), 0, NULL, HFILL }},
 	{ &hf_afs_cb_opcode, { "Operation", "afs.cb.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(cb_req), 0, "Operation", HFILL }},
+	VALS(cb_req), 0, NULL, HFILL }},
 	{ &hf_afs_prot_opcode, { "Operation", "afs.prot.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(prot_req), 0, "Operation", HFILL }},
+	VALS(prot_req), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_opcode, { "Operation", "afs.vldb.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(vldb_req), 0, "Operation", HFILL }},
+	VALS(vldb_req), 0, NULL, HFILL }},
 	{ &hf_afs_kauth_opcode, { "Operation", "afs.kauth.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(kauth_req), 0, "Operation", HFILL }},
+	VALS(kauth_req), 0, NULL, HFILL }},
 	{ &hf_afs_vol_opcode, { "Operation", "afs.vol.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(vol_req), 0, "Operation", HFILL }},
+	VALS(vol_req), 0, NULL, HFILL }},
 	{ &hf_afs_bos_opcode, { "Operation", "afs.bos.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(bos_req), 0, "Operation", HFILL }},
+	VALS(bos_req), 0, NULL, HFILL }},
 	{ &hf_afs_update_opcode, { "Operation", "afs.update.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(update_req), 0, "Operation", HFILL }},
+	VALS(update_req), 0, NULL, HFILL }},
 	{ &hf_afs_rmtsys_opcode, { "Operation", "afs.rmtsys.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(rmtsys_req), 0, "Operation", HFILL }},
+	VALS(rmtsys_req), 0, NULL, HFILL }},
 	{ &hf_afs_error_opcode, { "Operation", "afs.error.opcode",
 		FT_UINT32, BASE_DEC,
-	0, 0, "Operation", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_backup_opcode, {
 	"Operation", "afs.backup.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(backup_req), 0, "Operation", HFILL }},
+	VALS(backup_req), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_opcode, {
 	"Operation", "afs.ubik.opcode",
 		FT_UINT32, BASE_DEC,
-	VALS(ubik_req), 0, "Operation", HFILL }},
+	VALS(ubik_req), 0, NULL, HFILL }},
 
 
 /* File Server Fields */
@@ -3066,137 +3066,137 @@ proto_register_afs(void)
 	0, 0, "File ID (Uniqifier)", HFILL }},
 	{ &hf_afs_fs_offset, { "Offset", "afs.fs.offset",
 		FT_UINT32, BASE_DEC,
-	0, 0, "Offset", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_length, { "Length", "afs.fs.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_flength, { "FLength", "afs.fs.flength",
-		FT_UINT32, BASE_DEC, 0, 0, "FLength", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_offset64, { "Offset64", "afs.fs.offset64",
 		FT_UINT64, BASE_DEC,
-	0, 0, "Offset64", HFILL }},
+	0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_length64, { "Length64", "afs.fs.length64",
-		FT_UINT64, BASE_DEC, 0, 0, "Length64", HFILL }},
+		FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_flength64, { "FLength64", "afs.fs.flength64",
-		FT_UINT64, BASE_DEC, 0, 0, "FLength64", HFILL }},
+		FT_UINT64, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_errcode, { "Error Code", "afs.fs.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_fs_data, { "Data", "afs.fs.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_token, { "Token", "afs.fs.token",
-		FT_BYTES, BASE_HEX, 0, 0, "Token", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_oldname, { "Old Name", "afs.fs.oldname",
-		FT_STRING, BASE_HEX, 0, 0, "Old Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_newname, { "New Name", "afs.fs.newname",
-		FT_STRING, BASE_HEX, 0, 0, "New Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_name, { "Name", "afs.fs.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_symlink_name, { "Symlink Name", "afs.fs.symlink.name",
-		FT_STRING, BASE_HEX, 0, 0, "Symlink Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_symlink_content, { "Symlink Content", "afs.fs.symlink.content",
-		FT_STRING, BASE_HEX, 0, 0, "Symlink Content", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volid, { "Volume ID", "afs.fs.volid",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volname, { "Volume Name", "afs.fs.volname",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_timestamp, { "Timestamp", "afs.fs.timestamp",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Timestamp", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_offlinemsg, { "Offline Message", "afs.fs.offlinemsg",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, "Volume Name", HFILL }},
 	{ &hf_afs_fs_motd, { "Message of the Day", "afs.fs.motd",
-		FT_STRING, BASE_HEX, 0, 0, "Message of the Day", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_version, { "XStats Version", "afs.fs.xstats.version",
-		FT_UINT32, BASE_DEC, 0, 0, "XStats Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_clientversion, { "Client Version", "afs.fs.xstats.clientversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Client Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_collnumber, { "Collection Number", "afs.fs.xstats.collnumber",
-		FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, "Collection Number", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(xstat_collections), 0, NULL, HFILL }},
 	{ &hf_afs_fs_xstats_timestamp, { "XStats Timestamp", "afs.fs.xstats.timestamp",
-		FT_UINT32, BASE_DEC, 0, 0, "XStats Timestamp", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare1, { "CPS Spare1", "afs.fs.cps.spare1",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare1", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare2, { "CPS Spare2", "afs.fs.cps.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_cps_spare3, { "CPS Spare3", "afs.fs.cps.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "CPS Spare3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_vicelocktype, { "Vice Lock Type", "afs.fs.vicelocktype",
-		FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, "Vice Lock Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(vice_lock_types), 0, NULL, HFILL }},
 /* XXX - is this an IP address? */
 	{ &hf_afs_fs_viceid, { "Vice ID", "afs.fs.viceid",
-		FT_UINT32, BASE_DEC, 0, 0, "Vice ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_ipaddr, { "IP Addr", "afs.fs.ipaddr",
-		FT_IPv4, BASE_HEX, 0, 0, "IP Addr", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_fs_status_mask, { "Mask", "afs.fs.status.mask",
-		FT_UINT32, BASE_HEX, 0, 0, "Mask", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setmodtime, { "Set Modification Time", "afs.fs.status.mask.setmodtime",
-		FT_BOOLEAN, 32, 0, 0x00000001, "Set Modification Time", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000001, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setowner, { "Set Owner", "afs.fs.status.mask.setowner",
-		FT_BOOLEAN, 32, 0, 0x00000002, "Set Owner", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000002, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setgroup, { "Set Group", "afs.fs.status.mask.setgroup",
-		FT_BOOLEAN, 32, 0, 0x00000004, "Set Group", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000004, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setmode, { "Set Mode", "afs.fs.status.mask.setmode",
-		FT_BOOLEAN, 32, 0, 0x00000008, "Set Mode", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000008, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_setsegsize, { "Set Segment Size", "afs.fs.status.mask.setsegsize",
-		FT_BOOLEAN, 32, 0, 0x00000010, "Set Segment Size", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000010, NULL, HFILL }},
 	{ &hf_afs_fs_status_mask_fsync, { "FSync", "afs.fs.status.mask.fsync",
-		FT_BOOLEAN, 32, 0, 0x00000400, "FSync", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x00000400, NULL, HFILL }},
 
 	{ &hf_afs_fs_status_clientmodtime, { "Client Modification Time", "afs.fs.status.clientmodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Client Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_servermodtime, { "Server Modification Time", "afs.fs.status.servermodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Server Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_owner, { "Owner", "afs.fs.status.owner",
-		FT_UINT32, BASE_DEC, 0, 0, "Owner", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_group, { "Group", "afs.fs.status.group",
-		FT_UINT32, BASE_DEC, 0, 0, "Group", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_mode, { "Unix Mode", "afs.fs.status.mode",
-		FT_UINT32, BASE_OCT, 0, 0, "Unix Mode", HFILL }},
+		FT_UINT32, BASE_OCT, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_segsize, { "Segment Size", "afs.fs.status.segsize",
-		FT_UINT32, BASE_DEC, 0, 0, "Segment Size", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_interfaceversion, { "Interface Version", "afs.fs.status.interfaceversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Interface Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_filetype, { "File Type", "afs.fs.status.filetype",
-		FT_UINT32, BASE_DEC, 0, 0, "File Type", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_author, { "Author", "afs.fs.status.author",
-		FT_UINT32, BASE_DEC, 0, 0, "Author", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_calleraccess, { "Caller Access", "afs.fs.status.calleraccess",
-		FT_UINT32, BASE_DEC, 0, 0, "Caller Access", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_anonymousaccess, { "Anonymous Access", "afs.fs.status.anonymousaccess",
-		FT_UINT32, BASE_DEC, 0, 0, "Anonymous Access", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_parentvnode, { "Parent VNode", "afs.fs.status.parentvnode",
-		FT_UINT32, BASE_DEC, 0, 0, "Parent VNode", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_parentunique, { "Parent Unique", "afs.fs.status.parentunique",
-		FT_UINT32, BASE_DEC, 0, 0, "Parent Unique", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_dataversion, { "Data Version", "afs.fs.status.dataversion",
-		FT_UINT32, BASE_DEC, 0, 0, "Data Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_dataversionhigh, { "Data Version (High)", "afs.fs.status.dataversionhigh",
-		FT_UINT32, BASE_DEC, 0, 0, "Data Version (High)", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_linkcount, { "Link Count", "afs.fs.status.linkcount",
-		FT_UINT32, BASE_DEC, 0, 0, "Link Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare2, { "Spare 2", "afs.fs.status.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare3, { "Spare 3", "afs.fs.status.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_spare4, { "Spare 4", "afs.fs.status.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_synccounter, { "Sync Counter", "afs.fs.status.synccounter",
-		FT_UINT32, BASE_DEC, 0, 0, "Sync Counter", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_status_length, { "Length", "afs.fs.status.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 	{ &hf_afs_fs_volsync_spare1, { "Volume Creation Timestamp", "afs.fs.volsync.spare1",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Volume Creation Timestamp", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare2, { "Spare 2", "afs.fs.volsync.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare3, { "Spare 3", "afs.fs.volsync.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare4, { "Spare 4", "afs.fs.volsync.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare5, { "Spare 5", "afs.fs.volsync.spare5",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_volsync_spare6, { "Spare 6", "afs.fs.volsync.spare6",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 	{ &hf_afs_fs_acl_count_positive, {
@@ -3210,7 +3210,7 @@ proto_register_afs(void)
 		FT_UINT32, BASE_DEC, 0, 0, "ACL Data Size", HFILL }},
 	{ &hf_afs_fs_acl_entity, {
 	"Entity (User/Group)", "afs.fs.acl.entity",
-		FT_STRING, BASE_HEX, 0, 0, "ACL Entity (User/Group)", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, "ACL Entity (User/Group)", HFILL }},
 	{ &hf_afs_fs_acl_r, {
 	"_R_ead", "afs.fs.acl.r",
 		FT_BOOLEAN, 8, 0, PRSFS_READ, "Read", HFILL }},
@@ -3230,184 +3230,184 @@ proto_register_afs(void)
 		FT_BOOLEAN, 8, 0, PRSFS_ADMINISTER, "Administer", HFILL }},
 
 	{ &hf_afs_fs_callback_version, { "Version", "afs.fs.callback.version",
-		FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_callback_expires, { "Expires", "afs.fs.callback.expires",
-		FT_RELATIVE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+		FT_RELATIVE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_fs_callback_type, { "Type", "afs.fs.callback.type",
-		FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
 
 /* BOS Server Fields */
 	{ &hf_afs_bos_errcode, { "Error Code", "afs.bos.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_bos_type, { "Type", "afs.bos.type",
-		FT_STRING, BASE_HEX, 0, 0, "Type", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_content, { "Content", "afs.bos.content",
-		FT_STRING, BASE_HEX, 0, 0, "Content", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_data, { "Data", "afs.bos.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_path, { "Path", "afs.bos.path",
-		FT_STRING, BASE_HEX, 0, 0, "Path", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_parm, { "Parm", "afs.bos.parm",
-		FT_STRING, BASE_HEX, 0, 0, "Parm", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_error, { "Error", "afs.bos.error",
-		FT_STRING, BASE_HEX, 0, 0, "Error", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare1, { "Spare1", "afs.bos.spare1",
-		FT_STRING, BASE_HEX, 0, 0, "Spare1", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare2, { "Spare2", "afs.bos.spare2",
-		FT_STRING, BASE_HEX, 0, 0, "Spare2", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_spare3, { "Spare3", "afs.bos.spare3",
-		FT_STRING, BASE_HEX, 0, 0, "Spare3", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_file, { "File", "afs.bos.file",
-		FT_STRING, BASE_HEX, 0, 0, "File", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_cmd, { "Command", "afs.bos.cmd",
-		FT_STRING, BASE_HEX, 0, 0, "Command", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_key, { "Key", "afs.bos.key",
-		FT_BYTES, BASE_HEX, 0, 0, "key", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, "key", HFILL }},
 	{ &hf_afs_bos_user, { "User", "afs.bos.user",
-		FT_STRING, BASE_HEX, 0, 0, "User", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_instance, { "Instance", "afs.bos.instance",
-		FT_STRING, BASE_HEX, 0, 0, "Instance", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_status, { "Status", "afs.bos.status",
-		FT_INT32, BASE_DEC, 0, 0, "Status", HFILL }},
+		FT_INT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_statusdesc, { "Status Description", "afs.bos.statusdesc",
-		FT_STRING, BASE_DEC, 0, 0, "Status Description", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_num, { "Number", "afs.bos.number",
-		FT_UINT32, BASE_DEC, 0, 0, "Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_size, { "Size", "afs.bos.size",
-		FT_UINT32, BASE_DEC, 0, 0, "Size", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_flags, { "Flags", "afs.bos.flags",
-		FT_UINT32, BASE_DEC, 0, 0, "Flags", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_date, { "Date", "afs.bos.date",
-		FT_UINT32, BASE_DEC, 0, 0, "Date", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_kvno, { "Key Version Number", "afs.bos.kvno",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_cell, { "Cell", "afs.bos.cell",
-		FT_STRING, BASE_HEX, 0, 0, "Cell", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_host, { "Host", "afs.bos.host",
-		FT_STRING, BASE_HEX, 0, 0, "Host", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_newtime, { "New Time", "afs.bos.newtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "New Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_baktime, { "Backup Time", "afs.bos.baktime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Backup Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_oldtime, { "Old Time", "afs.bos.oldtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Old Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keymodtime, { "Key Modification Time", "afs.bos.keymodtime",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Key Modification Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keychecksum, { "Key Checksum", "afs.bos.keychecksum",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Checksum", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_bos_keyspare2, { "Key Spare 2", "afs.bos.keyspare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 
 /* KAUTH Server Fields */
 	{ &hf_afs_kauth_errcode, { "Error Code", "afs.kauth.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_kauth_princ, { "Principal", "afs.kauth.princ",
-		FT_STRING, BASE_HEX, 0, 0, "Principal", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_realm, { "Realm", "afs.kauth.realm",
-		FT_STRING, BASE_HEX, 0, 0, "Realm", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_domain, { "Domain", "afs.kauth.domain",
-		FT_STRING, BASE_HEX, 0, 0, "Domain", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_name, { "Name", "afs.kauth.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_data, { "Data", "afs.kauth.data",
-		FT_BYTES, BASE_HEX, 0, 0, "Data", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_kauth_kvno, { "Key Version Number", "afs.kauth.kvno",
-		FT_UINT32, BASE_DEC, 0, 0, "Key Version Number", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* VOL Server Fields */
 	{ &hf_afs_vol_errcode, { "Error Code", "afs.vol.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_vol_id, { "Volume ID", "afs.vol.id",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vol_count, { "Volume Count", "afs.vol.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vol_name, { "Volume Name", "afs.vol.name",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 
 /* VLDB Server Fields */
 	{ &hf_afs_vldb_errcode, { "Error Code", "afs.vldb.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_type, { "Volume Type", "afs.vldb.type",
-		FT_UINT32, BASE_HEX, VALS(volume_types), 0, "Volume Type", HFILL }},
+		FT_UINT32, BASE_HEX, VALS(volume_types), 0, NULL, HFILL }},
 	{ &hf_afs_vldb_id, { "Volume ID", "afs.vldb.id",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_bump, { "Bumped Volume ID", "afs.vldb.bump",
-		FT_UINT32, BASE_DEC, 0, 0, "Bumped Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_index, { "Volume Index", "afs.vldb.index",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Index", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_count, { "Volume Count", "afs.vldb.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Volume Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_numservers, { "Number of Servers", "afs.vldb.numservers",
-		FT_UINT32, BASE_DEC, 0, 0, "Number of Servers", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_nextindex, { "Next Volume Index", "afs.vldb.nextindex",
-		FT_UINT32, BASE_DEC, 0, 0, "Next Volume Index", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_rovol, { "Read-Only Volume ID", "afs.vldb.rovol",
-		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_rwvol, { "Read-Write Volume ID", "afs.vldb.rwvol",
 		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
 	{ &hf_afs_vldb_bkvol, { "Backup Volume ID", "afs.vldb.bkvol",
 		FT_UINT32, BASE_DEC, 0, 0, "Read-Only Volume ID", HFILL }},
 	{ &hf_afs_vldb_clonevol, { "Clone Volume ID", "afs.vldb.clonevol",
-		FT_UINT32, BASE_DEC, 0, 0, "Clone Volume ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_name, { "Volume Name", "afs.vldb.name",
-		FT_STRING, BASE_HEX, 0, 0, "Volume Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_partition, { "Partition", "afs.vldb.partition",
-		FT_STRING, BASE_HEX, 0, 0, "Partition", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_server, { "Server", "afs.vldb.server",
-		FT_IPv4, BASE_HEX, 0, 0, "Server", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serveruuid, { "Server UUID", "afs.vldb.serveruuid",
-		FT_BYTES, BASE_HEX, 0, 0, "Server UUID", HFILL }},
+		FT_BYTES, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serveruniq, { "Server Unique Address", "afs.vldb.serveruniq",
-		FT_UINT32, BASE_HEX, 0, 0, "Server Unique Address", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serverflags, { "Server Flags", "afs.vldb.serverflags",
-		FT_UINT32, BASE_HEX, 0, 0, "Server Flags", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_serverip, { "Server IP", "afs.vldb.serverip",
-		FT_IPv4, BASE_HEX, 0, 0, "Server IP", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_flags, { "Flags", "afs.vldb.flags",
-		FT_UINT32, BASE_HEX, 0, 0, "Flags", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_vldb_flags_rwexists, { "Read/Write Exists", "afs.vldb.flags.rwexists",
-		FT_BOOLEAN, 32, 0, 0x1000, "Read/Write Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x1000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_roexists, { "Read-Only Exists", "afs.vldb.flags.roexists",
-		FT_BOOLEAN, 32, 0, 0x2000, "Read-Only Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x2000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_bkexists, { "Backup Exists", "afs.vldb.flags.bkexists",
-		FT_BOOLEAN, 32, 0, 0x4000, "Backup Exists", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x4000, NULL, HFILL }},
 	{ &hf_afs_vldb_flags_dfsfileset, { "DFS Fileset", "afs.vldb.flags.dfsfileset",
-		FT_BOOLEAN, 32, 0, 0x8000, "DFS Fileset", HFILL }},
+		FT_BOOLEAN, 32, 0, 0x8000, NULL, HFILL }},
 
 	{ &hf_afs_vldb_spare1, { "Spare 1", "afs.vldb.spare1",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 1", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare2, { "Spare 2", "afs.vldb.spare2",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 2", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare3, { "Spare 3", "afs.vldb.spare3",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 3", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare4, { "Spare 4", "afs.vldb.spare4",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 4", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare5, { "Spare 5", "afs.vldb.spare5",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 5", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare6, { "Spare 6", "afs.vldb.spare6",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 6", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare7, { "Spare 7", "afs.vldb.spare7",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 7", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare8, { "Spare 8", "afs.vldb.spare8",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 8", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_vldb_spare9, { "Spare 9", "afs.vldb.spare9",
-		FT_UINT32, BASE_DEC, 0, 0, "Spare 9", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 
 /* BACKUP Server Fields */
 	{ &hf_afs_backup_errcode, { "Error Code", "afs.backup.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 
 /* CB Server Fields */
 	{ &hf_afs_cb_errcode, { "Error Code", "afs.cb.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_version, { "Version", "afs.cb.callback.version",
-		FT_UINT32, BASE_DEC, 0, 0, "Version", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_expires, { "Expires", "afs.cb.callback.expires",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Expires", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_cb_callback_type, { "Type", "afs.cb.callback.type",
-		FT_UINT32, BASE_DEC, VALS(cb_types), 0, "Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(cb_types), 0, NULL, HFILL }},
 	{ &hf_afs_cb_fid_volume, { "FileID (Volume)", "afs.cb.fid.volume",
 		FT_UINT32, BASE_DEC, 0, 0, "File ID (Volume)", HFILL }},
 	{ &hf_afs_cb_fid_vnode, { "FileID (VNode)", "afs.cb.fid.vnode",
@@ -3417,122 +3417,122 @@ proto_register_afs(void)
 
 /* PROT Server Fields */
 	{ &hf_afs_prot_errcode, { "Error Code", "afs.prot.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_prot_name, { "Name", "afs.prot.name",
-		FT_STRING, BASE_HEX, 0, 0, "Name", HFILL }},
+		FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_id, { "ID", "afs.prot.id",
-		FT_UINT32, BASE_DEC, 0, 0, "ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_oldid, { "Old ID", "afs.prot.oldid",
-		FT_UINT32, BASE_DEC, 0, 0, "Old ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_newid, { "New ID", "afs.prot.newid",
-		FT_UINT32, BASE_DEC, 0, 0, "New ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_gid, { "Group ID", "afs.prot.gid",
-		FT_UINT32, BASE_DEC, 0, 0, "Group ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_uid, { "User ID", "afs.prot.uid",
-		FT_UINT32, BASE_DEC, 0, 0, "User ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_count, { "Count", "afs.prot.count",
-		FT_UINT32, BASE_DEC, 0, 0, "Count", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_maxgid, { "Maximum Group ID", "afs.prot.maxgid",
-		FT_UINT32, BASE_DEC, 0, 0, "Maximum Group ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_maxuid, { "Maximum User ID", "afs.prot.maxuid",
-		FT_UINT32, BASE_DEC, 0, 0, "Maximum User ID", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_pos, { "Position", "afs.prot.pos",
-		FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_prot_flag, { "Flag", "afs.prot.flag",
-		FT_UINT32, BASE_HEX, 0, 0, "Flag", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 
 /* UBIK Fields */
 	{ &hf_afs_ubik_errcode, { "Error Code", "afs.ubik.errcode",
-		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, "Error Code", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(afs_errors), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_state, { "State", "afs.ubik.state",
-		FT_UINT32, BASE_HEX, 0, 0, "State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_version_epoch, { "Epoch", "afs.ubik.version.epoch",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Epoch", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_version_counter, { "Counter", "afs.ubik.version.counter",
-		FT_UINT32, BASE_DEC, 0, 0, "Counter", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_votestart, { "Vote Started", "afs.ubik.votestart",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Started", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_voteend, { "Vote Ends", "afs.ubik.voteend",
-		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, "Vote Ends", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_file, { "File", "afs.ubik.file",
-		FT_UINT32, BASE_DEC, 0, 0, "File", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_pos, { "Position", "afs.ubik.position",
-		FT_UINT32, BASE_DEC, 0, 0, "Position", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_length, { "Length", "afs.ubik.length",
-		FT_UINT32, BASE_DEC, 0, 0, "Length", HFILL }},
+		FT_UINT32, BASE_DEC, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_locktype, { "Lock Type", "afs.ubik.locktype",
-		FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, "Lock Type", HFILL }},
+		FT_UINT32, BASE_DEC, VALS(ubik_lock_types), 0, NULL, HFILL }},
 	{ &hf_afs_ubik_votetype, { "Vote Type", "afs.ubik.votetype",
-		FT_UINT32, BASE_HEX, 0, 0, "Vote Type", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_site, { "Site", "afs.ubik.site",
-		FT_IPv4, BASE_HEX, 0, 0, "Site", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_interface, { "Interface Address", "afs.ubik.interface",
-		FT_IPv4, BASE_HEX, 0, 0, "Interface Address", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 
 	{ &hf_afs_ubik_now, { "Now", "afs.ubik.now",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Now", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyestime, { "Last Yes Time", "afs.ubik.lastyesttime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyeshost, { "Last Yes Host", "afs.ubik.lastyeshost",
-		FT_IPv4, BASE_HEX, 0, 0, "Last Yes Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyesstate, { "Last Yes State", "afs.ubik.lastyesstate",
-		FT_UINT32, BASE_HEX, 0, 0, "Last Yes State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastyesclaim, { "Last Yes Claim", "afs.ubik.lastyesclaim",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Yes Claim", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lowesthost, { "Lowest Host", "afs.ubik.lowesthost",
-		FT_IPv4, BASE_HEX, 0, 0, "Lowest Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lowesttime, { "Lowest Time", "afs.ubik.lowesttime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Lowest Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_synchost, { "Sync Host", "afs.ubik.synchost",
-		FT_IPv4, BASE_HEX, 0, 0, "Sync Host", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_addr, { "Address", "afs.ubik.addr",
-		FT_IPv4, BASE_HEX, 0, 0, "Address", HFILL }},
+		FT_IPv4, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_synctime, { "Sync Time", "afs.ubik.synctime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastvotetime, { "Last Vote Time", "afs.ubik.lastvotetime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Vote Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastbeaconsent, { "Last Beacon Sent", "afs.ubik.lastbeaconsent",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Last Beacon Sent", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lastvote, { "Last Vote", "afs.ubik.lastvote",
-		FT_UINT32, BASE_HEX, 0, 0, "Last Vote", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_currentdb, { "Current DB", "afs.ubik.currentdb",
-		FT_UINT32, BASE_HEX, 0, 0, "Current DB", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_up, { "Up", "afs.ubik.up",
-		FT_UINT32, BASE_HEX, 0, 0, "Up", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_beaconsincedown, { "Beacon Since Down", "afs.ubik.beaconsincedown",
-		FT_UINT32, BASE_HEX, 0, 0, "Beacon Since Down", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_amsyncsite, { "Am Sync Site", "afs.ubik.amsyncsite",
-		FT_UINT32, BASE_HEX, 0, 0, "Am Sync Site", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_syncsiteuntil, { "Sync Site Until", "afs.ubik.syncsiteuntil",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Sync Site Until", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_nservers, { "Number of Servers", "afs.ubik.nservers",
-		FT_UINT32, BASE_HEX, 0, 0, "Number of Servers", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_lockedpages, { "Locked Pages", "afs.ubik.lockedpages",
-		FT_UINT32, BASE_HEX, 0, 0, "Locked Pages", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_writelockedpages, { "Write Locked Pages", "afs.ubik.writelockedpages",
-		FT_UINT32, BASE_HEX, 0, 0, "Write Locked Pages", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_activewrite, { "Active Write", "afs.ubik.activewrite",
-		FT_UINT32, BASE_HEX, 0, 0, "Active Write", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_tidcounter, { "TID Counter", "afs.ubik.tidcounter",
-		FT_UINT32, BASE_HEX, 0, 0, "TID Counter", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_anyreadlocks, { "Any Read Locks", "afs.ubik.anyreadlocks",
-		FT_UINT32, BASE_HEX, 0, 0, "Any Read Locks", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_anywritelocks, { "Any Write Locks", "afs.ubik.anywritelocks",
-		FT_UINT32, BASE_HEX, 0, 0, "Any Write Locks", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_recoverystate, { "Recovery State", "afs.ubik.recoverystate",
-		FT_UINT32, BASE_HEX, 0, 0, "Recovery State", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_currenttrans, { "Current Transaction", "afs.ubik.currenttran",
-		FT_UINT32, BASE_HEX, 0, 0, "Current Transaction", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_writetrans, { "Write Transaction", "afs.ubik.writetran",
-		FT_UINT32, BASE_HEX, 0, 0, "Write Transaction", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_epochtime, { "Epoch Time", "afs.ubik.epochtime",
-		FT_ABSOLUTE_TIME, BASE_HEX, 0, 0, "Epoch Time", HFILL }},
+		FT_ABSOLUTE_TIME, BASE_NONE, 0, 0, NULL, HFILL }},
 	{ &hf_afs_ubik_isclone, { "Is Clone", "afs.ubik.isclone",
-		FT_UINT32, BASE_HEX, 0, 0, "Is Clone", HFILL }},
+		FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
 	{ &hf_afs_reqframe, { "Request Frame", "afs.reqframe",
-		FT_FRAMENUM, BASE_NONE, NULL, 0, "Request Frame", HFILL }},
+		FT_FRAMENUM, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_afs_repframe, { "Reply Frame", "afs.repframe",
-		FT_FRAMENUM, BASE_NONE,	NULL, 0, "Reply Frame", HFILL }},
+		FT_FRAMENUM, BASE_NONE,	NULL, 0, NULL, HFILL }},
 	{ &hf_afs_time, { "Time from request", "afs.time",
 		FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "Time between Request and Reply for AFS calls", HFILL }},
 	};
diff --git a/epan/dissectors/packet-agentx.c b/epan/dissectors/packet-agentx.c
index 6c784423c8..e4c7e24671 100644
--- a/epan/dissectors/packet-agentx.c
+++ b/epan/dissectors/packet-agentx.c
@@ -918,60 +918,60 @@ proto_register_agentx(void)
   static hf_register_info hf[] = {
 
     { &hf_version,
-      { "Version        ", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
+      { "Version", "agentx.version", FT_UINT8, BASE_DEC, NULL, 0x0,
         "header version", HFILL }},
 
     { &hf_type,
-      { "Type           ", "agentx.type", FT_UINT8, BASE_DEC, VALS(type_values), 0x0,
+      { "Type", "agentx.type", FT_UINT8, BASE_DEC, VALS(type_values), 0x0,
         "header type", HFILL }},
 
     { &hf_flags,
-      { "Flags          ", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
+      { "Flags", "agentx.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
         "header type", HFILL }},
 
     { &hf_session_id,
-      { "sessionID      ", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "sessionID", "agentx.session_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Session ID", HFILL }},
 
     { &hf_trans_id,
-      { "TransactionID  ", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "TransactionID", "agentx.transaction_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Transaction ID", HFILL }},
 
     { &hf_packet_id,
-      { "PacketID       ", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
+      { "PacketID", "agentx.packet_id", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Packet ID", HFILL }},
 
     { &hf_payload_len,
-      { "Payload length ", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Payload length", HFILL }},
+      { "Payload length", "agentx.payload_len", FT_UINT32, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_ostring,
       { "Octet String", "agentx.ostring", FT_STRING, BASE_NONE, NULL, 0x0,
-        "Octet String", HFILL }},
+        NULL, HFILL }},
 
     { &hf_ostring_len,
       { "OString len", "agentx.ostring_len", FT_UINT32, BASE_DEC, NULL, 0x0,
         "Octet String Length", HFILL }},
 
     { &hf_oid_sub,
-      { "Number subids ", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Number subids", HFILL }},
+      { "Number subids", "agentx.n_subid", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_prefix,
-      { "OID prefix    ", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID prefix", HFILL }},
+      { "OID prefix", "agentx.oid_prefix", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_include,
-      { "OID include   ", "agentx.oid_include", FT_UINT8, BASE_DEC, NULL, 0x0,
-        "OID include", HFILL }},
+      { "OID include", "agentx.oid_include", FT_UINT8, BASE_DEC, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_oid_str,
-      { "OID", "agentx.oid", FT_STRING, BASE_DEC, NULL, 0x0,
-        "OID", HFILL }},
+      { "OID", "agentx.oid", FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_resp_uptime,
       { "sysUpTime", "agentx.r.uptime", FT_UINT32, BASE_DEC, NULL, 0x0,
-        "sysUpTime", HFILL }},
+        NULL, HFILL }},
 
     { &hf_resp_error,
       { "Resp. error", "agentx.r.error", FT_UINT16, BASE_DEC, VALS(resp_errors), 0x0,
diff --git a/epan/dissectors/packet-aim-admin.c b/epan/dissectors/packet-aim-admin.c
index 8079a41e19..213815509b 100644
--- a/epan/dissectors/packet-aim-admin.c
+++ b/epan/dissectors/packet-aim-admin.c
@@ -106,13 +106,13 @@ proto_register_aim_admin(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
 	  { &hf_admin_acctinfo_code,
-		  { "Account Information Request Code", "aim_admin.acctinfo.code", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		  { "Account Information Request Code", "aim_admin.acctinfo.code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_admin_acctinfo_permissions,
-		  { "Account Permissions", "aim_admin.acctinfo.permissions", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		  { "Account Permissions", "aim_admin.acctinfo.permissions", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	  }, 
 	  { &hf_admin_confirm_status,
-		  { "Confirmation status", "aim_admin.confirm_status", FT_UINT16, BASE_HEX, VALS(confirm_statusses), 0x0, "", HFILL },
+		  { "Confirmation status", "aim_admin.confirm_status", FT_UINT16, BASE_HEX, VALS(confirm_statusses), 0x0, NULL, HFILL },
 																					 },
   };
 
diff --git a/epan/dissectors/packet-aim-bos.c b/epan/dissectors/packet-aim-bos.c
index 87ef0e0d8b..40e4f1c342 100644
--- a/epan/dissectors/packet-aim-bos.c
+++ b/epan/dissectors/packet-aim-bos.c
@@ -103,10 +103,10 @@ proto_register_aim_bos(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_bos_data,
-			{ "Data", "aim_bos.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Data", "aim_bos.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_bos_class,
-			{ "User class", "aim_bos.userclass", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "User class", "aim_bos.userclass", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 	};
 
diff --git a/epan/dissectors/packet-aim-buddylist.c b/epan/dissectors/packet-aim-buddylist.c
index e5fe559b9d..608c352dc5 100644
--- a/epan/dissectors/packet-aim-buddylist.c
+++ b/epan/dissectors/packet-aim-buddylist.c
@@ -149,7 +149,7 @@ proto_register_aim_buddylist(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_userinfo_warninglevel,
-			{ "Warning Level", "aim_buddylist.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Warning Level", "aim_buddylist.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 	};
 
diff --git a/epan/dissectors/packet-aim-generic.c b/epan/dissectors/packet-aim-generic.c
index 9c6aa82757..c4e17203c0 100644
--- a/epan/dissectors/packet-aim-generic.c
+++ b/epan/dissectors/packet-aim-generic.c
@@ -475,95 +475,95 @@ proto_register_aim_generic(void)
 	static hf_register_info hf[] = {
 		{ &hf_generic_servicereq_service, 
 			{ "Requested Service", "aim_generic.servicereq.service", FT_UINT16,
-				BASE_HEX, NULL, 0x0, "", HFILL },
+				BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_motd_motdtype, 
 	  { "MOTD Type", "aim_generic.motd.motdtype", FT_UINT16,
-		  BASE_HEX, VALS(aim_snac_generic_motd_motdtypes), 0x0, "", HFILL },
+		  BASE_HEX, VALS(aim_snac_generic_motd_motdtypes), 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_numclasses,
-	  { "Number of Rateinfo Classes", "aim_generic.rateinfo.numclasses", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Number of Rateinfo Classes", "aim_generic.rateinfo.numclasses", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_windowsize,
-	  { "Window Size", "aim_generic.rateinfo.class.window_size", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Window Size", "aim_generic.rateinfo.class.window_size", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_clearlevel,
-	  { "Clear Level", "aim_generic.rateinfo.class.clearlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Clear Level", "aim_generic.rateinfo.class.clearlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_alertlevel,
-	  { "Alert Level", "aim_generic.rateinfo.class.alertlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Alert Level", "aim_generic.rateinfo.class.alertlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_limitlevel,
-	  { "Limit Level", "aim_generic.rateinfo.class.limitlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Limit Level", "aim_generic.rateinfo.class.limitlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_disconnectlevel,
-	  { "Disconnect Level", "aim_generic.rateinfo.class.disconnectlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Disconnect Level", "aim_generic.rateinfo.class.disconnectlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_currentlevel,
-	  { "Current Level", "aim_generic.rateinfo.class.currentlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Current Level", "aim_generic.rateinfo.class.currentlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_maxlevel,
-      { "Max Level", "aim_generic.rateinfo.class.maxlevel", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+      { "Max Level", "aim_generic.rateinfo.class.maxlevel", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_lasttime,
-	  { "Last Time", "aim_generic.rateinfo.class.lasttime", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Last Time", "aim_generic.rateinfo.class.lasttime", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_curstate, 
-	  { "Current State", "aim_generic.rateinfo.class.curstate", FT_UINT8, BASE_HEX, VALS(rateinfo_states), 0x0, "", HFILL },
+	  { "Current State", "aim_generic.rateinfo.class.curstate", FT_UINT8, BASE_HEX, VALS(rateinfo_states), 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_classid,
-	  { "Class ID", "aim_generic.rateinfo.class.id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Class ID", "aim_generic.rateinfo.class.id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfo_numpairs,
-	  { "Number of Family/Subtype pairs", "aim_generic.rateinfo.class.numpairs", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Number of Family/Subtype pairs", "aim_generic.rateinfo.class.numpairs", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_rateinfoack_group,
-	  { "Acknowledged Rate Class", "aim_generic.rateinfoack.class", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Acknowledged Rate Class", "aim_generic.rateinfoack.class", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_ratechange_msg,
-	  { "Rate Change Message", "aim_generic.ratechange.msg", FT_UINT16, BASE_HEX, VALS(ratechange_msgs), 0x0, "", HFILL },
+	  { "Rate Change Message", "aim_generic.ratechange.msg", FT_UINT16, BASE_HEX, VALS(ratechange_msgs), 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_migration_numfams,
-	  { "Number of families to migrate", "aim_generic.migrate.numfams", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Number of families to migrate", "aim_generic.migrate.numfams", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_priv_flags,
-	  { "Privilege flags", "aim_generic.privilege_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+	  { "Privilege flags", "aim_generic.privilege_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_allow_idle_see,
-	  { "Allow other users to see idle time", "aim_generic.privilege_flags.allow_idle", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0001, "", HFILL },
+	  { "Allow other users to see idle time", "aim_generic.privilege_flags.allow_idle", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0001, NULL, HFILL },
 	},
 	{ &hf_generic_allow_member_see,
-	  { "Allow other users to see how long account has been a member", "aim_generic.privilege_flags.allow_member", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0002, "", HFILL },
+	  { "Allow other users to see how long account has been a member", "aim_generic.privilege_flags.allow_member", FT_BOOLEAN, 32, TFS(&flags_set_truth), 0x0002, NULL, HFILL },
 	},
 	{ &hf_generic_selfinfo_warninglevel,
-		{ "Warning level", "aim_generic.selfinfo.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Warning level", "aim_generic.selfinfo.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_evil_new_warn_level,
-		{ "New warning level", "aim_generic.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "New warning level", "aim_generic.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_idle_time,
-		{ "Idle time (seconds)", "aim_generic.idle_time", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Idle time (seconds)", "aim_generic.idle_time", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_client_ver_req_offset, 
-		{ "Client Verification Request Offset", "aim_generic.client_verification.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Client Verification Request Offset", "aim_generic.client_verification.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_client_ver_req_length, 
-		{ "Client Verification Request Length", "aim_generic.client_verification.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Client Verification Request Length", "aim_generic.client_verification.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_client_ver_req_hash,
-		{ "Client Verification MD5 Hash", "aim_generic.client_verification.hash", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Client Verification MD5 Hash", "aim_generic.client_verification.hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_ext_status_type,
-		{ "Extended Status Type", "aim_generic.ext_status.type", FT_UINT16, BASE_DEC, VALS(ext_status_types), 0x0, "", HFILL },
+		{ "Extended Status Type", "aim_generic.ext_status.type", FT_UINT16, BASE_DEC, VALS(ext_status_types), 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_ext_status_flags,
-		{ "Extended Status Flags", "aim_generic.ext_status.flags", FT_UINT8, BASE_HEX, VALS(ext_status_flags), 0x0, "", HFILL },
+		{ "Extended Status Flags", "aim_generic.ext_status.flags", FT_UINT8, BASE_HEX, VALS(ext_status_flags), 0x0, NULL, HFILL },
 	},
 	{ &hf_generic_ext_status_length,
-		{ "Extended Status Length", "aim_generic.ext_status.length", FT_UINT8, BASE_HEX, NULL, 0x0, "" , HFILL },
+		{ "Extended Status Length", "aim_generic.ext_status.length", FT_UINT8, BASE_HEX, NULL, 0x0, NULL , HFILL },
 	},
 	{ &hf_generic_ext_status_data,
-		{ "Extended Status Data", "aim_generic.ext_status.data", FT_BYTES, BASE_HEX, NULL, 0x0, "" , HFILL },
+		{ "Extended Status Data", "aim_generic.ext_status.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL , HFILL },
 	},
 
   };
diff --git a/epan/dissectors/packet-aim-icq.c b/epan/dissectors/packet-aim-icq.c
index e41800d2e9..8ac5809773 100644
--- a/epan/dissectors/packet-aim-icq.c
+++ b/epan/dissectors/packet-aim-icq.c
@@ -222,22 +222,22 @@ proto_register_aim_icq(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
 	  { &hf_icq_tlv_data_chunk_size,
-	    { "Data chunk size", "aim_icq.chunk_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+	    { "Data chunk size", "aim_icq.chunk_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_icq_tlv_request_owner_uid,
-	    { "Owner UID", "aim_icq.owner_uid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL},
+	    { "Owner UID", "aim_icq.owner_uid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL},
 	  },
 	  { &hf_icq_tlv_request_type,
-	    {"Request Type", "aim_icq.request_type", FT_UINT16, BASE_DEC, VALS(aim_icq_data_types), 0x0, "", HFILL},
+	    {"Request Type", "aim_icq.request_type", FT_UINT16, BASE_DEC, VALS(aim_icq_data_types), 0x0, NULL, HFILL},
 	  },
 	  { &hf_icq_tlv_request_seq_num,
-	    {"Request Sequence Number", "aim_icq.request_seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL},
+	    {"Request Sequence Number", "aim_icq.request_seq_number", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL},
 	  },
 	  { &hf_icq_dropped_msg_flag,
-		{"Dropped messages flag", "aim_icq.offline_msgs.dropped_flag", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL },
+		{"Dropped messages flag", "aim_icq.offline_msgs.dropped_flag", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_icq_meta_subtype,
-		{"Meta Request Subtype", "aim_icq.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		{"Meta Request Subtype", "aim_icq.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	  },
   };
 
diff --git a/epan/dissectors/packet-aim-location.c b/epan/dissectors/packet-aim-location.c
index b148a2636b..c6861ddc7c 100644
--- a/epan/dissectors/packet-aim-location.c
+++ b/epan/dissectors/packet-aim-location.c
@@ -193,17 +193,17 @@ proto_register_aim_location(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_buddyname_len,
-			{ "Buddyname len", "aim_location.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Buddyname len", "aim_location.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_buddyname,
-			{ "Buddy Name", "aim_location.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+			{ "Buddy Name", "aim_location.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_userinfo_warninglevel,
-			{ "Warning Level", "aim_location.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Warning Level", "aim_location.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_snac_location_request_user_info_infotype,
 			{ "Infotype", "aim_location.snac.request_user_info.infotype", FT_UINT16, BASE_HEX, VALS(aim_snac_location_request_user_info_infotypes), 0x0,
-				"", HFILL }
+				NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-aim-messaging.c b/epan/dissectors/packet-aim-messaging.c
index 5c91d1573d..57226edf39 100644
--- a/epan/dissectors/packet-aim-messaging.c
+++ b/epan/dissectors/packet-aim-messaging.c
@@ -591,85 +591,85 @@ proto_register_aim_messaging(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_icbm_channel,
-			{ "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Channel to setup", "aim_messaging.icbm.channel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_msg_flags,
-			{ "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Message Flags", "aim_messaging.icbm.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_max_snac_size,
-			{ "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Max SNAC Size", "aim_messaging.icbm.max_snac", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_max_sender_warnlevel,
-			{ "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Max sender warn level", "aim_messaging.icbm.max_sender_warn-level", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_max_receiver_warnlevel,
-			{ "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "max receiver warn level", "aim_messaging.icbm.max_receiver_warnlevel", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_min_msg_interval,
-			{ "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Minimum message interval (milliseconds)", "aim_messaging.icbm.min_msg_interval", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_cookie,
-			{ "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "ICBM Cookie", "aim_messaging.icbmcookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_message_channel_id,
-			{ "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Message Channel ID", "aim_messaging.channelid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_icbm_evil,
-			{ "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, "", HFILL },
+			{ "Send Evil Bit As", "aim_messaging.evilreq.origin", FT_UINT16, BASE_DEC, VALS(evil_origins), 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_evil_warn_level,
-			{ "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Old warning level", "aim_messaging.evil.warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_evil_new_warn_level,
-			{ "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "New warning level", "aim_messaging.evil.new_warn_level", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_notification_cookie,
-			{ "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Notification Cookie", "aim_messaging.notification.cookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_notification_channel,
-			{ "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Notification Channel", "aim_messaging.notification.channel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_notification_type,
-			{ "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Notification Type", "aim_messaging.notification.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_msg_type,
-			{ "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, "", HFILL },
+			{ "Message Type", "aim_messaging.rendezvous.msg_type", FT_UINT16, BASE_HEX, VALS(rendezvous_msg_types), 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_clientautoresp_reason,
-			{ "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, "", HFILL },
+			{ "Reason", "aim_messaging.clientautoresp.reason", FT_UINT16, BASE_DEC, VALS(clientautoresp_reason_types), 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_clientautoresp_protocol_version,
-			{ "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Version", "aim_messaging.clientautoresp.protocol_version", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_icbm_clientautoresp_client_caps_flags,
-			{ "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Client Capabilities Flags", "aim_messaging.clientautoresp.client_caps_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_type,
-			{ "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, "", HFILL },
+			{ "Message Type", "aim_messaging.icbm.extended_data.message.type", FT_UINT8, BASE_HEX, VALS(extended_data_message_types), 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_flags,
-			{ "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Message Flags", "aim_messaging.icbm.extended_data.message.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_flags_normal,
-			{ "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, "", HFILL },
+			{ "Normal Message", "aim_messaging.icbm.extended_data.message.flags.normal", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_NORMAL, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_flags_auto,
-			{ "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, "", HFILL },
+			{ "Auto Message", "aim_messaging.icbm.extended_data.message.flags.auto", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_AUTO, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_flags_multi,
-			{ "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, "", HFILL },
+			{ "Multiple Recipients Message", "aim_messaging.icbm.rendezvous.extended_data.message.flags.multi", FT_BOOLEAN, 16, TFS(&flags_set_truth), EXTENDED_DATA_MFLAG_MULTI, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_status_code,
-			{ "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Status Code", "aim_messaging.icbm.extended_data.message.status_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_priority_code,
-			{ "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Priority Code", "aim_messaging.icbm.extended_data.message.priority_code", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_text_length,
-			{ "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+			{ "Text Length", "aim_messaging.icbm.extended_data.message.text_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_aim_rendezvous_extended_data_message_text,
-			{ "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL },
+			{ "Text", "aim_messaging.icbm.extended_data.message.text", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL },
 		}
 	};
 
diff --git a/epan/dissectors/packet-aim-signon.c b/epan/dissectors/packet-aim-signon.c
index 687a8b0c91..25f9f14496 100644
--- a/epan/dissectors/packet-aim-signon.c
+++ b/epan/dissectors/packet-aim-signon.c
@@ -161,13 +161,13 @@ proto_register_aim_signon(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_infotype,
-			{ "Infotype", "aim_signon.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Infotype", "aim_signon.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_signon_challenge_len,
-			{ "Signon challenge length", "aim_signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Signon challenge length", "aim_signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_signon_challenge,
-			{ "Signon challenge", "aim_signon.challenge", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Signon challenge", "aim_signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-aim-ssi.c b/epan/dissectors/packet-aim-ssi.c
index b028cb54a6..63a344a85b 100644
--- a/epan/dissectors/packet-aim-ssi.c
+++ b/epan/dissectors/packet-aim-ssi.c
@@ -337,49 +337,49 @@ proto_register_aim_ssi(void)
 	/* Setup list of header fields */
 	static hf_register_info hf[] = {
 		{ &hf_aim_fnac_subtype_ssi_version,
-			{ "SSI Version", "aim_ssi.fnac.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Version", "aim_ssi.fnac.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_numitems,
-			{ "SSI Object count", "aim_ssi.fnac.numitems", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Object count", "aim_ssi.fnac.numitems", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_last_change_time,
-			{ "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }
+			{ "SSI Last Change Time", "aim_ssi.fnac.last_change_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_buddyname_len,
-			{ "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_buddyname,
-			{ "Buddy Name", "aim_ssi.fnac.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+			{ "Buddy Name", "aim_ssi.fnac.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_gid,
-			{ "SSI Buddy Group ID", "aim_ssi.fnac.gid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Buddy Group ID", "aim_ssi.fnac.gid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_bid,
-			{ "SSI Buddy ID", "aim_ssi.fnac.bid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Buddy ID", "aim_ssi.fnac.bid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_type,
-			{ "SSI Buddy type", "aim_ssi.fnac.type", FT_UINT16, BASE_HEX, VALS(aim_fnac_family_ssi_types), 0x0, "", HFILL }
+			{ "SSI Buddy type", "aim_ssi.fnac.type", FT_UINT16, BASE_HEX, VALS(aim_fnac_family_ssi_types), 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_tlvlen,
-			{ "SSI TLV Len", "aim_ssi.fnac.tlvlen", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI TLV Len", "aim_ssi.fnac.tlvlen", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_data,
-			{ "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Buddy Data", "aim_ssi.fnac.data", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_buddyname_len8,
-			{ "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SSI Buddy Name length", "aim_ssi.fnac.buddyname_len8", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_reason_str_len,
-			{ "Reason Message length", "aim_ssi.fnac.reason_len", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Reason Message length", "aim_ssi.fnac.reason_len", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_reason_str,
-			{ "Reason Message", "aim_ssi.fnac.reason", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+			{ "Reason Message", "aim_ssi.fnac.reason", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_grant_auth_unkn,
-			{ "Unknown", "aim_ssi.fnac.auth_unkn", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Unknown", "aim_ssi.fnac.auth_unkn", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_aim_fnac_subtype_ssi_allow_auth,
-			{ "Allow flag", "aim_ssi.fnac.allow_auth_flag", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Allow flag", "aim_ssi.fnac.allow_auth_flag", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-aim-sst.c b/epan/dissectors/packet-aim-sst.c
index f8d285d393..c573a09cd2 100644
--- a/epan/dissectors/packet-aim-sst.c
+++ b/epan/dissectors/packet-aim-sst.c
@@ -160,22 +160,22 @@ proto_register_aim_sst(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
 	  { &hf_aim_sst_md5_hash,
-		  { "MD5 Hash", "aim_sst.md5", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+		  { "MD5 Hash", "aim_sst.md5", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	  }, 
 	  { &hf_aim_sst_md5_hash_size,
-		  { "MD5 Hash Size", "aim_sst.md5.size", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL },
+		  { "MD5 Hash Size", "aim_sst.md5.size", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_aim_sst_unknown,
-		  { "Unknown Data", "aim_sst.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+		  { "Unknown Data", "aim_sst.unknown", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_aim_sst_ref_num,
-		  { "Reference Number", "aim_sst.ref_num", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		  { "Reference Number", "aim_sst.ref_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_aim_sst_icon_size,
-		  { "Icon Size", "aim_sst.icon_size", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		  { "Icon Size", "aim_sst.icon_size", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	  },
 	  { &hf_aim_sst_icon,
-		  { "Icon", "aim_sst.icon", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+		  { "Icon", "aim_sst.icon", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	  },
   };
 
diff --git a/epan/dissectors/packet-aim.c b/epan/dissectors/packet-aim.c
index d0c7ec72f7..7b15b9d1a1 100644
--- a/epan/dissectors/packet-aim.c
+++ b/epan/dissectors/packet-aim.c
@@ -1441,184 +1441,184 @@ proto_register_aim(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
     { &hf_aim_cmd_start,
-      { "Command Start", "aim.cmd_start", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Command Start", "aim.cmd_start", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_channel,
-      { "Channel ID", "aim.channel", FT_UINT8, BASE_HEX, VALS(aim_flap_channels), 0x0, "", HFILL }
+      { "Channel ID", "aim.channel", FT_UINT8, BASE_HEX, VALS(aim_flap_channels), 0x0, NULL, HFILL }
     },
     { &hf_aim_seqno,
-      { "Sequence Number", "aim.seqno", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Sequence Number", "aim.seqno", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 	{ &hf_aim_version,
-	  { "Protocol Version", "aim.version", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL },
+	  { "Protocol Version", "aim.version", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_data_len,
-      { "Data Field Length", "aim.datalen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Data Field Length", "aim.datalen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_data,
-      { "Data", "aim.data", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Data", "aim.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_signon_challenge_len,
-      { "Signon challenge length", "aim.signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Signon challenge length", "aim.signon.challengelen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_signon_challenge,
-      { "Signon challenge", "aim.signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Signon challenge", "aim.signon.challenge", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_family,
-      { "FNAC Family ID", "aim.fnac.family", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Family ID", "aim.fnac.family", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_subtype,
-      { "FNAC Subtype ID", "aim.fnac.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Subtype ID", "aim.fnac.subtype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_flags,
-      { "FNAC Flags", "aim.fnac.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC Flags", "aim.fnac.flags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_fnac_id,
-      { "FNAC ID", "aim.fnac.id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "FNAC ID", "aim.fnac.id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_infotype,
-      { "Infotype", "aim.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Infotype", "aim.infotype", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_buddyname_len,
-      { "Buddyname len", "aim.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Buddyname len", "aim.buddynamelen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_buddyname,
-      { "Buddy Name", "aim.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Buddy Name", "aim.buddyname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_aim_tlvcount,
-      { "TLV Count", "aim.tlvcount", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+      { "TLV Count", "aim.tlvcount", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
     },
 	{ &hf_aim_snac_error,
-	  { "SNAC Error", "aim.snac.error", FT_UINT16, BASE_HEX, VALS(aim_snac_errors), 0x0, "", HFILL },
+	  { "SNAC Error", "aim.snac.error", FT_UINT16, BASE_HEX, VALS(aim_snac_errors), 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unconfirmed,
-		{ "AOL Unconfirmed account flag", "aim.userclass.unconfirmed", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNCONFIRMED, "", HFILL },
+		{ "AOL Unconfirmed account flag", "aim.userclass.unconfirmed", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNCONFIRMED, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_administrator,
-		{ "AOL Administrator flag", "aim.userclass.administrator", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ADMINISTRATOR, "", HFILL },
+		{ "AOL Administrator flag", "aim.userclass.administrator", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ADMINISTRATOR, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_aol,
-		{ "AOL Staff User Flag", "aim.userclass.staff", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AOL, "", HFILL },
+		{ "AOL Staff User Flag", "aim.userclass.staff", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AOL, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_commercial,
-		{ "AOL commercial account flag", "aim.userclass.commercial", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_COMMERCIAL, "", HFILL },
+		{ "AOL commercial account flag", "aim.userclass.commercial", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_COMMERCIAL, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_aim,
-		{ "AIM user flag", "aim.userclass.free", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AIM, "", HFILL },
+		{ "AIM user flag", "aim.userclass.free", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AIM, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_away,
-		{ "AOL away status flag", "aim.userclass.away", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AWAY, "", HFILL },
+		{ "AOL away status flag", "aim.userclass.away", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_AWAY, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_icq,
-		{ "ICQ user sign", "aim.userclass.icq", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ICQ, "", HFILL },
+		{ "ICQ user sign", "aim.userclass.icq", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ICQ, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_wireless,
-		{ "AOL wireless user", "aim.userclass.wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_WIRELESS, "", HFILL },
+		{ "AOL wireless user", "aim.userclass.wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_WIRELESS, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown100,
-		{ "Unknown bit", "aim.userclass.unknown100", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN100, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown100", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN100, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_imf,
-		{ "Using IM Forwarding", "aim.userclass.imf", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_IMF, "", HFILL },
+		{ "Using IM Forwarding", "aim.userclass.imf", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_IMF, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_bot,
-		{ "Bot User", "aim.userclass.bot", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_BOT, "", HFILL },
+		{ "Bot User", "aim.userclass.bot", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_BOT, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown800,
-		{ "Unknown bit", "aim.userclass.unknown800", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN800, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown800", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN800, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_one_way_wireless,
-		{ "One Way Wireless Device", "aim.userclass.one_way_wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ONE_WAY_WIRELESS, "", HFILL },
+		{ "One Way Wireless Device", "aim.userclass.one_way_wireless", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_ONE_WAY_WIRELESS, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown2000,
-		{ "Unknown bit", "aim.userclass.unknown2000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN2000, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown2000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN2000, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown4000,
-		{ "Unknown bit", "aim.userclass.unknown4000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN4000, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown4000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN4000, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown8000,
-		{ "Unknown bit", "aim.userclass.unknown8000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN8000, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown8000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN8000, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown10000,
-		{ "Unknown bit", "aim.userclass.unknown10000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN10000, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown10000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN10000, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_unknown20000,
-		{ "Unknown bit", "aim.userclass.unknown20000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN20000, "", HFILL },
+		{ "Unknown bit", "aim.userclass.unknown20000", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_UNKNOWN20000, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_no_knock_knock,
-		{ "Do not display the 'not on Buddy List' knock-knock", "aim.userclass.no_knock_knock", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_NO_KNOCK_KNOCK, "", HFILL },
+		{ "Do not display the 'not on Buddy List' knock-knock", "aim.userclass.no_knock_knock", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_NO_KNOCK_KNOCK, NULL, HFILL },
 	},
 	{ &hf_aim_userclass_forward_mobile,
-		{ "Forward to mobile if not active", "aim.userclass.forward_mobile", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_FORWARD_MOBILE, "", HFILL },
+		{ "Forward to mobile if not active", "aim.userclass.forward_mobile", FT_BOOLEAN, 32, TFS(&flags_set_truth), CLASS_FORWARD_MOBILE, NULL, HFILL },
 	},
 	{ &hf_aim_fnac_flag_next_is_related,
-		{ "Followed By SNAC with related information", "aim.fnac.flags.next_is_related", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_NEXT_IS_RELATED, "", HFILL },
+		{ "Followed By SNAC with related information", "aim.fnac.flags.next_is_related", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_NEXT_IS_RELATED, NULL, HFILL },
 	},
 	{ &hf_aim_fnac_flag_contains_version,
-		{ "Contains Version of Family this SNAC is in", "aim.fnac.flags.contains_version", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_CONTAINS_VERSION, "", HFILL },
+		{ "Contains Version of Family this SNAC is in", "aim.fnac.flags.contains_version", FT_BOOLEAN, 16, TFS(&flags_set_truth), FNAC_FLAG_CONTAINS_VERSION, NULL, HFILL },
 	},
 	{ &hf_aim_userinfo_warninglevel,
-		{ "Warning Level", "aim.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Warning Level", "aim.userinfo.warninglevel", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_featuresdes,
-		{ "Features", "aim.messageblock.featuresdes", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		{ "Features", "aim.messageblock.featuresdes", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_featureslen,
-		{ "Features Length", "aim.messageblock.featureslen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Features Length", "aim.messageblock.featureslen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_features,
-		{ "Features", "aim.messageblock.features", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+		{ "Features", "aim.messageblock.features", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_info,
-		{ "Block info", "aim.messageblock.info", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		{ "Block info", "aim.messageblock.info", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_len,
-		{ "Block length", "aim.messageblock.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Block length", "aim.messageblock.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_charset,
-		{ "Block Character set", "aim.messageblock.charset", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		{ "Block Character set", "aim.messageblock.charset", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_charsubset,
-		{ "Block Character subset", "aim.messageblock.charsubset", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL },
+		{ "Block Character subset", "aim.messageblock.charsubset", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
     { &hf_aim_messageblock_message,
-		{ "Message", "aim.messageblock.message", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL },
+		{ "Message", "aim.messageblock.message", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_ip,
-		{ "Internal IP address", "aim.dcinfo.addr", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL },
+		{ "Internal IP address", "aim.dcinfo.addr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_tcpport,
-		{ "TCP Port", "aim.dcinfo.tcpport", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "TCP Port", "aim.dcinfo.tcpport", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_type,
-		{ "Type", "aim.dcinfo.type", FT_UINT8, BASE_HEX, VALS(dc_types), 0x0, "", HFILL },
+		{ "Type", "aim.dcinfo.type", FT_UINT8, BASE_HEX, VALS(dc_types), 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_proto_version,
-		{ "Protocol Version", "aim.dcinfo.proto_version", FT_UINT16, BASE_DEC, VALS(protocol_versions), 0x0, "", HFILL },
+		{ "Protocol Version", "aim.dcinfo.proto_version", FT_UINT16, BASE_DEC, VALS(protocol_versions), 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_auth_cookie,
-		{ "Authorization Cookie", "aim.dcinfo.auth_cookie", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL },
+		{ "Authorization Cookie", "aim.dcinfo.auth_cookie", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_webport,
-		{ "Web Front Port", "aim.dcinfo.webport", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Web Front Port", "aim.dcinfo.webport", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_client_future,
-		{ "Client Futures", "aim.dcinfo.client_futures", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL },
+		{ "Client Futures", "aim.dcinfo.client_futures", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_last_info_update,
-		{ "Last Info Update", "aim.dcinfo.last_info_update", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Last Info Update", "aim.dcinfo.last_info_update", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_last_ext_info_update,
-		{ "Last Extended Info Update", "aim.dcinfo.last_ext_info_update", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Last Extended Info Update", "aim.dcinfo.last_ext_info_update", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_last_ext_status_update,
-		{ "Last Extended Status Update", "aim.dcinfo.last_ext_status_update", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Last Extended Status Update", "aim.dcinfo.last_ext_status_update", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_dcinfo_unknown,
-		{ "Unknown", "aim.dcinfo.unknown", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL },
+		{ "Unknown", "aim.dcinfo.unknown", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL },
 	},
 	{ &hf_aim_ssi_result_code,
-	  { "Last SSI operation result code", "aim.ssi.code", FT_UINT16, BASE_HEX, VALS(aim_ssi_result_codes), 0x0, "", HFILL },
+	  { "Last SSI operation result code", "aim.ssi.code", FT_UINT16, BASE_HEX, VALS(aim_ssi_result_codes), 0x0, NULL, HFILL },
 	}
   };
 
diff --git a/epan/dissectors/packet-airopeek.c b/epan/dissectors/packet-airopeek.c
index 8005604744..ae32a49816 100644
--- a/epan/dissectors/packet-airopeek.c
+++ b/epan/dissectors/packet-airopeek.c
@@ -92,35 +92,35 @@ proto_register_airopeek(void)
   static hf_register_info hf[] = {
 	{ &hf_airopeek_unknown1,
            { "Unknown1",      "airopeek.unknown1", FT_BYTES, BASE_NONE, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_unknown2,
            { "caplength1",      "airopeek.unknown2", FT_UINT16, BASE_DEC, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_unknown3,
            { "caplength2",      "airopeek.unknown3", FT_UINT16, BASE_DEC, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_unknown4,
            { "Unknown4",      "airopeek.unknown4", FT_BYTES, BASE_NONE, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_unknown5,
            { "Unknown5",      "airopeek.unknown5", FT_BYTES, BASE_NONE, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_unknown6,
            { "Unknown6",      "airopeek.unknown6", FT_BYTES, BASE_NONE, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_timestamp,
            { "Timestamp?",       "airopeek.timestamp", FT_UINT32, BASE_DEC, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
 	{ &hf_airopeek_channel,
            { "Channel",       "airopeek.channel", FT_UINT8, BASE_DEC, NULL,
-             0x0, "", HFILL }},
+             0x0, NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ajp13.c b/epan/dissectors/packet-ajp13.c
index 815a113789..d546476cc0 100644
--- a/epan/dissectors/packet-ajp13.c
+++ b/epan/dissectors/packet-ajp13.c
@@ -779,7 +779,7 @@ proto_register_ajp13(void)
 {
   static hf_register_info hf[] = {
     { &hf_ajp13_magic,
-      { "Magic",  "ajp13.magic", FT_BYTES, BASE_HEX, NULL, 0x0, "Magic Number",
+      { "Magic",  "ajp13.magic", FT_BYTES, BASE_NONE, NULL, 0x0, "Magic Number",
         HFILL }
     },
     { &hf_ajp13_len,
@@ -787,31 +787,31 @@ proto_register_ajp13(void)
         HFILL }
     },
     { &hf_ajp13_code,
-      { "Code",  "ajp13.code", FT_STRING, BASE_DEC, NULL, 0x0, "Type Code",
+      { "Code",  "ajp13.code", FT_STRING, BASE_NONE, NULL, 0x0, "Type Code",
          HFILL }
     },
     { &hf_ajp13_method,
-      { "Method",  "ajp13.method", FT_STRING, BASE_DEC, NULL, 0x0, "HTTP Method",
+      { "Method",  "ajp13.method", FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Method",
         HFILL }
     },
     { &hf_ajp13_ver,
-      { "Version",  "ajp13.ver", FT_STRING, BASE_DEC, NULL, 0x0, "HTTP Version",
+      { "Version",  "ajp13.ver", FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Version",
         HFILL }
     },
     { &hf_ajp13_uri,
-      { "URI",  "ajp13.uri", FT_STRING, BASE_DEC, NULL, 0x0, "HTTP URI",
+      { "URI",  "ajp13.uri", FT_STRING, BASE_NONE, NULL, 0x0, "HTTP URI",
         HFILL }
     },
     { &hf_ajp13_raddr,
-      { "RADDR",  "ajp13.raddr", FT_STRING, BASE_DEC, NULL, 0x0, "Remote Address",
+      { "RADDR",  "ajp13.raddr", FT_STRING, BASE_NONE, NULL, 0x0, "Remote Address",
         HFILL }
     },
     { &hf_ajp13_rhost,
-      { "RHOST",  "ajp13.rhost", FT_STRING, BASE_DEC, NULL, 0x0, "Remote Host",
+      { "RHOST",  "ajp13.rhost", FT_STRING, BASE_NONE, NULL, 0x0, "Remote Host",
         HFILL }
     },
     { &hf_ajp13_srv,
-      { "SRV",  "ajp13.srv", FT_STRING, BASE_DEC, NULL, 0x0, "Server",
+      { "SRV",  "ajp13.srv", FT_STRING, BASE_NONE, NULL, 0x0, "Server",
         HFILL }
     },
     { &hf_ajp13_port,
@@ -827,11 +827,11 @@ proto_register_ajp13(void)
         HFILL }
     },
     { &hf_ajp13_hname,
-      { "HNAME",  "ajp13.hname", FT_STRING, BASE_DEC, NULL, 0x0, "Header Name",
+      { "HNAME",  "ajp13.hname", FT_STRING, BASE_NONE, NULL, 0x0, "Header Name",
         HFILL }
     },
     { &hf_ajp13_hval,
-      { "HVAL",  "ajp13.hval", FT_STRING, BASE_DEC, NULL, 0x0, "Header Value",
+      { "HVAL",  "ajp13.hval", FT_STRING, BASE_NONE, NULL, 0x0, "Header Value",
         HFILL }
     },
     { &hf_ajp13_rlen,
@@ -847,11 +847,11 @@ proto_register_ajp13(void)
         HFILL }
     },
     { &hf_ajp13_rsmsg,
-      { "RSMSG",  "ajp13.rmsg", FT_STRING, BASE_DEC, NULL, 0x0, "HTTP Status Message",
+      { "RSMSG",  "ajp13.rmsg", FT_STRING, BASE_NONE, NULL, 0x0, "HTTP Status Message",
         HFILL }
     },
     { &hf_ajp13_data,
-      { "Data",  "ajp13.data", FT_STRING, BASE_DEC, NULL, 0x0, "Data",
+      { "Data",  "ajp13.data", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
         HFILL }
     },
   };
diff --git a/epan/dissectors/packet-alcap.c b/epan/dissectors/packet-alcap.c
index f11363b363..f283c7bf90 100644
--- a/epan/dissectors/packet-alcap.c
+++ b/epan/dissectors/packet-alcap.c
@@ -1537,200 +1537,200 @@ proto_register_alcap(void)
     
     static hf_register_info hf[] = {
     { &hf_alcap_dsaid, { "DSAID", "alcap.dsaid", FT_UINT32, BASE_HEX, NULL, 0, "Destination Service Association ID", HFILL }},
-    { &hf_alcap_msg_id, { "Message Type", "alcap.msg_type", FT_UINT8, BASE_DEC, VALS(msg_type_strings), 0, "", HFILL }},
-    { &hf_alcap_compat, { "Message Compatibility", "alcap.compat", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+    { &hf_alcap_msg_id, { "Message Type", "alcap.msg_type", FT_UINT8, BASE_DEC, VALS(msg_type_strings), 0, NULL, HFILL }},
+    { &hf_alcap_compat, { "Message Compatibility", "alcap.compat", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_alcap_compat_pass_on_sni, { "Pass-On SNI", "alcap.compat.pass.sni", FT_UINT8, BASE_DEC, VALS(send_notification), 0x40, "Send Notificaation Indicator", HFILL }},
     { &hf_alcap_compat_pass_on_ii, { "Pass-On II", "alcap.compat.pass.ii", FT_UINT8, BASE_DEC, VALS(instruction_indicator), 0x30, "Instruction Indicator", HFILL }},
     { &hf_alcap_compat_general_sni, { "General SNI", "alcap.compat.general.sni", FT_UINT8, BASE_DEC, VALS(send_notification), 0x04, "Send Notificaation Indicator", HFILL }},
     { &hf_alcap_compat_general_ii, { "General II", "alcap.compat.general.ii", FT_UINT8, BASE_DEC, VALS(instruction_indicator), 0x03, "Instruction Indicator", HFILL }},
         
-    { &hf_alcap_unknown, { "Unknown Field Data", "alcap.unknown.field", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+    { &hf_alcap_unknown, { "Unknown Field Data", "alcap.unknown.field", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
         
     { &hf_alcap_param_id, { "Parameter", "alcap.param", FT_UINT8, BASE_DEC, VALS(msg_parm_strings), 0, "Parameter Id", HFILL }},
     { &hf_alcap_param_len, { "Length", "alcap.param.len", FT_UINT8, BASE_DEC, NULL, 0, "Parameter Length", HFILL }},
         
-    { &hf_alcap_cau_coding, { "Cause Coding", "alcap.cau.coding", FT_UINT8, BASE_DEC, VALS(cause_coding_vals), 0x03, "", HFILL }},
-    { &hf_alcap_cau_value_itu, { "Cause Value (ITU)", "alcap.cau.value", FT_UINT8, BASE_DEC, VALS(cause_values_itu), 0x7f, "", HFILL }},
-    { &hf_alcap_cau_value_non_itu, { "Cause Value (Other)", "alcap.cau.value", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_cau_diag, { "Diagnostic", "alcap.cau.diag", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+    { &hf_alcap_cau_coding, { "Cause Coding", "alcap.cau.coding", FT_UINT8, BASE_DEC, VALS(cause_coding_vals), 0x03, NULL, HFILL }},
+    { &hf_alcap_cau_value_itu, { "Cause Value (ITU)", "alcap.cau.value", FT_UINT8, BASE_DEC, VALS(cause_values_itu), 0x7f, NULL, HFILL }},
+    { &hf_alcap_cau_value_non_itu, { "Cause Value (Other)", "alcap.cau.value", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_cau_diag, { "Diagnostic", "alcap.cau.diag", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_alcap_cau_diag_len, { "Length", "alcap.cau.diag.len", FT_UINT8, BASE_DEC, NULL, 0, "Diagnostics Length", HFILL }},
-    { &hf_alcap_cau_diag_msg, { "Message Identifier", "alcap.cau.diag.msg", FT_UINT8, BASE_DEC, VALS(msg_type_strings), 0, "", HFILL }},
-    { &hf_alcap_cau_diag_param_id, { "Parameter Identifier", "alcap.cau.diag.param", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_cau_diag_field_num, { "Field Number", "alcap.cau.diag.field_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_cau_diag_msg, { "Message Identifier", "alcap.cau.diag.msg", FT_UINT8, BASE_DEC, VALS(msg_type_strings), 0, NULL, HFILL }},
+    { &hf_alcap_cau_diag_param_id, { "Parameter Identifier", "alcap.cau.diag.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_cau_diag_field_num, { "Field Number", "alcap.cau.diag.field_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_ceid_pathid, { "Path ID", "alcap.ceid.pathid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ceid_cid, { "CID", "alcap.ceid.cid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_ceid_pathid, { "Path ID", "alcap.ceid.pathid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ceid_cid, { "CID", "alcap.ceid.cid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_dnsea, { "Address", "alcap.dnsea.addr", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+    { &hf_alcap_dnsea, { "Address", "alcap.dnsea.addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_alc_max_br_fw, { "Maximum Forward Bit Rate", "alcap.alc.bitrate.max.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_alc_max_br_bw, { "Maximum Backwards Bit Rate", "alcap.alc.bitrate.max.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_alc_avg_br_fw, { "Average Forward Bit Rate", "alcap.alc.bitrate.avg.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_alc_avg_br_bw, { "Average Backwards Bit Rate", "alcap.alc.bitrate.avg.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_alc_max_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.alc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_alc_max_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.alc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_alc_avg_sdu_fw, { "Average Forward CPS SDU Size", "alcap.alc.sdusize.avg.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_alc_avg_sdu_bw, { "Average Backwards CPS SDU Size", "alcap.alc.sdusize.avg.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+    { &hf_alcap_alc_max_br_fw, { "Maximum Forward Bit Rate", "alcap.alc.bitrate.max.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_alc_max_br_bw, { "Maximum Backwards Bit Rate", "alcap.alc.bitrate.max.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_alc_avg_br_fw, { "Average Forward Bit Rate", "alcap.alc.bitrate.avg.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_alc_avg_br_bw, { "Average Backwards Bit Rate", "alcap.alc.bitrate.avg.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_alc_max_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.alc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_alc_max_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.alc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_alc_avg_sdu_fw, { "Average Forward CPS SDU Size", "alcap.alc.sdusize.avg.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_alc_avg_sdu_bw, { "Average Backwards CPS SDU Size", "alcap.alc.sdusize.avg.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
         
     { &hf_alcap_osaid, { "OSAID", "alcap.osaid", FT_UINT32, BASE_HEX, NULL, 0, "Originating Service Association ID", HFILL }},
         
-    { &hf_alcap_sugr, { "SUGR", "alcap.sugr", FT_BYTES, BASE_HEX, NULL, 0, "Served User Generated Reference", HFILL }},
+    { &hf_alcap_sugr, { "SUGR", "alcap.sugr", FT_BYTES, BASE_NONE, NULL, 0, "Served User Generated Reference", HFILL }},
         
-    { &hf_alcap_sut_len, { "SUT Length", "alcap.sut.sut_len", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-    { &hf_alcap_sut, { "SUT", "alcap.sut.transport", FT_BYTES, BASE_HEX, NULL, 0, "Served User Transport", HFILL }},
+    { &hf_alcap_sut_len, { "SUT Length", "alcap.sut.sut_len", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_sut, { "SUT", "alcap.sut.transport", FT_BYTES, BASE_NONE, NULL, 0, "Served User Transport", HFILL }},
         
     { &hf_alcap_ssia_pr_type, { "Profile Type", "alcap.ssia.profile.type", FT_UINT8, BASE_DEC, VALS(audio_profile_type), 0xc0, "I.366.2 Profile Type", HFILL }},
-    { &hf_alcap_ssia_pr_id, { "Profile Id", "alcap.ssia.profile.id", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssia_frm, { "Frame Mode", "alcap.ssia.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_ssia_cmd, { "Circuit Mode", "alcap.ssia.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, "", HFILL }},
-    { &hf_alcap_ssia_mfr2, { "Multi-Frequency R2", "alcap.ssia.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, "", HFILL }},
-    { &hf_alcap_ssia_mfr1, { "Multi-Frequency R1", "alcap.ssia.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, "", HFILL }},
-    { &hf_alcap_ssia_dtmf, { "DTMF", "alcap.ssia.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, "", HFILL }},
+    { &hf_alcap_ssia_pr_id, { "Profile Id", "alcap.ssia.profile.id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssia_frm, { "Frame Mode", "alcap.ssia.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_ssia_cmd, { "Circuit Mode", "alcap.ssia.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, NULL, HFILL }},
+    { &hf_alcap_ssia_mfr2, { "Multi-Frequency R2", "alcap.ssia.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, NULL, HFILL }},
+    { &hf_alcap_ssia_mfr1, { "Multi-Frequency R1", "alcap.ssia.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, NULL, HFILL }},
+    { &hf_alcap_ssia_dtmf, { "DTMF", "alcap.ssia.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, NULL, HFILL }},
     { &hf_alcap_ssia_cas, { "CAS", "alcap.ssia.cas", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x04, "Channel Associated Signalling", HFILL }},
     { &hf_alcap_ssia_fax, { "Fax", "alcap.ssia.fax", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x02, "Facsimile", HFILL }},
-    { &hf_alcap_ssia_pcm, { "PCM Mode", "alcap.ssia.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, "", HFILL }},
-    { &hf_alcap_ssia_max_len, { "Max Len of FM Data", "alcap.ssia.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssia_oui, { "OUI", "alcap.ssia.oui", FT_BYTES, BASE_HEX, NULL, 0, "Organizational Unique Identifier", HFILL }},
+    { &hf_alcap_ssia_pcm, { "PCM Mode", "alcap.ssia.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, NULL, HFILL }},
+    { &hf_alcap_ssia_max_len, { "Max Len of FM Data", "alcap.ssia.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssia_oui, { "OUI", "alcap.ssia.oui", FT_BYTES, BASE_NONE, NULL, 0, "Organizational Unique Identifier", HFILL }},
         
-    { &hf_alcap_ssim_frm, { "Frame Mode", "alcap.ssim.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_ssim_mult, { "Multiplier", "alcap.ssim.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, "", HFILL }},
-    { &hf_alcap_ssim_max, { "Max Len", "alcap.ssim.max", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_ssim_frm, { "Frame Mode", "alcap.ssim.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_ssim_mult, { "Multiplier", "alcap.ssim.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
+    { &hf_alcap_ssim_max, { "Max Len", "alcap.ssim.max", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_ssisa_max_sssar_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisa_max_sssar_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisa_max_sscop_sdu_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sscop.max_sdu_len.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisa_max_sscop_sdu_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sscop.max_sdu_len.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisa_max_sscop_uu_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sscop.max_uu_len.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisa_max_sscop_uu_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sscop.max_uu_len.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_ssisa_max_sssar_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisa_max_sssar_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisa_max_sscop_sdu_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sscop.max_sdu_len.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisa_max_sscop_sdu_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sscop.max_sdu_len.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisa_max_sscop_uu_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisa.sscop.max_uu_len.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisa_max_sscop_uu_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisa.sscop.max_uu_len.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_ssisu_max_sssar_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisu.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisu_max_sssar_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisu.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssisu_ted, { "Transmission Error Detection", "alcap.ssisu.ted", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
+    { &hf_alcap_ssisu_max_sssar_fw, { "Maximum Len of SSSAR-SDU Forward", "alcap.ssisu.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisu_max_sssar_bw, { "Maximum Len of SSSAR-SDU Backwards", "alcap.ssisu.sssar.max_len.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssisu_ted, { "Transmission Error Detection", "alcap.ssisu.ted", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
         
-    { &hf_alcap_pt, { "QoS Codepoint", "alcap.pt.codepoint", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+    { &hf_alcap_pt, { "QoS Codepoint", "alcap.pt.codepoint", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         
-    { &hf_alcap_plc_max_br_fw, { "Maximum Forward Bit Rate", "alcap.plc.bitrate.max.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_plc_max_br_bw, { "Maximum Backwards Bit Rate", "alcap.plc.bitrate.max.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_plc_avg_br_fw, { "Average Forward Bit Rate", "alcap.plc.bitrate.avg.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_plc_avg_br_bw, { "Average Backwards Bit Rate", "alcap.plc.bitrate.avg.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_plc_max_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.plc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_plc_max_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.plc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_plc_avg_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.plc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
-    { &hf_alcap_plc_avg_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.plc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+    { &hf_alcap_plc_max_br_fw, { "Maximum Forward Bit Rate", "alcap.plc.bitrate.max.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_plc_max_br_bw, { "Maximum Backwards Bit Rate", "alcap.plc.bitrate.max.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_plc_avg_br_fw, { "Average Forward Bit Rate", "alcap.plc.bitrate.avg.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_plc_avg_br_bw, { "Average Backwards Bit Rate", "alcap.plc.bitrate.avg.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_plc_max_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.plc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_plc_max_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.plc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_plc_avg_sdu_fw, { "Maximum Forward CPS SDU Size", "alcap.plc.sdusize.max.fw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
+    { &hf_alcap_plc_avg_sdu_bw, { "Maximum Backwards CPS SDU Size", "alcap.plc.sdusize.max.bw", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
         
     { &hf_alcap_pssiae_pr_type, { "Profile Type", "alcap.pssiae.profile.type", FT_UINT8, BASE_DEC, VALS(audio_profile_type), 0xc0, "I.366.2 Profile Type", HFILL }},
-    { &hf_alcap_pssiae_pr_id, { "Profile Id", "alcap.pssiae.profile.id", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pssiae_lb, { "Loopback", "alcap.pssiae.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "", HFILL }},
-    { &hf_alcap_pssiae_rc, { "Rate Control", "alcap.pssiae.rc", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "", HFILL }},
+    { &hf_alcap_pssiae_pr_id, { "Profile Id", "alcap.pssiae.profile.id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pssiae_lb, { "Loopback", "alcap.pssiae.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, NULL, HFILL }},
+    { &hf_alcap_pssiae_rc, { "Rate Control", "alcap.pssiae.rc", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, NULL, HFILL }},
     { &hf_alcap_pssiae_syn, { "Synchronization", "alcap.pssiae.syn", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "Transport of synchronization of change in SSCS operation", HFILL }},
-    { &hf_alcap_pssiae_frm, { "Frame Mode", "alcap.pssiae.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_pssiae_cmd, { "Circuit Mode", "alcap.pssiae.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, "", HFILL }},
-    { &hf_alcap_pssiae_mfr2, { "Multi-Frequency R2", "alcap.pssiae.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, "", HFILL }},
-    { &hf_alcap_pssiae_mfr1, { "Multi-Frequency R1", "alcap.pssiae.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, "", HFILL }},
-    { &hf_alcap_pssiae_dtmf, { "DTMF", "alcap.pssiae.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, "", HFILL }},
+    { &hf_alcap_pssiae_frm, { "Frame Mode", "alcap.pssiae.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_pssiae_cmd, { "Circuit Mode", "alcap.pssiae.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, NULL, HFILL }},
+    { &hf_alcap_pssiae_mfr2, { "Multi-Frequency R2", "alcap.pssiae.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, NULL, HFILL }},
+    { &hf_alcap_pssiae_mfr1, { "Multi-Frequency R1", "alcap.pssiae.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, NULL, HFILL }},
+    { &hf_alcap_pssiae_dtmf, { "DTMF", "alcap.pssiae.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, NULL, HFILL }},
     { &hf_alcap_pssiae_cas, { "CAS", "alcap.pssiae.cas", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x04, "Channel Associated Signalling", HFILL }},
     { &hf_alcap_pssiae_fax, { "Fax", "alcap.pssiae.fax", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x02, "Facsimile", HFILL }},
-    { &hf_alcap_pssiae_pcm, { "PCM Mode", "alcap.pssiae.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, "", HFILL }},
-    { &hf_alcap_pssiae_max_len, { "Max Len of FM Data", "alcap.pssiae.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pssiae_oui, { "OUI", "alcap.pssiae.oui", FT_BYTES, BASE_HEX, NULL, 0, "Organizational Unique Identifier", HFILL }},
+    { &hf_alcap_pssiae_pcm, { "PCM Mode", "alcap.pssiae.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, NULL, HFILL }},
+    { &hf_alcap_pssiae_max_len, { "Max Len of FM Data", "alcap.pssiae.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pssiae_oui, { "OUI", "alcap.pssiae.oui", FT_BYTES, BASE_NONE, NULL, 0, "Organizational Unique Identifier", HFILL }},
         
-    { &hf_alcap_pssime_frm, { "Frame Mode", "alcap.pssime.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_pssime_lb, { "Loopback", "alcap.pssime.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, "", HFILL }},
-    { &hf_alcap_pssime_mult, { "Multiplier", "alcap.pssime.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, "", HFILL }},
-    { &hf_alcap_pssime_max, { "Max Len", "alcap.pssime.max", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_pssime_frm, { "Frame Mode", "alcap.pssime.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_pssime_lb, { "Loopback", "alcap.pssime.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, NULL, HFILL }},
+    { &hf_alcap_pssime_mult, { "Multiplier", "alcap.pssime.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
+    { &hf_alcap_pssime_max, { "Max Len", "alcap.pssime.max", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
         
     { &hf_alcap_suci, { "SUCI", "alcap.suci", FT_UINT8, BASE_HEX, NULL, 0, "Served User Correlation Id", HFILL }},
         
-    { &hf_alcap_onsea, { "Address", "alcap.onsea.addr", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+    { &hf_alcap_onsea, { "Address", "alcap.onsea.addr", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
         
     { &hf_alcap_ssiae_pr_type, { "Profile Type", "alcap.ssiae.profile.type", FT_UINT8, BASE_DEC, VALS(audio_profile_type), 0xc0, "I.366.2 Profile Type", HFILL }},
-    { &hf_alcap_ssiae_lb, { "Loopback", "alcap.ssiae.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "", HFILL }},
-    { &hf_alcap_ssiae_rc, { "Rate Control", "alcap.ssiae.rc", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "", HFILL }},
+    { &hf_alcap_ssiae_lb, { "Loopback", "alcap.ssiae.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, NULL, HFILL }},
+    { &hf_alcap_ssiae_rc, { "Rate Control", "alcap.ssiae.rc", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, NULL, HFILL }},
     { &hf_alcap_ssiae_syn, { "Synchronization", "alcap.ssiae.syn", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0xc0, "Transport of synchronization of change in SSCS operation", HFILL }},
-    { &hf_alcap_ssiae_pr_id, { "Profile Id", "alcap.ssiae.profile.id", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssiae_frm, { "Frame Mode", "alcap.ssiae.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_ssiae_cmd, { "Circuit Mode", "alcap.ssiae.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, "", HFILL }},
-    { &hf_alcap_ssiae_mfr2, { "Multi-Frequency R2", "alcap.ssiae.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, "", HFILL }},
-    { &hf_alcap_ssiae_mfr1, { "Multi-Frequency R1", "alcap.ssiae.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, "", HFILL }},
-    { &hf_alcap_ssiae_dtmf, { "DTMF", "alcap.ssiae.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, "", HFILL }},
+    { &hf_alcap_ssiae_pr_id, { "Profile Id", "alcap.ssiae.profile.id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssiae_frm, { "Frame Mode", "alcap.ssiae.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_ssiae_cmd, { "Circuit Mode", "alcap.ssiae.cmd", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, NULL, HFILL }},
+    { &hf_alcap_ssiae_mfr2, { "Multi-Frequency R2", "alcap.ssiae.mfr2", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x20, NULL, HFILL }},
+    { &hf_alcap_ssiae_mfr1, { "Multi-Frequency R1", "alcap.ssiae.mfr1", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x10, NULL, HFILL }},
+    { &hf_alcap_ssiae_dtmf, { "DTMF", "alcap.ssiae.dtmf", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x08, NULL, HFILL }},
     { &hf_alcap_ssiae_cas, { "CAS", "alcap.ssiae.cas", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x04, "Channel Associated Signalling", HFILL }},
     { &hf_alcap_ssiae_fax, { "Fax", "alcap.ssiae.fax", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x02, "Facsimile", HFILL }},
-    { &hf_alcap_ssiae_pcm, { "PCM Mode", "alcap.ssiae.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, "", HFILL }},
-    { &hf_alcap_ssiae_max_len, { "Max Len of FM Data", "alcap.ssiae.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_ssiae_oui, { "OUI", "alcap.ssiae.oui", FT_BYTES, BASE_HEX, NULL, 0, "Organizational Unique Identifier", HFILL }},
+    { &hf_alcap_ssiae_pcm, { "PCM Mode", "alcap.ssiae.pcm", FT_UINT8, BASE_DEC, VALS(alaw_ulaw), 0x01, NULL, HFILL }},
+    { &hf_alcap_ssiae_max_len, { "Max Len of FM Data", "alcap.ssiae.max_fmdata_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_ssiae_oui, { "OUI", "alcap.ssiae.oui", FT_BYTES, BASE_NONE, NULL, 0, "Organizational Unique Identifier", HFILL }},
         
-    { &hf_alcap_ssime_frm, { "Frame Mode", "alcap.ssime.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, "", HFILL }},
-    { &hf_alcap_ssime_lb, { "Loopback", "alcap.ssime.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, "", HFILL }},
-    { &hf_alcap_ssime_mult, { "Multiplier", "alcap.ssime.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, "", HFILL }},
-    { &hf_alcap_ssime_max, { "Max Len", "alcap.ssime.max", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_ssime_frm, { "Frame Mode", "alcap.ssime.frm", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x80, NULL, HFILL }},
+    { &hf_alcap_ssime_lb, { "Loopback", "alcap.ssime.lb", FT_UINT8, BASE_DEC, VALS(enabled_disabled), 0x40, NULL, HFILL }},
+    { &hf_alcap_ssime_mult, { "Multiplier", "alcap.ssime.mult", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
+    { &hf_alcap_ssime_max, { "Max Len", "alcap.ssime.max", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_acc_level, { "Congestion Level", "alcap.acc.level", FT_UINT8, BASE_DEC, VALS(congestion_level), 0, "", HFILL }},
+    { &hf_alcap_acc_level, { "Congestion Level", "alcap.acc.level", FT_UINT8, BASE_DEC, VALS(congestion_level), 0, NULL, HFILL }},
         
-    { &hf_alcap_cp, { "Level", "alcap.cp.level", FT_UINT8, BASE_DEC, VALS(connection_priority), 0x07, "", HFILL }},
+    { &hf_alcap_cp, { "Level", "alcap.cp.level", FT_UINT8, BASE_DEC, VALS(connection_priority), 0x07, NULL, HFILL }},
         
-    { &hf_alcap_hc, { "Codepoint", "alcap.hc.codepoint", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_hc, { "Codepoint", "alcap.hc.codepoint", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_pfbw_br_fw, { "CPS Forward Bitrate", "alcap.pfbw.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pfbw_br_bw, { "CPS Backwards Bitrate", "alcap.pfbw.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pfbw_bucket_fw, { "Forward CPS Bucket Size", "alcap.pfbw.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pfbw_bucket_bw, { "Backwards CPS Bucket Size", "alcap.pfbw.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pfbw_size_fw, { "Forward CPS Packet Size", "alcap.pfbw.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pfbw_size_bw, { "Backwards CPS Packet Size", "alcap.pfbw.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_pfbw_br_fw, { "CPS Forward Bitrate", "alcap.pfbw.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pfbw_br_bw, { "CPS Backwards Bitrate", "alcap.pfbw.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pfbw_bucket_fw, { "Forward CPS Bucket Size", "alcap.pfbw.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pfbw_bucket_bw, { "Backwards CPS Bucket Size", "alcap.pfbw.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pfbw_size_fw, { "Forward CPS Packet Size", "alcap.pfbw.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pfbw_size_bw, { "Backwards CPS Packet Size", "alcap.pfbw.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_pvbws_br_fw, { "Peak CPS Forward Bitrate", "alcap.pvbws.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_br_bw, { "Peak CPS Backwards Bitrate", "alcap.pvbws.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.pvbws.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.pvbws.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_size_fw, { "Forward CPS Packet Size", "alcap.pvbws.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_size_bw, { "Backwards CPS Packet Size", "alcap.pvbws.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbws_stt, { "Source Traffic Type", "alcap.pvbws.stt", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_pvbws_br_fw, { "Peak CPS Forward Bitrate", "alcap.pvbws.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_br_bw, { "Peak CPS Backwards Bitrate", "alcap.pvbws.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.pvbws.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.pvbws.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_size_fw, { "Forward CPS Packet Size", "alcap.pvbws.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_size_bw, { "Backwards CPS Packet Size", "alcap.pvbws.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbws_stt, { "Source Traffic Type", "alcap.pvbws.stt", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_pvbwt_peak_br_fw, { "Peak CPS Forward Bitrate", "alcap.pvbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_peak_br_bw, { "Peak CPS Backwards Bitrate", "alcap.pvbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_peak_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.pvbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_peak_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.pvbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_sust_br_fw, { "Sustainable CPS Forward Bitrate", "alcap.pvbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_sust_br_bw, { "Sustainable CPS Backwards Bitrate", "alcap.pvbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_sust_bucket_fw, { "Sustainable Forward CPS Bucket Size", "alcap.pvbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_sust_bucket_bw, { "Sustainable Backwards CPS Bucket Size", "alcap.pvbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_size_fw, { "Forward CPS Packet Size", "alcap.pvbwt.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_pvbwt_size_bw, { "Backwards CPS Packet Size", "alcap.pvbwt.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_pvbwt_peak_br_fw, { "Peak CPS Forward Bitrate", "alcap.pvbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_peak_br_bw, { "Peak CPS Backwards Bitrate", "alcap.pvbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_peak_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.pvbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_peak_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.pvbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_sust_br_fw, { "Sustainable CPS Forward Bitrate", "alcap.pvbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_sust_br_bw, { "Sustainable CPS Backwards Bitrate", "alcap.pvbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_sust_bucket_fw, { "Sustainable Forward CPS Bucket Size", "alcap.pvbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_sust_bucket_bw, { "Sustainable Backwards CPS Bucket Size", "alcap.pvbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_size_fw, { "Forward CPS Packet Size", "alcap.pvbwt.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_pvbwt_size_bw, { "Backwards CPS Packet Size", "alcap.pvbwt.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_fbw_br_fw, { "CPS Forward Bitrate", "alcap.fbw.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_fbw_br_bw, { "CPS Backwards Bitrate", "alcap.fbw.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_fbw_bucket_fw, { "Forward CPS Bucket Size", "alcap.fbw.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_fbw_bucket_bw, { "Backwards CPS Bucket Size", "alcap.fbw.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_fbw_size_fw, { "Forward CPS Packet Size", "alcap.fbw.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_fbw_size_bw, { "Backwards CPS Packet Size", "alcap.fbw.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_fbw_br_fw, { "CPS Forward Bitrate", "alcap.fbw.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_fbw_br_bw, { "CPS Backwards Bitrate", "alcap.fbw.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_fbw_bucket_fw, { "Forward CPS Bucket Size", "alcap.fbw.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_fbw_bucket_bw, { "Backwards CPS Bucket Size", "alcap.fbw.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_fbw_size_fw, { "Forward CPS Packet Size", "alcap.fbw.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_fbw_size_bw, { "Backwards CPS Packet Size", "alcap.fbw.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_vbws_br_fw, { "CPS Forward Bitrate", "alcap.vbws.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_br_bw, { "CPS Backwards Bitrate", "alcap.vbws.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_bucket_fw, { "Forward CPS Bucket Size", "alcap.vbws.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_bucket_bw, { "Backwards CPS Bucket Size", "alcap.vbws.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_size_fw, { "Forward CPS Packet Size", "alcap.vbws.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_size_bw, { "Backwards CPS Packet Size", "alcap.vbws.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbws_stt, { "Source Traffic Type", "alcap.vbws.stt", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_vbws_br_fw, { "CPS Forward Bitrate", "alcap.vbws.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_br_bw, { "CPS Backwards Bitrate", "alcap.vbws.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_bucket_fw, { "Forward CPS Bucket Size", "alcap.vbws.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_bucket_bw, { "Backwards CPS Bucket Size", "alcap.vbws.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_size_fw, { "Forward CPS Packet Size", "alcap.vbws.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_size_bw, { "Backwards CPS Packet Size", "alcap.vbws.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbws_stt, { "Source Traffic Type", "alcap.vbws.stt", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_vbwt_peak_br_fw, { "Peak CPS Forward Bitrate", "alcap.vbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_peak_br_bw, { "Peak CPS Backwards Bitrate", "alcap.vbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_peak_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.vbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_peak_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.vbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_sust_br_fw, { "Sustainable CPS Forward Bitrate", "alcap.vbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_sust_br_bw, { "Sustainable CPS Backwards Bitrate", "alcap.vbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_sust_bucket_fw, { "Sustainable Forward CPS Bucket Size", "alcap.vbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_sust_bucket_bw, { "Sustainable Backwards CPS Bucket Size", "alcap.vbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_size_fw, { "Forward CPS Packet Size", "alcap.vbwt.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-    { &hf_alcap_vbwt_size_bw, { "Backwards CPS Packet Size", "alcap.vbwt.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+    { &hf_alcap_vbwt_peak_br_fw, { "Peak CPS Forward Bitrate", "alcap.vbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_peak_br_bw, { "Peak CPS Backwards Bitrate", "alcap.vbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_peak_bucket_fw, { "Peak Forward CPS Bucket Size", "alcap.vbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_peak_bucket_bw, { "Peak Backwards CPS Bucket Size", "alcap.vbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_sust_br_fw, { "Sustainable CPS Forward Bitrate", "alcap.vbwt.bitrate.fw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_sust_br_bw, { "Sustainable CPS Backwards Bitrate", "alcap.vbwt.bitrate.bw", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_sust_bucket_fw, { "Sustainable Forward CPS Bucket Size", "alcap.vbwt.bucket_size.fw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_sust_bucket_bw, { "Sustainable Backwards CPS Bucket Size", "alcap.vbwt.bucket_size.bw", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_size_fw, { "Forward CPS Packet Size", "alcap.vbwt.max_size.fw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+    { &hf_alcap_vbwt_size_bw, { "Backwards CPS Packet Size", "alcap.vbwt.max_size.bw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
         
-    { &hf_alcap_leg_osaid, { "Leg's ERQ OSA id",    "alcap.leg.osaid", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_dsaid, { "Leg's ECF OSA id",    "alcap.leg.dsaid", FT_UINT32, BASE_HEX, NULL, 0,"", HFILL } },
-    { &hf_alcap_leg_pathid, { "Leg's path id",    "alcap.leg.pathid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_cid, { "Leg's channel id",    "alcap.leg.cid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_sugr, { "Leg's SUGR",    "alcap.leg.sugr", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_dnsea, { "Leg's destination NSAP",    "alcap.leg.dnsea", FT_STRING, BASE_NONE, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_onsea, { "Leg's originating NSAP",    "alcap.leg.onsea", FT_STRING, BASE_NONE, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_frame, { "a message of this leg",    "alcap.leg.msg", FT_FRAMENUM, BASE_DEC, NULL, 0, "", HFILL } },
-    { &hf_alcap_leg_release_cause, { "Leg's cause value in REL",    "alcap.leg.cause", FT_UINT8, BASE_DEC, VALS(cause_values_itu), 0, "", HFILL }},
+    { &hf_alcap_leg_osaid, { "Leg's ERQ OSA id",    "alcap.leg.osaid", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_dsaid, { "Leg's ECF OSA id",    "alcap.leg.dsaid", FT_UINT32, BASE_HEX, NULL, 0,NULL, HFILL } },
+    { &hf_alcap_leg_pathid, { "Leg's path id",    "alcap.leg.pathid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_cid, { "Leg's channel id",    "alcap.leg.cid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_sugr, { "Leg's SUGR",    "alcap.leg.sugr", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_dnsea, { "Leg's destination NSAP",    "alcap.leg.dnsea", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_onsea, { "Leg's originating NSAP",    "alcap.leg.onsea", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_frame, { "a message of this leg",    "alcap.leg.msg", FT_FRAMENUM, BASE_DEC, NULL, 0, NULL, HFILL } },
+    { &hf_alcap_leg_release_cause, { "Leg's cause value in REL",    "alcap.leg.cause", FT_UINT8, BASE_DEC, VALS(cause_values_itu), 0, NULL, HFILL }},
         
     };
     
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 70938cdb5d..9f1c0376b4 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -666,8 +666,8 @@ proto_register_amr(void)
 		},
 		{ &hf_amr_toc_f,
 			{ "F bit",           "amr.toc.f",
-			FT_BOOLEAN, 8, TFS(&toc_f_bit_vals), 0x0,          
-			"F bit", HFILL }
+			FT_BOOLEAN, BASE_NONE, TFS(&toc_f_bit_vals), 0x0,          
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_toc_ft,
 			{ "FT bits",           "amr.nb.toc.ft",
@@ -681,78 +681,78 @@ proto_register_amr(void)
 		},
 		{ &hf_amr_toc_q,
 			{ "Q bit",           "amr.toc.q",
-			FT_BOOLEAN, 8, TFS(&toc_q_bit_vals), 0x00,          
+			FT_BOOLEAN, BASE_NONE, TFS(&toc_q_bit_vals), 0x0,          
 			"Frame quality indicator bit", HFILL }
 		},
 		{ &hf_amr_nb_if1_ft,
 			{ "Frame Type",           "amr.nb.if1.ft",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0xf0,          
-			"Frame Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if1_ft,
 			{ "Frame Type",           "amr.wb.if1.ft",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0,          
-			"Frame Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if1_mode_req,
 			{ "Mode Type request",           "amr.nb.if1.modereq",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_request_vals), 0xe0,
-			"Mode Type request", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if1_mode_req,
 			{ "Mode Type request",           "amr.wb.if1.modereq",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_request_vals), 0x0f,
-			"Mode Type request", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_if1_sti,
 			{ "SID Type Indicator",           "amr.if1.sti",
 			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x10,          
-			"SID Type Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if1_sti_mode_ind,
 			{ "Mode Type indication",           "amr.nb.if1.stimodeind",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x0e,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if1_sti_mode_ind,
 			{ "Mode Type indication",           "amr.wb.if1.stimodeind",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0x0f,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if1_mode_ind,
 			{ "Mode Type indication",           "amr.nb.if1.modeind",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x07,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if1_mode_ind,
 			{ "Mode Type indication",           "amr.wb.if1.modeind",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if2_ft,
 			{ "Frame Type",           "amr.nb.if2.ft",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x0f,
-			"Frame Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if2_ft,
 			{ "Frame Type",           "amr.wb.if2.ft",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0,
-			"Frame Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_if2_sti,
 			{ "SID Type Indicator",           "amr.if2.sti",
 			FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x80,          
-			"SID Type Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_nb_if2_sti_mode_ind,
 			{ "Mode Type indication",           "amr.nb.if2.stimodeind",
 			FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x07,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_wb_if2_sti_mode_ind,
 			{ "Mode Type indication",           "amr.wb.if2.stimodeind",
 			FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0x78,
-			"Mode Type indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_amr_if1_fqi,
 			{ "FQI",           "amr.fqi",
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 11d310b5a4..813eabea05 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -2289,7 +2289,7 @@ proto_register_ansi_637(void)
 	    NULL, HFILL }},
 	{ &hf_ansi_637_trans_bin_addr,
 	    { "Binary Address", "ansi_637_trans.bin_addr",
-	    FT_BYTES, BASE_HEX, 0, 0,
+	    FT_BYTES, BASE_NONE, 0, 0,
 	    NULL, HFILL }},
 	};
     static hf_register_info hf_tele[] =
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index cde6f8e2f2..750d6d858b 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -4833,21 +4833,21 @@ proto_register_ansi_683(void)
 	  { "Forward Link Message Type",
 	    "ansi_683.for_msg_type",
 	    FT_UINT8, BASE_DEC, VALS(for_msg_type_strings), 0,
-	    "", HFILL }},
+	    NULL, HFILL }},
 	{ &hf_ansi_683_rev_msg_type,
 	  { "Reverse Link Message Type",
 	    "ansi_683.rev_msg_type",
 	    FT_UINT8, BASE_DEC, VALS(rev_msg_type_strings), 0,
-	    "", HFILL }},
+	    NULL, HFILL }},
 	{ &hf_ansi_683_length,
 	    { "Length",		"ansi_683.len",
 	    FT_UINT8, BASE_DEC, NULL, 0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_ansi_683_none,
 	    { "Sub tree",	"ansi_683.none",
-	    FT_NONE, 0, 0, 0,
-	    "", HFILL }
+	    FT_NONE, BASE_NONE, 0, 0,
+	    NULL, HFILL }
 	},
     };
 
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index 95d443bc63..6380144d79 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -11910,82 +11910,82 @@ proto_register_ansi_a(void)
         { &hf_ansi_a_bsmap_msgtype,
             { "BSMAP Message Type",     "ansi_a_bsmap.msgtype",
             FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_dtap_msgtype,
             { "DTAP Message Type",      "ansi_a_bsmap.dtap_msgtype",
             FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_elem_id,
             { "Element ID",     "ansi_a_bsmap.elem_id",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_length,
             { "Length",         "ansi_a_bsmap.len",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_none,
             { "Sub tree",       "ansi_a_bsmap.none",
-            FT_NONE, 0, 0, 0,
-            "", HFILL }
+            FT_NONE, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_esn,
             { "ESN",    "ansi_a_bsmap.esn",
             FT_UINT32, BASE_HEX, 0, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_imsi,
             { "IMSI",   "ansi_a_bsmap.imsi",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_min,
             { "MIN",    "ansi_a_bsmap.min",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_meid,
             { "MEID",   "ansi_a_bsmap.meid",
-            FT_STRING, BASE_HEX, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_cld_party_bcd_num,
             { "Called Party BCD Number",        "ansi_a_bsmap.cld_party_bcd_num",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_clg_party_bcd_num,
             { "Calling Party BCD Number",       "ansi_a_bsmap.clg_party_bcd_num",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_cld_party_ascii_num,
             { "Called Party ASCII Number",      "ansi_a_bsmap.cld_party_ascii_num",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_clg_party_ascii_num,
             { "Calling Party ASCII Number",     "ansi_a_bsmap.clg_party_ascii_num",
-            FT_STRING, BASE_DEC, 0, 0,
-            "", HFILL }
+            FT_STRING, BASE_NONE, 0, 0,
+            NULL, HFILL }
         },
         { &hf_ansi_a_cell_ci,
             { "Cell CI",        "ansi_a_bsmap.cell_ci",
             FT_UINT16, BASE_HEX, 0, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_cell_lac,
             { "Cell LAC",       "ansi_a_bsmap.cell_lac",
             FT_UINT16, BASE_HEX, 0, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_cell_mscid,
             { "Cell MSCID",     "ansi_a_bsmap.cell_mscid",
             FT_UINT24, BASE_HEX, 0, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_pdsn_ip_addr,
             { "PDSN IP Address", "ansi_a_bsmap.pdsn_ip_addr",
@@ -12010,37 +12010,37 @@ proto_register_ansi_a(void)
         { &hf_ansi_a_a2p_bearer_ipv4_addr,
             { "A2p Bearer IP Address", "ansi_a_bsmap.a2p_bearer_ipv4_addr",
             FT_IPv4, BASE_NONE, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_a2p_bearer_ipv6_addr,
             { "A2p Bearer IP Address", "ansi_a_bsmap.a2p_bearer_ipv6_addr",
             FT_IPv6, BASE_NONE, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_a2p_bearer_udp_port,
             { "A2p Bearer UDP Port", "ansi_a_bsmap.a2p_bearer_udp_port",
             FT_UINT16, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_so,
             { "Service Option", "ansi_a_bsmap.so",
             FT_UINT16, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_cause_1,
             { "Cause",  "ansi_a_bsmap.cause_1",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_cause_2,
             { "Cause",  "ansi_a_bsmap.cause_2",
             FT_UINT16, BASE_DEC, NULL, 0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_a_meid_configured,
             { "Is MEID configured",  "ansi_a_bsmap.meid_configured",
-            FT_BOOLEAN, BASE_NONE, NULL, 0,
-            "Is MEID configured", HFILL }
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }
         }
     };
 
diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c
index faa1cca0ff..84a92ffb48 100644
--- a/epan/dissectors/packet-ansi_map.c
+++ b/epan/dissectors/packet-ansi_map.c
@@ -16271,284 +16271,284 @@ void proto_register_ansi_map(void) {
         { &hf_ansi_map_op_code_fam,
           { "Operation Code Family", "ansi_map.op_code_fam",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "Operation Code Family", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitH,
           { "Reserved", "ansi_map.reserved_bitH",
             FT_BOOLEAN, 8, NULL,0x80,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitD,
           { "Reserved", "ansi_map.reserved_bitD",
             FT_BOOLEAN, 8, NULL,0x08,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitHG,
           { "Reserved", "ansi_map.reserved_bitHG",
             FT_UINT8, BASE_DEC, NULL, 0xc0,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitHGFE,
           { "Reserved", "ansi_map.reserved_bitHGFE",
             FT_UINT8, BASE_DEC, NULL, 0xf0,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitFED,
           { "Reserved", "ansi_map.reserved_bitFED",
             FT_UINT8, BASE_DEC, NULL, 0x38,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_reservedBitED,
           { "Reserved", "ansi_map.reserved_bitED",
             FT_UINT8, BASE_DEC, NULL, 0x18,
-            "Reserved", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_op_code,
           { "Operation Code", "ansi_map.op_code",
             FT_UINT8, BASE_DEC, VALS(ansi_map_opr_code_strings), 0x0,
-            "Operation Code", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_type_of_digits,
           { "Type of Digits", "ansi_map.type_of_digits",
             FT_UINT8, BASE_DEC, VALS(ansi_map_type_of_digits_vals), 0x0,
-            "Type of Digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_na,
           { "Nature of Number", "ansi_map.na",
             FT_BOOLEAN, 8, TFS(&ansi_map_na_bool_val),0x01,
-            "Nature of Number", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_pi,
           { "Presentation Indication", "ansi_map.type_of_pi",
             FT_BOOLEAN, 8, TFS(&ansi_map_pi_bool_val),0x02,
-            "Presentation Indication", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_navail,
           { "Number available indication", "ansi_map.navail",
             FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x04,
-            "Number available indication", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_si,
           { "Screening indication", "ansi_map.si",
             FT_UINT8, BASE_DEC, VALS(ansi_map_si_vals), 0x30,
-            "Screening indication", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_digits_enc,
           { "Encoding", "ansi_map.enc",
             FT_UINT8, BASE_DEC, VALS(ansi_map_digits_enc_vals), 0x0f,
-            "Encoding", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_np,
           { "Numbering Plan", "ansi_map.np",
             FT_UINT8, BASE_DEC, VALS(ansi_map_np_vals), 0xf0,
-            "Numbering Plan", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_nr_digits,
           { "Number of Digits", "ansi_map.nr_digits",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Number of Digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_bcd_digits,
           { "BCD digits", "ansi_map.bcd_digits",
             FT_STRING, BASE_NONE, NULL, 0,
-            "BCD digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_ia5_digits,
           { "IA5 digits", "ansi_map.ia5_digits",
             FT_STRING, BASE_NONE, NULL, 0,
-            "IA5 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_subaddr_type,
           { "Type of Subaddress", "ansi_map.subaddr_type",
             FT_UINT8, BASE_DEC, VALS(ansi_map_sub_addr_type_vals), 0x70,
-            "Type of Subaddress", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_subaddr_odd_even,
           { "Odd/Even Indicator", "ansi_map.subaddr_odd_even",
             FT_BOOLEAN, 8, TFS(&ansi_map_navail_bool_val),0x08,
-            "Odd/Even Indicator", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_alertcode_cadence,
           { "Cadence", "ansi_map.alertcode.cadence",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Cadence_vals), 0x3f,
-            "Cadence", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_alertcode_pitch,
           { "Pitch", "ansi_map.alertcode.pitch",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Pitch_vals), 0xc0,
-            "Pitch", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_alertcode_alertaction,
           { "Alert Action", "ansi_map.alertcode.alertaction",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AlertCode_Alert_Action_vals), 0x07,
-            "Alert Action", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_announcementcode_tone,
           { "Tone", "ansi_map.announcementcode.tone",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_tone_vals), 0x0,
-            "Tone", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_announcementcode_class,
           { "Tone", "ansi_map.announcementcode.class",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_class_vals), 0xf,
-            "Tone", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_announcementcode_std_ann,
           { "Standard Announcement", "ansi_map.announcementcode.std_ann",
             FT_UINT8, BASE_DEC, VALS(ansi_map_AnnouncementCode_std_ann_vals), 0x0,
-            "Standard Announcement", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_announcementcode_cust_ann,
           { "Custom Announcement", "ansi_map.announcementcode.cust_ann",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Custom Announcement", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_authorizationperiod_period,
           { "Period", "ansi_map.authorizationperiod.period",
             FT_UINT8, BASE_DEC, VALS(ansi_map_authorizationperiod_period_vals), 0x0,
-            "Period", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_value,
-          { " Value", "ansi_map.value",
+          { "Value", "ansi_map.value",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "Value", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_msc_type,
           { "Type", "ansi_map.extendedmscid.type",
             FT_UINT8, BASE_DEC, VALS(ansi_map_msc_type_vals), 0x0,
-            "Type", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_handoffstate_pi,
           { "Party Involved (PI)", "ansi_map.handoffstate.pi",
             FT_BOOLEAN, 8, TFS(&ansi_map_HandoffState_pi_bool_val),0x01,
-            "Party Involved (PI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_tgn,
           { "Trunk Group Number (G)", "ansi_map.tgn",
             FT_UINT8, BASE_DEC, NULL,0x0,
-            "Trunk Group Number (G)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_tmn,
           { "Trunk Member Number (M)", "ansi_map.tgn",
             FT_UINT8, BASE_DEC, NULL,0x0,
-            "Trunk Member Number (M)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationcount_tom,
           { "Type of messages", "ansi_map.messagewaitingnotificationcount.tom",
             FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationCount_type_vals), 0x0,
-            "Type of messages", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationcount_no_mw,
           { "Number of Messages Waiting", "ansi_map.messagewaitingnotificationcount.nomw",
             FT_UINT8, BASE_DEC, NULL,0x0,
-            "Number of Messages Waiting", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationtype_mwi,
           { "Message Waiting Indication (MWI)", "ansi_map.messagewaitingnotificationcount.mwi",
             FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationType_mwi_vals), 0x0,
-            "Message Waiting Indication (MWI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationtype_apt,
           { "Alert Pip Tone (APT)", "ansi_map.messagewaitingnotificationtype.apt",
             FT_BOOLEAN, 8, TFS(&ansi_map_HandoffState_pi_bool_val),0x02,
-            "Alert Pip Tone (APT)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_messagewaitingnotificationtype_pt,
           { "Pip Tone (PT)", "ansi_map.messagewaitingnotificationtype.pt",
             FT_UINT8, BASE_DEC, VALS(ansi_map_MessageWaitingNotificationType_mwi_vals), 0xc0,
-            "Pip Tone (PT)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_trans_cap_prof,
           { "Profile (PROF)", "ansi_map.trans_cap_prof",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_prof_bool_val),0x01,
-            "Profile (PROF)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_busy,
           { "Busy Detection (BUSY)", "ansi_map.trans_cap_busy",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_busy_bool_val),0x02,
-            "Busy Detection (BUSY)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_ann,
           { "Announcements (ANN)", "ansi_map.trans_cap_ann",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ann_bool_val),0x04,
-            "Announcements (ANN)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_rui,
           { "Remote User Interaction (RUI)", "ansi_map.trans_cap_rui",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_rui_bool_val),0x08,
-            "Remote User Interaction (RUI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_spini,
           { "Subscriber PIN Intercept (SPINI)", "ansi_map.trans_cap_spini",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_spini_bool_val),0x10,
-            "Subscriber PIN Intercept (SPINI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_uzci,
           { "UZ Capability Indicator (UZCI)", "ansi_map.trans_cap_uzci",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_uzci_bool_val),0x20,
-            "UZ Capability Indicator (UZCI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_trans_cap_ndss,
           { "NDSS Capability (NDSS)", "ansi_map.trans_cap_ndss",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_ndss_bool_val),0x40,
-            "NDSS Capability (NDSS)", HFILL }},         
+            NULL, HFILL }},         
         { &hf_ansi_map_trans_cap_nami,
           { "NAME Capability Indicator (NAMI)", "ansi_map.trans_cap_nami",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_nami_bool_val),0x80,
-            "NAME Capability Indicator (NAMI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_trans_cap_multerm,
           { "Multiple Terminations", "ansi_map.trans_cap_multerm",
             FT_UINT8, BASE_DEC, VALS(ansi_map_trans_cap_multerm_vals), 0x0f,
-            "Multiple Terminations", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_terminationtriggers_busy,
           { "Busy", "ansi_map.terminationtriggers.busy",
             FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_busy_vals), 0x03,
-            "Busy", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_terminationtriggers_rf,
           { "Routing Failure (RF)", "ansi_map.terminationtriggers.rf",
             FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_rf_vals), 0x0c,
-            "Routing Failure (RF)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_terminationtriggers_npr,
           { "No Page Response (NPR)", "ansi_map.terminationtriggers.npr",
             FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_npr_vals), 0x30,
-            "No Page Response (NPR)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_terminationtriggers_na,
           { "No Answer (NA)", "ansi_map.terminationtriggers.na",
             FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_na_vals), 0xc0,
-            "No Answer (NA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_terminationtriggers_nr,
           { "None Reachable (NR)", "ansi_map.terminationtriggers.nr",
             FT_UINT8, BASE_DEC, VALS(ansi_map_terminationtriggers_nr_vals), 0x01,
-            "None Reachable (NR)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_trans_cap_tl,
           { "TerminationList (TL)", "ansi_map.trans_cap_tl",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_tl_bool_val),0x10,
-            "TerminationList (TL)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmaserviceoption,
           { "CDMAServiceOption", "ansi_map.cdmaserviceoption",
             FT_UINT16, BASE_RANGE_STRING | BASE_DEC, RVALS(&cdmaserviceoption_vals), 0x0,
-            "CDMAServiceOption", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_trans_cap_waddr,
           { "WIN Addressing (WADDR)", "ansi_map.trans_cap_waddr",
             FT_BOOLEAN, 8, TFS(&ansi_map_trans_cap_waddr_bool_val),0x20,
-            "WIN Addressing (WADDR)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_MarketID,
           { "MarketID", "ansi_map.marketid",
             FT_UINT16, BASE_DEC, NULL, 0,
-            "MarketID", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_swno,
           { "Switch Number (SWNO)", "ansi_map.swno",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "Switch Number (SWNO)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_idno,
           { "ID Number", "ansi_map.idno",
             FT_UINT32, BASE_DEC, NULL, 0,
-            "ID Number", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_segcount,
           { "Segment Counter", "ansi_map.segcount",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "Segment Counter", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_sms_originationrestrictions_direct,
           { "DIRECT", "ansi_map.originationrestrictions.direct",
             FT_BOOLEAN, 8, TFS(&ansi_map_SMS_OriginationRestrictions_direct_bool_val),0x04,
-            "DIRECT", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_sms_originationrestrictions_default,
           { "DEFAULT", "ansi_map.originationrestrictions.default",
             FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_OriginationRestrictions_default_vals), 0x03,
-            "DEFAULT", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_sms_originationrestrictions_fmc,
           { "Force Message Center (FMC)", "ansi_map.originationrestrictions.fmc",
             FT_BOOLEAN, 8, TFS(&ansi_map_SMS_OriginationRestrictions_fmc_bool_val),0x08,
-            "Force Message Center (FMC)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_systemcapabilities_auth,
           { "Authentication Parameters Requested (AUTH)", "ansi_map.systemcapabilities.auth",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_auth_bool_val),0x01,
-            "Authentication Parameters Requested (AUTH)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_systemcapabilities_se,
           { "Signaling Message Encryption Capable (SE )", "ansi_map.systemcapabilities.se",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_se_bool_val),0x02,
-            "Signaling Message Encryption Capable (SE )", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_systemcapabilities_vp,
           { "Voice Privacy Capable (VP )", "ansi_map.systemcapabilities.vp",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_vp_bool_val),0x04,
-            "Voice Privacy Capable (VP )", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_systemcapabilities_cave,
           { "CAVE Algorithm Capable (CAVE)", "ansi_map.systemcapabilities.cave",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_cave_bool_val),0x08,
-            "CAVE Algorithm Capable (CAVE)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_systemcapabilities_ssd,
           { "Shared SSD (SSD)", "ansi_map.systemcapabilities.ssd",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_ssd_bool_val),0x10,
-            "Shared SSD (SSD)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_systemcapabilities_dp,
           { "Data Privacy (DP)", "ansi_map.systemcapabilities.dp",
             FT_BOOLEAN, 8, TFS(&ansi_map_systemcapabilities_dp_bool_val),0x20,
-            "Data Privacy (DP)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_mslocation_lat,
           { "Latitude in tenths of a second", "ansi_map.mslocation.lat",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "Latitude in tenths of a second", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_mslocation_long,
           { "Longitude in tenths of a second", "ansi_map.mslocation.long",
             FT_UINT8, BASE_DEC, NULL, 0,
@@ -16556,182 +16556,182 @@ void proto_register_ansi_map(void) {
         { &hf_ansi_map_mslocation_res,
           { "Resolution in units of 1 foot", "ansi_map.mslocation.res",
             FT_UINT8, BASE_DEC, NULL, 0,
-            "Resolution in units of 1 foot", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_nampscallmode_namps,
           { "Call Mode", "ansi_map.nampscallmode.namps",
             FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_namps_bool_val),0x01,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_nampscallmode_amps,
           { "Call Mode", "ansi_map.nampscallmode.amps",
             FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_nampschanneldata_navca,
           { "Narrow Analog Voice Channel Assignment (NAVCA)", "ansi_map.nampschanneldata.navca",
             FT_UINT8, BASE_DEC, VALS(ansi_map_NAMPSChannelData_navca_vals), 0x03,
-            "Narrow Analog Voice Channel Assignment (NAVCA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_nampschanneldata_CCIndicator,
           { "Color Code Indicator (CCIndicator)", "ansi_map.nampschanneldata.ccindicator",
             FT_UINT8, BASE_DEC, VALS(ansi_map_NAMPSChannelData_ccinidicator_vals), 0x1c,
-            "Color Code Indicator (CCIndicator)", HFILL }},
+            NULL, HFILL }},
 
 
         { &hf_ansi_map_callingfeaturesindicator_cfufa,
           { "Call Forwarding Unconditional FeatureActivity, CFU-FA", "ansi_map.callingfeaturesindicator.cfufa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "Call Forwarding Unconditional FeatureActivity, CFU-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cfbfa,
           { "Call Forwarding Busy FeatureActivity, CFB-FA", "ansi_map.callingfeaturesindicator.cfbafa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
-            "Call Forwarding Busy FeatureActivity, CFB-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cfnafa,
           { "Call Forwarding No Answer FeatureActivity, CFNA-FA", "ansi_map.callingfeaturesindicator.cfnafa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30,
-            "Call Forwarding No Answer FeatureActivity, CFNA-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cwfa,
           { "Call Waiting: FeatureActivity, CW-FA", "ansi_map.callingfeaturesindicator.cwfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0,
-            "Call Waiting: FeatureActivity, CW-FA", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_callingfeaturesindicator_3wcfa,
           { "Three-Way Calling FeatureActivity, 3WC-FA", "ansi_map.callingfeaturesindicator.3wcfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "Three-Way Calling FeatureActivity, 3WC-FA", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_callingfeaturesindicator_pcwfa,
           { "Priority Call Waiting FeatureActivity PCW-FA", "ansi_map.callingfeaturesindicator.pcwfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "Priority Call Waiting FeatureActivity PCW-FA", HFILL }},
+            NULL, HFILL }},
           
         { &hf_ansi_map_callingfeaturesindicator_dpfa,
           { "Data Privacy Feature Activity DP-FA", "ansi_map.callingfeaturesindicator.dpfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
-            "Data Privacy Feature Activity DP-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_ahfa,
           { "Answer Hold: FeatureActivity AH-FA", "ansi_map.callingfeaturesindicator.ahfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30,
-            "Answer Hold: FeatureActivity AH-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_uscfvmfa,
           { "USCF divert to voice mail: FeatureActivity USCFvm-FA", "ansi_map.callingfeaturesindicator.uscfvmfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0,
-            "USCF divert to voice mail: FeatureActivity USCFvm-FA", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_callingfeaturesindicator_uscfmsfa,
           { "USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA", "ansi_map.callingfeaturesindicator.uscfmsfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "USCF divert to mobile station provided DN:FeatureActivity.USCFms-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_uscfnrfa,
           { "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", "ansi_map.callingfeaturesindicator.uscfmsfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
-            "USCF divert to network registered DN:FeatureActivity. USCFnr-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cpdsfa,
           { "CDMA-Packet Data Service: FeatureActivity. CPDS-FA", "ansi_map.callingfeaturesindicator.cpdfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30,
-            "CDMA-Packet Data Service: FeatureActivity. CPDS-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_ccsfa,
           { "CDMA-Concurrent Service:FeatureActivity. CCS-FA", "ansi_map.callingfeaturesindicator.ccsfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0,
-            "CDMA-Concurrent Service:FeatureActivity. CCS-FA", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_callingfeaturesindicator_epefa,
           { "TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA", "ansi_map.callingfeaturesindicator.epefa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "TDMA Enhanced Privacy and Encryption:FeatureActivity.TDMA EPE-FA", HFILL }},
+            NULL, HFILL }},
 
 
         { &hf_ansi_map_callingfeaturesindicator_cdfa,
           { "Call Delivery: FeatureActivity, CD-FA", "ansi_map.callingfeaturesindicator.cdfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
-            "Call Delivery: FeatureActivity, CD-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_vpfa,
           { "Voice Privacy FeatureActivity, VP-FA", "ansi_map.callingfeaturesindicator.vpfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30,
-            "Voice Privacy FeatureActivity, VP-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_ctfa,
           { "Call Transfer: FeatureActivity, CT-FA", "ansi_map.callingfeaturesindicator.ctfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0,
-            "Call Transfer: FeatureActivity, CT-FA", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_callingfeaturesindicator_cnip1fa,
           { "One number (network-provided only) Calling Number Identification Presentation: FeatureActivity CNIP1-FA", "ansi_map.callingfeaturesindicator.cnip1fa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x03,
-            "One number (network-provided only) Calling Number Identification Presentation: FeatureActivity CNIP1-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cnip2fa,
           { "Two number (network-provided and user-provided) Calling Number Identification Presentation: FeatureActivity CNIP2-FA", "ansi_map.callingfeaturesindicator.cnip2fa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x0c,
-            "Two number (network-provided and user-provided) Calling Number Identification Presentation: FeatureActivity CNIP2-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cnirfa,
           { "Calling Number Identification Restriction: FeatureActivity CNIR-FA", "ansi_map.callingfeaturesindicator.cnirfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0x30,
-            "Calling Number Identification Restriction: FeatureActivity CNIR-FA", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_callingfeaturesindicator_cniroverfa,
           { "Calling Number Identification Restriction Override FeatureActivity CNIROver-FA", "ansi_map.callingfeaturesindicator.cniroverfa",
             FT_UINT8, BASE_DEC, VALS(ansi_map_FeatureActivity_vals), 0xc0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_cdmacallmode_cdma,
           { "Call Mode", "ansi_map.cdmacallmode.cdma",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cdma_bool_val),0x01,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_amps,
           { "Call Mode", "ansi_map.cdmacallmode.amps",
             FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_amps_bool_val),0x02,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_namps,
           { "Call Mode", "ansi_map.cdmacallmode.namps",
             FT_BOOLEAN, 8, TFS(&ansi_map_CallMode_namps_bool_val),0x04,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls1,
           { "Call Mode", "ansi_map.cdmacallmode.cls1",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls1_bool_val),0x08,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls2,
           { "Call Mode", "ansi_map.cdmacallmode.cls2",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls2_bool_val),0x10,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls3,
           { "Call Mode", "ansi_map.cdmacallmode.cls3",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls3_bool_val),0x20,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls4,
           { "Call Mode", "ansi_map.cdmacallmode.cls4",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls4_bool_val),0x40,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls5,
           { "Call Mode", "ansi_map.cdmacallmode.cls5",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls5_bool_val),0x80,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls6,
           { "Call Mode", "ansi_map.cdmacallmode.cls6",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls6_bool_val),0x01,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls7,
           { "Call Mode", "ansi_map.cdmacallmode.cls7",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls7_bool_val),0x02,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls8,
           { "Call Mode", "ansi_map.cdmacallmode.cls8",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls8_bool_val),0x04,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls9,
           { "Call Mode", "ansi_map.cdmacallmode.cls9",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls9_bool_val),0x08,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmacallmode_cls10,
           { "Call Mode", "ansi_map.cdmacallmode.cls10",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMACallMode_cls10_bool_val),0x10,
-            "Call Mode", HFILL }},
+            NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_Frame_Offset,
          { "Frame Offset", "ansi_map.cdmachanneldata.frameoffset",
            FT_UINT8, BASE_DEC, NULL, 0x78,
-           "Frame Offset", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_CDMA_ch_no,
          { "CDMA Channel Number", "ansi_map.cdmachanneldata.cdma_ch_no",
            FT_UINT16, BASE_DEC, NULL, 0x07FF,
-           "CDMA Channel Number", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_band_cls,
          { "Band Class", "ansi_map.cdmachanneldata.band_cls",
            FT_UINT8, BASE_DEC, VALS(ansi_map_cdmachanneldata_band_cls_vals), 0x7c,
-           "Band Class", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_lc_mask_b6,
          { "Long Code Mask (byte 6) MSB", "ansi_map.cdmachanneldata.lc_mask_b6",
            FT_UINT8, BASE_HEX, NULL, 0x03,
@@ -16739,19 +16739,19 @@ void proto_register_ansi_map(void) {
         {&hf_ansi_map_cdmachanneldata_lc_mask_b5,
          { "Long Code Mask (byte 5)", "ansi_map.cdmachanneldata.lc_mask_b5",
            FT_UINT8, BASE_HEX, NULL, 0xff,
-           "Long Code Mask (byte 5)", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_lc_mask_b4,
          { "Long Code Mask (byte 4)", "ansi_map.cdmachanneldata.lc_mask_b4",
            FT_UINT8, BASE_HEX, NULL, 0xff,
-           "Long Code Mask (byte 4)", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_lc_mask_b3,
          { "Long Code Mask (byte 3)", "ansi_map.cdmachanneldata.lc_mask_b3",
            FT_UINT8, BASE_HEX, NULL, 0xff,
-           "Long Code Mask (byte 3)", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_lc_mask_b2,
          { "Long Code Mask (byte 2)", "ansi_map.cdmachanneldata.lc_mask_b2",
            FT_UINT8, BASE_HEX, NULL, 0xff,
-           "Long Code Mask (byte 2)", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_lc_mask_b1,
          { "Long Code Mask LSB(byte 1)", "ansi_map.cdmachanneldata.lc_mask_b1",
            FT_UINT8, BASE_HEX, NULL, 0xff,
@@ -16759,318 +16759,318 @@ void proto_register_ansi_map(void) {
         {&hf_ansi_map_cdmachanneldata_np_ext,
          { "NP EXT", "ansi_map.cdmachanneldata.np_ext",
            FT_BOOLEAN, 8, NULL,0x80,
-           "NP EXT", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_nominal_pwr,
          { "Nominal Power", "ansi_map.cdmachanneldata.nominal_pwr",
            FT_UINT8, BASE_DEC, NULL, 0x71,
-           "Nominal Power", HFILL }},
+           NULL, HFILL }},
         {&hf_ansi_map_cdmachanneldata_nr_preamble,
          { "Number Preamble", "ansi_map.cdmachanneldata.nr_preamble",
            FT_UINT8, BASE_DEC, NULL, 0x07,
-           "Number Preamble", HFILL }},
+           NULL, HFILL }},
 
         { &hf_ansi_map_cdmastationclassmark_pc,
           { "Power Class(PC)", "ansi_map.cdmastationclassmark.pc",
             FT_UINT8, BASE_DEC, VALS(ansi_map_CDMAStationClassMark_pc_vals), 0x03,
-            "Power Class(PC)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_cdmastationclassmark_dtx,
           { "Analog Transmission: (DTX)", "ansi_map.cdmastationclassmark.dtx",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_dtx_bool_val),0x04,
-            "Analog Transmission: (DTX)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmastationclassmark_smi,
-          { " Slotted Mode Indicator: (SMI)", "ansi_map.cdmastationclassmark.smi",
+          { "Slotted Mode Indicator: (SMI)", "ansi_map.cdmastationclassmark.smi",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_smi_bool_val),0x20,
-            " Slotted Mode Indicator: (SMI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_cdmastationclassmark_dmi,
           { "Dual-mode Indicator(DMI)", "ansi_map.cdmastationclassmark.dmi",
             FT_BOOLEAN, 8, TFS(&ansi_map_CDMAStationClassMark_dmi_bool_val),0x40,
-            "Dual-mode Indicator(DMI)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_channeldata_vmac,
           { "Voice Mobile Attenuation Code (VMAC)", "ansi_map.channeldata.vmac",
             FT_UINT8, BASE_DEC, NULL, 0x07,
-            "Voice Mobile Attenuation Code (VMAC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_channeldata_dtx,
           { "Discontinuous Transmission Mode (DTX)", "ansi_map.channeldata.dtx",
             FT_UINT8, BASE_DEC, VALS(ansi_map_ChannelData_dtx_vals), 0x18,
-            "Discontinuous Transmission Mode (DTX)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_channeldata_scc,
           { "SAT Color Code (SCC)", "ansi_map.channeldata.scc",
             FT_UINT8, BASE_DEC, NULL, 0xc0,
-            "SAT Color Code (SCC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_channeldata_chno,
           { "Channel Number (CHNO)", "ansi_map.channeldata.chno",
             FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Channel Number (CHNO)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_ConfidentialityModes_vp,
           { "Voice Privacy (VP) Confidentiality Status", "ansi_map.confidentialitymodes.vp",
             FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x01,
-            "Voice Privacy (VP) Confidentiality Status", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_dcc,
           { "Digital Color Code (DCC)", "ansi_map.controlchanneldata.dcc",
             FT_UINT8, BASE_DEC, NULL, 0xc0,
-            "Digital Color Code (DCC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_cmac,
           { "Control Mobile Attenuation Code (CMAC)", "ansi_map.controlchanneldata.cmac",
             FT_UINT8, BASE_DEC, NULL, 0x07,
-            "Control Mobile Attenuation Code (CMAC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_chno,
           { "Channel Number (CHNO)", "ansi_map.controlchanneldata.cmac",
             FT_UINT16, BASE_DEC, NULL, 0x0,
-            "Channel Number (CHNO)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_sdcc1,
           { "Supplementary Digital Color Codes (SDCC1)", "ansi_map.controlchanneldata.ssdc1",
             FT_UINT8, BASE_DEC, NULL, 0x0c,
-            "Supplementary Digital Color Codes (SDCC1)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_controlchanneldata_sdcc2,
           { "Supplementary Digital Color Codes (SDCC2)", "ansi_map.controlchanneldata.ssdc2",
             FT_UINT8, BASE_DEC, NULL, 0x03,
-            "Supplementary Digital Color Codes (SDCC2)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_ConfidentialityModes_se,
           { "Signaling Message Encryption (SE) Confidentiality Status", "ansi_map.confidentialitymodes.se",
             FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x02,
-            "Signaling Message Encryption (SE) Confidentiality Status", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_ConfidentialityModes_dp,
           { "DataPrivacy (DP) Confidentiality Status", "ansi_map.confidentialitymodes.dp",
             FT_BOOLEAN, 8, TFS(&ansi_map_ConfidentialityModes_bool_val),0x04,
-            "DataPrivacy (DP) Confidentiality Status", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_deniedauthorizationperiod_period,
           { "Period", "ansi_map.deniedauthorizationperiod.period",
             FT_UINT8, BASE_DEC, VALS(ansi_map_deniedauthorizationperiod_period_vals), 0x0,
-            "Period", HFILL }},
+            NULL, HFILL }},
 
 
         { &hf_ansi_map_originationtriggers_all,
           { "All Origination (All)", "ansi_map.originationtriggers.all",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_all_bool_val),0x01,
-            "All Origination (All)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_local,
           { "Local", "ansi_map.originationtriggers.all",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_local_bool_val),0x02,
-            "Local", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_ilata,
           { "Intra-LATA Toll (ILATA)", "ansi_map.originationtriggers.ilata",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ilata_bool_val),0x04,
-            "Intra-LATA Toll (ILATA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_olata,
           { "Inter-LATA Toll (OLATA)", "ansi_map.originationtriggers.olata",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_olata_bool_val),0x08,
-            "Inter-LATA Toll (OLATA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_int,
           { "International (Int'l )", "ansi_map.originationtriggers.int",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_int_bool_val),0x10,
-            "International (Int'l )", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_wz,
           { "World Zone (WZ)", "ansi_map.originationtriggers.wz",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_wz_bool_val),0x20,
-            "World Zone (WZ)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_unrec,
           { "Unrecognized Number (Unrec)", "ansi_map.originationtriggers.unrec",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_unrec_bool_val),0x40,
-            "Unrecognized Number (Unrec)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_rvtc,
           { "Revertive Call (RvtC)", "ansi_map.originationtriggers.rvtc",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_rvtc_bool_val),0x80,
-            "Revertive Call (RvtC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_star,
           { "Star", "ansi_map.originationtriggers.star",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_star_bool_val),0x01,
-            "Star", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_ds,
           { "Double Star (DS)", "ansi_map.originationtriggers.ds",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ds_bool_val),0x02,
-            "Double Star (DS)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_pound,
           { "Pound", "ansi_map.originationtriggers.pound",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_pound_bool_val),0x04,
-            "Pound", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_dp,
           { "Double Pound (DP)", "ansi_map.originationtriggers.dp",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_dp_bool_val),0x08,
-            "Double Pound (DP)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_pa,
           { "Prior Agreement (PA)", "ansi_map.originationtriggers.pa",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_pa_bool_val),0x10,
-            "Prior Agreement (PA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_nodig,
           { "No digits", "ansi_map.originationtriggers.nodig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_nodig_bool_val),0x01,
-            "No digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_onedig,
           { "1 digit", "ansi_map.originationtriggers.onedig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_onedig_bool_val),0x02,
-            "1 digit", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_twodig,
           { "2 digits", "ansi_map.originationtriggers.twodig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twodig_bool_val),0x04,
-            "2 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_threedig,
           { "3 digits", "ansi_map.originationtriggers.threedig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_threedig_bool_val),0x08,
-            "3 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_fourdig,
           { "4 digits", "ansi_map.originationtriggers.fourdig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fourdig_bool_val),0x10,
-            "4 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_fivedig,
           { "5 digits", "ansi_map.originationtriggers.fivedig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fivedig_bool_val),0x20,
-            "5 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_sixdig,
           { "6 digits", "ansi_map.originationtriggers.sixdig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_sixdig_bool_val),0x40,
-            "6 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_sevendig,
           { "7 digits", "ansi_map.originationtriggers.sevendig",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_sevendig_bool_val),0x80,
-            "7 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_eightdig,
           { "8 digits", "ansi_map.originationtriggers.eight",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_eightdig_bool_val),0x01,
-            "8 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_ninedig,
           { "9 digits", "ansi_map.originationtriggers.nine",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_ninedig_bool_val),0x02,
-            "9 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_tendig,
           { "10 digits", "ansi_map.originationtriggers.ten",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_tendig_bool_val),0x04,
-            "10 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_elevendig,
           { "11 digits", "ansi_map.originationtriggers.eleven",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_elevendig_bool_val),0x08,
-            "11 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_twelvedig,
           { "12 digits", "ansi_map.originationtriggers.twelve",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_twelvedig_bool_val),0x10,
-            "12 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_thirteendig,
           { "13 digits", "ansi_map.originationtriggers.thirteen",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_thirteendig_bool_val),0x20,
-            "13 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_fourteendig,
           { "14 digits", "ansi_map.originationtriggers.fourteen",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fourteendig_bool_val),0x40,
-            "14 digits", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_originationtriggers_fifteendig,
           { "15 digits", "ansi_map.originationtriggers.fifteen",
             FT_BOOLEAN, 8, TFS(&ansi_map_originationtriggers_fifteendig_bool_val),0x80,
-            "15 digits", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_triggercapability_init,
           { "Introducing Star/Pound (INIT)", "ansi_map.triggercapability.init",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01,
-            "Introducing Star/Pound (INIT)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_kdigit,
           { "K-digit (K-digit)", "ansi_map.triggercapability.kdigit",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02,
-            "K-digit (K-digit)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_all,
           { "All_Calls (All)", "ansi_map.triggercapability.all",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04,
-            "All_Calls (All)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_rvtc,
           { "Revertive_Call (RvtC)", "ansi_map.triggercapability.rvtc",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08,
-            "Revertive_Call (RvtC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_oaa,
           { "Origination_Attempt_Authorized (OAA)", "ansi_map.triggercapability.oaa",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10,
-            "Origination_Attempt_Authorized (OAA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_oans,
           { "O_Answer (OANS)", "ansi_map.triggercapability.oans",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x20,
-            "O_Answer (OANS)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_odisc,
           { "O_Disconnect (ODISC)", "ansi_map.triggercapability.odisc",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40,
-            "O_Disconnect (ODISC)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_ona,
           { "O_No_Answer (ONA)", "ansi_map.triggercapability.ona",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80,
-            "O_No_Answer (ONA)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_triggercapability_ct ,
           { "Call Types (CT)", "ansi_map.triggercapability.ona",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01,
-            "Call Types (CT)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_unrec,
           { "Unrecognized_Number (Unrec)", "ansi_map.triggercapability.unrec",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02,
-            "Unrecognized_Number (Unrec)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_pa,
           { "Prior_Agreement (PA)", "ansi_map.triggercapability.pa",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04,
-            "Prior_Agreement (PA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_at,
           { "Advanced_Termination (AT)", "ansi_map.triggercapability.at",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08,
-            "Advanced_Termination (AT)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_cgraa,
           { "Calling_Routing_Address_Available (CgRAA)", "ansi_map.triggercapability.cgraa",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10,
-            "Calling_Routing_Address_Available (CgRAA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_it,
           { "Initial_Termination (IT)", "ansi_map.triggercapability.it",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x20,
-            "Initial_Termination (IT)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_cdraa,
           { "Called_Routing_Address_Available (CdRAA)", "ansi_map.triggercapability.cdraa",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x40,
-            "Called_Routing_Address_Available (CdRAA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_obsy,
           { "O_Called_Party_Busy (OBSY)", "ansi_map.triggercapability.ona",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x80,
-            "O_Called_Party_Busy (OBSY)", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ansi_map_triggercapability_tra ,
           { "Terminating_Resource_Available (TRA)", "ansi_map.triggercapability.tra",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x01,
-            "Terminating_Resource_Available (TRA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_tbusy,
           { "T_Busy (TBusy)", "ansi_map.triggercapability.tbusy",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x02,
-            "T_Busy (TBusy)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_tna,
           { "T_No_Answer (TNA)", "ansi_map.triggercapability.tna",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x04,
-            "T_No_Answer (TNA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_tans,
           { "T_Answer (TANS)", "ansi_map.triggercapability.tans",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x08,
-            "T_Answer (TANS)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_triggercapability_tdisc,
-          { "T_Disconnect (TDISC) ", "ansi_map.triggercapability.tdisc",
+          { "T_Disconnect (TDISC)", "ansi_map.triggercapability.tdisc",
             FT_BOOLEAN, 8, TFS(&ansi_map_triggercapability_bool_val),0x10,
-            "T_Disconnect (TDISC) ", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_winoperationscapability_conn,
           { "ConnectResource (CONN)", "ansi_map.winoperationscapability.conn",
             FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_conn_bool_val),0x01,
-            "ConnectResource (CONN)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_winoperationscapability_ccdir,
           { "CallControlDirective(CCDIR)", "ansi_map.winoperationscapability.ccdir",
             FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_ccdir_bool_val),0x02,
-            "CallControlDirective(CCDIR)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_winoperationscapability_pos,
           { "PositionRequest (POS)", "ansi_map.winoperationscapability.pos",
             FT_BOOLEAN, 8, TFS(&ansi_map_winoperationscapability_pos_bool_val),0x04,
-            "PositionRequest (POS)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_pacaindicator_pa,
           { "Permanent Activation (PA)", "ansi_map.pacaindicator_pa",
             FT_BOOLEAN, 8, TFS(&ansi_map_pacaindicator_pa_bool_val),0x01,
-            "Permanent Activation (PA)", HFILL }},
+            NULL, HFILL }},
         { &hf_ansi_map_PACA_Level,
           { "PACA Level", "ansi_map.PACA_Level",
             FT_UINT8, BASE_DEC, VALS(ansi_map_PACA_Level_vals), 0x1e,
-            "PACA Level", HFILL }},
+            NULL, HFILL }},
                 
 
 /*--- Included file: packet-ansi_map-hfarr.c ---*/
 #line 1 "packet-ansi_map-hfarr.c"
     { &hf_ansi_map_electronicSerialNumber,
       { "electronicSerialNumber", "ansi_map.electronicSerialNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ElectronicSerialNumber", HFILL }},
     { &hf_ansi_map_msid,
       { "msid", "ansi_map.msid",
@@ -17078,15 +17078,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.MSID", HFILL }},
     { &hf_ansi_map_authenticationAlgorithmVersion,
       { "authenticationAlgorithmVersion", "ansi_map.authenticationAlgorithmVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationAlgorithmVersion", HFILL }},
     { &hf_ansi_map_authenticationResponseReauthentication,
       { "authenticationResponseReauthentication", "ansi_map.authenticationResponseReauthentication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationResponseReauthentication", HFILL }},
     { &hf_ansi_map_authenticationResponseUniqueChallenge,
       { "authenticationResponseUniqueChallenge", "ansi_map.authenticationResponseUniqueChallenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationResponseUniqueChallenge", HFILL }},
     { &hf_ansi_map_callHistoryCount,
       { "callHistoryCount", "ansi_map.callHistoryCount",
@@ -17094,15 +17094,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.CallHistoryCount", HFILL }},
     { &hf_ansi_map_cdmaPrivateLongCodeMask,
       { "cdmaPrivateLongCodeMask", "ansi_map.cdmaPrivateLongCodeMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAPrivateLongCodeMask", HFILL }},
     { &hf_ansi_map_carrierDigits,
       { "carrierDigits", "ansi_map.carrierDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CarrierDigits", HFILL }},
     { &hf_ansi_map_caveKey,
       { "caveKey", "ansi_map.caveKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CaveKey", HFILL }},
     { &hf_ansi_map_denyAccess,
       { "denyAccess", "ansi_map.denyAccess",
@@ -17110,51 +17110,51 @@ void proto_register_ansi_map(void) {
         "ansi_map.DenyAccess", HFILL }},
     { &hf_ansi_map_destinationDigits,
       { "destinationDigits", "ansi_map.destinationDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DestinationDigits", HFILL }},
     { &hf_ansi_map_locationAreaID,
       { "locationAreaID", "ansi_map.locationAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.LocationAreaID", HFILL }},
     { &hf_ansi_map_randomVariableReauthentication,
       { "randomVariableReauthentication", "ansi_map.randomVariableReauthentication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RandomVariableReauthentication", HFILL }},
     { &hf_ansi_map_meid,
       { "meid", "ansi_map.meid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MEID", HFILL }},
     { &hf_ansi_map_mobileStationMIN,
       { "mobileStationMIN", "ansi_map.mobileStationMIN",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.MobileStationMIN", HFILL }},
     { &hf_ansi_map_mscid,
       { "mscid", "ansi_map.mscid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MSCID", HFILL }},
     { &hf_ansi_map_randomVariableSSD,
       { "randomVariableSSD", "ansi_map.randomVariableSSD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RandomVariableSSD", HFILL }},
     { &hf_ansi_map_randomVariableUniqueChallenge,
       { "randomVariableUniqueChallenge", "ansi_map.randomVariableUniqueChallenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RandomVariableUniqueChallenge", HFILL }},
     { &hf_ansi_map_routingDigits,
       { "routingDigits", "ansi_map.routingDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RoutingDigits", HFILL }},
     { &hf_ansi_map_senderIdentificationNumber,
       { "senderIdentificationNumber", "ansi_map.senderIdentificationNumber",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SenderIdentificationNumber", HFILL }},
     { &hf_ansi_map_sharedSecretData,
       { "sharedSecretData", "ansi_map.sharedSecretData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SharedSecretData", HFILL }},
     { &hf_ansi_map_signalingMessageEncryptionKey,
       { "signalingMessageEncryptionKey", "ansi_map.signalingMessageEncryptionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SignalingMessageEncryptionKey", HFILL }},
     { &hf_ansi_map_ssdnotShared,
       { "ssdnotShared", "ansi_map.ssdnotShared",
@@ -17166,11 +17166,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.UpdateCount", HFILL }},
     { &hf_ansi_map_interMSCCircuitID,
       { "interMSCCircuitID", "ansi_map.interMSCCircuitID",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.InterMSCCircuitID", HFILL }},
     { &hf_ansi_map_mobileIdentificationNumber,
       { "mobileIdentificationNumber", "ansi_map.mobileIdentificationNumber",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.MobileIdentificationNumber", HFILL }},
     { &hf_ansi_map_countUpdateReport,
       { "countUpdateReport", "ansi_map.countUpdateReport",
@@ -17190,7 +17190,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.SystemAccessType", HFILL }},
     { &hf_ansi_map_systemCapabilities,
       { "systemCapabilities", "ansi_map.systemCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SystemCapabilities", HFILL }},
     { &hf_ansi_map_callHistoryCountExpected,
       { "callHistoryCountExpected", "ansi_map.callHistoryCountExpected",
@@ -17206,19 +17206,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.TerminalType", HFILL }},
     { &hf_ansi_map_authenticationData,
       { "authenticationData", "ansi_map.authenticationData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationData", HFILL }},
     { &hf_ansi_map_authenticationResponse,
       { "authenticationResponse", "ansi_map.authenticationResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationResponse", HFILL }},
     { &hf_ansi_map_cdmaNetworkIdentification,
       { "cdmaNetworkIdentification", "ansi_map.cdmaNetworkIdentification",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMANetworkIdentification", HFILL }},
     { &hf_ansi_map_confidentialityModes,
       { "confidentialityModes", "ansi_map.confidentialityModes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ConfidentialityModes", HFILL }},
     { &hf_ansi_map_controlChannelMode,
       { "controlChannelMode", "ansi_map.controlChannelMode",
@@ -17226,15 +17226,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.ControlChannelMode", HFILL }},
     { &hf_ansi_map_digits,
       { "digits", "ansi_map.digits",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.Digits", HFILL }},
     { &hf_ansi_map_pc_ssn,
       { "pc-ssn", "ansi_map.pc_ssn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PC_SSN", HFILL }},
     { &hf_ansi_map_randomVariable,
       { "randomVariable", "ansi_map.randomVariable",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RandomVariable", HFILL }},
     { &hf_ansi_map_serviceRedirectionCause,
       { "serviceRedirectionCause", "ansi_map.serviceRedirectionCause",
@@ -17246,7 +17246,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.SuspiciousAccess", HFILL }},
     { &hf_ansi_map_transactionCapability,
       { "transactionCapability", "ansi_map.transactionCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TransactionCapability", HFILL }},
     { &hf_ansi_map_analogRedirectRecord,
       { "analogRedirectRecord", "ansi_map.analogRedirectRecord",
@@ -17258,19 +17258,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMARedirectRecord", HFILL }},
     { &hf_ansi_map_dataKey,
       { "dataKey", "ansi_map.dataKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DataKey", HFILL }},
     { &hf_ansi_map_roamingIndication,
       { "roamingIndication", "ansi_map.roamingIndication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RoamingIndication", HFILL }},
     { &hf_ansi_map_serviceRedirectionInfo,
       { "serviceRedirectionInfo", "ansi_map.serviceRedirectionInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ServiceRedirectionInfo", HFILL }},
     { &hf_ansi_map_voicePrivacyMask,
       { "voicePrivacyMask", "ansi_map.voicePrivacyMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.VoicePrivacyMask", HFILL }},
     { &hf_ansi_map_reauthenticationReport,
       { "reauthenticationReport", "ansi_map.reauthenticationReport",
@@ -17294,19 +17294,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.VoicePrivacyReport", HFILL }},
     { &hf_ansi_map_randomVariableBaseStation,
       { "randomVariableBaseStation", "ansi_map.randomVariableBaseStation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RandomVariableBaseStation", HFILL }},
     { &hf_ansi_map_authenticationResponseBaseStation,
       { "authenticationResponseBaseStation", "ansi_map.authenticationResponseBaseStation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthenticationResponseBaseStation", HFILL }},
     { &hf_ansi_map_billingID,
       { "billingID", "ansi_map.billingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.BillingID", HFILL }},
     { &hf_ansi_map_channelData,
       { "channelData", "ansi_map.channelData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ChannelData", HFILL }},
     { &hf_ansi_map_interSwitchCount,
       { "interSwitchCount", "ansi_map.interSwitchCount",
@@ -17314,15 +17314,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.InterSwitchCount", HFILL }},
     { &hf_ansi_map_servingCellID,
       { "servingCellID", "ansi_map.servingCellID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ServingCellID", HFILL }},
     { &hf_ansi_map_stationClassMark,
       { "stationClassMark", "ansi_map.stationClassMark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.StationClassMark", HFILL }},
     { &hf_ansi_map_targetCellID,
       { "targetCellID", "ansi_map.targetCellID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TargetCellID", HFILL }},
     { &hf_ansi_map_handoffReason,
       { "handoffReason", "ansi_map.handoffReason",
@@ -17330,31 +17330,31 @@ void proto_register_ansi_map(void) {
         "ansi_map.HandoffReason", HFILL }},
     { &hf_ansi_map_handoffState,
       { "handoffState", "ansi_map.handoffState",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.HandoffState", HFILL }},
     { &hf_ansi_map_tdmaBurstIndicator,
       { "tdmaBurstIndicator", "ansi_map.tdmaBurstIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMABurstIndicator", HFILL }},
     { &hf_ansi_map_tdmaCallMode,
       { "tdmaCallMode", "ansi_map.tdmaCallMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMACallMode", HFILL }},
     { &hf_ansi_map_tdmaChannelData,
       { "tdmaChannelData", "ansi_map.tdmaChannelData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMAChannelData", HFILL }},
     { &hf_ansi_map_baseStationManufacturerCode,
       { "baseStationManufacturerCode", "ansi_map.baseStationManufacturerCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.BaseStationManufacturerCode", HFILL }},
     { &hf_ansi_map_alertCode,
       { "alertCode", "ansi_map.alertCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AlertCode", HFILL }},
     { &hf_ansi_map_cdma2000HandoffInvokeIOSData,
       { "cdma2000HandoffInvokeIOSData", "ansi_map.cdma2000HandoffInvokeIOSData",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.CDMA2000HandoffInvokeIOSData", HFILL }},
     { &hf_ansi_map_cdmaBandClassList,
       { "cdmaBandClassList", "ansi_map.cdmaBandClassList",
@@ -17362,11 +17362,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMABandClassList", HFILL }},
     { &hf_ansi_map_cdmaCallMode,
       { "cdmaCallMode", "ansi_map.cdmaCallMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMACallMode", HFILL }},
     { &hf_ansi_map_cdmaChannelData,
       { "cdmaChannelData", "ansi_map.cdmaChannelData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAChannelData", HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceList,
       { "cdmaConnectionReferenceList", "ansi_map.cdmaConnectionReferenceList",
@@ -17374,15 +17374,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAConnectionReferenceList", HFILL }},
     { &hf_ansi_map_cdmaMobileProtocolRevision,
       { "cdmaMobileProtocolRevision", "ansi_map.cdmaMobileProtocolRevision",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAMobileProtocolRevision", HFILL }},
     { &hf_ansi_map_cdmaMSMeasuredChannelIdentity,
       { "cdmaMSMeasuredChannelIdentity", "ansi_map.cdmaMSMeasuredChannelIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAMSMeasuredChannelIdentity", HFILL }},
     { &hf_ansi_map_cdmaServiceConfigurationRecord,
       { "cdmaServiceConfigurationRecord", "ansi_map.cdmaServiceConfigurationRecord",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServiceConfigurationRecord", HFILL }},
     { &hf_ansi_map_cdmaServiceOptionList,
       { "cdmaServiceOptionList", "ansi_map.cdmaServiceOptionList",
@@ -17390,15 +17390,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAServiceOptionList", HFILL }},
     { &hf_ansi_map_cdmaServingOneWayDelay,
       { "cdmaServingOneWayDelay", "ansi_map.cdmaServingOneWayDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServingOneWayDelay", HFILL }},
     { &hf_ansi_map_cdmaStationClassMark,
       { "cdmaStationClassMark", "ansi_map.cdmaStationClassMark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAStationClassMark", HFILL }},
     { &hf_ansi_map_cdmaStationClassMark2,
       { "cdmaStationClassMark2", "ansi_map.cdmaStationClassMark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAStationClassMark2", HFILL }},
     { &hf_ansi_map_cdmaTargetMAHOList,
       { "cdmaTargetMAHOList", "ansi_map.cdmaTargetMAHOList",
@@ -17410,7 +17410,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMATargetMeasurementList", HFILL }},
     { &hf_ansi_map_dataPrivacyParameters,
       { "dataPrivacyParameters", "ansi_map.dataPrivacyParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DataPrivacyParameters", HFILL }},
     { &hf_ansi_map_ilspInformation,
       { "ilspInformation", "ansi_map.ilspInformation",
@@ -17418,35 +17418,35 @@ void proto_register_ansi_map(void) {
         "ansi_map.ISLPInformation", HFILL }},
     { &hf_ansi_map_msLocation,
       { "msLocation", "ansi_map.msLocation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MSLocation", HFILL }},
     { &hf_ansi_map_nampsCallMode,
       { "nampsCallMode", "ansi_map.nampsCallMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NAMPSCallMode", HFILL }},
     { &hf_ansi_map_nampsChannelData,
       { "nampsChannelData", "ansi_map.nampsChannelData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NAMPSChannelData", HFILL }},
     { &hf_ansi_map_nonPublicData,
       { "nonPublicData", "ansi_map.nonPublicData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NonPublicData", HFILL }},
     { &hf_ansi_map_pdsnAddress,
       { "pdsnAddress", "ansi_map.pdsnAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PDSNAddress", HFILL }},
     { &hf_ansi_map_pdsnProtocolType,
       { "pdsnProtocolType", "ansi_map.pdsnProtocolType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PDSNProtocolType", HFILL }},
     { &hf_ansi_map_qosPriority,
       { "qosPriority", "ansi_map.qosPriority",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.QoSPriority", HFILL }},
     { &hf_ansi_map_systemOperatorCode,
       { "systemOperatorCode", "ansi_map.systemOperatorCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SystemOperatorCode", HFILL }},
     { &hf_ansi_map_tdmaBandwidth,
       { "tdmaBandwidth", "ansi_map.tdmaBandwidth",
@@ -17458,15 +17458,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.TDMAServiceCode", HFILL }},
     { &hf_ansi_map_tdmaTerminalCapability,
       { "tdmaTerminalCapability", "ansi_map.tdmaTerminalCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMATerminalCapability", HFILL }},
     { &hf_ansi_map_tdmaVoiceCoder,
       { "tdmaVoiceCoder", "ansi_map.tdmaVoiceCoder",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMAVoiceCoder", HFILL }},
     { &hf_ansi_map_userZoneData,
       { "userZoneData", "ansi_map.userZoneData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.UserZoneData", HFILL }},
     { &hf_ansi_map_bsmcstatus,
       { "bsmcstatus", "ansi_map.bsmcstatus",
@@ -17474,7 +17474,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.BSMCStatus", HFILL }},
     { &hf_ansi_map_cdma2000HandoffResponseIOSData,
       { "cdma2000HandoffResponseIOSData", "ansi_map.cdma2000HandoffResponseIOSData",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.CDMA2000HandoffResponseIOSData", HFILL }},
     { &hf_ansi_map_cdmaCodeChannelList,
       { "cdmaCodeChannelList", "ansi_map.cdmaCodeChannelList",
@@ -17482,11 +17482,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMACodeChannelList", HFILL }},
     { &hf_ansi_map_cdmaSearchParameters,
       { "cdmaSearchParameters", "ansi_map.cdmaSearchParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMASearchParameters", HFILL }},
     { &hf_ansi_map_cdmaSearchWindow,
       { "cdmaSearchWindow", "ansi_map.cdmaSearchWindow",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMASearchWindow", HFILL }},
     { &hf_ansi_map_sOCStatus,
       { "sOCStatus", "ansi_map.sOCStatus",
@@ -17498,39 +17498,39 @@ void proto_register_ansi_map(void) {
         "ansi_map.ReleaseReason", HFILL }},
     { &hf_ansi_map_acgencountered,
       { "acgencountered", "ansi_map.acgencountered",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ACGEncountered", HFILL }},
     { &hf_ansi_map_callingPartyName,
       { "callingPartyName", "ansi_map.callingPartyName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyName", HFILL }},
     { &hf_ansi_map_callingPartyNumberDigits1,
       { "callingPartyNumberDigits1", "ansi_map.callingPartyNumberDigits1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyNumberDigits1", HFILL }},
     { &hf_ansi_map_callingPartyNumberDigits2,
       { "callingPartyNumberDigits2", "ansi_map.callingPartyNumberDigits2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyNumberDigits2", HFILL }},
     { &hf_ansi_map_callingPartySubaddress,
       { "callingPartySubaddress", "ansi_map.callingPartySubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartySubaddress", HFILL }},
     { &hf_ansi_map_conferenceCallingIndicator,
       { "conferenceCallingIndicator", "ansi_map.conferenceCallingIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ConferenceCallingIndicator", HFILL }},
     { &hf_ansi_map_mobileDirectoryNumber,
       { "mobileDirectoryNumber", "ansi_map.mobileDirectoryNumber",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.MobileDirectoryNumber", HFILL }},
     { &hf_ansi_map_mSCIdentificationNumber,
       { "mSCIdentificationNumber", "ansi_map.mSCIdentificationNumber",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.MSCIdentificationNumber", HFILL }},
     { &hf_ansi_map_oneTimeFeatureIndicator,
       { "oneTimeFeatureIndicator", "ansi_map.oneTimeFeatureIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.OneTimeFeatureIndicator", HFILL }},
     { &hf_ansi_map_systemMyTypeCode,
       { "systemMyTypeCode", "ansi_map.systemMyTypeCode",
@@ -17554,35 +17554,35 @@ void proto_register_ansi_map(void) {
         "ansi_map.AnnouncementList", HFILL }},
     { &hf_ansi_map_callingPartyNumberString1,
       { "callingPartyNumberString1", "ansi_map.callingPartyNumberString1",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyNumberString1", HFILL }},
     { &hf_ansi_map_callingPartyNumberString2,
       { "callingPartyNumberString2", "ansi_map.callingPartyNumberString2",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyNumberString2", HFILL }},
     { &hf_ansi_map_digits_Destination,
       { "digits-Destination", "ansi_map.digits_Destination",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.Digits", HFILL }},
     { &hf_ansi_map_displayText,
       { "displayText", "ansi_map.displayText",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DisplayText", HFILL }},
     { &hf_ansi_map_displayText2,
       { "displayText2", "ansi_map.displayText2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DisplayText2", HFILL }},
     { &hf_ansi_map_dmh_AccountCodeDigits,
       { "dmh-AccountCodeDigits", "ansi_map.dmh_AccountCodeDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DMH_AccountCodeDigits", HFILL }},
     { &hf_ansi_map_dmh_AlternateBillingDigits,
       { "dmh-AlternateBillingDigits", "ansi_map.dmh_AlternateBillingDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DMH_AlternateBillingDigits", HFILL }},
     { &hf_ansi_map_dmh_BillingDigits,
       { "dmh-BillingDigits", "ansi_map.dmh_BillingDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DMH_BillingDigits", HFILL }},
     { &hf_ansi_map_dmh_RedirectionIndicator,
       { "dmh-RedirectionIndicator", "ansi_map.dmh_RedirectionIndicator",
@@ -17590,19 +17590,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.DMH_RedirectionIndicator", HFILL }},
     { &hf_ansi_map_groupInformation,
       { "groupInformation", "ansi_map.groupInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.GroupInformation", HFILL }},
     { &hf_ansi_map_noAnswerTime,
       { "noAnswerTime", "ansi_map.noAnswerTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NoAnswerTime", HFILL }},
     { &hf_ansi_map_pACAIndicator,
       { "pACAIndicator", "ansi_map.pACAIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PACAIndicator", HFILL }},
     { &hf_ansi_map_pilotNumber,
       { "pilotNumber", "ansi_map.pilotNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PilotNumber", HFILL }},
     { &hf_ansi_map_preferredLanguageIndicator,
       { "preferredLanguageIndicator", "ansi_map.preferredLanguageIndicator",
@@ -17610,15 +17610,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.PreferredLanguageIndicator", HFILL }},
     { &hf_ansi_map_redirectingNumberDigits,
       { "redirectingNumberDigits", "ansi_map.redirectingNumberDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RedirectingNumberDigits", HFILL }},
     { &hf_ansi_map_redirectingNumberString,
       { "redirectingNumberString", "ansi_map.redirectingNumberString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RedirectingNumberString", HFILL }},
     { &hf_ansi_map_redirectingSubaddress,
       { "redirectingSubaddress", "ansi_map.redirectingSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RedirectingSubaddress", HFILL }},
     { &hf_ansi_map_resumePIC,
       { "resumePIC", "ansi_map.resumePIC",
@@ -17630,7 +17630,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.TerminationList", HFILL }},
     { &hf_ansi_map_terminationTriggers,
       { "terminationTriggers", "ansi_map.terminationTriggers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TerminationTriggers", HFILL }},
     { &hf_ansi_map_triggerAddressList,
       { "triggerAddressList", "ansi_map.triggerAddressList",
@@ -17638,7 +17638,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.TriggerAddressList", HFILL }},
     { &hf_ansi_map_emergencyServicesRoutingDigits,
       { "emergencyServicesRoutingDigits", "ansi_map.emergencyServicesRoutingDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.EmergencyServicesRoutingDigits", HFILL }},
     { &hf_ansi_map_targetCellIDList,
       { "targetCellIDList", "ansi_map.targetCellIDList",
@@ -17658,39 +17658,39 @@ void proto_register_ansi_map(void) {
         "ansi_map.AlertResult", HFILL }},
     { &hf_ansi_map_messageWaitingNotificationCount,
       { "messageWaitingNotificationCount", "ansi_map.messageWaitingNotificationCount",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MessageWaitingNotificationCount", HFILL }},
     { &hf_ansi_map_messageWaitingNotificationType,
       { "messageWaitingNotificationType", "ansi_map.messageWaitingNotificationType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MessageWaitingNotificationType", HFILL }},
     { &hf_ansi_map_cdmaBandClass,
       { "cdmaBandClass", "ansi_map.cdmaBandClass",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMABandClass", HFILL }},
     { &hf_ansi_map_cdmaServiceOption,
       { "cdmaServiceOption", "ansi_map.cdmaServiceOption",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServiceOption", HFILL }},
     { &hf_ansi_map_cdmaSlotCycleIndex,
       { "cdmaSlotCycleIndex", "ansi_map.cdmaSlotCycleIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMASlotCycleIndex", HFILL }},
     { &hf_ansi_map_extendedMSCID,
       { "extendedMSCID", "ansi_map.extendedMSCID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ExtendedMSCID", HFILL }},
     { &hf_ansi_map_extendedSystemMyTypeCode,
       { "extendedSystemMyTypeCode", "ansi_map.extendedSystemMyTypeCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ExtendedSystemMyTypeCode", HFILL }},
     { &hf_ansi_map_imsi,
       { "imsi", "ansi_map.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_ansi_map_legInformation,
       { "legInformation", "ansi_map.legInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.LegInformation", HFILL }},
     { &hf_ansi_map_mSIDUsage,
       { "mSIDUsage", "ansi_map.mSIDUsage",
@@ -17698,11 +17698,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.MSIDUsage", HFILL }},
     { &hf_ansi_map_networkTMSI,
       { "networkTMSI", "ansi_map.networkTMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NetworkTMSI", HFILL }},
     { &hf_ansi_map_pageCount,
       { "pageCount", "ansi_map.pageCount",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PageCount", HFILL }},
     { &hf_ansi_map_pageIndicator,
       { "pageIndicator", "ansi_map.pageIndicator",
@@ -17710,19 +17710,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.PageIndicator", HFILL }},
     { &hf_ansi_map_pageResponseTime,
       { "pageResponseTime", "ansi_map.pageResponseTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PageResponseTime", HFILL }},
     { &hf_ansi_map_pilotBillingID,
       { "pilotBillingID", "ansi_map.pilotBillingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PilotBillingID", HFILL }},
     { &hf_ansi_map_redirectingPartyName,
       { "redirectingPartyName", "ansi_map.redirectingPartyName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RedirectingPartyName", HFILL }},
     { &hf_ansi_map_tdmaDataFeaturesIndicator,
       { "tdmaDataFeaturesIndicator", "ansi_map.tdmaDataFeaturesIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMADataFeaturesIndicator", HFILL }},
     { &hf_ansi_map_terminationTreatment,
       { "terminationTreatment", "ansi_map.terminationTreatment",
@@ -17742,19 +17742,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.PSID_RSIDList", HFILL }},
     { &hf_ansi_map_randc,
       { "randc", "ansi_map.randc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RANDC", HFILL }},
     { &hf_ansi_map_tdmaDataMode,
       { "tdmaDataMode", "ansi_map.tdmaDataMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMADataMode", HFILL }},
     { &hf_ansi_map_changeServiceAttributes,
       { "changeServiceAttributes", "ansi_map.changeServiceAttributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ChangeServiceAttributes", HFILL }},
     { &hf_ansi_map_edirectingSubaddress,
       { "edirectingSubaddress", "ansi_map.edirectingSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RedirectingSubaddress", HFILL }},
     { &hf_ansi_map_setupResult,
       { "setupResult", "ansi_map.setupResult",
@@ -17774,27 +17774,27 @@ void proto_register_ansi_map(void) {
         "ansi_map.WINCapability", HFILL }},
     { &hf_ansi_map_callingPartyCategory,
       { "callingPartyCategory", "ansi_map.callingPartyCategory",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingPartyCategory", HFILL }},
     { &hf_ansi_map_controlNetworkID,
       { "controlNetworkID", "ansi_map.controlNetworkID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ControlNetworkID", HFILL }},
     { &hf_ansi_map_digits_carrier,
       { "digits-carrier", "ansi_map.digits_carrier",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.Digits", HFILL }},
     { &hf_ansi_map_digits_dest,
       { "digits-dest", "ansi_map.digits_dest",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.Digits", HFILL }},
     { &hf_ansi_map_dmh_ServiceID,
       { "dmh-ServiceID", "ansi_map.dmh_ServiceID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DMH_ServiceID", HFILL }},
     { &hf_ansi_map_lectronicSerialNumber,
       { "lectronicSerialNumber", "ansi_map.lectronicSerialNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ElectronicSerialNumber", HFILL }},
     { &hf_ansi_map_deregistrationType,
       { "deregistrationType", "ansi_map.deregistrationType",
@@ -17810,7 +17810,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.SMS_MessageWaitingIndicator", HFILL }},
     { &hf_ansi_map_originationTriggers,
       { "originationTriggers", "ansi_map.originationTriggers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.OriginationTriggers", HFILL }},
     { &hf_ansi_map_featureIndicator,
       { "featureIndicator", "ansi_map.featureIndicator",
@@ -17818,7 +17818,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.FeatureIndicator", HFILL }},
     { &hf_ansi_map_dmh_ChargeInformation,
       { "dmh-ChargeInformation", "ansi_map.dmh_ChargeInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DMH_ChargeInformation", HFILL }},
     { &hf_ansi_map_qualificationInformationCode,
       { "qualificationInformationCode", "ansi_map.qualificationInformationCode",
@@ -17830,11 +17830,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.AuthorizationDenied", HFILL }},
     { &hf_ansi_map_authorizationPeriod,
       { "authorizationPeriod", "ansi_map.authorizationPeriod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AuthorizationPeriod", HFILL }},
     { &hf_ansi_map_deniedAuthorizationPeriod,
       { "deniedAuthorizationPeriod", "ansi_map.deniedAuthorizationPeriod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DeniedAuthorizationPeriod", HFILL }},
     { &hf_ansi_map_authenticationCapability,
       { "authenticationCapability", "ansi_map.authenticationCapability",
@@ -17842,7 +17842,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.AuthenticationCapability", HFILL }},
     { &hf_ansi_map_callingFeaturesIndicator,
       { "callingFeaturesIndicator", "ansi_map.callingFeaturesIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CallingFeaturesIndicator", HFILL }},
     { &hf_ansi_map_geographicAuthorization,
       { "geographicAuthorization", "ansi_map.geographicAuthorization",
@@ -17858,23 +17858,23 @@ void proto_register_ansi_map(void) {
         "ansi_map.OriginationIndicator", HFILL }},
     { &hf_ansi_map_restrictionDigits,
       { "restrictionDigits", "ansi_map.restrictionDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RestrictionDigits", HFILL }},
     { &hf_ansi_map_sms_OriginationRestrictions,
       { "sms-OriginationRestrictions", "ansi_map.sms_OriginationRestrictions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginationRestrictions", HFILL }},
     { &hf_ansi_map_sms_TerminationRestrictions,
       { "sms-TerminationRestrictions", "ansi_map.sms_TerminationRestrictions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_TerminationRestrictions", HFILL }},
     { &hf_ansi_map_spinipin,
       { "spinipin", "ansi_map.spinipin",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SPINIPIN", HFILL }},
     { &hf_ansi_map_spiniTriggers,
       { "spiniTriggers", "ansi_map.spiniTriggers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SPINITriggers", HFILL }},
     { &hf_ansi_map_terminationRestrictionCode,
       { "terminationRestrictionCode", "ansi_map.terminationRestrictionCode",
@@ -17882,7 +17882,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.TerminationRestrictionCode", HFILL }},
     { &hf_ansi_map_userGroup,
       { "userGroup", "ansi_map.userGroup",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.UserGroup", HFILL }},
     { &hf_ansi_map_lirMode,
       { "lirMode", "ansi_map.lirMode",
@@ -17890,7 +17890,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.LIRMode", HFILL }},
     { &hf_ansi_map_randValidTime,
       { "randValidTime", "ansi_map.randValidTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RANDValidTime", HFILL }},
     { &hf_ansi_map_redirectionReason,
       { "redirectionReason", "ansi_map.redirectionReason",
@@ -17902,7 +17902,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.CancellationType", HFILL }},
     { &hf_ansi_map_controlChannelData,
       { "controlChannelData", "ansi_map.controlChannelData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ControlChannelData", HFILL }},
     { &hf_ansi_map_receivedSignalQuality,
       { "receivedSignalQuality", "ansi_map.receivedSignalQuality",
@@ -17910,7 +17910,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.ReceivedSignalQuality", HFILL }},
     { &hf_ansi_map_systemAccessData,
       { "systemAccessData", "ansi_map.systemAccessData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SystemAccessData", HFILL }},
     { &hf_ansi_map_cancellationDenied,
       { "cancellationDenied", "ansi_map.cancellationDenied",
@@ -17926,15 +17926,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.BorderCellAccess", HFILL }},
     { &hf_ansi_map_msc_Address,
       { "msc-Address", "ansi_map.msc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MSC_Address", HFILL }},
     { &hf_ansi_map_sms_Address,
       { "sms-Address", "ansi_map.sms_Address",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SMS_Address", HFILL }},
     { &hf_ansi_map_mpcAddress,
       { "mpcAddress", "ansi_map.mpcAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MPCAddress", HFILL }},
     { &hf_ansi_map_mpcAddressList,
       { "mpcAddressList", "ansi_map.mpcAddressList",
@@ -17942,11 +17942,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.MPCAddressList", HFILL }},
     { &hf_ansi_map_digits_Carrier,
       { "digits-Carrier", "ansi_map.digits_Carrier",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.Digits", HFILL }},
     { &hf_ansi_map_digitCollectionControl,
       { "digitCollectionControl", "ansi_map.digitCollectionControl",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DigitCollectionControl", HFILL }},
     { &hf_ansi_map_trunkStatus,
       { "trunkStatus", "ansi_map.trunkStatus",
@@ -17954,19 +17954,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.TrunkStatus", HFILL }},
     { &hf_ansi_map_voiceMailboxNumber,
       { "voiceMailboxNumber", "ansi_map.voiceMailboxNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.VoiceMailboxNumber", HFILL }},
     { &hf_ansi_map_voiceMailboxPIN,
       { "voiceMailboxPIN", "ansi_map.voiceMailboxPIN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.VoiceMailboxPIN", HFILL }},
     { &hf_ansi_map_sms_BearerData,
       { "sms-BearerData", "ansi_map.sms_BearerData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_BearerData", HFILL }},
     { &hf_ansi_map_sms_TeleserviceIdentifier,
       { "sms-TeleserviceIdentifier", "ansi_map.sms_TeleserviceIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_TeleserviceIdentifier", HFILL }},
     { &hf_ansi_map_sms_ChargeIndicator,
       { "sms-ChargeIndicator", "ansi_map.sms_ChargeIndicator",
@@ -17974,27 +17974,27 @@ void proto_register_ansi_map(void) {
         "ansi_map.SMS_ChargeIndicator", HFILL }},
     { &hf_ansi_map_sms_DestinationAddress,
       { "sms-DestinationAddress", "ansi_map.sms_DestinationAddress",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SMS_DestinationAddress", HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationAddress,
       { "sms-OriginalDestinationAddress", "ansi_map.sms_OriginalDestinationAddress",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginalDestinationAddress", HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationSubaddress,
       { "sms-OriginalDestinationSubaddress", "ansi_map.sms_OriginalDestinationSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginalDestinationSubaddress", HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingAddress,
       { "sms-OriginalOriginatingAddress", "ansi_map.sms_OriginalOriginatingAddress",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginalOriginatingAddress", HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingSubaddress,
       { "sms-OriginalOriginatingSubaddress", "ansi_map.sms_OriginalOriginatingSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginalOriginatingSubaddress", HFILL }},
     { &hf_ansi_map_sms_OriginatingAddress,
       { "sms-OriginatingAddress", "ansi_map.sms_OriginatingAddress",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.SMS_OriginatingAddress", HFILL }},
     { &hf_ansi_map_sms_CauseCode,
       { "sms-CauseCode", "ansi_map.sms_CauseCode",
@@ -18002,27 +18002,27 @@ void proto_register_ansi_map(void) {
         "ansi_map.SMS_CauseCode", HFILL }},
     { &hf_ansi_map_cdmaServingOneWayDelay2,
       { "cdmaServingOneWayDelay2", "ansi_map.cdmaServingOneWayDelay2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServingOneWayDelay2", HFILL }},
     { &hf_ansi_map_interMessageTime,
       { "interMessageTime", "ansi_map.interMessageTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.InterMessageTime", HFILL }},
     { &hf_ansi_map_newlyAssignedIMSI,
       { "newlyAssignedIMSI", "ansi_map.newlyAssignedIMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NewlyAssignedIMSI", HFILL }},
     { &hf_ansi_map_newlyAssignedMIN,
       { "newlyAssignedMIN", "ansi_map.newlyAssignedMIN",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.NewlyAssignedMIN", HFILL }},
     { &hf_ansi_map_newMINExtension,
       { "newMINExtension", "ansi_map.newMINExtension",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NewMINExtension", HFILL }},
     { &hf_ansi_map_sms_MessageCount,
       { "sms-MessageCount", "ansi_map.sms_MessageCount",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_MessageCount", HFILL }},
     { &hf_ansi_map_sms_NotificationIndicator,
       { "sms-NotificationIndicator", "ansi_map.sms_NotificationIndicator",
@@ -18030,11 +18030,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.SMS_NotificationIndicator", HFILL }},
     { &hf_ansi_map_teleservice_Priority,
       { "teleservice-Priority", "ansi_map.teleservice_Priority",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.Teleservice_Priority", HFILL }},
     { &hf_ansi_map_temporaryReferenceNumber,
       { "temporaryReferenceNumber", "ansi_map.temporaryReferenceNumber",
-        FT_NONE, BASE_DEC, NULL, 0,
+        FT_NONE, BASE_NONE, NULL, 0,
         "ansi_map.TemporaryReferenceNumber", HFILL }},
     { &hf_ansi_map_mobileStationMSID,
       { "mobileStationMSID", "ansi_map.mobileStationMSID",
@@ -18042,7 +18042,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.MobileStationMSID", HFILL }},
     { &hf_ansi_map_sms_TransactionID,
       { "sms-TransactionID", "ansi_map.sms_TransactionID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SMS_TransactionID", HFILL }},
     { &hf_ansi_map_sms_AccessDeniedReason,
       { "sms-AccessDeniedReason", "ansi_map.sms_AccessDeniedReason",
@@ -18054,7 +18054,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.SeizureType", HFILL }},
     { &hf_ansi_map_requiredParametersMask,
       { "requiredParametersMask", "ansi_map.requiredParametersMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RequiredParametersMask", HFILL }},
     { &hf_ansi_map_reasonList,
       { "reasonList", "ansi_map.reasonList",
@@ -18062,15 +18062,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.ReasonList", HFILL }},
     { &hf_ansi_map_networkTMSIExpirationTime,
       { "networkTMSIExpirationTime", "ansi_map.networkTMSIExpirationTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NetworkTMSIExpirationTime", HFILL }},
     { &hf_ansi_map_newNetworkTMSI,
       { "newNetworkTMSI", "ansi_map.newNetworkTMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.NewNetworkTMSI", HFILL }},
     { &hf_ansi_map_serviceID,
       { "serviceID", "ansi_map.serviceID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ServiceID", HFILL }},
     { &hf_ansi_map_dataAccessElementList,
       { "dataAccessElementList", "ansi_map.dataAccessElementList",
@@ -18078,7 +18078,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.DataAccessElementList", HFILL }},
     { &hf_ansi_map_timeDateOffset,
       { "timeDateOffset", "ansi_map.timeDateOffset",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TimeDateOffset", HFILL }},
     { &hf_ansi_map_timeOfDay,
       { "timeOfDay", "ansi_map.timeOfDay",
@@ -18094,15 +18094,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.FailureType", HFILL }},
     { &hf_ansi_map_failureCause,
       { "failureCause", "ansi_map.failureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.FailureCause", HFILL }},
     { &hf_ansi_map_outingDigits,
       { "outingDigits", "ansi_map.outingDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.RoutingDigits", HFILL }},
     { &hf_ansi_map_databaseKey,
       { "databaseKey", "ansi_map.databaseKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DatabaseKey", HFILL }},
     { &hf_ansi_map_modificationRequestList,
       { "modificationRequestList", "ansi_map.modificationRequestList",
@@ -18118,11 +18118,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.ServiceDataAccessElementList", HFILL }},
     { &hf_ansi_map_privateSpecializedResource,
       { "privateSpecializedResource", "ansi_map.privateSpecializedResource",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PrivateSpecializedResource", HFILL }},
     { &hf_ansi_map_specializedResource,
       { "specializedResource", "ansi_map.specializedResource",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.SpecializedResource", HFILL }},
     { &hf_ansi_map_executeScript,
       { "executeScript", "ansi_map.executeScript",
@@ -18130,11 +18130,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.ExecuteScript", HFILL }},
     { &hf_ansi_map_scriptResult,
       { "scriptResult", "ansi_map.scriptResult",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ScriptResult", HFILL }},
     { &hf_ansi_map_tdmaVoiceMode,
       { "tdmaVoiceMode", "ansi_map.tdmaVoiceMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMAVoiceMode", HFILL }},
     { &hf_ansi_map_callStatus,
       { "callStatus", "ansi_map.callStatus",
@@ -18150,43 +18150,43 @@ void proto_register_ansi_map(void) {
         "ansi_map.CallRecoveryIDList", HFILL }},
     { &hf_ansi_map_positionInformationCode,
       { "positionInformationCode", "ansi_map.positionInformationCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PositionInformationCode", HFILL }},
     { &hf_ansi_map_mSStatus,
       { "mSStatus", "ansi_map.mSStatus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MSStatus", HFILL }},
     { &hf_ansi_map_pSID_RSIDInformation,
       { "pSID-RSIDInformation", "ansi_map.pSID_RSIDInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PSID_RSIDInformation", HFILL }},
     { &hf_ansi_map_positionRequestType,
       { "positionRequestType", "ansi_map.positionRequestType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PositionRequestType", HFILL }},
     { &hf_ansi_map_lcsBillingID,
       { "lcsBillingID", "ansi_map.lcsBillingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.LCSBillingID", HFILL }},
     { &hf_ansi_map_lcs_Client_ID,
       { "lcs-Client-ID", "ansi_map.lcs_Client_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.LCS_Client_ID", HFILL }},
     { &hf_ansi_map_mobilePositionCapability,
       { "mobilePositionCapability", "ansi_map.mobilePositionCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MobilePositionCapability", HFILL }},
     { &hf_ansi_map_dtxIndication,
       { "dtxIndication", "ansi_map.dtxIndication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DTXIndication", HFILL }},
     { &hf_ansi_map_cdmaCodeChannel,
       { "cdmaCodeChannel", "ansi_map.cdmaCodeChannel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMACodeChannel", HFILL }},
     { &hf_ansi_map_cdmaMobileCapabilities,
       { "cdmaMobileCapabilities", "ansi_map.cdmaMobileCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAMobileCapabilities", HFILL }},
     { &hf_ansi_map_cdmaPSMMList,
       { "cdmaPSMMList", "ansi_map.cdmaPSMMList",
@@ -18194,31 +18194,31 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAPSMMList", HFILL }},
     { &hf_ansi_map_tdma_MAHO_CELLID,
       { "tdma-MAHO-CELLID", "ansi_map.tdma_MAHO_CELLID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMA_MAHO_CELLID", HFILL }},
     { &hf_ansi_map_tdma_MAHO_CHANNEL,
       { "tdma-MAHO-CHANNEL", "ansi_map.tdma_MAHO_CHANNEL",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMA_MAHO_CHANNEL", HFILL }},
     { &hf_ansi_map_tdma_TimeAlignment,
       { "tdma-TimeAlignment", "ansi_map.tdma_TimeAlignment",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMA_TimeAlignment", HFILL }},
     { &hf_ansi_map_pqos_HorizontalPosition,
       { "pqos-HorizontalPosition", "ansi_map.pqos_HorizontalPosition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_HorizontalPosition", HFILL }},
     { &hf_ansi_map_pqos_HorizontalVelocity,
       { "pqos-HorizontalVelocity", "ansi_map.pqos_HorizontalVelocity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_HorizontalVelocity", HFILL }},
     { &hf_ansi_map_pqos_MaximumPositionAge,
       { "pqos-MaximumPositionAge", "ansi_map.pqos_MaximumPositionAge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_MaximumPositionAge", HFILL }},
     { &hf_ansi_map_pqos_PositionPriority,
       { "pqos-PositionPriority", "ansi_map.pqos_PositionPriority",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_PositionPriority", HFILL }},
     { &hf_ansi_map_pqos_ResponseTime,
       { "pqos-ResponseTime", "ansi_map.pqos_ResponseTime",
@@ -18226,15 +18226,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.PQOS_ResponseTime", HFILL }},
     { &hf_ansi_map_pqos_VerticalPosition,
       { "pqos-VerticalPosition", "ansi_map.pqos_VerticalPosition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_VerticalPosition", HFILL }},
     { &hf_ansi_map_pqos_VerticalVelocity,
       { "pqos-VerticalVelocity", "ansi_map.pqos_VerticalVelocity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PQOS_VerticalVelocity", HFILL }},
     { &hf_ansi_map_cdmaPSMMCount,
       { "cdmaPSMMCount", "ansi_map.cdmaPSMMCount",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAPSMMCount", HFILL }},
     { &hf_ansi_map_lirAuthorization,
       { "lirAuthorization", "ansi_map.lirAuthorization",
@@ -18242,15 +18242,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.LIRAuthorization", HFILL }},
     { &hf_ansi_map_mpcid,
       { "mpcid", "ansi_map.mpcid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MPCID", HFILL }},
     { &hf_ansi_map_tdma_MAHORequest,
       { "tdma-MAHORequest", "ansi_map.tdma_MAHORequest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TDMA_MAHORequest", HFILL }},
     { &hf_ansi_map_positionResult,
       { "positionResult", "ansi_map.positionResult",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PositionResult", HFILL }},
     { &hf_ansi_map_positionInformation,
       { "positionInformation", "ansi_map.positionInformation",
@@ -18258,7 +18258,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.PositionInformation", HFILL }},
     { &hf_ansi_map_controlType,
       { "controlType", "ansi_map.controlType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ControlType", HFILL }},
     { &hf_ansi_map_destinationAddress,
       { "destinationAddress", "ansi_map.destinationAddress",
@@ -18282,15 +18282,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.Range", HFILL }},
     { &hf_ansi_map_meidStatus,
       { "meidStatus", "ansi_map.meidStatus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MEIDStatus", HFILL }},
     { &hf_ansi_map_aKeyProtocolVersion,
       { "aKeyProtocolVersion", "ansi_map.aKeyProtocolVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AKeyProtocolVersion", HFILL }},
     { &hf_ansi_map_mobileStationPartialKey,
       { "mobileStationPartialKey", "ansi_map.mobileStationPartialKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MobileStationPartialKey", HFILL }},
     { &hf_ansi_map_newlyAssignedMSID,
       { "newlyAssignedMSID", "ansi_map.newlyAssignedMSID",
@@ -18298,11 +18298,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.NewlyAssignedMSID", HFILL }},
     { &hf_ansi_map_baseStationPartialKey,
       { "baseStationPartialKey", "ansi_map.baseStationPartialKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.BaseStationPartialKey", HFILL }},
     { &hf_ansi_map_modulusValue,
       { "modulusValue", "ansi_map.modulusValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ModulusValue", HFILL }},
     { &hf_ansi_map_otasp_ResultCode,
       { "otasp-ResultCode", "ansi_map.otasp_ResultCode",
@@ -18310,35 +18310,35 @@ void proto_register_ansi_map(void) {
         "ansi_map.OTASP_ResultCode", HFILL }},
     { &hf_ansi_map_primitiveValue,
       { "primitiveValue", "ansi_map.primitiveValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PrimitiveValue", HFILL }},
     { &hf_ansi_map_record_Type,
       { "record-Type", "ansi_map.record_Type",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.Record_Type", HFILL }},
     { &hf_ansi_map_information_Record,
       { "information-Record", "ansi_map.information_Record",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.Information_Record", HFILL }},
     { &hf_ansi_map_cdma2000MobileSupportedCapabilities,
       { "cdma2000MobileSupportedCapabilities", "ansi_map.cdma2000MobileSupportedCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMA2000MobileSupportedCapabilities", HFILL }},
     { &hf_ansi_map_announcementCode1,
       { "announcementCode1", "ansi_map.announcementCode1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AnnouncementCode", HFILL }},
     { &hf_ansi_map_announcementCode2,
       { "announcementCode2", "ansi_map.announcementCode2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AnnouncementCode", HFILL }},
     { &hf_ansi_map_cdmaPilotPN,
       { "cdmaPilotPN", "ansi_map.cdmaPilotPN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAPilotPN", HFILL }},
     { &hf_ansi_map_cdmaPowerCombinedIndicator,
       { "cdmaPowerCombinedIndicator", "ansi_map.cdmaPowerCombinedIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAPowerCombinedIndicator", HFILL }},
     { &hf_ansi_map_CDMACodeChannelList_item,
       { "CDMACodeChannelInformation", "ansi_map.CDMACodeChannelInformation",
@@ -18346,11 +18346,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMACodeChannelInformation", HFILL }},
     { &hf_ansi_map_cdmaPilotStrength,
       { "cdmaPilotStrength", "ansi_map.cdmaPilotStrength",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAPilotStrength", HFILL }},
     { &hf_ansi_map_cdmaTargetOneWayDelay,
       { "cdmaTargetOneWayDelay", "ansi_map.cdmaTargetOneWayDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMATargetOneWayDelay", HFILL }},
     { &hf_ansi_map_CDMATargetMAHOList_item,
       { "CDMATargetMAHOInformation", "ansi_map.CDMATargetMAHOInformation",
@@ -18358,7 +18358,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMATargetMAHOInformation", HFILL }},
     { &hf_ansi_map_cdmaSignalQuality,
       { "cdmaSignalQuality", "ansi_map.cdmaSignalQuality",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMASignalQuality", HFILL }},
     { &hf_ansi_map_CDMATargetMeasurementList_item,
       { "CDMATargetMeasurementInformation", "ansi_map.CDMATargetMeasurementInformation",
@@ -18390,27 +18390,27 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMABandClassInformation", HFILL }},
     { &hf_ansi_map_CDMAServiceOptionList_item,
       { "CDMAServiceOption", "ansi_map.CDMAServiceOption",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServiceOption", HFILL }},
     { &hf_ansi_map_pSID_RSIDInformation1,
       { "pSID-RSIDInformation1", "ansi_map.pSID_RSIDInformation1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PSID_RSIDInformation", HFILL }},
     { &hf_ansi_map_targetCellID1,
       { "targetCellID1", "ansi_map.targetCellID1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TargetCellID", HFILL }},
     { &hf_ansi_map_cdmaConnectionReference,
       { "cdmaConnectionReference", "ansi_map.cdmaConnectionReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAConnectionReference", HFILL }},
     { &hf_ansi_map_cdmaState,
       { "cdmaState", "ansi_map.cdmaState",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAState", HFILL }},
     { &hf_ansi_map_cdmaServiceOptionConnectionIdentifier,
       { "cdmaServiceOptionConnectionIdentifier", "ansi_map.cdmaServiceOptionConnectionIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAServiceOptionConnectionIdentifier", HFILL }},
     { &hf_ansi_map_CDMAConnectionReferenceList_item,
       { "CDMAConnectionReferenceList item", "ansi_map.CDMAConnectionReferenceList_item",
@@ -18426,7 +18426,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAConnectionReferenceInformation", HFILL }},
     { &hf_ansi_map_analogRedirectInfo,
       { "analogRedirectInfo", "ansi_map.analogRedirectInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.AnalogRedirectInfo", HFILL }},
     { &hf_ansi_map_CDMAChannelNumberList_item,
       { "CDMAChannelNumberList item", "ansi_map.CDMAChannelNumberList_item",
@@ -18434,11 +18434,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAChannelNumberList_item", HFILL }},
     { &hf_ansi_map_cdmaChannelNumber,
       { "cdmaChannelNumber", "ansi_map.cdmaChannelNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAChannelNumber", HFILL }},
     { &hf_ansi_map_cdmaChannelNumber2,
       { "cdmaChannelNumber2", "ansi_map.cdmaChannelNumber2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.CDMAChannelNumber", HFILL }},
     { &hf_ansi_map_cdmaChannelNumberList,
       { "cdmaChannelNumberList", "ansi_map.cdmaChannelNumberList",
@@ -18446,7 +18446,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMAChannelNumberList", HFILL }},
     { &hf_ansi_map_dataID,
       { "dataID", "ansi_map.dataID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DataID", HFILL }},
     { &hf_ansi_map_change,
       { "change", "ansi_map.change",
@@ -18454,7 +18454,7 @@ void proto_register_ansi_map(void) {
         "ansi_map.Change", HFILL }},
     { &hf_ansi_map_dataValue,
       { "dataValue", "ansi_map.dataValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.DataValue", HFILL }},
     { &hf_ansi_map_DataAccessElementList_item,
       { "DataAccessElementList item", "ansi_map.DataAccessElementList_item",
@@ -18478,19 +18478,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.DataUpdateResult", HFILL }},
     { &hf_ansi_map_globalTitle,
       { "globalTitle", "ansi_map.globalTitle",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.GlobalTitle", HFILL }},
     { &hf_ansi_map_pC_SSN,
       { "pC-SSN", "ansi_map.pC_SSN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PC_SSN", HFILL }},
     { &hf_ansi_map_scriptName,
       { "scriptName", "ansi_map.scriptName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ScriptName", HFILL }},
     { &hf_ansi_map_scriptArgument,
       { "scriptArgument", "ansi_map.scriptArgument",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.ScriptArgument", HFILL }},
     { &hf_ansi_map_allOrNone,
       { "allOrNone", "ansi_map.allOrNone",
@@ -18530,15 +18530,15 @@ void proto_register_ansi_map(void) {
         "ansi_map.TriggerList", HFILL }},
     { &hf_ansi_map_wIN_TriggerList,
       { "wIN-TriggerList", "ansi_map.wIN_TriggerList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.WIN_TriggerList", HFILL }},
     { &hf_ansi_map_triggerCapability,
       { "triggerCapability", "ansi_map.triggerCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.TriggerCapability", HFILL }},
     { &hf_ansi_map_wINOperationsCapability,
       { "wINOperationsCapability", "ansi_map.wINOperationsCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.WINOperationsCapability", HFILL }},
     { &hf_ansi_map_CallRecoveryIDList_item,
       { "CallRecoveryID", "ansi_map.CallRecoveryID",
@@ -18550,19 +18550,19 @@ void proto_register_ansi_map(void) {
         "ansi_map.GeneralizedTime", HFILL }},
     { &hf_ansi_map_geographicPosition,
       { "geographicPosition", "ansi_map.geographicPosition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.GeographicPosition", HFILL }},
     { &hf_ansi_map_positionSource,
       { "positionSource", "ansi_map.positionSource",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.PositionSource", HFILL }},
     { &hf_ansi_map_horizontal_Velocity,
       { "horizontal-Velocity", "ansi_map.horizontal_Velocity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.Horizontal_Velocity", HFILL }},
     { &hf_ansi_map_vertical_Velocity,
       { "vertical-Velocity", "ansi_map.vertical_Velocity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.Vertical_Velocity", HFILL }},
     { &hf_ansi_map_sCFOverloadGapInterval,
       { "sCFOverloadGapInterval", "ansi_map.sCFOverloadGapInterval",
@@ -18582,11 +18582,11 @@ void proto_register_ansi_map(void) {
         "ansi_map.CDMATargetMAHOList", HFILL }},
     { &hf_ansi_map_mpcAddress2,
       { "mpcAddress2", "ansi_map.mpcAddress2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MPCAddress", HFILL }},
     { &hf_ansi_map_mobileStationIMSI,
       { "mobileStationIMSI", "ansi_map.mobileStationIMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_map.MobileStationIMSI", HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest,
       { "handoffMeasurementRequest", "ansi_map.handoffMeasurementRequest",
diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 2ea6b427d0..f3d6816c33 100644
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -1398,7 +1398,7 @@ proto_register_ansi_tcap(void)
           { "Session Id",
             "ansi_tcap.srt.session_id",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_ansi_tcapsrt_BeginSession,
           { "Begin Session",
@@ -1422,7 +1422,7 @@ proto_register_ansi_tcap(void)
           { "Request Duplicate",
             "ansi_tcap.srt.duplicate",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
 /*--- Included file: packet-ansi_tcap-hfarr.c ---*/
@@ -1473,7 +1473,7 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.T_abort", HFILL }},
     { &hf_ansi_tcap_identifier,
       { "identifier", "ansi_tcap.identifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.TransactionID", HFILL }},
     { &hf_ansi_tcap_dialoguePortion,
       { "dialoguePortion", "ansi_tcap.dialoguePortion",
@@ -1501,7 +1501,7 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.UserAbortInformation", HFILL }},
     { &hf_ansi_tcap_version,
       { "version", "ansi_tcap.version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.ProtocolVersion", HFILL }},
     { &hf_ansi_tcap_applicationContext,
       { "applicationContext", "ansi_tcap.applicationContext",
@@ -1581,7 +1581,7 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.ReturnResult", HFILL }},
     { &hf_ansi_tcap_componentIDs,
       { "componentIDs", "ansi_tcap.componentIDs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_componentIDs", HFILL }},
     { &hf_ansi_tcap_operationCode,
       { "operationCode", "ansi_tcap.operationCode",
@@ -1589,19 +1589,19 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.OperationCode", HFILL }},
     { &hf_ansi_tcap_parameter,
       { "parameter", "ansi_tcap.parameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_parameter", HFILL }},
     { &hf_ansi_tcap_componentID,
       { "componentID", "ansi_tcap.componentID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_componentID", HFILL }},
     { &hf_ansi_tcap_parameter_01,
       { "parameter", "ansi_tcap.parameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_parameter_01", HFILL }},
     { &hf_ansi_tcap_componentID_01,
       { "componentID", "ansi_tcap.componentID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_componentID_01", HFILL }},
     { &hf_ansi_tcap_errorCode,
       { "errorCode", "ansi_tcap.errorCode",
@@ -1609,11 +1609,11 @@ proto_register_ansi_tcap(void)
         "ansi_tcap.ErrorCode", HFILL }},
     { &hf_ansi_tcap_parameter_02,
       { "parameter", "ansi_tcap.parameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.T_parameter_02", HFILL }},
     { &hf_ansi_tcap_componentID_02,
       { "componentID", "ansi_tcap.componentID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ansi_tcap.OCTET_STRING_SIZE_0_1", HFILL }},
     { &hf_ansi_tcap_rejectProblem,
       { "rejectProblem", "ansi_tcap.rejectProblem",
diff --git a/epan/dissectors/packet-aodv.c b/epan/dissectors/packet-aodv.c
index 288d74566e..199663fb41 100644
--- a/epan/dissectors/packet-aodv.c
+++ b/epan/dissectors/packet-aodv.c
@@ -846,62 +846,62 @@ proto_register_aodv(void)
 	{ &hf_aodv_flags,
 	  { "Flags", "aodv.flags",
 	    FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "Flags", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_join,
 	  { "RREQ Join", "aodv.flags.rreq_join",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_JOIN,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_repair,
 	  { "RREQ Repair", "aodv.flags.rreq_repair",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_REP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_gratuitous,
 	  { "RREQ Gratuitous RREP", "aodv.flags.rreq_gratuitous",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_GRATRREP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_destinationonly,
 	  { "RREQ Destination only", "aodv.flags.rreq_destinationonly",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_DESTONLY,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rreq_unknown,
 	  { "RREQ Unknown Sequence Number", "aodv.flags.rreq_unknown",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREQ_UNKNSEQ,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rrep_repair,
 	  { "RREP Repair", "aodv.flags.rrep_repair",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_REP,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rrep_ack,
 	  { "RREP Acknowledgement", "aodv.flags.rrep_ack",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RREP_ACK_REQ,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_flags_rerr_nodelete,
 	  { "RERR No Delete", "aodv.flags.rerr_nodelete",
 	    FT_BOOLEAN, 8, TFS(&flags_set_truth), RERR_NODEL,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_prefix_sz,
 	  { "Prefix Size", "aodv.prefix_sz",
 	    FT_UINT8, BASE_DEC, NULL, 0x0,
-	    "Prefix Size", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_hopcount,
 	  { "Hop Count", "aodv.hopcount",
 	    FT_UINT8, BASE_DEC, NULL, 0x0,
-	    "Hop Count", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_rreq_id,
 	  { "RREQ Id", "aodv.rreq_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "RREQ Id", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_dest_ip,
 	  { "Destination IP", "aodv.dest_ip",
@@ -916,7 +916,7 @@ proto_register_aodv(void)
 	{ &hf_aodv_dest_seqno,
 	  { "Destination Sequence Number", "aodv.dest_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Destination Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_orig_ip,
 	  { "Originator IP", "aodv.orig_ip",
@@ -931,12 +931,12 @@ proto_register_aodv(void)
 	{ &hf_aodv_orig_seqno,
 	  { "Originator Sequence Number", "aodv.orig_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Originator Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_lifetime,
 	  { "Lifetime", "aodv.lifetime",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Lifetime", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_destcount,
 	  { "Destination Count", "aodv.destcount",
@@ -956,7 +956,7 @@ proto_register_aodv(void)
 	{ &hf_aodv_unreach_dest_seqno,
 	  { "Unreachable Destination Sequence Number", "aodv.unreach_dest_seqno",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Unreachable Destination Sequence Number", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_aodv_ext_type,
 	  { "Extension Type", "aodv.ext_type",
diff --git a/epan/dissectors/packet-aoe.c b/epan/dissectors/packet-aoe.c
index 34664ba05b..98b87f132f 100644
--- a/epan/dissectors/packet-aoe.c
+++ b/epan/dissectors/packet-aoe.c
@@ -451,10 +451,10 @@ proto_register_aoe(void)
 	"Error code", HFILL}},
     { &hf_aoe_err_feature,
       { "Err/Feature", "aoe.err_feature", FT_UINT8, BASE_HEX, NULL, 0x0,
-	"Err/Feature", HFILL}},
+	NULL, HFILL}},
     { &hf_aoe_sector_count,
       { "Sector Count", "aoe.sector_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-	"Sector Count", HFILL}},
+	NULL, HFILL}},
     { &hf_aoe_flags_response,
       { "Response flag", "aoe.response", FT_BOOLEAN, 8, TFS(&tfs_response), AOE_FLAGS_RESPONSE, "Whether this is a response PDU or not", HFILL}},
     { &hf_aoe_flags_error,
@@ -477,7 +477,7 @@ proto_register_aoe(void)
     { &hf_aoe_aflags_e,
       { "E", "aoe.aflags.e", FT_BOOLEAN, 8, TFS(&tfs_aflags_e), AOE_AFLAGS_E, "Whether this is a normal or LBA48 command", HFILL}},
     { &hf_aoe_aflags_d,
-      { "D", "aoe.aflags.d", FT_BOOLEAN, 8, TFS(&tfs_aflags_d), AOE_AFLAGS_D, "", HFILL}},
+      { "D", "aoe.aflags.d", FT_BOOLEAN, 8, TFS(&tfs_aflags_d), AOE_AFLAGS_D, NULL, HFILL}},
     { &hf_aoe_aflags_a,
       { "A", "aoe.aflags.a", FT_BOOLEAN, 8, TFS(&tfs_aflags_a), AOE_AFLAGS_A, "Whether this is an asynchronous write or not", HFILL}},
     { &hf_aoe_aflags_w,
diff --git a/epan/dissectors/packet-ap1394.c b/epan/dissectors/packet-ap1394.c
index e1ac60513c..9873130c3c 100644
--- a/epan/dissectors/packet-ap1394.c
+++ b/epan/dissectors/packet-ap1394.c
@@ -114,7 +114,7 @@ proto_register_ap1394(void)
     /* registered here but handled in ethertype.c */
     { &hf_ap1394_type,
       { "Type",	"ap1394.type", FT_UINT16, BASE_HEX,
-        VALS(etype_vals), 0x0, "", HFILL }},
+        VALS(etype_vals), 0x0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_ap1394,
diff --git a/epan/dissectors/packet-app-pkix-cert.c b/epan/dissectors/packet-app-pkix-cert.c
index dcfee1501e..1a872cfda8 100644
--- a/epan/dissectors/packet-app-pkix-cert.c
+++ b/epan/dissectors/packet-app-pkix-cert.c
@@ -86,7 +86,7 @@ proto_register_cert(void)
          */
         static hf_register_info hf[] = {
                 { &hf_cert,
-                { "Certificate", "cert", FT_NONE, BASE_HEX, NULL, 0x00, "Certificate", HFILL}},
+                { "Certificate", "cert", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL}},
         };
 
         /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-arcnet.c b/epan/dissectors/packet-arcnet.c
index 9badf3ef06..2625b89631 100644
--- a/epan/dissectors/packet-arcnet.c
+++ b/epan/dissectors/packet-arcnet.c
@@ -332,7 +332,7 @@ proto_register_arcnet (void)
     {&hf_arcnet_offset,
      {"Offset", "arcnet.offset",
       FT_BYTES, BASE_NONE, NULL, 0,
-      "Offset", HFILL}
+      NULL, HFILL}
      },
     {&hf_arcnet_protID,
      {"Protocol ID", "arcnet.protID",
diff --git a/epan/dissectors/packet-armagetronad.c b/epan/dissectors/packet-armagetronad.c
index 5f275bc769..d7f0d67abe 100644
--- a/epan/dissectors/packet-armagetronad.c
+++ b/epan/dissectors/packet-armagetronad.c
@@ -295,7 +295,7 @@ void proto_register_armagetronad(void)
 		 },
 		{&hf_armagetronad_data,
 		 {"Data", "armagetronad.data",
-		  FT_STRING, BASE_HEX, NULL, 0x0,
+		  FT_STRING, BASE_NONE, NULL, 0x0,
 		  "The actual data (array of shorts in network order)", HFILL}
 		 },
 		{&hf_armagetronad_sender_id,
@@ -305,7 +305,7 @@ void proto_register_armagetronad(void)
 		 },
 		{&hf_armagetronad_msg_subtree,
 		 {"Message", "armagetronad.message",
-		  FT_NONE, 0, NULL, 0x0,
+		  FT_NONE, BASE_NONE, NULL, 0x0,
 		  "A message", HFILL}
 		 }
 	};
diff --git a/epan/dissectors/packet-artnet.c b/epan/dissectors/packet-artnet.c
index c3a6e14395..447ebfc985 100644
--- a/epan/dissectors/packet-artnet.c
+++ b/epan/dissectors/packet-artnet.c
@@ -1743,14 +1743,14 @@ proto_register_artnet(void) {
     { &hf_artnet_filler,
       { "filler",
         "artnet.filler",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "filler", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_spare,
       { "spare",
         "artnet.spare",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "spare", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* header */
 
@@ -1763,7 +1763,7 @@ proto_register_artnet(void) {
     { &hf_artnet_header_id,
       { "ID",
         "artnet.header.id",
-        FT_STRING, BASE_DEC, NULL, 0x0,
+        FT_STRING, BASE_NONE, NULL, 0x0,
         "ArtNET ID", HFILL }},
 
     { &hf_artnet_header_opcode,
@@ -1790,25 +1790,25 @@ proto_register_artnet(void) {
       { "TalkToMe",
         "artnet.poll.talktome",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "TalkToMe", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_talktome_reply_dest,
       { "Reply destination",
         "artnet.poll.talktome_reply_dest",
         FT_UINT8, BASE_HEX, NULL, 0x01,
-        "Reply destination", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_talktome_reply_type,
       { "Reply type",
         "artnet.poll.talktome_reply_type",
         FT_UINT8, BASE_HEX, NULL, 0x02,
-        "Reply type", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_talktome_unused,
       { "unused",
         "artnet.poll.talktome_unused",
         FT_UINT8, BASE_HEX, NULL, 0xfc,
-        "unused", HFILL }},
+        NULL, HFILL }},
 
     /* ArtPollReply */
 
@@ -1821,8 +1821,8 @@ proto_register_artnet(void) {
     { &hf_artnet_poll_reply_ip_address,
       { "IP Address",
         "artnet.poll_reply.ip_address",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
-        "IP Address", HFILL }},
+        FT_IPv4, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_nr,
       { "Port number",
@@ -1858,103 +1858,103 @@ proto_register_artnet(void) {
       { "Status",
         "artnet.poll_reply.status",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Status", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_esta_man,
       { "ESTA Code",
         "artnet.poll_reply.esta_man",
         FT_UINT16, BASE_HEX, VALS(artnet_esta_man_vals), 0x0,
-        "ESTA Code", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_short_name,
       { "Short Name",
         "artnet.poll_reply.short_name",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Short Name", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_long_name,
       { "Long Name",
         "artnet.poll_reply.long_name",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Long Name", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_node_report,
       { "Node Report",
         "artnet.poll_reply.node_report",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Node Report", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_info,
       { "Port Info",
         "artnet.poll_reply.port_info",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Port Info", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_num_ports,
       { "Number of Ports",
         "artnet.poll_reply.num_ports",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Number of Ports", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_types,
       { "Port Types",
         "artnet.poll_reply.port_types",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Port Types", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_types_1,
       { "Type of Port 1",
         "artnet.poll_reply.port_types_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Type of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_types_2,
       { "Type of Port 2",
         "artnet.poll_reply.port_types_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Type of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_types_3,
       { "Type of Port 3",
         "artnet.poll_reply.port_types_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Type of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_port_types_4,
       { "Type of Port 4",
         "artnet.poll_reply.port_types_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Type of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_input,
       { "Input Status",
         "artnet.poll_reply.good_input",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Input Status", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_input_1,
       { "Input status of Port 1",
         "artnet.poll_reply.good_input_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input status of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_input_2,
       { "Input status of Port 2",
         "artnet.poll_reply.good_input_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input status of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_input_3,
       { "Input status of Port 3",
         "artnet.poll_reply.good_input_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input status of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_input_4,
       { "Input status of Port 4",
         "artnet.poll_reply.good_input_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input status of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_output,
       { "Output Status",
@@ -1966,19 +1966,19 @@ proto_register_artnet(void) {
       { "Output status of Port 1",
         "artnet.poll_reply.good_output_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output status of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_output_2,
       { "Output status of Port 2",
         "artnet.poll_reply.good_output_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output status of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_output_3,
       { "Output status of Port 3",
         "artnet.poll_reply.good_output_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output status of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_good_output_4,
       { "Output status of Port 4",
@@ -1990,85 +1990,85 @@ proto_register_artnet(void) {
       { "Input Subswitch",
         "artnet.poll_reply.swin",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Input Subswitch", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swin_1,
       { "Input Subswitch of Port 1",
         "artnet.poll_reply.swin_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swin_2,
       { "Input Subswitch of Port 2",
         "artnet.poll_reply.swin_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swin_3,
       { "Input Subswitch of Port 3",
         "artnet.poll_reply.swin_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swin_4,
       { "Input Subswitch of Port 4",
         "artnet.poll_reply.swin_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swout,
       { "Output Subswitch",
         "artnet.poll_reply.swout",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Output Subswitch", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swout_1,
       { "Output Subswitch of Port 1",
         "artnet.poll_reply.swout_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swout_2,
       { "Output Subswitch of Port 2",
         "artnet.poll_reply.swout_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swout_3,
       { "Output Subswitch of Port 3",
         "artnet.poll_reply.swout_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swout_4,
       { "Output Subswitch of Port 4",
         "artnet.poll_reply.swout_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swvideo,
       { "SwVideo",
         "artnet.poll_reply.swvideo",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "SwVideo", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swmacro,
       { "SwMacro",
         "artnet.poll_reply.swmacro",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "SwMacro", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_swremote,
       { "SwRemote",
         "artnet.poll_reply.swremote",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "SwRemote", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_poll_reply_mac,
       { "MAC",
         "artnet.poll_reply.mac",
         FT_ETHER, BASE_HEX, NULL, 0x0,
-        "MAC", HFILL }},
+        NULL, HFILL }},
 
     /* ArtOutput */
 
@@ -2082,42 +2082,42 @@ proto_register_artnet(void) {
       { "Sequence",
         "artnet.output.sequence",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Sequence", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_output_physical,
       { "Physical",
         "artnet.output.physical",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Physical", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_output_universe,
       { "Universe",
         "artnet.output.universe",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Universe", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_output_length,
       { "Length",
         "artnet.output.length",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Length", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_output_data,
       { "DMX data",
         "artnet.output.data",
-        FT_NONE, BASE_DEC, NULL, 0x0,
+        FT_NONE, BASE_NONE, NULL, 0x0,
         "DMX Data", HFILL }},
 
     { &hf_artnet_output_data_filter,
       { "DMX data filter",
         "artnet.output.data_filter",
-        FT_BYTES, BASE_DEC, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "DMX Data Filter", HFILL }},
 
     { &hf_artnet_output_dmx_data,
       { "DMX data",
         "artnet.output.dmx_data",
-        FT_NONE, BASE_DEC, NULL, 0x0,
+        FT_NONE, BASE_NONE, NULL, 0x0,
         "DMX Data", HFILL }},
 
     /* ArtAddress */
@@ -2131,92 +2131,92 @@ proto_register_artnet(void) {
     { &hf_artnet_address_short_name,
       { "Short Name",
         "artnet.address.short_name",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Short Name", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_address_long_name,
       { "Long Name",
         "artnet.address.long_name",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Long Name", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_address_swin,
       { "Input Subswitch",
         "artnet.address.swin",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Input Subswitch", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swin_1,
       { "Input Subswitch of Port 1",
         "artnet.address.swin_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swin_2,
       { "Input Subswitch of Port 2",
         "artnet.address.swin_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swin_3,
       { "Input Subswitch of Port 3",
         "artnet.address.swin_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swin_4,
       { "Input Subswitch of Port 4",
         "artnet.address.swin_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Input Subswitch of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swout,
       { "Output Subswitch",
         "artnet.address.swout",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Output Subswitch", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swout_1,
       { "Output Subswitch of Port 1",
         "artnet.address.swout_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swout_2,
       { "Output Subswitch of Port 2",
         "artnet.address.swout_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swout_3,
       { "Output Subswitch of Port 3",
         "artnet.address.swout_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swout_4,
       { "Output Subswitch of Port 4",
         "artnet.address.swout_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Output Subswitch of Port 4", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_subswitch,
       { "Subswitch",
         "artnet.address.subswitch",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Subswitch", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_swvideo,
       { "SwVideo",
         "artnet.address.swvideo",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "SwVideo", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_address_command,
       { "Command",
         "artnet.address.command",
         FT_UINT8, BASE_HEX, VALS(artnet_address_command_vals), 0x0,
-        "Command", HFILL }},
+        NULL, HFILL }},
 
     /* ArtInput */
 
@@ -2230,37 +2230,37 @@ proto_register_artnet(void) {
       { "Number of Ports",
         "artnet.input.num_ports",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Number of Ports", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_input_input,
       { "Port Status",
         "artnet.input.input",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Port Status", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_input_input_1,
       { "Status of Port 1",
         "artnet.input.input_1",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Status of Port 1", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_input_input_2,
       { "Status of Port 2",
         "artnet.input.input_2",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Status of Port 2", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_input_input_3,
       { "Status of Port 3",
         "artnet.input.input_3",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Status of Port 3", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_input_input_4,
       { "Status of Port 4",
         "artnet.input.input_4",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Status of Port 4", HFILL }},
+        NULL, HFILL }},
 
     /* ArtFirmwareMaster */
 
@@ -2280,19 +2280,19 @@ proto_register_artnet(void) {
       { "Block ID",
         "artnet.firmware_master.block_id",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Block ID", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_firmware_master_length,
       { "Length",
         "artnet.firmware_master.length",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Length", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_firmware_master_data,
       { "data",
         "artnet.firmware_master.data",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "data", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* ArtFirmwareReply */
 
@@ -2320,36 +2320,36 @@ proto_register_artnet(void) {
       { "control",
         "artnet.video_setup.control",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "control", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_setup_font_height,
       { "Font Height",
         "artnet.video_setup.font_height",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Font Height", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_setup_first_font,
       { "First Font",
         "artnet.video_setup.first_font",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "First Font", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_setup_last_font,
       { "Last Font",
         "artnet.video_setup.last_font",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Last Font", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_setup_win_font_name,
       { "Windows Font Name",
         "artnet.video_setup.win_font_name",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "Windows Font Name", HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_video_setup_font_data,
       { "Font data",
         "artnet.video_setup.font_data",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "Font Date", HFILL }},
 
     /* ArtVideoPalette */
@@ -2363,20 +2363,20 @@ proto_register_artnet(void) {
     { &hf_artnet_video_palette_colour_red,
       { "Colour Red",
         "artnet.video_palette.colour_red",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Colour Red", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_video_palette_colour_green,
       { "Colour Green",
         "artnet.video_palette.colour_green",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Colour Green", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_video_palette_colour_blue,
       { "Colour Blue",
         "artnet.video_palette.colour_blue",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Colour Blue", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* ArtVideoData */
 
@@ -2390,31 +2390,31 @@ proto_register_artnet(void) {
       { "PosX",
         "artnet.video_data.pos_x",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "PosX", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_data_pos_y,
       { "PosY",
         "artnet.video_data.pos_y",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "PosY", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_data_len_x,
       { "LenX",
         "artnet.video_data.len_x",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "LenX", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_data_len_y,
       { "LenY",
         "artnet.video_data.len_y",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "LenY", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_video_data_data,
       { "Video Data",
         "artnet.video_data.data",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Video Data", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* ArtTodRequest */
     { &hf_artnet_tod_request,
@@ -2427,19 +2427,19 @@ proto_register_artnet(void) {
       { "Command",
         "artnet.tod_request.command",
         FT_UINT8, BASE_HEX, VALS(artnet_tod_request_command_vals), 0x0,
-        "Command", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_request_ad_count,
       { "Address Count",
         "artnet.tod_request.ad_count",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Address Count", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_request_address,
       { "Address",
         "artnet.tod_request.address",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Address", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* ArtTodData */
     { &hf_artnet_tod_data,
@@ -2452,43 +2452,43 @@ proto_register_artnet(void) {
       { "Port",
         "artnet.tod_data.port",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Port", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_command_response,
       { "Command Response",
         "artnet.tod_data.command_response",
         FT_UINT8, BASE_HEX, VALS(artnet_tod_data_command_vals), 0x0,
-        "Command Response", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_address,
       { "Address",
         "artnet.tod_data.address",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Address", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_uid_total,
       { "UID Total",
         "artnet.tod_data.uid_total",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "UID Total", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_block_count,
       { "Block Count",
         "artnet.tod_data.block_count",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "Block Count", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_uid_count,
       { "UID Count",
         "artnet.tod_data.uid_count",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "UID Count", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_data_tod,
       { "TOD",
         "artnet.tod_data.tod",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "TOD", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     /* ArtTodControl */
     { &hf_artnet_tod_control,
@@ -2501,13 +2501,13 @@ proto_register_artnet(void) {
       { "Command",
         "artnet.tod_control.command",
         FT_UINT8, BASE_HEX, VALS(artnet_tod_control_command_vals), 0x0,
-        "Command", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_tod_control_address,
       { "Address",
         "artnet.tod_request.address",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Address", HFILL }},
+        NULL, HFILL }},
 
     /* ArtRdm */
     { &hf_artnet_rdm,
@@ -2520,13 +2520,13 @@ proto_register_artnet(void) {
       { "Command",
         "artnet.rdm.command",
         FT_UINT8, BASE_HEX, VALS(artnet_rdm_command_vals), 0x0,
-        "Command", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_rdm_address,
       { "Address",
         "artnet.rdm.address",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Address", HFILL }},
+        NULL, HFILL }},
 
     /* ArtIpProg */
     { &hf_artnet_ip_prog,
@@ -2539,61 +2539,61 @@ proto_register_artnet(void) {
       { "Command",
         "artnet.ip_prog.command",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "Command", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_prog_port,
       { "Program Port",
         "artnet.ip_prog.command_prog_port",
         FT_UINT8, BASE_HEX, NULL, 0x01,
-        "Program Port", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_prog_sm,
       { "Program Subnet Mask",
         "artnet.ip_prog.command_prog_sm",
         FT_UINT8, BASE_HEX, NULL, 0x02,
-        "Program Subnet Mask", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_prog_ip,
       { "Program IP",
         "artnet.ip_prog.command_prog_ip",
         FT_UINT8, BASE_HEX, NULL, 0x04,
-        "Program IP", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_reset,
       { "Reset parameters",
         "artnet.ip_prog.command_reset",
         FT_UINT8, BASE_HEX, NULL, 0x08,
-        "Reset parameters", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_unused,
       { "Unused",
         "artnet.ip_prog.command_unused",
         FT_UINT8, BASE_HEX, NULL, 0x70,
-        "Unused", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_command_prog_enable,
       { "Enable Programming",
         "artnet.ip_prog.command_prog_enable",
         FT_UINT8, BASE_HEX, NULL, 0x80,
-        "Enable Programming", HFILL }},
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_ip,
       { "IP Address",
         "artnet.ip_prog.ip",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
-        "IP Address", HFILL }},
+        FT_IPv4, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_sm,
       { "Subnet mask",
         "artnet.ip_prog.sm",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "IP Subnet mask", HFILL }},
 
     { &hf_artnet_ip_prog_port,
       { "Port",
         "artnet.ip_prog.port",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Port", HFILL }},
+        NULL, HFILL }},
 
     /* ArtIpProgReply */
     { &hf_artnet_ip_prog_reply,
@@ -2605,20 +2605,20 @@ proto_register_artnet(void) {
     { &hf_artnet_ip_prog_reply_ip,
       { "IP Address",
         "artnet.ip_prog_reply.ip",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
-        "IP Address", HFILL }},
+        FT_IPv4, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_artnet_ip_prog_reply_sm,
       { "Subnet mask",
         "artnet.ip_prog_reply.sm",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "IP Subnet mask", HFILL }},
 
     { &hf_artnet_ip_prog_reply_port,
       { "Port",
         "artnet.ip_prog_reply.port",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Port", HFILL }},
+        NULL, HFILL }},
 
     /* ArtPollServerReply */
     { &hf_artnet_poll_server_reply,
diff --git a/epan/dissectors/packet-aruba-adp.c b/epan/dissectors/packet-aruba-adp.c
index b2f0df7e90..63f89a1fed 100644
--- a/epan/dissectors/packet-aruba-adp.c
+++ b/epan/dissectors/packet-aruba-adp.c
@@ -131,7 +131,7 @@ proto_register_aruba_adp(void)
 
     { &hf_adp_mac,
     { "MAC address", "adp.mac", FT_ETHER, BASE_NONE, NULL, 0x0,
-    "MAC address", HFILL}},
+    NULL, HFILL}},
 
     { &hf_adp_switchip,
     { "Switch IP", "adp.switch", FT_IPv4, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index bd098dec15..29ae0494ef 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -862,49 +862,49 @@ proto_register_asap(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,           { "Type",                        "asap.message_type",                             FT_UINT8,   BASE_DEC,  VALS(message_type_values),        0x0,                       "", HFILL } },
-    { &hf_message_flags,          { "Flags",                       "asap.message_flags",                            FT_UINT8,   BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_message_length,         { "Length",                      "asap.message_length",                           FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_cause_code,             { "Cause Code",                  "asap.cause_code",                               FT_UINT16,  BASE_HEX,  VALS(cause_code_values),          0x0,                       "", HFILL } },
-    { &hf_cause_length,           { "Cause Length",                "asap.cause_length",                             FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_cause_info,             { "Cause Info",                  "asap.cause_info",                               FT_BYTES,   BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_cause_padding,          { "Padding",                     "asap.cause_padding",                            FT_BYTES,   BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_parameter_type,         { "Parameter Type",              "asap.parameter_type",                           FT_UINT16,  BASE_HEX,  VALS(parameter_type_values),      0x0,                       "", HFILL } },
-    { &hf_parameter_length,       { "Parameter Length",            "asap.parameter_length",                         FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_parameter_value,        { "Parameter Value",             "asap.parameter_value",                          FT_BYTES,   BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_parameter_padding,      { "Padding",                     "asap.parameter_padding",                        FT_BYTES,   BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_parameter_ipv4_address, { "IP Version 4 Address",        "asap.ipv4_address",                             FT_IPv4,    BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_parameter_ipv6_address, { "IP Version 6 Address",        "asap.ipv6_address",                             FT_IPv6,    BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_dccp_port,              { "Port",                        "asap.dccp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_dccp_reserved,          { "Reserved",                    "asap.dccp_transport_reserved",                  FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_dccp_service_code,      { "Service Code",                "asap.dccp_transport_service_code",              FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_sctp_port,              { "Port",                        "asap.sctp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_transport_use,          { "Transport Use",               "asap.transport_use",                            FT_UINT16,  BASE_DEC,  VALS(transport_use_values),       0x0,                       "", HFILL } },
-    { &hf_tcp_port,               { "Port",                        "asap.tcp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_udp_port,               { "Port",                        "asap.udp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_udp_reserved,           { "Reserved",                    "asap.udp_transport_reserved",                   FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_udp_lite_port,          { "Port",                        "asap.udp_lite_transport_port",                  FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_udp_lite_reserved,      { "Reserved",                    "asap.udp_lite_transport_reserved",              FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_type,            { "Policy Type",                 "asap.pool_member_selection_policy_type",        FT_UINT32,  BASE_HEX,  VALS(policy_type_values),         0x0,                       "", HFILL } },
-    { &hf_policy_weight,          { "Policy Weight",               "asap.pool_member_selection_policy_weight",      FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_priority,        { "Policy Priority",             "asap.pool_member_selection_policy_priority",    FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_load,            { "Policy Load",                 "asap.pool_member_selection_policy_load",        FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_degradation,     { "Policy Degradation",          "asap.pool_member_selection_policy_degradation", FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_loaddpf,         { "Policy Load DPF",             "asap.pool_member_selection_policy_load_dpf",    FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_weightdpf,       { "Policy Weight DPF",           "asap.pool_member_selection_policy_weight_dpf",  FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_distance,        { "Policy Distance",             "asap.pool_member_selection_policy_distance",    FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_policy_value,           { "Policy Value",                "asap.pool_member_selection_policy_value",       FT_BYTES,   BASE_NONE, NULL,                             0x0,                       "", HFILL } },
-    { &hf_pool_handle,            { "Pool Handle",                 "asap.pool_handle_pool_handle",                  FT_BYTES,   BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_pe_pe_identifier,       { "PE Identifier",               "asap.pool_element_pe_identifier",               FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_home_enrp_id,           { "Home ENRP Server Identifier", "asap.pool_element_home_enrp_server_identifier", FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_reg_life,               { "Registration Life",           "asap.pool_element_registration_life",           FT_INT32,   BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_cookie,                 { "Cookie",                      "asap.cookie",                                   FT_BYTES,   BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_pe_identifier,          { "PE Identifier",               "asap.pe_identifier",                            FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_pe_checksum,            { "PE Checksum",                 "asap.pe_checksum",                              FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_hropt_items,            { "Items",                       "asap.hropt_items",                              FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_server_identifier,      { "Server Identifier",           "asap.server_identifier",                        FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       "", HFILL } },
-    { &hf_home_enrp_server_bit,   { "H Bit",                       "asap.h_bit",                                    FT_BOOLEAN, 8,         TFS(&home_enrp_server_bit_value), HOME_ENRP_SERVER_BIT_MASK, "", HFILL } },
-    { &hf_reject_bit,             { "R Bit",                       "asap.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reject_bit_value),           REJECT_BIT_MASK,           "", HFILL } },
+    { &hf_message_type,           { "Type",                        "asap.message_type",                             FT_UINT8,   BASE_DEC,  VALS(message_type_values),        0x0,                       NULL, HFILL } },
+    { &hf_message_flags,          { "Flags",                       "asap.message_flags",                            FT_UINT8,   BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_message_length,         { "Length",                      "asap.message_length",                           FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_cause_code,             { "Cause Code",                  "asap.cause_code",                               FT_UINT16,  BASE_HEX,  VALS(cause_code_values),          0x0,                       NULL, HFILL } },
+    { &hf_cause_length,           { "Cause Length",                "asap.cause_length",                             FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_cause_info,             { "Cause Info",                  "asap.cause_info",                               FT_BYTES,   BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_cause_padding,          { "Padding",                     "asap.cause_padding",                            FT_BYTES,   BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_parameter_type,         { "Parameter Type",              "asap.parameter_type",                           FT_UINT16,  BASE_HEX,  VALS(parameter_type_values),      0x0,                       NULL, HFILL } },
+    { &hf_parameter_length,       { "Parameter Length",            "asap.parameter_length",                         FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_parameter_value,        { "Parameter Value",             "asap.parameter_value",                          FT_BYTES,   BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_parameter_padding,      { "Padding",                     "asap.parameter_padding",                        FT_BYTES,   BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_parameter_ipv4_address, { "IP Version 4 Address",        "asap.ipv4_address",                             FT_IPv4,    BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_parameter_ipv6_address, { "IP Version 6 Address",        "asap.ipv6_address",                             FT_IPv6,    BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_dccp_port,              { "Port",                        "asap.dccp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_dccp_reserved,          { "Reserved",                    "asap.dccp_transport_reserved",                  FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_dccp_service_code,      { "Service Code",                "asap.dccp_transport_service_code",              FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_sctp_port,              { "Port",                        "asap.sctp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_transport_use,          { "Transport Use",               "asap.transport_use",                            FT_UINT16,  BASE_DEC,  VALS(transport_use_values),       0x0,                       NULL, HFILL } },
+    { &hf_tcp_port,               { "Port",                        "asap.tcp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_udp_port,               { "Port",                        "asap.udp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_udp_reserved,           { "Reserved",                    "asap.udp_transport_reserved",                   FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_udp_lite_port,          { "Port",                        "asap.udp_lite_transport_port",                  FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_udp_lite_reserved,      { "Reserved",                    "asap.udp_lite_transport_reserved",              FT_UINT16,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_type,            { "Policy Type",                 "asap.pool_member_selection_policy_type",        FT_UINT32,  BASE_HEX,  VALS(policy_type_values),         0x0,                       NULL, HFILL } },
+    { &hf_policy_weight,          { "Policy Weight",               "asap.pool_member_selection_policy_weight",      FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_priority,        { "Policy Priority",             "asap.pool_member_selection_policy_priority",    FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_load,            { "Policy Load",                 "asap.pool_member_selection_policy_load",        FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_degradation,     { "Policy Degradation",          "asap.pool_member_selection_policy_degradation", FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_loaddpf,         { "Policy Load DPF",             "asap.pool_member_selection_policy_load_dpf",    FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_weightdpf,       { "Policy Weight DPF",           "asap.pool_member_selection_policy_weight_dpf",  FT_DOUBLE,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_distance,        { "Policy Distance",             "asap.pool_member_selection_policy_distance",    FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_policy_value,           { "Policy Value",                "asap.pool_member_selection_policy_value",       FT_BYTES,   BASE_NONE, NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_pool_handle,            { "Pool Handle",                 "asap.pool_handle_pool_handle",                  FT_BYTES,   BASE_NONE,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_pe_pe_identifier,       { "PE Identifier",               "asap.pool_element_pe_identifier",               FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_home_enrp_id,           { "Home ENRP Server Identifier", "asap.pool_element_home_enrp_server_identifier", FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_reg_life,               { "Registration Life",           "asap.pool_element_registration_life",           FT_INT32,   BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_cookie,                 { "Cookie",                      "asap.cookie",                                   FT_BYTES,   BASE_NONE,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_pe_identifier,          { "PE Identifier",               "asap.pe_identifier",                            FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_pe_checksum,            { "PE Checksum",                 "asap.pe_checksum",                              FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_hropt_items,            { "Items",                       "asap.hropt_items",                              FT_UINT32,  BASE_DEC,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_server_identifier,      { "Server Identifier",           "asap.server_identifier",                        FT_UINT32,  BASE_HEX,  NULL,                             0x0,                       NULL, HFILL } },
+    { &hf_home_enrp_server_bit,   { "H Bit",                       "asap.h_bit",                                    FT_BOOLEAN, 8,         TFS(&home_enrp_server_bit_value), HOME_ENRP_SERVER_BIT_MASK, NULL, HFILL } },
+    { &hf_reject_bit,             { "R Bit",                       "asap.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reject_bit_value),           REJECT_BIT_MASK,           NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 9be0a2bfce..59cd7fa6a9 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -123,27 +123,27 @@ proto_register_ascend(void)
   static hf_register_info hf[] = {
     { &hf_link_type,
     { "Link type",	"ascend.type",	FT_UINT32, BASE_DEC,	VALS(encaps_vals),	0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_session_id,
     { "Session ID",	"ascend.sess",	FT_UINT32, BASE_DEC,	NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_called_number,
     { "Called number",	"ascend.number", FT_STRING, BASE_NONE,	NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_chunk,
     { "WDD Chunk",	"ascend.chunk",	FT_UINT32, BASE_HEX,	NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_task,
     { "Task",		"ascend.task",	FT_UINT32, BASE_HEX,	NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_user_name,
     { "User name",     	"ascend.user",	FT_STRING, BASE_NONE,	NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_raw,
diff --git a/epan/dissectors/packet-atalk.c b/epan/dissectors/packet-atalk.c
index f3b0f2eff8..e23b744251 100644
--- a/epan/dissectors/packet-atalk.c
+++ b/epan/dissectors/packet-atalk.c
@@ -1923,125 +1923,125 @@ proto_register_atalk(void)
   static hf_register_info hf_llap[] = {
     { &hf_llap_dst,
       { "Destination Node",	"llap.dst",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_llap_src,
       { "Source Node",		"llap.src",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_llap_type,
       { "Type",			"llap.type",	FT_UINT8,  BASE_HEX, VALS(llap_type_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
 
   static hf_register_info hf_ddp[] = {
     { &hf_ddp_hopcount,
       { "Hop count",		"ddp.hopcount",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_len,
       { "Datagram length",	"ddp.len",	FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_checksum,
       { "Checksum",		"ddp.checksum",	FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_dst,
       { "Destination address",	"ddp.dst",	FT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_dst_net,
       { "Destination Net",	"ddp.dst.net",	FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_src,
       { "Source address",	"ddp.src",	FT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_src_net,
       { "Source Net",		"ddp.src.net",	FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_dst_node,
       { "Destination Node",	"ddp.dst.node",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_src_node,
       { "Source Node",		"ddp.src.node",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_dst_socket,
       { "Destination Socket",	"ddp.dst_socket", FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_src_socket,
       { "Source Socket",       	"ddp.src_socket", FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ddp_type,
       { "Protocol type",       	"ddp.type",	FT_UINT8,  BASE_DEC, VALS(op_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
 
   static hf_register_info hf_nbp[] = {
     { &hf_nbp_op,
       { "Operation",		"nbp.op",	FT_UINT8,  BASE_DEC,
-		VALS(nbp_op_vals), 0xF0, "Operation", HFILL }},
+		VALS(nbp_op_vals), 0xF0, NULL, HFILL }},
     { &hf_nbp_info,
       { "Info",		"nbp.info",	FT_UINT8,  BASE_HEX,
-		NULL, 0x0, "Info", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_count,
       { "Count",		"nbp.count",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0F, "Count", HFILL }},
+		NULL, 0x0F, NULL, HFILL }},
     { &hf_nbp_node_net,
       { "Network",		"nbp.net",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Network", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_node,
       { "Node",		"nbp.node",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Node", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_port,
       { "Port",		"nbp.port",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Port", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_enum,
       { "Enumerator",		"nbp.enum",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Enumerator", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_object,
-      { "Object",		"nbp.object",	FT_STRING,  BASE_DEC,
-		NULL, 0x0, "Object", HFILL }},
+      { "Object",		"nbp.object",	FT_STRING,  BASE_NONE,
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_type,
-      { "Type",		"nbp.type",	FT_STRING,  BASE_DEC,
-		NULL, 0x0, "Type", HFILL }},
+      { "Type",		"nbp.type",	FT_STRING,  BASE_NONE,
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_node_zone,
-      { "Zone",		"nbp.zone",	FT_STRING,  BASE_DEC,
-		NULL, 0x0, "Zone", HFILL }},
+      { "Zone",		"nbp.zone",	FT_STRING,  BASE_NONE,
+		NULL, 0x0, NULL, HFILL }},
     { &hf_nbp_tid,
       { "Transaction ID",		"nbp.tid",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Transaction ID", HFILL }}
+		NULL, 0x0, NULL, HFILL }}
   };
 
   static hf_register_info hf_rtmp[] = {
     { &hf_rtmp_net,
       { "Net",		"rtmp.net",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Net", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_node,
       { "Node",		"nbp.nodeid",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Node", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_node_len,
       { "Node Length",		"nbp.nodeid.length",	FT_UINT8,  BASE_DEC,
-		NULL, 0x0, "Node Length", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_tuple_net,
       { "Net",		"rtmp.tuple.net",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Net", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_tuple_range_start,
       { "Range Start",		"rtmp.tuple.range_start",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Range Start", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_tuple_range_end,
       { "Range End",		"rtmp.tuple.range_end",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Range End", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_tuple_dist,
       { "Distance",		"rtmp.tuple.dist",	FT_UINT16,  BASE_DEC,
-		NULL, 0x0, "Distance", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
     { &hf_rtmp_function,
       { "Function",		"rtmp.function",	FT_UINT8,  BASE_DEC,
 		VALS(rtmp_function_vals), 0x0, "Request Function", HFILL }}
@@ -2071,7 +2071,7 @@ proto_register_atalk(void)
 
     { &hf_atp_treltimer,
       { "TRel timer",		"atp.treltimer",	FT_UINT8,  BASE_DEC,
-		VALS(atp_trel_timer_vals), 0x07, "TRel timer", HFILL }},
+		VALS(atp_trel_timer_vals), 0x07, NULL, HFILL }},
 
     { &hf_atp_bitmap,
       { "Bitmap",		"atp.bitmap",	FT_UINT8,  BASE_HEX,
@@ -2082,7 +2082,7 @@ proto_register_atalk(void)
 		NULL, 0x0, "Transaction id", HFILL }},
     { &hf_atp_user_bytes,
       { "User bytes",			"atp.user_bytes",	FT_UINT32,  BASE_HEX,
-		NULL, 0x0, "User bytes", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
     { &hf_atp_segment_overlap,
       { "Segment overlap",	"atp.segment.overlap", FT_BOOLEAN, BASE_NONE,
@@ -2108,11 +2108,11 @@ proto_register_atalk(void)
 
     { &hf_atp_segment,
       { "ATP Fragment",		"atp.fragment", FT_FRAMENUM, BASE_NONE,
-		NULL, 0x0, "ATP Fragment", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
     { &hf_atp_segments,
       { "ATP Fragments",	"atp.fragments", FT_NONE, BASE_NONE,
-		NULL, 0x0, "ATP Fragments", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
     { &hf_atp_reassembled_in,
       { "Reassembled ATP in frame", "atp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
@@ -2122,7 +2122,7 @@ proto_register_atalk(void)
   static hf_register_info hf_asp[] = {
     { &hf_asp_func,
       { "asp function",		"asp.function",	FT_UINT8,  BASE_DEC,
-		VALS(asp_func_vals), 0, "asp function", HFILL }},
+		VALS(asp_func_vals), 0, NULL, HFILL }},
 
     { &hf_asp_error,
       { "asp error",		"asp.error",	FT_INT32,  BASE_DEC,
@@ -2158,33 +2158,33 @@ proto_register_atalk(void)
 
     { &hf_asp_zero_value,
       { "Pad (0)",         "asp.zero_value",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Pad", HFILL }},
 
 	/* asp ,dsi, afp */
     { &hf_asp_server_name,
       { "Server name",         "asp.server_name",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"Server name", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_asp_server_type,
       { "Server type",         "asp.server_type",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"Server type", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_asp_server_vers,
       { "AFP version",         "asp.server_vers",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"AFP version", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_asp_server_uams,
       { "UAM",         "asp.server_uams",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"UAM", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_asp_server_icon,
       { "Icon bitmap",         "asp.server_icon",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Server icon bitmap", HFILL }},
 
     { &hf_asp_server_directory,
@@ -2194,8 +2194,8 @@ proto_register_atalk(void)
 
     { &hf_asp_server_signature,
       { "Server signature",         "asp.server_signature",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Server signature", HFILL }},
+	FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_asp_server_flag,
       { "Flag",         "asp.server_flag",
@@ -2212,15 +2212,15 @@ proto_register_atalk(void)
     { &hf_asp_server_flag_no_save_passwd,
       { "Don't allow save password",      "asp.server_flag.no_save_passwd",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_NOSAVEPASSWD,
-      	"Don't allow save password", HFILL }},
+      	NULL, HFILL }},
     { &hf_asp_server_flag_srv_msg,
       { "Support server message",      "asp.server_flag.srv_msg",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_SRVMSGS,
-      	"Support server message", HFILL }},
+      	NULL, HFILL }},
     { &hf_asp_server_flag_srv_sig,
       { "Support server signature",      "asp.server_flag.srv_sig",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_SRVSIGNATURE,
-      	"Support server signature", HFILL }},
+      	NULL, HFILL }},
     { &hf_asp_server_flag_tcpip,
       { "Support TCP/IP",      "asp.server_flag.tcpip",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_TCPIP,
@@ -2258,7 +2258,7 @@ proto_register_atalk(void)
 
     { &hf_asp_server_addr_value,
       { "Value",          "asp.server_addr.value",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Address value", HFILL }},
 
     { &hf_asp_server_utf8_name_len,
@@ -2269,7 +2269,7 @@ proto_register_atalk(void)
     { &hf_asp_server_utf8_name,
       { "Server name (UTF8)",         "asp.server_utf8_name",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Server name (UTF8)", HFILL }},
+      	NULL, HFILL }},
   };
 
   static hf_register_info hf_zip[] = {
@@ -2278,69 +2278,69 @@ proto_register_atalk(void)
       	"ZIP function", HFILL }},
 
     { &hf_zip_zero_value,
-      { "Pad (0)",      "zip.zero_value",FT_BYTES, BASE_HEX, NULL, 0x0,
+      { "Pad (0)",      "zip.zero_value",FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Pad", HFILL }},
 
     { &hf_zip_atp_function,
       { "Function",	"zip.atp_function", FT_UINT8,  BASE_DEC, VALS(zip_atp_function_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_start_index,
       { "Start index",	"zip.start_index", FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_count,
       { "Count",	"zip.count", FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_network_count,
       { "Count",	"zip.network_count", FT_UINT8, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_zip_network,
       { "Network","zip.network", FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_zip_network_start,
       { "Network start","zip.network_start", FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_zip_network_end,
       { "Network end",	"zip.network_end", FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_flags,
       { "Flags",	"zip.flags", FT_BOOLEAN, 8, NULL, 0xC0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_last_flag,
-      { "Last Flag",	"zip.last_flag", FT_BOOLEAN, 8, NULL, 0,
+      { "Last Flag",	"zip.last_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
       	"Non zero if contains last zone name in the zone list", HFILL }},
 
     { &hf_zip_flags_zone_invalid,
       { "Zone invalid",	"zip.flags.zone_invalid", FT_BOOLEAN, 8, NULL, 0x80,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_flags_use_broadcast,
       { "Use broadcast","zip.flags.use_broadcast", FT_BOOLEAN, 8, NULL, 0x40,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_flags_only_one_zone,
       { "Only one zone","zip.flags.only_one_zone", FT_BOOLEAN, 8, NULL, 0x20,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_zone_name,
       { "Zone",         "zip.zone_name", FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_default_zone,
       { "Default zone", "zip.default_zone",FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_zip_multicast_length,
       { "Multicast length",	"zip.multicast_length", FT_UINT8,  BASE_DEC, NULL, 0x0,
       	"Multicast address length", HFILL }},
 
     { &hf_zip_multicast_address,
-      { "Multicast address", "zip.multicast_address",FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Multicast address", HFILL }},
+      { "Multicast address", "zip.multicast_address",FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
   };
 
@@ -2363,23 +2363,23 @@ proto_register_atalk(void)
 
     { &hf_pap_waittime,
       { "Wait time",	"pap.quantum",	FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"Wait time", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_pap_result,
       { "Result",	"pap.quantum",	FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"Result", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_pap_seq,
       { "Sequence",	"pap.seq",	FT_UINT16,  BASE_DEC, NULL, 0x0,
       	"Sequence number", HFILL }},
 
     { &hf_pap_status,
-      { "Status",	"pap.status",	FT_STRING,  BASE_DEC, NULL, 0x0,
+      { "Status",	"pap.status",	FT_STRING,  BASE_NONE, NULL, 0x0,
 		"Printer status", HFILL }},
 
     { &hf_pap_eof,
       { "EOF",	"pap.eof", FT_BOOLEAN, BASE_NONE,
-		NULL, 0x0, "EOF", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
     { &hf_pap_pad,
       { "Pad",    	"pad.pad", 		FT_NONE,   BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index a560446533..e4585a1479 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -1925,19 +1925,19 @@ proto_register_atm(void)
 	static hf_register_info hf[] = {
 		{ &hf_atm_aal,
 		{ "AAL",		"atm.aal", FT_UINT8, BASE_DEC, VALS(aal_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_atm_vpi,
 		{ "VPI",		"atm.vpi", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_atm_vci,
 		{ "VCI",		"atm.vci", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_atm_cid,
 		{ "CID",		"atm.cid", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-auto_rp.c b/epan/dissectors/packet-auto_rp.c
index 19f9e8952b..427569c0fb 100644
--- a/epan/dissectors/packet-auto_rp.c
+++ b/epan/dissectors/packet-auto_rp.c
@@ -197,7 +197,7 @@ void proto_register_auto_rp(void)
 
                 { &hf_auto_rp_rp_addr,
                   {"RP address", "auto_rp.rp_addr",
-                   FT_IPv4, 0, NULL, 0,
+                   FT_IPv4, BASE_NONE, NULL, 0,
                    "The unicast IP address of the RP", HFILL }},
 
                 { &hf_auto_rp_prefix_sgn,
@@ -212,7 +212,7 @@ void proto_register_auto_rp(void)
 
                 { &hf_auto_rp_group_prefix,
                   {"Prefix", "auto_rp.group_prefix",
-                   FT_IPv4, 0, NULL, 0,
+                   FT_IPv4, BASE_NONE, NULL, 0,
                    "Group prefix", HFILL }}
         };
 
diff --git a/epan/dissectors/packet-ax4000.c b/epan/dissectors/packet-ax4000.c
index e76d406d5b..08430c419b 100644
--- a/epan/dissectors/packet-ax4000.c
+++ b/epan/dissectors/packet-ax4000.c
@@ -117,37 +117,37 @@ proto_register_ax4000(void)
 		{ &hf_ax4000_port,
 			{ "Port Number", "ax4000.port",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_chassis,
 			{ "Chassis Number", "ax4000.chassis",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_fill,
 			{ "Fill Type", "ax4000.fill",
 			FT_UINT8, BASE_DEC, NULL, 0xc0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_index,
 			{ "Index", "ax4000.index",
 			FT_UINT16, BASE_DEC, NULL, 0x0FFF,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_timestamp,
 			{ "Timestamp", "ax4000.timestamp",
 			FT_UINT32, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_seq,
 			{ "Sequence Number", "ax4000.seq",
 			FT_UINT32, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ax4000_crc,
 			{ "CRC (unchecked)", "ax4000.crc",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		}
 	};
 
diff --git a/epan/dissectors/packet-ayiya.c b/epan/dissectors/packet-ayiya.c
index 964c57b21a..8a264234c7 100644
--- a/epan/dissectors/packet-ayiya.c
+++ b/epan/dissectors/packet-ayiya.c
@@ -147,52 +147,52 @@ proto_register_ayiya(void)
   static hf_register_info hf[] = {
   	{ &hf_id_len,
 		{ "Identity field length", "ayiya.idlen", FT_UINT8, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_HEX, NULL, 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_id_type,
 		{ "Identity field type", "ayiya.idtype", FT_UINT8, 
-			BASE_HEX, VALS(identity_types), 0x0, "", HFILL
+			BASE_HEX, VALS(identity_types), 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_sig_len,
 		{ "Signature Length", "ayiya.siglen", FT_UINT8, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_HEX, NULL, 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_hash_method,
 		{ "Hash method", "ayiya.hashmethod", FT_UINT8, 
-			BASE_HEX, VALS(hash_methods), 0x0, "", HFILL
+			BASE_HEX, VALS(hash_methods), 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_auth_method,
 		{ "Authentication method", "ayiya.authmethod", FT_UINT8, 
-			BASE_HEX, VALS(auth_methods), 0x0, "", HFILL
+			BASE_HEX, VALS(auth_methods), 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_opcode,
 		{ "Operation Code", "ayiya.opcode", FT_UINT8, 
-			BASE_HEX, VALS(opcodes), 0x0, "", HFILL
+			BASE_HEX, VALS(opcodes), 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_next_header,
 		{ "Next Header", "ayiya.nextheader", FT_UINT8, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_HEX, NULL, 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_epoch,
 		{ "Epoch", "ayiya.epoch", FT_ABSOLUTE_TIME, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_NONE, NULL, 0x0, NULL, HFILL
 		}
 	},
   	{ &hf_identity,
 		{ "Identity", "ayiya.identity", FT_BYTES, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_NONE, NULL, 0x0, NULL, HFILL
 		}
 	},
 	{ &hf_signature,
 		{ "Signature", "ayiya.signature", FT_BYTES, 
-			BASE_HEX, NULL, 0x0, "", HFILL
+			BASE_NONE, NULL, 0x0, NULL, HFILL
 		}
 	},
   };
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 78c9eb9994..ad12b05932 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -6313,15 +6313,15 @@ proto_register_bacapp(void)
 	static hf_register_info hf[] = {
 		{ &hf_bacapp_type,
 			{ "APDU Type",           "bacapp.type",
-			FT_UINT8, BASE_DEC, VALS(BACnetTypeName), 0xf0, "APDU Type", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetTypeName), 0xf0, NULL, HFILL }
 		},
 		{ &hf_bacapp_pduflags,
 			{ "PDU Flags",			"bacapp.pduflags",
-			FT_UINT8, BASE_HEX, NULL, 0x0f,	"PDU Flags", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0x0f,	NULL, HFILL }
 		},
 		{ &hf_bacapp_SEG,
 			{ "Segmented Request",           "bacapp.segmented_request",
-			FT_BOOLEAN, 8, TFS(&segments_follow), 0x08, "Segmented Request", HFILL }
+			FT_BOOLEAN, 8, TFS(&segments_follow), 0x08, NULL, HFILL }
 		},
 		{ &hf_bacapp_MOR,
 			{ "More Segments",           "bacapp.more_segments",
@@ -6333,47 +6333,47 @@ proto_register_bacapp(void)
 		},
 		{ &hf_bacapp_max_adpu_size,
 			{ "Size of Maximum ADPU accepted",           "bacapp.max_adpu_size",
-			FT_UINT8, BASE_DEC, VALS(BACnetMaxAPDULengthAccepted), 0x0f, "Size of Maximum ADPU accepted", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetMaxAPDULengthAccepted), 0x0f, NULL, HFILL }
 		},
 		{ &hf_bacapp_response_segments,
 			{ "Max Response Segments accepted",           "bacapp.response_segments",
-			FT_UINT8, BASE_DEC, VALS(BACnetMaxSegmentsAccepted), 0x70, "Max Response Segments accepted", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetMaxSegmentsAccepted), 0x70, NULL, HFILL }
 		},
 		{ &hf_bacapp_objectType,
 			{ "Object Type",           "bacapp.objectType",
-			FT_UINT32, BASE_DEC, VALS(BACnetObjectType), 0xffc00000, "Object Type", HFILL }
+			FT_UINT32, BASE_DEC, VALS(BACnetObjectType), 0xffc00000, NULL, HFILL }
 		},
 		{ &hf_bacapp_instanceNumber,
 			{ "Instance Number",           "bacapp.instance_number",
-			FT_UINT32, BASE_DEC, NULL, 0x003fffff, "Instance Number", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x003fffff, NULL, HFILL }
 		},
 		{ &hf_BACnetPropertyIdentifier,
 			{ "Property Identifier", "bacapp.property_identifier",
-			FT_UINT32, BASE_DEC, VALS(BACnetPropertyIdentifier), 0, "Property Identifier", HFILL }
+			FT_UINT32, BASE_DEC, VALS(BACnetPropertyIdentifier), 0, NULL, HFILL }
 		},
 		{ &hf_BACnetVendorIdentifier,
 			{ "Vendor Identifier", "bacapp.vendor_identifier",
-			FT_UINT16, BASE_DEC, VALS(BACnetVendorIdentifiers), 0, "Vendor Identifier", HFILL }
+			FT_UINT16, BASE_DEC, VALS(BACnetVendorIdentifiers), 0, NULL, HFILL }
 		},
 		{ &hf_bacapp_invoke_id,
 			{ "Invoke ID",           "bacapp.invoke_id",
-			FT_UINT8, BASE_DEC, NULL, 0, "Invoke ID", HFILL }
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_bacapp_sequence_number,
 			{ "Sequence Number",           "bacapp.sequence_number",
-			FT_UINT8, BASE_DEC, NULL, 0, "Sequence Number", HFILL }
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_bacapp_window_size,
 			{ "Proposed Window Size",           "bacapp.window_size",
-			FT_UINT8, BASE_DEC, NULL, 0, "Proposed Window Size", HFILL }
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_bacapp_service,
 			{ "Service Choice",           "bacapp.confirmed_service",
-			FT_UINT8, BASE_DEC, VALS(BACnetConfirmedServiceChoice), 0x00, "Service Choice", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetConfirmedServiceChoice), 0x00, NULL, HFILL }
 		},
 		{ &hf_bacapp_uservice,
 			{ "Unconfirmed Service Choice",           "bacapp.unconfirmed_service",
-			FT_UINT8, BASE_DEC, VALS(BACnetUnconfirmedServiceChoice), 0x00, "Unconfirmed Service Choice", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetUnconfirmedServiceChoice), 0x00, NULL, HFILL }
 		},
 		{ &hf_bacapp_NAK,
 			{ "NAK",           "bacapp.NAK",
@@ -6385,79 +6385,79 @@ proto_register_bacapp(void)
 		},
 		{ &hf_BACnetRejectReason,
 			{ "Reject Reason",           "bacapp.reject_reason",
-			FT_UINT8, BASE_DEC, VALS(BACnetRejectReason), 0x00, "Reject Reason", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetRejectReason), 0x00, NULL, HFILL }
 		},
 		{ &hf_BACnetAbortReason,
 			{ "Abort Reason",           "bacapp.abort_reason",
-			FT_UINT8, BASE_DEC, VALS(BACnetAbortReason), 0x00, "Abort Reason", HFILL }
+			FT_UINT8, BASE_DEC, VALS(BACnetAbortReason), 0x00, NULL, HFILL }
 		},
 		{ &hf_bacapp_vpart,
 			{ "BACnet APDU variable part:",           "bacapp.variable_part",
-			FT_NONE, 0, NULL, 0, "BACnet APDU variable part", HFILL }
+			FT_NONE, BASE_NONE, NULL, 0, "BACnet APDU variable part", HFILL }
 		},
 		{ &hf_bacapp_tag,
 			{ "BACnet Tag",
 			"bacapp.tag",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"BACnet Tag", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 		},
 		{ &hf_BACnetApplicationTagNumber,
 			{ "Application Tag Number",
 			"bacapp.application_tag_number",
 			FT_UINT8, BASE_DEC, VALS(&BACnetApplicationTagNumber), 0xF0,
-			"Application Tag Number", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_BACnetContextTagNumber,
 			{ "Context Tag Number",
 			"bacapp.context_tag_number",
 			FT_UINT8, BASE_DEC, NULL, 0xF0,
-			"Context Tag Number", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_BACnetExtendedTagNumber,
 			{ "Extended Tag Number",
 			"bacapp.extended_tag_number",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Extended Tag Number", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_BACnetNamedTag,
 			{ "Named Tag",
 			"bacapp.named_tag",
 			FT_UINT8, BASE_DEC, VALS(&BACnetTagNames), 0x07,
-			"Named Tag", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_BACnetCharacterSet,
 			{ "String Character Set",
 			"bacapp.string_character_set",
 			FT_UINT8, BASE_DEC, VALS(&BACnetCharacterSet),0,
-			"String Character Set", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_BACnetTagClass,
 			{ "Tag Class",           "bacapp.tag_class",
-			FT_BOOLEAN, 8, TFS(&BACnetTagClass), 0x08, "Tag Class", HFILL }
+			FT_BOOLEAN, 8, TFS(&BACnetTagClass), 0x08, NULL, HFILL }
 		},
 		{ &hf_bacapp_tag_lvt,
 			{ "Length Value Type",
 			"bacapp.LVT",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Length Value Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacapp_tag_value8,
 			{ "Tag Value",
 			"bacapp.tag_value8",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Tag Value", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacapp_tag_value16,
 			{ "Tag Value 16-bit",
 			"bacapp.tag_value16",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"Tag Value 16-bit", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacapp_tag_value32,
 			{ "Tag Value 32-bit",
 			"bacapp.tag_value32",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Tag Value 32-bit", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacapp_tag_ProcessId,
 			{ "ProcessIdentifier",           "bacapp.processId",
diff --git a/epan/dissectors/packet-bacnet.c b/epan/dissectors/packet-bacnet.c
index 6a9b021c54..e77339a47a 100644
--- a/epan/dissectors/packet-bacnet.c
+++ b/epan/dissectors/packet-bacnet.c
@@ -526,17 +526,17 @@ proto_register_bacnet(void)
 		{ &hf_bacnet_dnet,
 			{ "Destination Network Address", "bacnet.dnet",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"Destination Network Address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_dlen,
 			{ "Destination MAC Layer Address Length", "bacnet.dlen",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Destination MAC Layer Address Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_dadr_eth,
 			{ "Destination ISO 8802-3 MAC Address", "bacnet.dadr_eth",
 			FT_ETHER, BASE_HEX, NULL, 0,
-			"Destination ISO 8802-3 MAC Address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_dadr_mstp,
 			{ "DADR", "bacnet.dadr_mstp",
@@ -545,18 +545,18 @@ proto_register_bacnet(void)
 		},
 		{ &hf_bacnet_dadr_tmp,
 			{ "Unknown Destination MAC", "bacnet.dadr_tmp",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Unknown Destination MAC", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_snet,
 			{ "Source Network Address", "bacnet.snet",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"Source Network Address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_slen,
 			{ "Source MAC Layer Address Length", "bacnet.slen",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Source MAC Layer Address Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_sadr_eth,
 			{ "SADR", "bacnet.sadr_eth",
@@ -570,48 +570,48 @@ proto_register_bacnet(void)
 		},
 		{ &hf_bacnet_sadr_tmp,
 			{ "Unknown Source MAC", "bacnet.sadr_tmp",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Unknown Source MAC", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_hopc,
 			{ "Hop Count", "bacnet.hopc",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Hop Count", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_mesgtyp,
 			{ "Network Layer Message Type", "bacnet.mesgtyp",
 			FT_UINT8, BASE_HEX, NULL, 0,
-			"Network Layer Message Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_vendor,
 			{ "Vendor ID", "bacnet.vendor",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"Vendor ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_perf,
 			{ "Performance Index", "bacnet.perf",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Performance Index", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_rejectreason,
 			{ "Reject Reason", "bacnet.rejectreason",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Reject Reason", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_rportnum,
 			{ "Number of Port Mappings", "bacnet.rportnum",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Number of Port Mappings", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_pinfolen,
 			{ "Port Info Length", "bacnet.pinfolen",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Port Info Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_portid,
 			{ "Port ID", "bacnet.portid",
 			FT_UINT8, BASE_HEX, NULL, 0,
-			"Port ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bacnet_term_time_value,
 			{ "Termination Time Value (seconds)", "bacnet.term_time_value",
diff --git a/epan/dissectors/packet-banana.c b/epan/dissectors/packet-banana.c
index edc5fc8d3e..2fdd2ab6dc 100755
--- a/epan/dissectors/packet-banana.c
+++ b/epan/dissectors/packet-banana.c
@@ -310,12 +310,12 @@ proto_register_banana(void)
 		},
 		{ &hf_banana_lg_int,
 			{ "Float", "banana.lg_int",
-				FT_BYTES, BASE_DEC, NULL, 0,
+				FT_BYTES, BASE_NONE, NULL, 0,
 				"Banana large integer", HFILL }
 		},
 		{ &hf_banana_lg_neg_int,
 			{ "Float", "banana.lg_neg_int",
-				FT_BYTES, BASE_DEC, NULL, 0,
+				FT_BYTES, BASE_NONE, NULL, 0,
 				"Banana large negative integer", HFILL }
 		},
 		{ &hf_banana_pb,
diff --git a/epan/dissectors/packet-bat.c b/epan/dissectors/packet-bat.c
index a87286a1c6..5cc26af498 100644
--- a/epan/dissectors/packet-bat.c
+++ b/epan/dissectors/packet-bat.c
@@ -696,132 +696,132 @@ void proto_register_bat(void)
 		{ &hf_bat_batman_version,
 		  { "Version", "bat.batman.version",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_flags,
 		  { "Flags", "bat.batman.flags",
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_ttl,
 		  { "Time to Live", "bat.batman.ttl",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_gwflags,
 		  { "Gateway Flags", "bat.batman.gwflags",
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_seqno,
 		  { "Sequence number", "bat.batman.seq",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_gwport,
 		  { "Gateway Port", "bat.batman.gwport",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_orig,
 		  { "Originator", "bat.batman.orig",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_old_orig,
 		  { "Received from", "bat.batman.old_orig",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_tq,
 		  { "Transmission Quality", "bat.batman.tq",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_hna_len,
 		  { "Number of HNAs", "bat.batman.hna_len",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_flags_unidirectional,
 		  { "Unidirectional", "bat.batman.flags.unidirectional",
 		    FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x80,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_flags_directlink,
 		  { "DirectLink", "bat.batman.flags.directlink",
 		    FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x40,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_hna_network,
 		  { "HNA Network", "bat.batman.hna_network",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_batman_hna_netmask,
 		  { "HNA Netmask", "bat.batman.hna_netmask",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_gw_type,
 		  { "Type", "bat.gw.type",
 		    FT_UINT8, BASE_DEC, VALS(gw_packettypenames), 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_gw_ip,
 		  { "IP", "bat.gw.ip",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_vis_vis_orig,
 		  { "Originator", "bat.vis.sender_ip",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_vis_version,
 		  { "Version", "bat.vis.version",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_vis_gwflags,
 		  { "Gateway Flags", "bat.vis.gwflags",
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_max_tq_v22,
 		  { "Maximum Transmission Quality", "bat.vis.tq_max",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_max_tq_v23,
 		  { "Maximum Transmission Quality", "bat.vis.tq_max",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_vis_data_type,
 		  { "Type", "bat.vis.data_type",
 		    FT_UINT8, BASE_DEC, VALS(vis_packettypenames), 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_bat_vis_tq_v22,
 		  { "Transmission Quality", "bat.vis.tq",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_bat_vis_tq_v23,
 		  { "Transmission Quality", "bat.vis.tq",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_bat_vis_netmask,
 		  { "Netmask", "bat.vis.netmask",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_bat_vis_data_ip,
 		  { "IP", "bat.vis.data_ip",
 		    FT_IPv4, BASE_NONE, NULL, 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		}
 	};
 
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 0abc2cee07..eaec0d8e04 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -998,61 +998,61 @@ proto_register_beep(void)
 {
   static hf_register_info hf[] = {
     { &hf_beep_proto_viol,
-      { "Protocol Violation", "beep.violation", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Protocol Violation", "beep.violation", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_req,
-      { "Request", "beep.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Request", "beep.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_req_chan,
-      { "Request Channel Number", "beep.req.channel", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Request Channel Number", "beep.req.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_rsp,
-      { "Response", "beep.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Response", "beep.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_rsp_chan,
-      { "Response Channel Number", "beep.rsp.channel", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Response Channel Number", "beep.rsp.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_seq,
-      { "Sequence", "beep.seq", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Sequence", "beep.seq", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_seq_chan,
-      { "Sequence Channel Number", "beep.seq.channel", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Sequence Channel Number", "beep.seq.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_end,
-      { "End", "beep.end", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "End", "beep.end", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_complete,
-      { "Complete", "beep.more.complete", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Complete", "beep.more.complete", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_intermediate,
-      { "Intermediate", "beep.more.intermediate", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Intermediate", "beep.more.intermediate", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_msgno,
-      { "Msgno", "beep.msgno", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Msgno", "beep.msgno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_ansno,
-      { "Ansno", "beep.ansno", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Ansno", "beep.ansno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_seqno,
-      { "Seqno", "beep.seqno", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Seqno", "beep.seqno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_size,
-      { "Size", "beep.size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Size", "beep.size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_channel,
-      { "Channel", "beep.channel", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Channel", "beep.channel", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_negative,
-      { "Negative", "beep.status.negative", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Negative", "beep.status.negative", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_positive,
-      { "Positive", "beep.status.positive", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Positive", "beep.status.positive", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_ackno,
-      { "Ackno", "beep.seq.ackno", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Ackno", "beep.seq.ackno", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_beep_window,
-      { "Window", "beep.seq.window", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Window", "beep.seq.window", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index dd2c119985..2dee4c9fca 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4265,16 +4265,16 @@ proto_register_ber(void)
 	    "Length", "ber.length", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Length of contents", HFILL }},
 	{ &hf_ber_unknown_OCTETSTRING, {
-	    "OCTETSTRING", "ber.unknown.OCTETSTRING", FT_BYTES, BASE_HEX,
+	    "OCTETSTRING", "ber.unknown.OCTETSTRING", FT_BYTES, BASE_NONE,
 	    NULL, 0, "This is an unknown OCTETSTRING", HFILL }},
 	{ &hf_ber_unknown_BER_OCTETSTRING, {
-	    "OCTETSTRING [BER encoded]", "ber.unknown.OCTETSTRING", FT_NONE, BASE_HEX,
+	    "OCTETSTRING [BER encoded]", "ber.unknown.OCTETSTRING", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is an BER encoded OCTETSTRING", HFILL }},
 	{ &hf_ber_unknown_OID, {
 	    "OID", "ber.unknown.OID", FT_OID, BASE_NONE,
 	    NULL, 0, "This is an unknown Object Identifier", HFILL }},
 	{ &hf_ber_unknown_GraphicString, {
-	    "GRAPHICSTRING", "ber.unknown.GRAPHICSTRING", FT_STRING, BASE_HEX,
+	    "GRAPHICSTRING", "ber.unknown.GRAPHICSTRING", FT_STRING, BASE_NONE,
 	    NULL, 0, "This is an unknown GRAPHICSTRING", HFILL }},
 	{ &hf_ber_unknown_NumericString, {
 	    "NumericString", "ber.unknown.NumericString", FT_STRING, BASE_NONE,
@@ -4313,7 +4313,7 @@ proto_register_ber(void)
 	    "INTEGER", "ber.unknown.INTEGER", FT_UINT32, BASE_DEC,
 	    NULL, 0, "This is an unknown INTEGER", HFILL }},
 	{ &hf_ber_unknown_BITSTRING, {
-	    "BITSTRING", "ber.unknown.BITSTRING", FT_BYTES, BASE_DEC,
+	    "BITSTRING", "ber.unknown.BITSTRING", FT_BYTES, BASE_NONE,
 	    NULL, 0, "This is an unknown BITSTRING", HFILL }},
 	{ &hf_ber_unknown_BOOLEAN, {
 	    "BOOLEAN", "ber.unknown.BOOLEAN", FT_UINT8, BASE_HEX,
@@ -4322,7 +4322,7 @@ proto_register_ber(void)
 	    "ENUMERATED", "ber.unknown.ENUMERATED", FT_UINT32, BASE_DEC,
 	    NULL, 0, "This is an unknown ENUMERATED", HFILL }},
 	{ &hf_ber_constructed_OCTETSTRING, {
-	    "OCTETSTRING", "ber.constructed.OCTETSTRING", FT_BYTES, BASE_HEX,
+	    "OCTETSTRING", "ber.constructed.OCTETSTRING", FT_BYTES, BASE_NONE,
 	    NULL, 0, "This is a component of an constructed OCTETSTRING", HFILL }},
 	{ &hf_ber_no_oid, {
 	    "No OID", "ber.no_oid", FT_NONE, BASE_NONE,
@@ -4348,11 +4348,11 @@ proto_register_ber(void)
         "ber.T_encoding", HFILL }},
     { &hf_ber_octet_aligned,
       { "octet-aligned", "ber.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ber.T_octet_aligned", HFILL }},
     { &hf_ber_arbitrary,
       { "arbitrary", "ber.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ber.T_arbitrary", HFILL }},
     { &hf_ber_single_ASN1_type,
       { "single-ASN1-type", "ber.single_ASN1_type",
diff --git a/epan/dissectors/packet-bfd.c b/epan/dissectors/packet-bfd.c
index 3eea5393fd..2b82c4237e 100644
--- a/epan/dissectors/packet-bfd.c
+++ b/epan/dissectors/packet-bfd.c
@@ -558,27 +558,27 @@ void proto_register_bfd(void)
         { &hf_bfd_flags,
           { "Message Flags", "bfd.flags",
             FT_UINT8, BASE_HEX, NULL, 0xf0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_flags_h,
           { "I hear you", "bfd.flags.h",
             FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x80,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_flags_d_v0,
           { "Demand", "bfd.flags.d",
             FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x40,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_flags_p_v0,
           { "Poll", "bfd.flags.p",
             FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x20,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_flags_f_v0,
           { "Final", "bfd.flags.f",
             FT_BOOLEAN, 8, TFS(&flags_set_truth), 0x10,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_flags_p,
           { "Poll", "bfd.flags.p",
@@ -625,12 +625,12 @@ void proto_register_bfd(void)
         { &hf_bfd_my_discriminator,
           { "My Discriminator", "bfd.my_discriminator",
             FT_UINT32, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_your_discriminator,
           { "Your Discriminator", "bfd.your_discriminator",
             FT_UINT32, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_bfd_desired_min_tx_interval,
           { "Desired Min TX Interval", "bfd.desired_min_tx_interval",
diff --git a/epan/dissectors/packet-bgp.c b/epan/dissectors/packet-bgp.c
index ee2b1d180a..6fae1136a3 100644
--- a/epan/dissectors/packet-bgp.c
+++ b/epan/dissectors/packet-bgp.c
@@ -3060,16 +3060,16 @@ proto_register_bgp(void)
           NULL, 0x80, "SSA Transitive bit", HFILL}},
       { &hf_bgp_ssa_type,
         { "SSA Type", "bgp.ssa_type", FT_UINT16, BASE_DEC,
-          VALS(bgp_ssa_type), 0x7FFF, "SSA Type", HFILL}},
+          VALS(bgp_ssa_type), 0x7FFF, NULL, HFILL}},
       { &hf_bgp_ssa_len,
         { "Length", "bgp.ssa_len", FT_UINT16, BASE_DEC,
           NULL, 0x0, "SSA Length", HFILL}},
       { &hf_bgp_ssa_value,
-        { "Value", "bgp.ssa_value", FT_BYTES, BASE_HEX,
+        { "Value", "bgp.ssa_value", FT_BYTES, BASE_NONE,
           NULL, 0x0, "SSA Value", HFILL}},
       { &hf_bgp_ssa_l2tpv3_pref,
         { "Preference", "bgp.ssa_l2tpv3_pref", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "Preference", HFILL}},
+          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ssa_l2tpv3_s,
         { "Sequencing bit", "bgp.ssa_l2tpv3_s", FT_BOOLEAN, 8,
           NULL, 0x80, "Sequencing S-bit", HFILL}},
@@ -3078,18 +3078,18 @@ proto_register_bgp(void)
           NULL, 0x7F, "Unused Flags", HFILL}},
       { &hf_bgp_ssa_l2tpv3_cookie_len,
         { "Cookie Length", "bgp.ssa_l2tpv3_cookie_len", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "Cookie Length", HFILL}},
+          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ssa_l2tpv3_session_id,
         { "Session ID", "bgp.ssa_l2tpv3_session_id", FT_UINT32, BASE_DEC,
-          NULL, 0x0, "Session ID", HFILL}},
+          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_ssa_l2tpv3_cookie,
-        { "Cookie", "bgp.ssa_l2tpv3_cookie", FT_BYTES, BASE_HEX,
-          NULL, 0x0, "Cookie", HFILL}},
+        { "Cookie", "bgp.ssa_l2tpv3_cookie", FT_BYTES, BASE_NONE,
+          NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_withdrawn_prefix,
         { "Withdrawn prefix", "bgp.withdrawn_prefix", FT_IPv4, BASE_NONE,
           NULL, 0x0, NULL, HFILL}},
       { &hf_bgp_cluster_list,
-        { "Cluster List", "bgp.cluster_list", FT_BYTES, BASE_HEX,
+        { "Cluster List", "bgp.cluster_list", FT_BYTES, BASE_NONE,
           NULL, 0x0, NULL, HFILL}}
     };
 
diff --git a/epan/dissectors/packet-bittorrent.c b/epan/dissectors/packet-bittorrent.c
index 59bf37cfa7..0e17a910fe 100644
--- a/epan/dissectors/packet-bittorrent.c
+++ b/epan/dissectors/packet-bittorrent.c
@@ -777,88 +777,88 @@ proto_register_bittorrent(void)
 {
    static hf_register_info hf[] = {
       { &hf_bittorrent_field_length,
-      { "Field Length", "bittorrent.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Field Length", "bittorrent.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_prot_name_len,
-      { "Protocol Name Length", "bittorrent.protocol.name.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Protocol Name Length", "bittorrent.protocol.name.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_prot_name,
-      { "Protocol Name", "bittorrent.protocol.name", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Protocol Name", "bittorrent.protocol.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_reserved,
-      { "Reserved Extension Bytes", "bittorrent.reserved", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Reserved Extension Bytes", "bittorrent.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_sha1_hash,
-      { "SHA1 Hash of info dictionary", "bittorrent.info_hash", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "SHA1 Hash of info dictionary", "bittorrent.info_hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_peer_id,
-      { "Peer ID", "bittorrent.peer_id", FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Peer ID", "bittorrent.peer_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_msg,
-      { "Message", "bittorrent.msg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Message", "bittorrent.msg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_msg_len,
-      { "Message Length", "bittorrent.msg.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Message Length", "bittorrent.msg.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_msg_type,
-      { "Message Type", "bittorrent.msg.type", FT_UINT8, BASE_DEC, VALS(bittorrent_messages), 0x0, "", HFILL }
+      { "Message Type", "bittorrent.msg.type", FT_UINT8, BASE_DEC, VALS(bittorrent_messages), 0x0, NULL, HFILL }
       },
       { &hf_azureus_msg,
-      { "Azureus Message", "bittorrent.azureus_msg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }
+      { "Azureus Message", "bittorrent.azureus_msg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_msg_type_len,
-      { "Message Type Length", "bittorrent.msg.typelen", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Message Type Length", "bittorrent.msg.typelen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_msg_type,
-      { "Message Type", "bittorrent.msg.aztype", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+      { "Message Type", "bittorrent.msg.aztype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_msg_prio,
-      { "Message Priority", "bittorrent.msg.prio", FT_UINT8, BASE_DEC, VALS(azureus_priorities), 0x0, "", HFILL }
+      { "Message Priority", "bittorrent.msg.prio", FT_UINT8, BASE_DEC, VALS(azureus_priorities), 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bitfield_data,
-     { "Bitfield data", "bittorrent.msg.bitfield", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+     { "Bitfield data", "bittorrent.msg.bitfield", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_piece_index,
-      { "Piece index", "bittorrent.piece.index", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Piece index", "bittorrent.piece.index", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_piece_begin,
-      { "Begin offset of piece", "bittorrent.piece.begin", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Begin offset of piece", "bittorrent.piece.begin", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_piece_data,
-      { "Data in a piece", "bittorrent.piece.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+      { "Data in a piece", "bittorrent.piece.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_piece_length,
-         { "Piece Length", "bittorrent.piece.length", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+         { "Piece Length", "bittorrent.piece.length", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bstr_length,
-	{ "String Length", "bittorrent.bstr.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "String Length", "bittorrent.bstr.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bstr,
-	{ "String", "bittorrent.bstr", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "String", "bittorrent.bstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bint,
-	{ "Integer", "bittorrent.bint", FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "Integer", "bittorrent.bint", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bdict,
-	{ "Dictionary", "bittorrent.bdict", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }
+	{ "Dictionary", "bittorrent.bdict", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_bdict_entry,
-	{ "Entry", "bittorrent.bdict.entry", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }
+	{ "Entry", "bittorrent.bdict.entry", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_bittorrent_blist,
-	{ "List", "bittorrent.blist", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }
+	{ "List", "bittorrent.blist", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_jpc_addrlen,
-	{ "Cache Address Length", "bittorrent.jpc.addr.length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "Cache Address Length", "bittorrent.jpc.addr.length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_jpc_addr,
-	{ "Cache Address", "bittorrent.jpc.addr", FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "Cache Address", "bittorrent.jpc.addr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_jpc_port,
-	{ "Port", "bittorrent.jpc.port", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+	{ "Port", "bittorrent.jpc.port", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
       },
       { &hf_azureus_jpc_session,
-	{ "Session ID", "bittorrent.jpc.session", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+	{ "Session ID", "bittorrent.jpc.session", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
       }
   };
 
diff --git a/epan/dissectors/packet-bjnp.c b/epan/dissectors/packet-bjnp.c
index 8dabc5d859..048eb1117e 100644
--- a/epan/dissectors/packet-bjnp.c
+++ b/epan/dissectors/packet-bjnp.c
@@ -145,7 +145,7 @@ void proto_register_bjnp (void)
 {
   static hf_register_info hf[] = {
     { &hf_bjnp_id,
-      { "Id", "bjnp.id", FT_STRING, BASE_DEC,
+      { "Id", "bjnp.id", FT_STRING, BASE_NONE,
         NULL, 0x0, NULL, HFILL } },
     { &hf_dev_type,
       { "Type", "bjnp.type", FT_UINT8, BASE_DEC,
@@ -163,7 +163,7 @@ void proto_register_bjnp (void)
       { "Payload Length", "bjnp.payload_len", FT_UINT32, BASE_DEC,
         NULL, 0x0, NULL, HFILL } },
     { &hf_payload,
-      { "Payload", "bjnp.payload", FT_BYTES, BASE_DEC,
+      { "Payload", "bjnp.payload", FT_BYTES, BASE_NONE,
         NULL, 0x0, NULL, HFILL } },
   };
 
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index e2d670d8cc..01c405c735 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -4062,108 +4062,108 @@ proto_register_bootp(void)
   static hf_register_info hf[] = {
     { &hf_bootp_dhcp,
       { "Frame is DHCP",                "bootp.dhcp",    FT_BOOLEAN,
-        0,				NULL,		 0x0,
-        "", HFILL }},
+        BASE_NONE,				NULL,		 0x0,
+        NULL, HFILL }},
 
     { &hf_bootp_type,
       { "Message type",			"bootp.type",	 FT_UINT8,
          BASE_DEC, 			VALS(op_vals),   0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hw_type,
       { "Hardware type",	       	"bootp.hw.type", FT_UINT8,
         BASE_HEX,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hw_len,
       { "Hardware address length",	"bootp.hw.len",  FT_UINT8,
         BASE_DEC,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hops,
       { "Hops",			       	"bootp.hops",	 FT_UINT8,
         BASE_DEC,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_id,
       { "Transaction ID",	       	"bootp.id",	 FT_UINT32,
         BASE_HEX,			 NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_secs,
       { "Seconds elapsed",	       	"bootp.secs",	 FT_UINT16,
         BASE_DEC,			 NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_flags,
       { "Bootp flags",		       	"bootp.flags",   FT_UINT16,
         BASE_HEX,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_flags_broadcast,
       { "Broadcast flag",	       	"bootp.flags.bc", FT_BOOLEAN,
         16,			TFS(&flag_set_broadcast), BOOTP_BC,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_flags_reserved,
       { "Reserved flags",	       	"bootp.flags.reserved", FT_UINT16,
         BASE_HEX,			NULL,		BOOTP_MBZ,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_ip_client,
       { "Client IP address",	       	"bootp.ip.client",FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_ip_your,
       { "Your (client) IP address",	"bootp.ip.your",  FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_ip_server,
       { "Next server IP address",	"bootp.ip.server",FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_ip_relay,
       { "Relay agent IP address",	"bootp.ip.relay", FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hw_addr,
       { "Client hardware address",	"bootp.hw.addr", FT_BYTES,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hw_addr_padding,
       { "Client hardware address padding",	"bootp.hw.addr_padding", FT_BYTES,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_hw_ether_addr,
       { "Client MAC address",		"bootp.hw.mac_addr", FT_ETHER,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_server,
       { "Server host name",		"bootp.server",  FT_STRING,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_file,
       { "Boot file name",		"bootp.file",	 FT_STRING,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_cookie,
       { "Magic cookie",			"bootp.cookie",	 FT_IPv4,
          BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_vendor,
       { "Bootp Vendor Options",		"bootp.vendor", FT_BYTES,
         BASE_NONE,			NULL,		 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_fqdn_s,
       { "Server",		"bootp.fqdn.s",		FT_BOOLEAN,
@@ -4188,7 +4188,7 @@ proto_register_bootp(void)
     { &hf_bootp_fqdn_mbz,
       { "Reserved flags",	"bootp.fqdn.mbz",	FT_UINT8,
         BASE_HEX,		NULL,			F_FQDN_MBZ,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_fqdn_rcode1,
       { "A-RR result",	       	"bootp.fqdn.rcode1",	 FT_UINT8,
@@ -4228,12 +4228,12 @@ proto_register_bootp(void)
 	{ &hf_bootp_alu_tftp1,
       { "Spatial Redundancy TFTP1",    "bootp.vendor.alu.tftp1" ,FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
 	{ &hf_bootp_alu_tftp2,
       { "Spatial Redundancy TFTP2",    "bootp.vendor.alu.tftp2" ,FT_IPv4,
         BASE_NONE,			NULL,		  0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_bootp_client_identifier_uuid,
       { "Client Identifier (UUID)",    "bootp.client_id_uuid",
diff --git a/epan/dissectors/packet-bootparams.c b/epan/dissectors/packet-bootparams.c
index 9dd28daa2a..78c4327b4b 100644
--- a/epan/dissectors/packet-bootparams.c
+++ b/epan/dissectors/packet-bootparams.c
@@ -158,28 +158,28 @@ proto_register_bootparams(void)
 	static hf_register_info hf[] = {
 		{ &hf_bootparams_procedure_v1, {
 			"V1 Procedure", "bootparams.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(bootparams1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(bootparams1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_bootparams_host, {
-			"Client Host", "bootparams.host", FT_STRING, BASE_DEC,
-			NULL, 0, "Client Host", HFILL }},
+			"Client Host", "bootparams.host", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_bootparams_domain, {
-			"Client Domain", "bootparams.domain", FT_STRING, BASE_DEC,
-			NULL, 0, "Client Domain", HFILL }},
+			"Client Domain", "bootparams.domain", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_bootparams_fileid, {
-			"File ID", "bootparams.fileid", FT_STRING, BASE_DEC,
-			NULL, 0, "File ID", HFILL }},
+			"File ID", "bootparams.fileid", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_bootparams_filepath, {
-			"File Path", "bootparams.filepath", FT_STRING, BASE_DEC,
-			NULL, 0, "File Path", HFILL }},
+			"File Path", "bootparams.filepath", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_bootparams_hostaddr, {
-			"Client Address", "bootparams.hostaddr", FT_IPv4, BASE_DEC,
+			"Client Address", "bootparams.hostaddr", FT_IPv4, BASE_NONE,
 			NULL, 0, "Address", HFILL }},
 		{ &hf_bootparams_routeraddr, {
-			"Router Address", "bootparams.routeraddr", FT_IPv4, BASE_DEC,
-			NULL, 0, "Router Address", HFILL }},
+			"Router Address", "bootparams.routeraddr", FT_IPv4, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_bootparams_addresstype, {
 			"Address Type", "bootparams.type", FT_UINT32, BASE_DEC,
-			VALS(addr_type), 0, "Address Type", HFILL }},
+			VALS(addr_type), 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_bootparams,
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 9bea9c1fe0..01456be01f 100644
--- a/epan/dissectors/packet-bpdu.c
+++ b/epan/dissectors/packet-bpdu.c
@@ -986,167 +986,167 @@ proto_register_bpdu(void)
     { &hf_bpdu_proto_id,
       { "Protocol Identifier",		"stp.protocol",
 	FT_UINT16,	BASE_HEX,	VALS(&protocol_id_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_version_id,
       { "Protocol Version Identifier",	"stp.version",
 	FT_UINT8,	BASE_DEC,	VALS(&version_id_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_type,
       { "BPDU Type",			"stp.type",
 	FT_UINT8,	BASE_HEX,	VALS(&bpdu_type_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags,
       { "BPDU flags",			"stp.flags",
 	FT_UINT8,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_tcack,
       { "Topology Change Acknowledgment",  "stp.flags.tcack",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TCACK,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_agreement,
       { "Agreement",			"stp.flags.agreement",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_AGREEMENT,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_forwarding,
       { "Forwarding",			"stp.flags.forwarding",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_FORWARDING,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_learning,
       { "Learning",			"stp.flags.learning",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_LEARNING,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_port_role,
       { "Port Role",			"stp.flags.port_role",
 	FT_UINT8,	BASE_DEC,	VALS(role_vals),	BPDU_FLAGS_PORT_ROLE_MASK,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_proposal,
       { "Proposal",			"stp.flags.proposal",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_PROPOSAL,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_flags_tc,
       { "Topology Change",		"stp.flags.tc",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TC,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_root_prio,
       { "Root Bridge Priority",		"stp.root.prio",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_root_sys_id_ext,
       { "Root Bridge System ID Extension",	"stp.root.ext",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_root_mac,
       { "Root Bridge System ID",	"stp.root.hw",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_root_cost,
       { "Root Path Cost",		"stp.root.cost",
 	FT_UINT32,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_bridge_prio,
       { "Bridge Priority",		"stp.bridge.prio",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_bridge_sys_id_ext,
       { "Bridge System ID Extension",	"stp.bridge.ext",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_bridge_mac,
       { "Bridge System ID",		"stp.bridge.hw",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_port_id,
       { "Port identifier",		"stp.port",
 	FT_UINT16,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msg_age,
       { "Message Age",			"stp.msg_age",
 	FT_DOUBLE,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_max_age,
       { "Max Age",			"stp.max_age",
 	FT_DOUBLE,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_hello_time,
       { "Hello Time",			"stp.hello",
 	FT_DOUBLE,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_forward_delay,
       { "Forward Delay",		"stp.forward",
 	FT_DOUBLE,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_version_1_length,
       { "Version 1 Length",		"stp.version_1_length",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_version_3_length,
       { "Version 3 Length",		"mstp.version_3_length",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_mst_config_format_selector,
       { "MST Config ID format selector",	"mstp.config_format_selector",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_mst_config_name,
       { "MST Config name",		"mstp.config_name",
 	FT_STRINGZ,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_mst_config_revision_level,
       { "MST Config revision",		"mstp.config_revision_level",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_mst_config_digest,
       { "MST Config digest",		"mstp.config_digest",
-	FT_BYTES,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
+      	NULL, HFILL }},
     { &hf_bpdu_cist_internal_root_path_cost,
       { "CIST Internal Root Path Cost",		"mstp.cist_internal_root_path_cost",
 	FT_UINT32,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_cist_bridge_prio,
       { "CIST Bridge Priority",		"mstp.cist_bridge.prio",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_cist_bridge_sys_id_ext,
       { "CIST Bridge Identifier System ID Extension",	"mstp.cist_bridge.ext",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_cist_bridge_mac,
       { "CIST Bridge Identifier System ID",	"mstp.cist_bridge.hw",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_cist_remaining_hops,
       { "CIST Remaining hops",		"mstp.cist_remaining_hops",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_flags,
       { "MSTI flags",			"mstp.msti.flags",
 	FT_UINT8,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_regional_root_mac,
       { "Regional Root",		"mstp.msti.root.hw",
 	FT_ETHER,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_internal_root_path_cost,
       { "Internal root path cost",		"mstp.msti.root_cost",
 	FT_UINT32,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_bridge_identifier_priority,
       { "Bridge Identifier Priority",		"mstp.msti.bridge_priority",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_port_identifier_priority,
       { "Port identifier priority",		"mstp.msti.port_priority",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_port_id,
       { "Port identifier",		"mstp.msti.port",
 	FT_UINT16,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_bpdu_msti_remaining_hops,
       { "Remaining hops",		"mstp.msti.remaining_hops",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-brdwlk.c b/epan/dissectors/packet-brdwlk.c
index ac5a3ebed3..589aef545d 100644
--- a/epan/dissectors/packet-brdwlk.c
+++ b/epan/dissectors/packet-brdwlk.c
@@ -405,48 +405,48 @@ proto_register_brdwlk (void)
     static hf_register_info hf[] = {
         { &hf_brdwlk_sof,
           {"SOF", "brdwlk.sof", FT_UINT8, BASE_HEX, VALS (brdwlk_sof_vals),
-           0xF0, "SOF", HFILL}},
+           0xF0, NULL, HFILL}},
         { &hf_brdwlk_eof,
           {"EOF", "brdwlk.eof", FT_UINT8, BASE_HEX, VALS (brdwlk_eof_vals),
-           0x0F, "EOF", HFILL}},
+           0x0F, NULL, HFILL}},
         { &hf_brdwlk_error,
-          {"Error", "brdwlk.error", FT_UINT8, BASE_HEX, NULL, 0x0, "Error",
+          {"Error", "brdwlk.error", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_brdwlk_pktcnt,
           {"Packet Count", "brdwlk.pktcnt", FT_UINT16, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_brdwlk_drop,
           {"Packet Dropped", "brdwlk.drop", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_brdwlk_vsan,
-          {"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0xFFF, "",
+          {"VSAN", "brdwlk.vsan", FT_UINT16, BASE_DEC, NULL, 0xFFF, NULL,
            HFILL}},
         { &hf_brdwlk_plen,
-          {"Original Packet Length", "brdwlk.plen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"Original Packet Length", "brdwlk.plen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_brdwlk_error_plp,
-          {"Packet Length Present", "brdwlk.error.plp", FT_BOOLEAN, 8, TFS(&tfs_error_plp), 0x01, "",
+          {"Packet Length Present", "brdwlk.error.plp", FT_BOOLEAN, 8, TFS(&tfs_error_plp), 0x01, NULL,
            HFILL}},
         { &hf_brdwlk_error_ef,
-          {"Empty Frame", "brdwlk.error.ef", FT_BOOLEAN, 8, TFS(&tfs_error_ef), 0x02, "",
+          {"Empty Frame", "brdwlk.error.ef", FT_BOOLEAN, 8, TFS(&tfs_error_ef), 0x02, NULL,
            HFILL}},
         { &hf_brdwlk_error_nd,
-          {"No Data", "brdwlk.error.nd", FT_BOOLEAN, 8, TFS(&tfs_error_nd), 0x04, "",
+          {"No Data", "brdwlk.error.nd", FT_BOOLEAN, 8, TFS(&tfs_error_nd), 0x04, NULL,
            HFILL}},
         { &hf_brdwlk_error_tr,
-          {"Truncated", "brdwlk.error.tr", FT_BOOLEAN, 8, TFS(&tfs_error_tr), 0x08, "",
+          {"Truncated", "brdwlk.error.tr", FT_BOOLEAN, 8, TFS(&tfs_error_tr), 0x08, NULL,
            HFILL}},
         { &hf_brdwlk_error_badcrc,
-          {"CRC", "brdwlk.error.crc", FT_BOOLEAN, 8, TFS(&tfs_error_crc), 0x10, "",
+          {"CRC", "brdwlk.error.crc", FT_BOOLEAN, 8, TFS(&tfs_error_crc), 0x10, NULL,
            HFILL}},
         { &hf_brdwlk_error_ff,
-          {"Fifo Full", "brdwlk.error.ff", FT_BOOLEAN, 8, TFS(&tfs_error_ff), 0x20, "",
+          {"Fifo Full", "brdwlk.error.ff", FT_BOOLEAN, 8, TFS(&tfs_error_ff), 0x20, NULL,
            HFILL}},
         { &hf_brdwlk_error_jumbo,
-          {"Jumbo FC Frame", "brdwlk.error.jumbo", FT_BOOLEAN, 8, TFS(&tfs_error_jumbo), 0x40, "",
+          {"Jumbo FC Frame", "brdwlk.error.jumbo", FT_BOOLEAN, 8, TFS(&tfs_error_jumbo), 0x40, NULL,
            HFILL}},
         { &hf_brdwlk_error_ctrl,
-          {"Ctrl Char Inside Frame", "brdwlk.error.ctrl", FT_BOOLEAN, 8, TFS(&tfs_error_ctrl), 0x80, "",
+          {"Ctrl Char Inside Frame", "brdwlk.error.ctrl", FT_BOOLEAN, 8, TFS(&tfs_error_ctrl), 0x80, NULL,
            HFILL}},
     };
 
diff --git a/epan/dissectors/packet-bssap.c b/epan/dissectors/packet-bssap.c
index 6b61227db8..fd64e256cf 100644
--- a/epan/dissectors/packet-bssap.c
+++ b/epan/dissectors/packet-bssap.c
@@ -2198,160 +2198,160 @@ proto_register_bssap(void)
 	    { &hf_bssap_pdu_type,
 	      { "Message Type", "bssap.pdu_type",
 		FT_UINT8, BASE_HEX, VALS(bssap_pdu_type_values), 0x0,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bsap_pdu_type,
 	      { "Message Type", "bsap.pdu_type",
 		FT_UINT8, BASE_HEX, VALS(bsap_pdu_type_values), 0x0,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_dlci_cc,
 	      { "Control Channel", "bssap.dlci.cc",
 		FT_UINT8, BASE_HEX, VALS(bssap_cc_values), CC_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bsap_dlci_cc,
 	      { "Control Channel", "bsap.dlci.cc",
 		FT_UINT8, BASE_HEX, VALS(bsap_cc_values), CC_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_dlci_spare,
 	      { "Spare", "bssap.dlci.spare",
 		FT_UINT8, BASE_HEX, NULL, SPARE_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bsap_dlci_rsvd,
 	      { "Reserved", "bsap.dlci.rsvd",
 		FT_UINT8, BASE_HEX, NULL, SPARE_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_dlci_sapi,
 	      { "SAPI", "bssap.dlci.sapi",
 		FT_UINT8, BASE_HEX, VALS(bssap_sapi_values), SAPI_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bsap_dlci_sapi,
 	      { "SAPI", "bsap.dlci.sapi",
 		FT_UINT8, BASE_HEX, VALS(bsap_sapi_values), SAPI_MASK,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_length,
 	      { "Length", "bssap.length",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"", HFILL}},
+		NULL, HFILL}},
 
 	    { &hf_bssap_plus_message_type,
 	      { "Message Type", "bssap_plus.msg_type",
 		FT_UINT8, BASE_DEC, VALS(bssap_plus_message_type_values), 0x0,
-		"Message Type", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_plus_ie,
 	      { "IEI", "bssap_plus.iei",
 		FT_UINT8, BASE_DEC, VALS(bssap_plus_ie_id_values), 0x0,
-		"", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_plus_ie_len,
 	      { "Length indicator", "bssap_plus.iei",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Length indicator", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_extension,
 	      { "Extension", "bssap.extension",
 	        FT_BOOLEAN, 8, TFS(&bssap_extension_value), 0x80,
-	        "Extension", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_type_of_number,
 	      { "Type of number", "bssap.type_of_number",
 	        FT_UINT8, BASE_HEX, VALS(gsm_a_type_of_number_values), 0x70,
-	        "Type of number", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_numbering_plan_id,
 	      { "Numbering plan identification", "bssap.number_plan",
 	        FT_UINT8, BASE_HEX, VALS(gsm_a_numbering_plan_id_values), 0x0f,
-	        "Numbering plan identification", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_sgsn_number,
 	      { "SGSN number", "bssap.sgsn_number",
 	        FT_STRING, BASE_NONE, NULL, 0,
-	        "SGSN number", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_vlr_number,
 	      { "VLR number", "bssap.vlr_number",
 	        FT_STRING, BASE_NONE, NULL, 0,
-	        "VLR number", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_cell_global_id_ie,
 	      { "Cell global identity IE", "bssap.cell_global_id_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Cell global identity IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_channel_needed_ie,
 	      { "Channel needed IE", "bssap.cell_global_id_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Channel needed IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_dlink_tnl_pld_cntrl_amd_inf_ie,
 	      { "Downlink Tunnel Payload Control and Info IE", "bssap.dlink_tnl_pld_cntrl_amd_inf_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Downlink Tunnel Payload Control and Info IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_ulink_tnl_pld_cntrl_amd_inf_ie,
 	      { "Uplink Tunnel Payload Control and Info IE", "bssap.ulink_tnl_pld_cntrl_amd_inf_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Uplink Tunnel Payload Control and Info IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_emlpp_prio_ie,
 	      { "eMLPP Priority IE", "bssap.emlpp_prio_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "eMLPP Priority IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_gprs_erroneous_msg_ie,
 	      { "Erroneous message IE", "bssap.erroneous_msg_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Erroneous message IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_gprs_loc_upd_type_ie,
 	      { "GPRS location update type IE", "bssap.loc_upd_type_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "GPRS location update type IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_Gs_cause_ie,
 	      { "Gs Cause IE", "bssap.Gs_cause_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Gs Cause IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imei_ie,
 	      { "IMEI IE", "bssap.imei_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "IMEI IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imesiv_ie,
 	      { "IMEISV IE", "bssap.imesiv",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "IMEISV IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imsi_ie,
 	      { "IMSI IE", "bssap.imsi_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "IMSI IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imsi_det_from_gprs_serv_type_ie,
 	      { "IMSI detach from GPRS service type IE", "bssap.msi_det_from_gprs_serv_type_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "IMSI detach from GPRS service type IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imsi_det_from_non_gprs_serv_type_ie,
 	      { "IMSI detach from non-GPRS service IE", "bssap.msi_det_from_non_gprs_serv_type_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "IMSI detach from non-GPRS service IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_info_req_ie,
 	      { "Information requested IE", "bssap.info_req_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Information requested IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_loc_area_id_ie,
 	      { "Location area identifier IE", "bssap.loc_area_id_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Location area identifier IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_loc_inf_age_ie,
 	      { "Location information age IE", "bssap.loc_inf_age",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Location information age IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_mm_information_ie,
 	      { "MM information IE", "bssap.mm_information",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "MM information IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_mobile_id_ie,
 	      { "Mobile identity IE", "bssap.mobile_id_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Mobile identity IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_mobile_stn_cls_mrk1_ie,
 	      { "Mobile station classmark 1 IE", "bssap.mobile_stn_cls_mrk1_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Mobile station classmark 1 IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_mobile_station_state_ie,
 	      { "Mobile station state IE", "bssap.mobile_station_state_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Mobile station state IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_ptmsi_ie,
 	      { "PTMSI IE", "bssap.ptmsi_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "PTMSI IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_reject_cause_ie,
 	      { "Reject cause IE", "bssap.reject_cause_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Reject cause IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_service_area_id_ie,
 	      { "Service area identification IE", "bssap.mobile_stn_cls_mrk1_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
@@ -2359,109 +2359,109 @@ proto_register_bssap(void)
 	    { &hf_bssap_sgsn_nr_ie,
 	      { "SGSN number IE", "bssap.imsi_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "SGSN number IE", HFILL }},	
+	        NULL, HFILL }},	
 	    { &hf_bssap_tmsi_ie,
 	      { "TMSI IE", "bssap.tmsi_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "TMSI IE", HFILL }},	
+	        NULL, HFILL }},	
 	    { &hf_bssap_tmsi_status_ie,
 	      { "TMSI status IE", "bssap.tmsi_status_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "TMSI status IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_vlr_number_ie,
 	      { "VLR number IE", "bssap.vlr_number_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "VLR number IE", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_global_cn_id_ie,
 	      { "Global CN-Id IE", "bssap.global_cn_id_ie",
 	        FT_NONE, BASE_NONE, NULL, 0,
-	        "Global CN-Id IE", HFILL }},
+	        NULL, HFILL }},
 
 	    { &hf_bssap_plus_ie_data,
 	      { "IE Data", "bssap.ie_data",
 	        FT_BYTES, BASE_NONE, NULL, 0,
-	        "IE Data", HFILL }},
+	        NULL, HFILL }},
 
 	    { &hf_bssap_call_priority,
 	      { "eMLPP Priority", "bssap.gprs_loc_upd_type",
 		FT_UINT8, BASE_DEC, VALS(bssap_call_priority_values), 0x07,
-		"eMLPP Priority", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_gprs_loc_upd_type,
 	      { "GPRS location update type", "bssap.gprs_loc_upd_type",
 		FT_UINT8, BASE_DEC, VALS(bssap_plus_GPRS_loc_upd_type_values), 0x0,
-		"GPRS location update type", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_Gs_cause,
 	      { "Gs cause", "bssap.gprs_loc_upd_type",
 		FT_UINT8, BASE_DEC, VALS(bssap_Gs_cause_values), 0x0,
-		"Gs cause", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_imei,
 	      { "IMEI", "bssap.imei",
 	        FT_STRING, BASE_NONE, NULL, 0,
-	        "IMEI", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imeisv,
 	      { "IMEISV", "bssap.imeisv",
 	        FT_STRING, BASE_NONE, NULL, 0,
-	        "IMEISV", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imsi,
 	      { "IMSI", "bssap.imsi",
 	        FT_STRING, BASE_NONE, NULL, 0,
-	        "IMSI", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_imsi_det_from_gprs_serv_type,
 	      { "IMSI detach from GPRS service type", "bssap.imsi_det_from_gprs_serv_type",
 		FT_UINT8, BASE_DEC, VALS(bssap_Gs_cause_values), 0x0,
-		"IMSI detach from GPRS service type", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_info_req,
 	      { "Information requested", "bssap.info_req",
 		FT_UINT8, BASE_DEC, VALS(bssap_info_req_values), 0x0,
-		"Information requested", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_loc_inf_age,
 	      { "AgeOfLocationInformation in minutes", "bssap.loc_inf_age",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"AgeOfLocationInformation in minutes", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_mobile_station_state,
 	      { "Mobile station state", "bssap.mobile_station_state",
 		FT_UINT8, BASE_DEC, VALS(bssap_mobile_station_state_values), 0x0,
-		"Mobile station state", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_ptmsi,
 	      { "PTMSI", "bssap.ptmsi",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"PTMSI", HFILL}},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}},
 	    { &hf_bssap_tmsi,
 	      { "TMSI", "bssap.tmsi",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"TMSI", HFILL}},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}},
 	    { &hf_bssap_tmsi_status,
 	      { "TMSI status", "bssap.tmsi_status",
 	        FT_BOOLEAN, 8, TFS(&bssap_tmsi_flag), 0x01,
-	        "TMSI status", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_tom_prot_disc,
 	      { "TOM Protocol Discriminator", "bssap.Tom_prot_disc",
 	        FT_UINT8, BASE_DEC, VALS(bssap_tom_prot_disc_values), 0x78,
-	        "TOM Protocol Discriminator", HFILL}},
+	        NULL, HFILL}},
 	    { &hf_bssap_e_bit,
 	      { "E: Cipher Request", "bssap.tmsi_status",
 	        FT_BOOLEAN, 8, TFS(&bssap_E_flag), 0x04,
-	        "E: Cipher Request", HFILL }},
+	        NULL, HFILL }},
 	    { &hf_bssap_tunnel_prio,
 	      { "Tunnel Priority", "bssap.tunnel_prio",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Tunnel Priority", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_global_cn_id,
 	      { "Global CN-Id", "bssap.global_cn_id",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Global CN-Id", HFILL}},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}},
 	    { &hf_bssap_plmn_id,
 	      { "PLMN-Id", "bssap.plmn_id",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"PLMN-Id", HFILL}},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}},
 	    { &hf_bssap_cn_id,
 	      { "CN-Id", "bssap.cn_id",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"CN-Id", HFILL}},
+		NULL, HFILL}},
 	    { &hf_bssap_cell_global_id,
 	      { "Cell global identity", "bssap.plmn_id",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Cell global identity", HFILL}},
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index f286d8a77f..e63b9fde2f 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -6030,12 +6030,12 @@ proto_register_bssgp(void)
     { &hf_bssgp_pdu_type,
       { "PDU Type", "bssgp.pdu_type",
 	FT_UINT8, BASE_HEX, VALS(tab_bssgp_pdu_types), 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_iei_nacc_cause,
       { "NACC Cause", "bssgp.iei.nacc_cause",
 	FT_UINT8, BASE_HEX, VALS(tab_nacc_cause), 0x0,
-	"NACC Cause", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_ie_type,
       { "IE Type", "bssgp.ie_type",
@@ -6045,37 +6045,37 @@ proto_register_bssgp(void)
     { &hf_bssgp_bvci,
       { "BVCI", "bssgp.bvci",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_tlli,
       { "TLLI", "bssgp.tlli",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_nsei,
       { "NSEI", "bssgp.nsei",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_mcc,
       { "MCC", "bssgp.mcc",
 	FT_UINT8, BASE_DEC, VALS(E212_codes), 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_mnc,
       { "MNC", "bssgp.mnc",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_lac,
       { "LAC", "bssgp.lac",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_rac,
       { "RAC", "bssgp.rac",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_ci,
       { "CI", "bssgp.ci",
@@ -6085,57 +6085,57 @@ proto_register_bssgp(void)
     { &hf_bssgp_ra_discriminator,
       { "Routing Address Discriminator", "bssgp.rad",
 	FT_UINT8, BASE_DEC, VALS(ra_discriminator_vals), 0x0f,
-	"Routing Address Discriminator", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_appid,
       { "Application ID", "bssgp.appid",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"Application ID", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_rcid,
       { "Reporting Cell Identity", "bssgp.rcid",
 	FT_UINT64, BASE_HEX, NULL, 0x0,
-	"Reporting Cell Identity", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_rrc_si_msg_type,
       { "RRC SI type", "bssgp.rrc_si_type",
 	FT_UINT8, BASE_HEX, VALS(gsm_a_dtap_msg_rr_strings), 0x0,
-	"RRC SI type", HFILL }
+	NULL, HFILL }
     },
     { &hf_ran_inf_req_pdu_type_ext,
       { "PDU Type Extension", "bssgp.ran_inf_req_pdu_type_ext",
 	FT_UINT8, BASE_DEC, VALS(ran_inf_req_pdu_type_ext_vals), 0x0e,
-	"PDU Type Extension", HFILL }
+	NULL, HFILL }
     },
     { &hf_ran_inf_pdu_type_ext,
       { "PDU Type Extension", "bssgp.ran_req_pdu_type_ext",
 	FT_UINT8, BASE_DEC, VALS(ran_inf_pdu_type_ext_vals), 0x0e,
-	"PDU Type Extension", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_tmsi_ptmsi,
       { "TMSI/PTMSI", "bssgp.tmsi_ptmsi",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_imsi,
       { "IMSI", "bssgp.imsi",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_imei,
       { "IMEI", "bssgp.imei",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_imeisv,
       { "IMEISV", "bssgp.imeisv",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_bssgp_nri,
       { "NRI", "bssgp.nri",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
   };
 
diff --git a/epan/dissectors/packet-bthci_acl.c b/epan/dissectors/packet-bthci_acl.c
index 38e55f9a36..fb231a67b5 100644
--- a/epan/dissectors/packet-bthci_acl.c
+++ b/epan/dissectors/packet-bthci_acl.c
@@ -236,7 +236,7 @@ proto_register_btacl(void)
 		{ &hf_btacl_chandle,
 			{ "Connection Handle",           "btacl.chandle",
 				FT_UINT16, BASE_HEX, NULL, 0x0FFF,
-				"Connection Handle", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btacl_pb_flag,
 			{ "PB Flag",           "btacl.pb_flag",
@@ -251,12 +251,12 @@ proto_register_btacl(void)
 		{ &hf_btacl_length,
 			{ "Data Total Length",           "btacl.length",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Data Total Length", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btacl_data,
 			{ "Data",           "btacl.data",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Data", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btacl_continuation_to,
 			{ "This is a continuation to the PDU in frame",		"btacl.continuation_to", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index 6f36342a25..41a2259ebe 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -1971,12 +1971,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_param_length,
 			{ "Parameter Total Length",           "bthci_cmd.param_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,          
-				"Parameter Total Length", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_params,
 			{ "Command Parameters",           "bthci_cmd.params",
-				FT_BYTES, BASE_HEX, NULL, 0x0,          
-				"Command Parameters", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0x0,          
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_lap,
 			{ "LAP",           "bthci_cmd.lap",
@@ -1996,87 +1996,87 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_encrypt_mode,
 			{ "Encryption Mode",           "bthci_cmd.encrypt_mode",
 				FT_UINT8, BASE_HEX, VALS(encrypt_mode_vals), 0x0,          
-				"Encryption Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_bd_addr,
-			{ "BD_ADDR: ",          "bthci_cmd.bd_addr",
+			{ "BD_ADDR:",          "bthci_cmd.bd_addr",
 				FT_NONE, BASE_NONE, NULL, 0x0,
 				"Bluetooth Device Address", HFILL}
 		},
 		{ &hf_bthci_cmd_packet_type_2dh1,
 			{ "Packet Type 2-DH1",        "bthci_cmd.packet_type_2dh1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0002,
-				"Packet Type 2-DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_3dh1,
 			{ "Packet Type 3-DH1",        "bthci_cmd.packet_type_3dh1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0004,
-				"Packet Type 3-DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dm1,
 			{ "Packet Type DM1",        "bthci_cmd.packet_type_dm1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0008,
-				"Packet Type DM1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dh1,
 			{ "Packet Type DH1",        "bthci_cmd.packet_type_dh1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0010,
-				"Packet Type DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_2dh3,
 			{ "Packet Type 2-DH3",        "bthci_cmd.packet_type_2dh3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0100,
-				"Packet Type 2-DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_3dh3,
 			{ "Packet Type 3-DH3",        "bthci_cmd.packet_type_3dh3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0200,
-				"Packet Type 3-DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dm3,
 			{ "Packet Type DM3",        "bthci_cmd.packet_type_dm3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0400,
-				"Packet Type DM3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dh3,
 			{ "Packet Type DH3",        "bthci_cmd.packet_type_dh3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0800,
-				"Packet Type DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_2dh5,
 			{ "Packet Type 2-DH5",        "bthci_cmd.packet_type_2dh5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x1000,
-				"Packet Type 2-DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_3dh5,
 			{ "Packet Type 3-DH5",        "bthci_cmd.packet_type_3dh5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x2000,
-				"Packet Type 3-DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dm5,
 			{ "Packet Type DM5",        "bthci_cmd.packet_type_dm5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x4000,
-				"Packet Type DM5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_dh5,
 			{ "Packet Type DH5",        "bthci_cmd.packet_type_dh5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x8000,
-				"Packet Type DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_page_scan_mode,
 			{ "Page Scan Mode",        "bthci_cmd.page_scan_mode",
 				FT_UINT8, BASE_HEX, VALS(cmd_page_scan_modes), 0x0,
-				"Page Scan Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_page_scan_repetition_mode,
 			{ "Page Scan Repetition Mode",        "bthci_cmd.page_scan_repetition_mode",
 				FT_UINT8, BASE_HEX, VALS(cmd_page_scan_repetition_modes), 0x0,
-				"Page Scan Repetition Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_page_scan_period_mode,
 			{ "Page Scan Period Mode",        "bthci_cmd.page_scan_period_mode",
 				FT_UINT8, BASE_HEX, VALS(cmd_page_scan_period_modes), 0x0,
-				"Page Scan Period Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_clock_offset,
 			{ "Clock Offset",        "bthci_cmd.clock_offset",
@@ -2091,12 +2091,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_allow_role_switch,
 			{ "Allow Role Switch",         "bthci_cmd.allow_role_switch",
 				FT_UINT8, BASE_HEX, VALS(cmd_role_switch_modes), 0x0,
-				"Allow Role Switch", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_status,
 			{ "Status",           "bthci_cmd.status",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_status_vals), 0x0,          
-				"Status", HFILL }
+				NULL, HFILL }
 		},
 
 		{ &hf_bthci_cmd_max_period_length,       
@@ -2112,52 +2112,52 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_connection_handle,
 			{ "Connection Handle",             "bthci_cmd.connection_handle",
 				FT_UINT16, BASE_HEX, NULL, 0x0,
-				"Connection Handle", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_reason,
 			{ "Reason",           "bthci_cmd.reason",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_status_vals), 0x0,          
-				"Reason", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_num_link_keys,
 			{ "Number of Link Keys", "bthci_cmd_num_link_keys",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Number of Link Keys", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_link_key,
 			{ "Link Key",        "bthci_cmd.link_key",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"Link Key for the associated BD_ADDR", HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_hv1,
 			{ "Packet Type HV1",        "bthci_cmd.packet_type_hv1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0020,
-				"Packet Type HV1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_hv2,
 			{ "Packet Type HV2",        "bthci_cmd.packet_type_hv2",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0040,
-				"Packet Type HV2", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_packet_type_hv3,
 			{ "Packet Type HV3",        "bthci_cmd.packet_type_hv3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0080,
-				"Packet Type HV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_role,
 			{ "Role",        "bthci_cmd.role",
 				FT_UINT8, BASE_HEX, VALS(cmd_role_vals), 0x0,
-				"Role", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_pin_code_length,
 			{ "PIN Code Length",        "bthci_cmd.pin_code_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"PIN Code Length", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_pin_code,
 			{ "PIN Code",        "bthci_cmd.pin_code",
-				FT_STRING, BASE_HEX, NULL, 0x0,
-				"PIN Code", HFILL }
+				FT_STRING, BASE_NONE, NULL, 0x0,
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_pin_type,
 			{ "PIN Type", "bthci_cmd.pin_type",
@@ -2167,12 +2167,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_encryption_enable,
 			{ "Encryption Enable",        "bthci_cmd.encryption_enable",
 				FT_UINT8, BASE_HEX, VALS(cmd_encryption_enable), 0x0,
-				"Encryption Enable", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_key_flag,
 			{ "Key Flag",        "bthci_cmd.key_flag",
 				FT_UINT8, BASE_HEX, VALS(cmd_key_flag), 0x0,
-				"Key Flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_max_interval_hold,
 			{ "Hold Mode Max Interval",        "bthci_cmd.hold_mode_max_int",
@@ -2217,12 +2217,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_flags,
 			{ "Flags",        "bthci_cmd.flags",
 				FT_UINT8, BASE_HEX, NULL, 0x0,
-				"Flags", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_service_type,
 			{ "Service Type",        "bthci_cmd.service_type",
 				FT_UINT8, BASE_HEX, VALS(cmd_service_types), 0x0,
-				"Service Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_token_rate,
 			{ "Available Token Rate",        "bthci_cmd.token_rate",
@@ -2252,42 +2252,42 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_link_policy_setting_switch,
 			{ "Enable Master Slave Switch", "bthci_cmd.link_policy_switch",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0001,
-				"Enable Master Slave Switch", HFILL }
+				NULL, HFILL }
 		}, 
 		{ &hf_bthci_cmd_link_policy_setting_hold,
 			{ "Enable Hold Mode", "bthci_cmd.link_policy_hold",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0002,
-				"Enable Hold Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_link_policy_setting_sniff,
 			{ "Enable Sniff Mode", "bthci_cmd.link_policy_sniff",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0004,
-				"Enable Sniff Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_link_policy_setting_park,
 			{ "Enable Park Mode", "bthci_cmd.link_policy_park",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0008,
-				"Enable Park Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_filter_type,
 			{ "Filter Type", "bthci_cmd.filter_type",
 				FT_UINT8, BASE_HEX, VALS(cmd_filter_types), 0x0,
-				"Filter Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_inquiry_result_filter_condition_type,
 			{ "Filter Condition Type", "bthci_cmd.filter_condition_type",
 				FT_UINT8, BASE_HEX, VALS(cmd_inquiry_result_filter_condition_types), 0x0,
-				"Filter Condition Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_connection_setup_filter_condition_type,
 			{ "Filter Condition Type", "bthci_cmd.filter_condition_type",
 				FT_UINT8, BASE_HEX, VALS(cmd_connection_setup_filter_condition_types), 0x0,
-				"Filter Condition Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_class_of_device,
 			{ "Class of Device", "bthci_cmd.class_of_device",
 				FT_UINT24, BASE_HEX, NULL, 0x0,
-				"Class of Device", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_class_of_device_mask,
 			{ "Class of Device Mask", "bthci_cmd.class_of_device_mask",
@@ -2302,17 +2302,17 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_read_all_flag,
 			{ "Read All Flag", "bthci_cmd.read_all_flag",
 				FT_UINT8, BASE_HEX, VALS(cmd_read_all_flag_values), 0x0,
-				"Read All Flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_delete_all_flag,
 			{ "Delete All Flag", "bthci_cmd.delete_all_flag",
 				FT_UINT8, BASE_HEX, VALS(cmd_delete_all_flag_values), 0x0,
-				"Delete All Flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_authentication_enable,
 			{ "Authentication Enable", "bthci_cmd.auth_enable",
 				FT_UINT8, BASE_HEX, VALS(cmd_authentication_enable_values), 0x0,
-				"Authentication Enable", HFILL }
+				NULL, HFILL }
 		},  
 		{ &hf_bthci_cmd_input_coding,
 			{ "Input Coding", "bthci_cmd.input_coding",
@@ -2322,12 +2322,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_input_data_format,
 			{ "Input Data Format", "bthci_cmd.input_data_format",
 				FT_UINT16, BASE_DEC, VALS(cmd_input_data_format_values), 0x00c0,
-				"Input Data Format", HFILL }
+				NULL, HFILL }
 		},  
 		{ &hf_bthci_cmd_input_sample_size,
 			{ "Input Sample Size", "bthci_cmd.input_sample_size",
 				FT_UINT16, BASE_DEC, VALS(cmd_input_sample_size_values), 0x0020,
-				"Input Sample Size", HFILL }
+				NULL, HFILL }
 		}, 
 		{ &hf_bthci_cmd_linear_pcm_bit_pos,
 			{ "Linear PCM Bit Pos", "bthci_cmd.lin_pcm_bit_pos",
@@ -2337,7 +2337,7 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_air_coding_format,
 			{ "Air Coding Format", "bthci_cmd.air_coding_format",
 				FT_UINT16, BASE_DEC, VALS(cmd_air_coding_format_values), 0x0003,
-				"Air Coding Format", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_num_broadcast_retransmissions,
 			{ "Num Broadcast Retran", "bthci_cmd.num_broad_retran",
@@ -2362,12 +2362,12 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_scan_enable,
 			{ "Scan Enable", "bthci_cmd.scan_enable",
 				FT_UINT8, BASE_HEX, VALS(cmd_scan_enable_values), 0x0,
-				"Scan Enable", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_interval,
 			{ "Interval", "bthci_cmd.interval",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Interval", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_window,
 			{ "Interval", "bthci_cmd.window",
@@ -2390,42 +2390,42 @@ proto_register_bthci_cmd(void)
 				"LAP(s)used to create IAC", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_00,
-			{ "Inquiry Complete                   ", "bthci_cmd.evt_mask_00",
+			{ "Inquiry Complete", "bthci_cmd.evt_mask_00",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"Inquiry Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_01,
-			{ "Inquiry Result                     ", "bthci_cmd.evt_mask_01",
+			{ "Inquiry Result", "bthci_cmd.evt_mask_01",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"Inquiry Result Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_02,
-			{ "Connect Complete                   ", "bthci_cmd.evt_mask_02",
+			{ "Connect Complete", "bthci_cmd.evt_mask_02",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"Connection Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_03,
-			{ "Connect Request                    ", "bthci_cmd.evt_mask_03",
+			{ "Connect Request", "bthci_cmd.evt_mask_03",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Connect Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_04,
-			{ "Disconnect Complete                ", "bthci_cmd.evt_mask_04",
+			{ "Disconnect Complete", "bthci_cmd.evt_mask_04",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"Disconnect Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_05,
-			{ "Auth Complete                      ", "bthci_cmd.evt_mask_05",
+			{ "Auth Complete", "bthci_cmd.evt_mask_05",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x20,
 				"Auth Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_06,
-			{ "Remote Name Req Complete           ", "bthci_cmd.evt_mask_06",
+			{ "Remote Name Req Complete", "bthci_cmd.evt_mask_06",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x40,
 				"Remote Name Req Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_07,
-			{ "Encrypt Change                     ", "bthci_cmd.evt_mask_07",
+			{ "Encrypt Change", "bthci_cmd.evt_mask_07",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Encrypt Change Bit", HFILL }
 		},
@@ -2435,204 +2435,204 @@ proto_register_bthci_cmd(void)
 				"Change Connection Link Key Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_11,
-			{ "Master Link Key Complete           ", "bthci_cmd.evt_mask_11",
+			{ "Master Link Key Complete", "bthci_cmd.evt_mask_11",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"Master Link Key Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_12,
-			{ "Read Remote Supported Features     ", "bthci_cmd.evt_mask_12",
+			{ "Read Remote Supported Features", "bthci_cmd.evt_mask_12",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"Read Remote Supported Features Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_13,
-			{ "Read Remote Ver Info Complete      ", "bthci_cmd.evt_mask_13",
+			{ "Read Remote Ver Info Complete", "bthci_cmd.evt_mask_13",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Read Remote Ver Info Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_14,
-			{ "QoS Setup Complete                 ", "bthci_cmd.evt_mask_14",
+			{ "QoS Setup Complete", "bthci_cmd.evt_mask_14",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"QoS Setup Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_17,
-			{ "Hardware Error                     ", "bthci_cmd.evt_mask_17",
+			{ "Hardware Error", "bthci_cmd.evt_mask_17",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Hardware Error Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_20,
-			{ "Flush Occurred                     ", "bthci_cmd.evt_mask_20",
+			{ "Flush Occurred", "bthci_cmd.evt_mask_20",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"Flush Occurred Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_21,
-			{ "Role Change                        ", "bthci_cmd.evt_mask_21",
+			{ "Role Change", "bthci_cmd.evt_mask_21",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"Role Change Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_23,
-			{ "Mode Change                        ", "bthci_cmd.evt_mask_23",
+			{ "Mode Change", "bthci_cmd.evt_mask_23",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Mode Change Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_24,
-			{ "Return Link Keys                   ", "bthci_cmd.evt_mask_24",
+			{ "Return Link Keys", "bthci_cmd.evt_mask_24",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"Return Link Keys Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_25,
-			{ "PIN Code Request                   ", "bthci_cmd.evt_mask_25",
+			{ "PIN Code Request", "bthci_cmd.evt_mask_25",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x20,
 				"PIN Code Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_26,
-			{ "Link Key Request                   ", "bthci_cmd.evt_mask_26",
+			{ "Link Key Request", "bthci_cmd.evt_mask_26",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x40,
 				"Link Key Request Bit", HFILL }
 		},  
 		{ &hf_bthci_cmd_evt_mask_27,
-			{ "Link Key Notification              ", "bthci_cmd.evt_mask_27",
+			{ "Link Key Notification", "bthci_cmd.evt_mask_27",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Link Key Notification Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_30,
-			{ "Loopback Command                   ", "bthci_cmd.evt_mask_30",
+			{ "Loopback Command", "bthci_cmd.evt_mask_30",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"Loopback Command Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_31,
-			{ "Data Buffer Overflow               " , "bthci_cmd.evt_mask_31",
+			{ "Data Buffer Overflow" , "bthci_cmd.evt_mask_31",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"Data Buffer Overflow Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_32,
-			{ "Max Slots Change                   ", "bthci_cmd.evt_mask_32",
+			{ "Max Slots Change", "bthci_cmd.evt_mask_32",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"Max Slots Change Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_33,
-			{ "Read Clock Offset Complete         ", "bthci_cmd.evt_mask_33",
+			{ "Read Clock Offset Complete", "bthci_cmd.evt_mask_33",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Read Clock Offset Complete Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_34,
-			{ "Connection Packet Type Changed     ", "bthci_cmd.evt_mask_34",
+			{ "Connection Packet Type Changed", "bthci_cmd.evt_mask_34",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"Connection Packet Type Changed Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_35,
-			{ "QoS Violation                      ", "bthci_cmd.evt_mask_35",
+			{ "QoS Violation", "bthci_cmd.evt_mask_35",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x20,
 				"QoS Violation Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_36,
-			{ "Page Scan Mode Change              ", "bthci_cmd.evt_mask_36",
+			{ "Page Scan Mode Change", "bthci_cmd.evt_mask_36",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x40,
 				"Page Scan Mode Change Bit", HFILL }
 		}, 
 		{ &hf_bthci_cmd_evt_mask_37,
-			{ "Page Scan Repetition Mode Change   ", "bthci_cmd.evt_mask_37",
+			{ "Page Scan Repetition Mode Change", "bthci_cmd.evt_mask_37",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Page Scan Repetition Mode Change Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_40,
-			{ "Flow Specification Complete        ", "bthci_cmd.evt_mask_40",
+			{ "Flow Specification Complete", "bthci_cmd.evt_mask_40",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"Flow Specification Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_41,
-			{ "Inquiry Result With RSSI           ", "bthci_cmd.evt_mask_41",
+			{ "Inquiry Result With RSSI", "bthci_cmd.evt_mask_41",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"Inquiry Result With RSSI Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_42,
-			{ "Read Remote Ext. Features Complete ", "bthci_cmd.evt_mask_42",
+			{ "Read Remote Ext. Features Complete", "bthci_cmd.evt_mask_42",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"Read Remote Ext. Features Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_53,
-			{ "Synchronous Connection Complete    ", "bthci_cmd.evt_mask_53",
+			{ "Synchronous Connection Complete", "bthci_cmd.evt_mask_53",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Synchronous Connection Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_54,
-			{ "Synchronous Connection Changed     ", "bthci_cmd.evt_mask_54",
+			{ "Synchronous Connection Changed", "bthci_cmd.evt_mask_54",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"Synchronous Connection Changed Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_55,
-			{ "Sniff Subrate                      ", "bthci_cmd.evt_mask_55",
+			{ "Sniff Subrate", "bthci_cmd.evt_mask_55",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x20,
 				"Sniff Subrate Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_56,
-			{ "Extended Inquiry Result            ", "bthci_cmd.evt_mask_56",
+			{ "Extended Inquiry Result", "bthci_cmd.evt_mask_56",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x40,
 				"Extended Inquiry Result Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_57,
-			{ "Encryption Key Refresh Complete    ", "bthci_cmd.evt_mask_57",
+			{ "Encryption Key Refresh Complete", "bthci_cmd.evt_mask_57",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Encryption Key Refresh Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_60,
-			{ "IO Capability Request              ", "bthci_cmd.evt_mask_60",
+			{ "IO Capability Request", "bthci_cmd.evt_mask_60",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"IO Capability Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_61,
-			{ "IO Capability Response             ", "bthci_cmd.evt_mask_61",
+			{ "IO Capability Response", "bthci_cmd.evt_mask_61",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x02,
 				"IO Capability Response Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_62,
-			{ "User Confirmation Request          ", "bthci_cmd.evt_mask_62",
+			{ "User Confirmation Request", "bthci_cmd.evt_mask_62",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"User Confirmation Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_63,
-			{ "User Passkey Request               ", "bthci_cmd.evt_mask_63",
+			{ "User Passkey Request", "bthci_cmd.evt_mask_63",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"User Passkey Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_64,
-			{ "Remote OOB Data Request            ", "bthci_cmd.evt_mask_64",
+			{ "Remote OOB Data Request", "bthci_cmd.evt_mask_64",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x10,
 				"Remote OOB Data Request Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_65,
-			{ "Simple Pairing Complete            ", "bthci_cmd.evt_mask_65",
+			{ "Simple Pairing Complete", "bthci_cmd.evt_mask_65",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x20,
 				"Simple Pairing Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_67,
-			{ "Link Supervision Timeout Changed   ", "bthci_cmd.evt_mask_67",
+			{ "Link Supervision Timeout Changed", "bthci_cmd.evt_mask_67",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x80,
 				"Link Supervision Timeout Changed Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_70,
-			{ "Enhanced Flush Complete            ", "bthci_cmd.evt_mask_70",
+			{ "Enhanced Flush Complete", "bthci_cmd.evt_mask_70",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x01,
 				"Enhanced Flush Complete Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_72,
-			{ "User Passkey Notification          ", "bthci_cmd.evt_mask_72",
+			{ "User Passkey Notification", "bthci_cmd.evt_mask_72",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x04,
 				"User Passkey Notification Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_evt_mask_73,
-			{ "Keypress Notification              ", "bthci_cmd.evt_mask_73",
+			{ "Keypress Notification", "bthci_cmd.evt_mask_73",
 				FT_UINT8, BASE_HEX, VALS(cmd_boolean), 0x08,
 				"Keypress Notification Bit", HFILL }
 		},
 		{ &hf_bthci_cmd_sco_flow_control,
 			{ "SCO Flow Control","bthci_cmd.flow_control",
 				FT_UINT8, BASE_HEX, VALS(cmd_en_disabled), 0x0,
-				"SCO Flow Control", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_num_handles,
 			{ "Number of Handles", "bthci_cmd.num_handles",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Number of Handles", HFILL }
+				NULL, HFILL }
 		},
 
 		{ &hf_bthci_cmd_num_compl_packets,
@@ -2643,7 +2643,7 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_flow_contr_enable,
 			{ "Flow Control Enable", "bthci_cmd.flow_contr_enable",
 				FT_UINT8, BASE_HEX, VALS(cmd_flow_contr_enable), 0x0,
-				"Flow Control Enable", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_host_data_packet_length_acl,
 			{"Host ACL Data Packet Length (bytes)", "bthci_cmd.max_data_length_acl",
@@ -2668,17 +2668,17 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_power_level_type,
 			{"Type", "bthci_cmd.power_level_type",
 				FT_UINT8, BASE_HEX, VALS(cmd_power_level_types), 0x0,
-				"Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_loopback_mode,
 			{"Loopback Mode", "bthci_cmd.loopback_mode",
 				FT_UINT8, BASE_HEX, VALS(cmd_loopback_modes), 0x0,
-				"Loopback Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_page_number,
 			{"Page Number", "bthci_cmd.page_number",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Page Number", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_transmit_bandwidth,
 			{"Tx Bandwidth (bytes/s)", "bthci_cmd.tx_bandwidth",
@@ -2693,7 +2693,7 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_max_latency_ms,
 			{"Max. Latency (ms)", "bthci_cmd.max_latency_ms",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Max. Latency (ms)", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_max_latency,
 			{"Max. Latency", "bthci_cmd.max_latency",
@@ -2703,82 +2703,82 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_retransmission_effort,
 			{"Retransmission Effort", "bthci_cmd.retransmission_effort",
 				FT_UINT8, BASE_DEC, VALS(cmd_rtx_effort), 0x0,
-				"Retransmission Effort", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_scan_type,
 			{"Scan Type", "bthci_cmd.inq_scan_type",
 				FT_UINT8, BASE_DEC, VALS(cmd_scan_types), 0x0,
-				"Scan Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_inq_mode,
 			{"Inquiry Mode", "bthci_cmd.inq_scan_type",
 				FT_UINT8, BASE_DEC, VALS(cmd_inq_modes), 0x0,
-				"Inquiry Mode", HFILL}
+				NULL, HFILL}
 		},	
 		{ &hf_bthci_cmd_fec_required,
 			{"FEC Required", "bthci_cmd.fec_required",
 				FT_UINT8, BASE_DEC, VALS(cmd_boolean), 0x0,
-				"FEC Required", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_err_data_reporting,
 			{"Erroneous Data Reporting", "bthci_cmd.err_data_reporting",
 				FT_UINT8, BASE_DEC, VALS(cmd_en_disabled), 0x0,
-				"Erroneous Data Reporting", HFILL}
+				NULL, HFILL}
 		},	
 		{ &hf_bthci_cmd_tx_power,
 			{"Power Level (dBm)", "bthci_cmd.power_level",
 				FT_INT8, BASE_DEC, NULL, 0x0,
-				"Power Level (dBm)", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_sco_packet_type_hv1,
 			{ "Packet Type HV1",        "bthci_cmd.sco_packet_type_hv1",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0001,
-				"Packet Type HV1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_hv2,
 			{ "Packet Type HV2",        "bthci_cmd.sco_packet_type_hv2",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0002,
-				"Packet Type HV2", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_hv3,
 			{ "Packet Type HV3",        "bthci_cmd.sco_packet_type_hv3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0004,
-				"Packet Type HV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_ev3,
 			{ "Packet Type EV3",        "bthci_cmd.sco_packet_type_ev3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0008,
-				"Packet Type EV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_ev4,
 			{ "Packet Type EV4",        "bthci_cmd.sco_packet_type_ev4",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0010,
-				"Packet Type EV4", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_ev5,
 			{ "Packet Type EV5",        "bthci_cmd.sco_packet_type_ev5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0020,
-				"Packet Type EV5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_2ev3,
 			{ "Packet Type 2-EV3",        "bthci_cmd.sco_packet_type_2ev3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0040,
-				"Packet Type 2-EV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_3ev3,
 			{ "Packet Type 3-EV3",        "bthci_cmd.sco_packet_type_3ev3",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0080,
-				"Packet Type 3-EV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_2ev5,
 			{ "Packet Type 2-EV5",        "bthci_cmd.sco_packet_type_2ev5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0100,
-				"Packet Type 2-EV5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_sco_packet_type_3ev5,
 			{ "Packet Type 3-EV5",        "bthci_cmd.sco_packet_type_3ev5",
 				FT_UINT16, BASE_DEC, VALS(cmd_boolean), 0x0200,
-				"Packet Type 3-EV5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_min_remote_timeout,
 			{"Min. Remote Timeout", "bthci_cmd.min_remote_timeout",
@@ -2793,71 +2793,71 @@ proto_register_bthci_cmd(void)
 		{ &hf_bthci_cmd_flush_packet_type,
 			{"Packet Type", "bthci_cmd.flush_packet_type",
 				FT_UINT8, BASE_DEC, VALS(cmd_flush_pkt_type), 0x0,
-				"Packet Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_afh_ch_assessment_mode,
 			{"AFH Channel Assessment Mode", "bthci_cmd.afh_ch_assessment_mode",
 				FT_UINT8, BASE_DEC, VALS(cmd_en_disabled), 0x0,
-				"AFH Channel Assessment Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_afh_ch_classification,
 			{ "Channel Classification",           "bthci_cmd.afh_ch_classification",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Channel Classification", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_cmd_which_clock,
 			{"Which Clock", "bthci_cmd.which_clock",
 				FT_UINT8, BASE_DEC, VALS(cmd_which_clock), 0x0,
-				"Which Clock", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_io_capability,
 			{"IO Capability", "bthci_cmd.io_capability",
 				FT_UINT8, BASE_DEC, VALS(bthci_cmd_io_capability_vals), 0x0,
-				"IO Capability", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_oob_data_present,
 			{"OOB Data Present", "bthci_cmd.oob_data_present",
 				FT_UINT8, BASE_DEC, VALS(bthci_cmd_oob_data_present_vals), 0x0,
-				"OOB Data Present", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_auth_requirements,
 			{"Authentication Requirements", "bthci_cmd.auth_requirements",
 				FT_UINT8, BASE_DEC, VALS(bthci_cmd_auth_req_vals), 0x0,
-				"Authentication Requirements", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_passkey,
 			{"Passkey", "bthci_cmd.passkey",
 				FT_UINT32, BASE_DEC, NULL, 0x0,
-				"Passkey", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_hash_c,
 			{"Hash C", "bthci_cmd.hash_c",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Hash C", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_randomizer_r,
 			{"Randomizer R", "bthci_cmd.randomizer_r",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Randomizer R", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_simple_pairing_mode,
 			{"Simple Pairing Mode", "bthci_cmd.simple_pairing_mode",
 				FT_UINT8, BASE_DEC, VALS(cmd_en_disabled), 0x0,
-				"Simple Pairing Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_simple_pairing_debug_mode,
 			{"Simple Pairing Debug Mode", "bthci_cmd.simple_pairing_debug_mode",
 				FT_UINT8, BASE_DEC, VALS(cmd_en_disabled), 0x0,
-				"Simple Pairing Debug Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_notification_type,
 			{"Notification Type", "bthci_cmd.notification_type",
 				FT_UINT8, BASE_DEC, VALS(cmd_notification_types), 0x0,
-				"Notification Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_cmd_eir_data,
 			{"Data", "bthci_cmd.eir_data",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"EIR Data", HFILL}
 		},
 		{ &hf_bthci_cmd_eir_struct_length,
@@ -2882,7 +2882,7 @@ proto_register_bthci_cmd(void)
 		},
 		{ &hf_bthci_cmd_sc_uuid128,
 			{ "UUID",           "bthci_cmd.service_class_uuid128",
-				FT_BYTES, BASE_HEX, NULL, 0x0,          
+				FT_BYTES, BASE_NONE, NULL, 0x0,          
 				"128-bit Service Class UUID", HFILL }
 		}
 	};
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index cf5d71c9a3..18af72883a 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -2557,22 +2557,22 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_code,
 			{ "Event Code",           "bthci_evt.code",
 				FT_UINT8, BASE_HEX, VALS(evt_code_vals), 0x0,          
-				"Event Code", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_param_length,
 			{ "Parameter Total Length",           "bthci_evt.param_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,          
-				"Parameter Total Length", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_params,
 			{ "Event Parameter",           "bthci_evt.params",
 				FT_NONE, BASE_NONE, NULL, 0x0,          
-				"Event Parameter", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_command_packets,
 			{ "Number of Allowed Command Packets",           "bthci_evt.num_command_packets",
 				FT_UINT8, BASE_DEC, NULL, 0x0,          
-				"Number of Allowed Command Packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_handles,
 			{ "Number of Connection Handles",           "bthci_evt.num_handles",
@@ -2582,7 +2582,7 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_connection_handle,
 			{ "Connection Handle",             "bthci_evt.connection_handle",
 				FT_UINT16, BASE_HEX, NULL, 0x0,
-				"Connection Handle", HFILL }
+				NULL, HFILL }
 		},
 
 		{ &hf_bthci_evt_num_compl_packets,
@@ -2594,7 +2594,7 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_com_opcode,
 			{ "Command Opcode",           "bthci_evt.com_opcode",
 				FT_UINT16, BASE_HEX, VALS(bthci_cmd_opcode_vals), 0x0,          
-				"Command Opcode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_ogf,
 			{ "ogf",           "bthci_evt.ogf",
@@ -2609,42 +2609,42 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_ret_params,
 			{ "Return Parameter",           "bthci_evt.ret_params",
 				FT_NONE, BASE_NONE, NULL, 0x0,          
-				"Return Parameter", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_status,
 			{ "Status",           "bthci_evt.status",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_status_vals), 0x0,          
-				"Status", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_status_pending,
 			{ "Status", "bthci_evt.status",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_status_pending_vals), 0x0,          
-				"Status", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_bd_addr,
-			{ "BD_ADDR: ",          "bthci_evt.bd_addr",
+			{ "BD_ADDR:",          "bthci_evt.bd_addr",
 				FT_NONE, BASE_NONE, NULL, 0x0,
 				"Bluetooth Device Address", HFILL}
 		},
 		{ &hf_bthci_evt_class_of_device,
 			{ "Class of Device", "bthci_evt.class_of_device",
 				FT_UINT24, BASE_HEX, NULL, 0x0,
-				"Class of Device", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type,
 			{ "Link Type",        "bthci_evt.link_type",
 				FT_UINT8, BASE_HEX, VALS(evt_link_types), 0x0,
-				"Link Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_encryption_mode,
 			{ "Encryption Mode",  "bthci_evt.encryption_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_encryption_modes), 0x0,
-				"Encryption Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_reason,
 			{ "Reason",           "bthci_evt.reason",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_status_vals), 0x0,          
-				"Reason", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_remote_name,
 			{ "Remote Name",           "bthci_evt.remote_name",
@@ -2654,12 +2654,12 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_encryption_enable,
 			{ "Encryption Enable",        "bthci_evt.encryption_enable",
 				FT_UINT8, BASE_HEX, VALS(evt_encryption_enable), 0x0,
-				"Encryption Enable", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_key_flag,
 			{ "Key Flag",        "bthci_evt.key_flag",
 				FT_UINT8, BASE_HEX, VALS(evt_key_flag), 0x0,
-				"Key Flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_vers_nr,
 			{ "LMP Version",        "bthci_evt.lmp_vers_nr",
@@ -2689,12 +2689,12 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_flags,
 			{ "Flags",        "bthci_evt.flags",
 				FT_UINT8, BASE_HEX, NULL, 0x0,
-				"Flags", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_service_type,
 			{ "Service Type",        "bthci_evt.service_type",
 				FT_UINT8, BASE_HEX, VALS(evt_service_types), 0x0,
-				"Service Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_token_rate,
 			{ "Available Token Rate",        "bthci_evt.token_rate",
@@ -2724,12 +2724,12 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_role,
 			{ "Role",        "bthci_evt.role",
 				FT_UINT8, BASE_HEX, VALS(evt_role_vals), 0x0,
-				"Role", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_curr_mode,
 			{ "Current Mode",        "bthci_evt.current_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_modes), 0x0,
-				"Current Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_interval,
 			{ "Interval",        "bthci_evt.interval",
@@ -2738,13 +2738,13 @@ proto_register_bthci_evt(void)
 		},
 		{ &hf_bthci_evt_link_key,
 			{ "Link Key",        "bthci_evt.link_key",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"Link Key for the associated BD_ADDR", HFILL }
 		},
 		{ &hf_bthci_evt_key_type,
 			{ "Key Type",        "bthci_evt.key_type",
 				FT_UINT8, BASE_HEX, VALS(evt_key_types), 0x0,
-				"Key Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_max_slots,
 			{ "Maximum Number of Slots",        "bthci_evt.max_slots",
@@ -2759,342 +2759,342 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_page_scan_mode,
 			{ "Page Scan Mode",        "bthci_evt.page_scan_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_page_scan_modes), 0x0,
-				"Page Scan Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_page_scan_repetition_mode,
 			{ "Page Scan Repetition Mode",        "bthci_evt.page_scan_repetition_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_page_scan_repetition_modes), 0x0,
-				"Page Scan Repetition Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_page_scan_period_mode,
 			{ "Page Scan Period Mode",        "bthci_evt.page_scan_period_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_page_scan_period_modes), 0x0,
-				"Page Scan Period Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_2dh1,
 			{ "ACL Link Type 2-DH1",        "bthci_evt.link_type_2dh1",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0002,
-				"ACL Link Type 2-DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_3dh1,
 			{ "ACL Link Type 3-DH1",        "bthci_evt.link_type_3dh1",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0004,
-				"ACL Link Type 3-DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dm1,
 			{ "ACL Link Type DM1",        "bthci_evt.link_type_dm1",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0008,
-				"ACL Link Type DM1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dh1,
 			{ "ACL Link Type DH1",        "bthci_evt.link_type_dh1",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0010,
-				"ACL Link Type DH1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_2dh3,
 			{ "ACL Link Type 2-DH3",        "bthci_evt.link_type_2dh3",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0100,
-				"ACL Link Type 2-DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_3dh3,
 			{ "ACL Link Type 3-DH3",        "bthci_evt.link_type_3dh3",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0200,
-				"ACL Link Type 3-DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dm3,
 			{ "ACL Link Type DM3",        "bthci_evt.link_type_dm3",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0400,
-				"ACL Link Type DM3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dh3,
 			{ "ACL Link Type DH3",        "bthci_evt.link_type_dh3",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0800,
-				"ACL Link Type DH3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_2dh5,
 			{ "ACL Link Type 2-DH5",        "bthci_evt.link_type_2dh5",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x1000,
-				"ACL Link Type 2-DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_3dh5,
 			{ "ACL Link Type 3-DH5",        "bthci_evt.link_type_3dh5",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x2000,
-				"ACL Link Type 3-DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dm5,
 			{ "ACL Link Type DM5",        "bthci_evt.link_type_dm5",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x4000,
-				"ACL Link Type DM5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_dh5,
 			{ "ACL Link Type DH5",        "bthci_evt.link_type_dh5",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x8000,
-				"ACL Link Type DH5", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_hv1,
 			{ "SCO Link Type HV1",        "bthci_evt.link_type_hv1",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0020,
-				"SCO Link Type HV1", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_hv2,
 			{ "SCO Link Type HV2",        "bthci_evt.link_type_hv2",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0040,
-				"SCO Link Type HV2", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_type_hv3,
 			{ "SCO Link Type HV3",        "bthci_evt.link_type_hv3",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0080,
-				"SCO Link Type HV3", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_00,
 			{ "3-slot packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"3-slot packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_01,
 			{ "5-slot packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"5-slot packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_02,
 			{ "encryption",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x04,
-				"encryption", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_03,
 			{ "slot offset",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"slot offset", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_04,
 			{ "timing accuracy",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"timing accuracy", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_05,
 			{ "master/slave switch",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x20,
-				"master/slave switch", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_06,
 			{ "hold mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x40,
-				"hold mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_07,
 			{ "sniff mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"sniff mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_10,
 			{ "park mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"park mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_11,
 			{ "RSSI",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"RSSI", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_12,
 			{ "channel quality driven data rate",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x04,
-				"channel quality driven data rate", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_13,
 			{ "SCO link",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"SCO link", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_14,
 			{ "HV2 packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"HV2 packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_15,
 			{ "HV3 packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x20,
-				"HV3 packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_16,
 			{ "u-law log",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x40,
-				"u-law log", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_17,
 			{ "A-law log",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"A-law log", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_20,
 			{ "CVSD",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"CVSD", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_21,
 			{ "paging scheme",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"paging scheme", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_22,
 			{ "power control",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x04,
-				"power control", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_23,
 			{ "transparent SCO data",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"transparent SCO data", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_24,
 			{ "Flow control lag",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, NULL, 0x70,
-				"Flow control lag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_27,
 			{ "broadband encryption",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"broadband encryption", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_31,
 			{ "EDR ACL 2 Mbps mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"EDR ACL 2 Mbps mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_32,
 			{ "EDR ACL 3 Mbps mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x04,
-				"EDR ACL 3 Mbps mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_33,
 			{ "enhanced inquiry scan",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"enhanced inquiry scan", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_34,
 			{ "interlaced inquiry scan",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"interlaced inquiry scan", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_35,
 			{ "interlaced page scan",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x20,
-				"interlaced page scan", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_36,
 			{ "RSSI with inquiry results",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x40,
-				"RSSI with inquiry results", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_37,
 			{ "eSCO EV3 packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"eSCO EV3 packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_40,
 			{ "eSCO EV4 packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"eSCO EV4 packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_41,
 			{ "eSCO EV5 packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"eSCO EV5 packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_43,
 			{ "AFH capable slave",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"AFH capable slave", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_44,
 			{ "AFH classification slave",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"AFH classification slave", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_47,
 			{ "3-slot EDR ACL packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"3-slot EDR ACL packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_50,
 			{ "5-slot EDR ACL packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"5-slot EDR ACL packets", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_51,
 			{ "sniff subrating",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"sniff subrating", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_52,
 			{ "pause encryption",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x04,
-				"pause encryption", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_53,
 			{ "AFH capable master",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"AFH capable master", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_54,
 			{ "AFH classification master",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"AFH classification master", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_55,
 			{ "EDR eSCO 2 Mbps mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x20,
-				"EDR eSCO 2 Mbps mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_56,
 			{ "EDR eSCO 3 Mbps mode",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x40,
-				"EDR eSCO 3 Mbps mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_57,
 			{ "3-slot EDR eSCO packets",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_60,
 			{ "extended inquiry response",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"extended inquiry response", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_63,
 			{ "secure simple pairing",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x08,
-				"secure simple pairing", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_64,
 			{ "encapsulated PDU",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x10,
-				"encapsulated PDU", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_65,
 			{ "erroneous data reporting",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x20,
-				"erroneous data reporting", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_66,
 			{ "non-flushable packet boundary flag",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x40,
-				"non-flushable packet boundary flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_70,
 			{ "link supervision timeout changed event",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x01,
-				"link supervision timeout changed event", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_71,
 			{ "inquiry response TX power level",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x02,
-				"inquiry response TX power level", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_lmp_feature_77,
 			{ "extended features",        "bthci_evt.lmp_feature",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x80,
-				"extended features", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_keys,
 			{ "Number of Link Keys",        "bthci_evt.num_keys",
@@ -3104,17 +3104,17 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_num_keys_read,
 			{ "Number of Link Keys Read",        "bthci_evt.num_keys_read",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Number of Link Keys Read", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_keys_deleted,
 			{ "Number of Link Keys Deleted",        "bthci_evt.num_keys_deleted",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Number of Link Keys Deleted", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_keys_written,
 			{ "Number of Link Keys Written",        "bthci_evt.num_keys_written",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Number of Link Keys Written", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_max_num_keys,
 			{ "Max Num Keys",        "bthci_evt.max_num_keys",
@@ -3124,27 +3124,27 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_num_responses,
 			{ "Number of responses",        "bthci_evt.num_responses",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Number of Responses from Inquiry ", HFILL }
+				"Number of Responses from Inquiry", HFILL }
 		},
 		{ &hf_bthci_evt_link_policy_setting_switch,
 			{ "Enable Master Slave Switch", "bthci_evt.link_policy_switch",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0001,
-				"Enable Master Slave Switch", HFILL }
+				NULL, HFILL }
 		}, 
 		{ &hf_bthci_evt_link_policy_setting_hold,
 			{ "Enable Hold Mode", "bthci_evt.link_policy_hold",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0002,
-				"Enable Hold Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_policy_setting_sniff,
 			{ "Enable Sniff Mode", "bthci_evt.link_policy_sniff",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0004,
-				"Enable Sniff Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_link_policy_setting_park,
 			{ "Enable Park Mode", "bthci_evt.link_policy_park",
 				FT_UINT16, BASE_DEC, VALS(evt_boolean), 0x0008,
-				"Enable Park Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_curr_role,
 			{ "Current Role", "bthci_evt_curr_role",
@@ -3194,12 +3194,12 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_input_data_format,
 			{ "Input Data Format", "bthci_evt.input_data_format",
 				FT_UINT16, BASE_DEC, VALS(evt_input_data_format_values), 0x00c0,
-				"Input Data Format", HFILL }
+				NULL, HFILL }
 		},  
 		{ &hf_bthci_evt_input_sample_size,
 			{ "Input Sample Size", "bthci_evt.input_sample_size",
 				FT_UINT16, BASE_DEC, VALS(evt_input_sample_size_values), 0x0020,
-				"Input Sample Size", HFILL }
+				NULL, HFILL }
 		}, 
 		{ &hf_bthci_evt_num_broadcast_retransm,
 			{ "Num Broadcast Retran", "bthci_evt.num_broad_retran",
@@ -3224,15 +3224,15 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_transmit_power_level,
 			{ "Transmit Power Level (dBm)", "bthci_evt.transmit_power_level",
 				FT_INT8, BASE_DEC, NULL, 0x0,
-				"Transmit Power Level (dBm)", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_num_supp_iac,
-			{" Num Support IAC", "bthci_evt.num_supp_iac",
+			{"Num Support IAC", "bthci_evt.num_supp_iac",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
 				"Num of supported IAC the device can simultaneously listen", HFILL }
 		},
 		{ &hf_bthci_evt_num_curr_iac,
-			{" Num Current IAC", "bthci_evt.num_curr_iac",
+			{"Num Current IAC", "bthci_evt.num_curr_iac",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
 				"Num of IACs currently in use to simultaneously listen", HFILL }
 		},
@@ -3244,17 +3244,17 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_loopback_mode,
 			{"Loopback Mode", "bthci_evt.loopback_mode",
 				FT_UINT8, BASE_HEX, VALS(evt_loopback_modes), 0x0,
-				"Loopback Mode", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_country_code,
 			{"Country Code", "bthci_evt.country_code",
 				FT_UINT8, BASE_HEX, VALS(evt_country_code_values), 0x0,
-				"Country Code", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_failed_contact_counter,
 			{"Failed Contact Counter", "bthci_evt.failed_contact_counter",
 				FT_UINT16, BASE_DEC, NULL, 0x0,  
-				"Failed Contact Counter", HFILL }
+				NULL, HFILL }
 		},   
 		{ &hf_bthci_evt_link_quality,
 			{"Link Quality", "bthci_evt.link_quality",
@@ -3264,7 +3264,7 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_rssi,
 			{ "RSSI (dB)", "bthci_evt.rssi",
 				FT_INT8, BASE_DEC, NULL, 0x0,
-				"RSSI (dB)", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_host_data_packet_length_acl,
 			{"Host ACL Data Packet Length (bytes)", "bthci_evt.max_data_length_acl",
@@ -3289,42 +3289,42 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_page_number,
 			{"Page Number", "bthci_evt.page_number",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Page Number", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_max_page_number,
 			{"Max. Page Number", "bthci_evt.max_page_number",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Max. Page Number", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_local_supported_cmds,
 			{ "Local Supported Commands",        "bthci_evt.local_supported_cmds",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
-				"Local Supported Commands", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0x0,
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_fec_required,
 			{"FEC Required", "bthci_evt.fec_required",
 				FT_UINT8, BASE_DEC, VALS(evt_boolean), 0x0,
-				"FEC Required", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_err_data_reporting,
 			{"Erroneous Data Reporting", "bthci_evt.err_data_reporting",
 				FT_UINT8, BASE_DEC, VALS(evt_enable_values), 0x0,
-				"Erroneous Data Reporting", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_scan_type,
 			{"Scan Type", "bthci_evt.inq_scan_type",
 				FT_UINT8, BASE_DEC, VALS(evt_scan_types), 0x0,
-				"Scan Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_inq_mode,
 			{"Inquiry Mode", "bthci_evt.inq_scan_type",
 				FT_UINT8, BASE_DEC, VALS(evt_inq_modes), 0x0,
-				"Inquiry Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_power_level_type,
 			{"Type", "bthci_evt.power_level_type",
 				FT_UINT8, BASE_HEX, VALS(evt_power_level_types), 0x0,
-				"Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_ext_lmp_features,
 			{"Ext. LMP Features", "bthci_evt.page_number",
@@ -3334,57 +3334,57 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_sync_link_type,
 			{"Link Type", "bthci_evt.sync_link_type",
 				FT_UINT8, BASE_HEX, VALS(evt_sync_link_types), 0x0,
-				"Link Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_sync_tx_interval,
 			{"Transmit Interval", "bthci_evt.sync_tx_interval",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Transmit Interval", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_sync_rtx_window,
 			{"Retransmit Window", "bthci_evt.sync_rtx_window",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"Retransmit Window", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_sync_rx_packet_length,
 			{"Rx Packet Length", "bthci_evt.sync_rx_pkt_len",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Rx Packet Length", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_sync_tx_packet_length,
 			{"Tx Packet Length", "bthci_evt.sync_tx_pkt_len",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Tx Packet Length", HFILL}
+				NULL, HFILL}
 		},	
 		{ &hf_bthci_evt_air_mode,
 			{"Air Mode", "bthci_evt.air_mode",
 				FT_UINT8, BASE_DEC, VALS(evt_air_mode_values), 0x0,
-				"Air Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_max_tx_latency,
 			{"Max. Tx Latency", "bthci_evt.max_tx_latency",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Max. Tx Latency", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_max_rx_latency,
 			{"Max. Rx Latency", "bthci_evt.max_rx_latency",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Max. Rx Latency", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_min_remote_timeout,
 			{"Min. Remote Timeout", "bthci_evt.min_remote_timeout",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Min. Remote Timeout", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_min_local_timeout,
 			{"Min. Local Timeout", "bthci_evt.min_local_timeout",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Min. Local Timeout", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_link_supervision_timeout,
 			{"Link Supervision Timeout", "bthci_evt.link_supervision_timeout",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Link Supervision Timeout", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_token_bucket_size,
 			{ "Token Bucket Size",        "bthci_evt.token_bucket_size",
@@ -3394,86 +3394,86 @@ proto_register_bthci_evt(void)
 		{ &hf_bthci_evt_flow_direction,
 			{"Flow Direction", "bthci_evt.flow_direction",
 				FT_UINT8, BASE_DEC, VALS(evt_flow_direction_values), 0x0,
-				"Flow Direction", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_afh_ch_assessment_mode,
 			{"AFH Channel Assessment Mode", "bthci_evt.afh_ch_assessment_mode",
 				FT_UINT8, BASE_DEC, VALS(evt_enable_values), 0x0,
-				"AFH Channel Assessment Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_lmp_handle,
 			{ "LMP Handle",             "bthci_evt.lmp_handle",
 				FT_UINT16, BASE_HEX, NULL, 0x0,
-				"LMP Handle", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_clock,
 			{ "Clock",        "bthci_evt.clock",
 				FT_UINT32, BASE_HEX, NULL, 0x0,
-				"Clock", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_clock_accuracy,
 			{ "Clock",        "bthci_evt.clock_accuracy",
 				FT_UINT16, BASE_HEX, NULL, 0x0,
-				"Clock", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_bthci_evt_afh_mode,
 			{"AFH Mode", "bthci_evt.afh_mode",
 				FT_UINT8, BASE_DEC, VALS(evt_enable_values), 0x0,
-				"AFH Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_afh_channel_map,
 			{"AFH Channel Map", "bthci_evt.afh_channel_map",
 				FT_UINT_BYTES, BASE_HEX, NULL, 0x0,
-				"AFH Channel Map", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_simple_pairing_mode,
 			{"Simple Pairing Mode", "bthci_evt.simple_pairing_mode",
 				FT_UINT8, BASE_DEC, VALS(evt_enable_values), 0x0,
-				"Simple Pairing Mode", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_hash_c,
 			{"Hash C", "bthci_evt.hash_c",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Hash C", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_randomizer_r,
 			{"Randomizer R", "bthci_evt.randomizer_r",
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"Randomizer R", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_io_capability,
 			{"IO Capability", "bthci_evt.io_capability",
 				FT_UINT8, BASE_HEX, VALS(bthci_cmd_io_capability_vals), 0x0,
-				"IO Capability", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_oob_data_present,
 			{"OOB Data Present", "bthci_evt.oob_data_present",
 				FT_UINT8, BASE_DEC, VALS(bthci_cmd_oob_data_present_vals), 0x0,
-				"OOB Data Present", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_auth_requirements,
 			{"Authentication Requirements", "bthci_evt.auth_requirements",
 				FT_UINT8, BASE_DEC, VALS(bthci_cmd_auth_req_vals), 0x0,
-				"Authentication Requirements", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_numeric_value,
 			{"Numeric Value", "bthci_evt.numeric_value",
 				FT_UINT32, BASE_DEC, NULL, 0x0,
-				"Numeric Value", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_passkey,
 			{"Passkey", "bthci_evt.passkey",
 				FT_UINT32, BASE_DEC, NULL, 0x0,
-				"Passkey", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_notification_type,
 			{"Notification Type", "bthci_evt.notification_type",
 				FT_UINT8, BASE_DEC, VALS(evt_notification_type_vals), 0x0,
-				"Notification Type", HFILL}
+				NULL, HFILL}
 		},
 		{ &hf_bthci_evt_eir_data,
 			{"Data", "bthci_cmd.eir_data",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"EIR Data", HFILL}
 		},
 		{ &hf_bthci_evt_eir_struct_length,
@@ -3498,7 +3498,7 @@ proto_register_bthci_evt(void)
 		},
 		{ &hf_bthci_evt_sc_uuid128,
 			{ "UUID",           "bthci_cmd.service_class_uuid128",
-				FT_BYTES, BASE_HEX, NULL, 0x0,          
+				FT_BYTES, BASE_NONE, NULL, 0x0,          
 				"128-bit Service Class UUID", HFILL }
 		}
 	};
diff --git a/epan/dissectors/packet-bthci_sco.c b/epan/dissectors/packet-bthci_sco.c
index fc31f33bff..b1b41eff20 100644
--- a/epan/dissectors/packet-bthci_sco.c
+++ b/epan/dissectors/packet-bthci_sco.c
@@ -74,17 +74,17 @@ proto_register_btsco(void)
 		{ &hf_btsco_chandle,
 			{ "Connection Handle",           "btsco.chandle",
 			FT_UINT16, BASE_HEX, NULL, 0x0FFF,          
-			"Connection Handle", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_btsco_length,
 			{ "Data Total Length",           "btsco.length",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"Data Total Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_btsco_data,
 			{ "Data",           "btsco.data",
 			FT_NONE, BASE_NONE, NULL, 0x0,          
-			"Data", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-btl2cap.c b/epan/dissectors/packet-btl2cap.c
index 80c9236e31..6ca9047609 100644
--- a/epan/dissectors/packet-btl2cap.c
+++ b/epan/dissectors/packet-btl2cap.c
@@ -1009,7 +1009,7 @@ proto_register_btl2cap(void)
 		},
 		{ &hf_btl2cap_payload,
 			{ "Payload",           "btl2cap.payload",
-				FT_BYTES, BASE_HEX, NULL, 0x0,          
+				FT_BYTES, BASE_NONE, NULL, 0x0,          
 				"L2CAP Payload", HFILL }
 		},
 		{ &hf_btl2cap_command,
@@ -1055,22 +1055,22 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_result,
 			{ "Result",           "btl2cap.result",
 				FT_UINT16, BASE_HEX, VALS(result_vals), 0x0,          
-				"Result", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_status,
 			{ "Status",           "btl2cap.status",
 				FT_UINT16, BASE_HEX, VALS(status_vals), 0x0,          
-				"Status", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_rej_reason,
 			{ "Reason",           "btl2cap.rej_reason",
 				FT_UINT16, BASE_HEX, VALS(reason_vals), 0x0,          
-				"Reason", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_sig_mtu,
 			{ "Maximum Signalling MTU",           "btl2cap.sig_mtu",
 				FT_UINT16, BASE_DEC, NULL, 0x0,          
-				"Maximum Signalling MTU", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_info_mtu,
 			{ "Remote Entity MTU",           "btl2cap.info_mtu",
@@ -1110,7 +1110,7 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_continuation_flag,
 			{ "Continuation Flag",           "btl2cap.continuation",
 				FT_BOOLEAN, 16, NULL, 0x0001,          
-				"Continuation Flag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_configuration_result,
 			{ "Result",           "btl2cap.conf_result",
@@ -1125,7 +1125,7 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_option_length,
 			{ "Length",           "btl2cap.option_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,          
-				"Number of octets in option payload ", HFILL }
+				"Number of octets in option payload", HFILL }
 		},
 		{ &hf_btl2cap_option_mtu,
 			{ "MTU",           "btl2cap.option_mtu",
@@ -1205,12 +1205,12 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_option,
 			{ "Configuration Parameter Option",           "btl2cap.conf_param_option",
 				FT_NONE, BASE_NONE, NULL, 0x0,          
-				"Configuration Parameter Option", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_control_sar,
 			{ "Segmentation and reassembly",           "btl2cap.control_sar",
 				FT_UINT16, BASE_HEX, VALS(control_sar_vals), 0xC000,
-				"Segmentation and reassembly", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_control_reqseq,
 			{ "ReqSeq",           "btl2cap.control_reqseq",
@@ -1235,12 +1235,12 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_control_type,
 			{ "Frame Type",           "btl2cap.control_type",
 				FT_UINT16, BASE_HEX, VALS(control_type_vals), 0x0001,
-				"Frame Type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_control,
 			{ "Control field",           "btl2cap.control",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Control field", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_fcs,
 			{ "FCS",           "btl2cap.fcs",
@@ -1250,7 +1250,7 @@ proto_register_btl2cap(void)
 		{ &hf_btl2cap_sdulength,
 			{ "SDU Length",           "btl2cap.sdulength",
 				FT_UINT16, BASE_DEC, NULL, 0,
-				"SDU Length", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_btl2cap_reassembled_in,
 			{ "This SDU is reassembled in frame",           "btl2cap.reassembled_in",
diff --git a/epan/dissectors/packet-btrfcomm.c b/epan/dissectors/packet-btrfcomm.c
index fac6d1224f..18ba73489b 100644
--- a/epan/dissectors/packet-btrfcomm.c
+++ b/epan/dissectors/packet-btrfcomm.c
@@ -785,7 +785,7 @@ proto_register_btrfcomm(void)
 		{&hf_priority,
 			{"Priority", "btrfcomm.priority",
 			FT_UINT8, BASE_DEC, NULL, 0x3f,
-			"Priority", HFILL}
+			NULL, HFILL}
 		},
 		{&hf_max_frame_size,
 			{"Max Frame Size", "btrfcomm.max_frame_size",
@@ -800,7 +800,7 @@ proto_register_btrfcomm(void)
 		{&hf_error_recovery_mode,
 			{"Error Recovery Mode", "btrfcomm.error_recovery_mode",
 			FT_UINT8, BASE_DEC, NULL, 0x07,
-			"Error Recovery Mode", HFILL}
+			NULL, HFILL}
 		},
 		{&hf_ea,
 			{"EA Flag", "btrfcomm.ea",
@@ -891,7 +891,7 @@ proto_register_btrfcomm(void)
 		{&hf_msc_l,
 		         {"Length of break in units of 200ms", "btrfcomm.msc.bl",
 			 FT_UINT8, BASE_DEC, NULL, 0xf0,
-			  "Length of break in units of 200ms", HFILL}
+			  NULL, HFILL}
 		},
 		{&hf_fc_credits,
 		         {"Credits", "btrfcomm.credits",
diff --git a/epan/dissectors/packet-btsdp.c b/epan/dissectors/packet-btsdp.c
index 1839183a85..7ea1eb4e5e 100644
--- a/epan/dissectors/packet-btsdp.c
+++ b/epan/dissectors/packet-btsdp.c
@@ -772,7 +772,7 @@ proto_register_btsdp(void)
 		{&hf_plen,
 			{"ParameterLength", "btsdp.len",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"ParameterLength", HFILL}
+			NULL, HFILL}
 		},
 		{&hf_error_code,
 		        {"ErrorCode", "btsdp.error_code",
diff --git a/epan/dissectors/packet-bvlc.c b/epan/dissectors/packet-bvlc.c
index 23bbe6bd76..24ca19ab03 100644
--- a/epan/dissectors/packet-bvlc.c
+++ b/epan/dissectors/packet-bvlc.c
@@ -326,7 +326,7 @@ proto_register_bvlc(void)
 		{ &hf_bvlc_type,
 			{ "Type",           "bvlc.type",
 			FT_UINT8, BASE_HEX, VALS(bvlc_types), 0,
-			"Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_bvlc_function,
 			{ "Function",           "bvlc.function",
@@ -357,7 +357,7 @@ proto_register_bvlc(void)
 		},
 		{ &hf_bvlc_bdt_mask,
 			{ "Mask",           "bvlc.bdt_mask",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"BDT Broadcast Distribution Mask", HFILL }
 		},
 		{ &hf_bvlc_reg_ttl,
diff --git a/epan/dissectors/packet-calcappprotocol.c b/epan/dissectors/packet-calcappprotocol.c
index 08ae010edc..fa69b47f56 100644
--- a/epan/dissectors/packet-calcappprotocol.c
+++ b/epan/dissectors/packet-calcappprotocol.c
@@ -141,12 +141,12 @@ proto_register_calcappprotocol(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,      { "Type",      "calcappprotocol.message_type",      FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
-    { &hf_message_flags,     { "Flags",     "calcappprotocol.message_flags",     FT_UINT8,  BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_length,    { "Length",    "calcappprotocol.message_length",    FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_jobid,     { "JobID",     "calcappprotocol.message_jobid",     FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_jobsize,   { "JobSize",   "calcappprotocol.message_jobsize",   FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_completed, { "Completed", "calcappprotocol.message_completed", FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
+    { &hf_message_type,      { "Type",      "calcappprotocol.message_type",      FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } },
+    { &hf_message_flags,     { "Flags",     "calcappprotocol.message_flags",     FT_UINT8,  BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_length,    { "Length",    "calcappprotocol.message_length",    FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_jobid,     { "JobID",     "calcappprotocol.message_jobid",     FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_jobsize,   { "JobSize",   "calcappprotocol.message_jobsize",   FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_completed, { "Completed", "calcappprotocol.message_completed", FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 3ab8bd3202..927140f5de 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7305,18 +7305,18 @@ void proto_register_camel(void) {
     { &hf_camel_cause_indicator, /* Currently not enabled */
       { "Cause indicator",  "camel.cause_indicator",
         FT_UINT8, BASE_DEC, VALS(q850_cause_code_vals), 0x7f,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_digit,
       { "Digit Value",  "camel.digit_value",
-        FT_UINT8, BASE_DEC, VALS(digit_value), 0, "Digit Value", HFILL }},
+        FT_UINT8, BASE_DEC, VALS(digit_value), 0, NULL, HFILL }},
     { &hf_camel_PDPTypeNumber_etsi,
       { "ETSI defined PDP Type Value",  "camel.PDPTypeNumber_etsi",
         FT_UINT8, BASE_HEX, VALS(gsm_map_etsi_defined_pdp_vals), 0,
-        "ETSI defined PDP Type Value", HFILL }},
+        NULL, HFILL }},
     { &hf_camel_PDPTypeNumber_ietf,
       { "IETF defined PDP Type Value",  "camel.PDPTypeNumber_ietf",
         FT_UINT8, BASE_HEX, VALS(gsm_map_ietf_defined_pdp_vals), 0,
-        "IETF defined PDP Type Value", HFILL }},
+        NULL, HFILL }},
     { &hf_camel_PDPAddress_IPv4,
       { "PDPAddress IPv4",  "camel.PDPAddress_IPv4",
         FT_IPv4, BASE_NONE, NULL, 0,
@@ -7327,7 +7327,7 @@ void proto_register_camel(void) {
         "IPAddress IPv6", HFILL }},
     { &hf_camel_cellGlobalIdOrServiceAreaIdFixedLength,
       { "CellGlobalIdOrServiceAreaIdFixedLength", "camel.CellGlobalIdOrServiceAreaIdFixedLength",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "LocationInformationGPRS/CellGlobalIdOrServiceAreaIdOrLAI", HFILL }},
     { &hf_camel_RP_Cause,
       { "RP Cause",  "camel.RP_Cause",
@@ -7337,27 +7337,27 @@ void proto_register_camel(void) {
     { &hf_camel_CAMEL_AChBillingChargingCharacteristics,
       { "CAMEL-AChBillingChargingCharacteristics", "camel.CAMEL_AChBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC,  VALS(camel_CAMEL_AChBillingChargingCharacteristics_vals), 0,
-        "CAMEL-AChBillingChargingCharacteristics", HFILL }}, 
+        NULL, HFILL }}, 
     
     { &hf_camel_CAMEL_FCIBillingChargingCharacteristics,
       { "CAMEL-FCIBillingChargingCharacteristics", "camel.CAMEL_FCIBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCIBillingChargingCharacteristics_vals), 0,
-        "CAMEL-FCIBillingChargingCharacteristics", HFILL }},
+        NULL, HFILL }},
 
     { &hf_camel_CAMEL_FCIGPRSBillingChargingCharacteristics,
       { "CAMEL-FCIGPRSBillingChargingCharacteristics", "camel.CAMEL_FCIGPRSBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "CAMEL-FCIGPRSBillingChargingCharacteristics", HFILL }},
+        NULL, HFILL }},
 
     { &hf_camel_CAMEL_FCISMSBillingChargingCharacteristics,
       { "CAMEL-FCISMSBillingChargingCharacteristics", "camel.CAMEL_FCISMSBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC, VALS(camel_CAMEL_FCISMSBillingChargingCharacteristics_vals), 0,
-        "CAMEL-FCISMSBillingChargingCharacteristics", HFILL }},
+        NULL, HFILL }},
 
     { &hf_camel_CAMEL_SCIBillingChargingCharacteristics,
       { "CAMEL-SCIBillingChargingCharacteristics", "camel.CAMEL_SCIBillingChargingCharacteristics",
         FT_UINT32, BASE_DEC, VALS(camel_CAMEL_SCIBillingChargingCharacteristics_vals), 0,
-        "CAMEL-SCIBillingChargingCharacteristics", HFILL }},
+        NULL, HFILL }},
 
     { &hf_camel_CAMEL_SCIGPRSBillingChargingCharacteristics,
       { "CAMEL-SCIGPRSBillingChargingCharacteristics", "camel.CAMEL_SCIGPRSBillingChargingCharacteristics",
@@ -7374,19 +7374,19 @@ void proto_register_camel(void) {
       { "Session Id",
         "camel.srt.session_id",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }
+        NULL, HFILL }
     },
     { &hf_camelsrt_RequestNumber,
       { "Request Number",
         "camel.srt.request_number",
         FT_UINT64, BASE_DEC, NULL, 0x0,
-        "", HFILL }
+        NULL, HFILL }
     },
     { &hf_camelsrt_Duplicate,
       { "Request Duplicate",
         "camel.srt.duplicate",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }
+        NULL, HFILL }
     },
     { &hf_camelsrt_RequestFrame,
       { "Requested Frame",
@@ -7496,7 +7496,7 @@ void proto_register_camel(void) {
         "camel.ApplyChargingArg", HFILL }},
     { &hf_camel_ApplyChargingReportArg_PDU,
       { "ApplyChargingReportArg", "camel.ApplyChargingReportArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ApplyChargingReportArg", HFILL }},
     { &hf_camel_AssistRequestInstructionsArg_PDU,
       { "AssistRequestInstructionsArg", "camel.AssistRequestInstructionsArg",
@@ -7552,7 +7552,7 @@ void proto_register_camel(void) {
         "camel.EventReportBCSMArg", HFILL }},
     { &hf_camel_FurnishChargingInformationArg_PDU,
       { "FurnishChargingInformationArg", "camel.FurnishChargingInformationArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.FurnishChargingInformationArg", HFILL }},
     { &hf_camel_InitialDPArg_PDU,
       { "InitialDPArg", "camel.InitialDPArg",
@@ -7576,7 +7576,7 @@ void proto_register_camel(void) {
         "camel.PlayToneArg", HFILL }},
     { &hf_camel_ReleaseCallArg_PDU,
       { "ReleaseCallArg", "camel.ReleaseCallArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ReleaseCallArg", HFILL }},
     { &hf_camel_RequestReportBCSMEventArg_PDU,
       { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg",
@@ -7624,7 +7624,7 @@ void proto_register_camel(void) {
         "camel.EventReportGPRSArg", HFILL }},
     { &hf_camel_FurnishChargingInformationGPRSArg_PDU,
       { "FurnishChargingInformationGPRSArg", "camel.FurnishChargingInformationGPRSArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.FurnishChargingInformationGPRSArg", HFILL }},
     { &hf_camel_InitialDPGPRSArg_PDU,
       { "InitialDPGPRSArg", "camel.InitialDPGPRSArg",
@@ -7656,7 +7656,7 @@ void proto_register_camel(void) {
         "camel.EventReportSMSArg", HFILL }},
     { &hf_camel_FurnishChargingInformationSMSArg_PDU,
       { "FurnishChargingInformationSMSArg", "camel.FurnishChargingInformationSMSArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.FurnishChargingInformationSMSArg", HFILL }},
     { &hf_camel_InitialDPSMSArg_PDU,
       { "InitialDPSMSArg", "camel.InitialDPSMSArg",
@@ -7664,7 +7664,7 @@ void proto_register_camel(void) {
         "camel.InitialDPSMSArg", HFILL }},
     { &hf_camel_ReleaseSMSArg_PDU,
       { "ReleaseSMSArg", "camel.ReleaseSMSArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ReleaseSMSArg", HFILL }},
     { &hf_camel_RequestReportSMSEventArg_PDU,
       { "RequestReportSMSEventArg", "camel.RequestReportSMSEventArg",
@@ -7704,7 +7704,7 @@ void proto_register_camel(void) {
         "camel.INTEGER_1_86400", HFILL }},
     { &hf_camel_audibleIndicatorTone,
       { "tone", "camel.tone",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_burstList,
       { "burstList", "camel.burstList",
@@ -7712,15 +7712,15 @@ void proto_register_camel(void) {
         "camel.BurstList", HFILL }},
     { &hf_camel_conferenceTreatmentIndicator,
       { "conferenceTreatmentIndicator", "camel.conferenceTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_callCompletionTreatmentIndicator,
       { "callCompletionTreatmentIndicator", "camel.callCompletionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_calledAddressValue,
       { "calledAddressValue", "camel.calledAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_gapOnService,
       { "gapOnService", "camel.gapOnService",
@@ -7740,7 +7740,7 @@ void proto_register_camel(void) {
         "camel.T_callingAddressAndService", HFILL }},
     { &hf_camel_callingAddressValue,
       { "callingAddressValue", "camel.callingAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_eventTypeBCSM,
       { "eventTypeBCSM", "camel.eventTypeBCSM",
@@ -7760,11 +7760,11 @@ void proto_register_camel(void) {
         "camel.NULL", HFILL }},
     { &hf_camel_cause,
       { "cause", "camel.cause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Cause", HFILL }},
     { &hf_camel_bearerCap,
       { "bearerCap", "camel.bearerCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.T_bearerCap", HFILL }},
     { &hf_camel_numberOfBursts,
       { "numberOfBursts", "camel.numberOfBursts",
@@ -7840,7 +7840,7 @@ void proto_register_camel(void) {
         "camel.INTEGER_1_864000", HFILL }},
     { &hf_camel_releaseIfdurationExceeded,
       { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_timeDurationCharging_tariffSwitchInterval,
       { "tariffSwitchInterval", "camel.tariffSwitchInterval",
@@ -7868,7 +7868,7 @@ void proto_register_camel(void) {
         "camel.TimeInformation", HFILL }},
     { &hf_camel_legActive,
       { "legActive", "camel.legActive",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_callLegReleasedAtTcpExpiry,
       { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry",
@@ -7884,7 +7884,7 @@ void proto_register_camel(void) {
         "camel.T_fci_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_freeFormatData,
       { "freeFormatData", "camel.freeFormatData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_bound__minFCIBillingChargingDataLength_bound__maxFCIBillingChargingDataLength", HFILL }},
     { &hf_camel_fCIBCCCAMELsequence1partyToCharge,
       { "partyToCharge", "camel.partyToCharge",
@@ -7900,7 +7900,7 @@ void proto_register_camel(void) {
         "camel.T_fciGPRS_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_pDPID,
       { "pDPID", "camel.pDPID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.PDPID", HFILL }},
     { &hf_camel_fciSMS_fCIBCCCAMELsequence1,
       { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
@@ -7928,15 +7928,15 @@ void proto_register_camel(void) {
         "camel.ChangeOfLocation", HFILL }},
     { &hf_camel_cellGlobalId,
       { "cellGlobalId", "camel.cellGlobalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_serviceAreaId,
       { "serviceAreaId", "camel.serviceAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_locationAreaId,
       { "locationAreaId", "camel.locationAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOver,
       { "inter-SystemHandOver", "camel.inter_SystemHandOver",
@@ -7988,15 +7988,15 @@ void proto_register_camel(void) {
         "camel.INTEGER_1_30", HFILL }},
     { &hf_camel_endOfReplyDigit,
       { "endOfReplyDigit", "camel.endOfReplyDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_camel_cancelDigit,
       { "cancelDigit", "camel.cancelDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_camel_startDigit,
       { "startDigit", "camel.startDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_camel_firstDigitTimeOut,
       { "firstDigitTimeOut", "camel.firstDigitTimeOut",
@@ -8012,15 +8012,15 @@ void proto_register_camel(void) {
         "camel.ErrorTreatment", HFILL }},
     { &hf_camel_interruptableAnnInd,
       { "interruptableAnnInd", "camel.interruptableAnnInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_voiceInformation,
       { "voiceInformation", "camel.voiceInformation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_voiceBack,
       { "voiceBack", "camel.voiceBack",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_collectedDigits,
       { "collectedDigits", "camel.collectedDigits",
@@ -8032,11 +8032,11 @@ void proto_register_camel(void) {
         "camel.BasicGapCriteria", HFILL }},
     { &hf_camel_scfID,
       { "scfID", "camel.scfID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ScfID", HFILL }},
     { &hf_camel_DestinationRoutingAddress_item,
       { "CalledPartyNumber", "camel.CalledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyNumber", HFILL }},
     { &hf_camel_applicationTimer,
       { "applicationTimer", "camel.applicationTimer",
@@ -8088,7 +8088,7 @@ void proto_register_camel(void) {
         "camel.T_collectedInfoSpecificInfo", HFILL }},
     { &hf_camel_calledPartyNumber,
       { "calledPartyNumber", "camel.calledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyNumber", HFILL }},
     { &hf_camel_timeGPRSIfNoTariffSwitch,
       { "timeGPRSIfNoTariffSwitch", "camel.timeGPRSIfNoTariffSwitch",
@@ -8124,15 +8124,15 @@ void proto_register_camel(void) {
         "camel.INTEGER_0_255", HFILL }},
     { &hf_camel_pDPTypeOrganization,
       { "pDPTypeOrganization", "camel.pDPTypeOrganization",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.T_pDPTypeOrganization", HFILL }},
     { &hf_camel_pDPTypeNumber,
       { "pDPTypeNumber", "camel.pDPTypeNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.T_pDPTypeNumber", HFILL }},
     { &hf_camel_pDPAddress,
       { "pDPAddress", "camel.pDPAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.T_pDPAddress", HFILL }},
     { &hf_camel_routeSelectFailureSpecificInfo,
       { "routeSelectFailureSpecificInfo", "camel.routeSelectFailureSpecificInfo",
@@ -8140,7 +8140,7 @@ void proto_register_camel(void) {
         "camel.T_routeSelectFailureSpecificInfo", HFILL }},
     { &hf_camel_routeSelectfailureCause,
       { "failureCause", "camel.failureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Cause", HFILL }},
     { &hf_camel_oCalledPartyBusySpecificInfo,
       { "oCalledPartyBusySpecificInfo", "camel.oCalledPartyBusySpecificInfo",
@@ -8148,7 +8148,7 @@ void proto_register_camel(void) {
         "camel.T_oCalledPartyBusySpecificInfo", HFILL }},
     { &hf_camel_busyCause,
       { "busyCause", "camel.busyCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Cause", HFILL }},
     { &hf_camel_oNoAnswerSpecificInfo,
       { "oNoAnswerSpecificInfo", "camel.oNoAnswerSpecificInfo",
@@ -8160,7 +8160,7 @@ void proto_register_camel(void) {
         "camel.T_oAnswerSpecificInfo", HFILL }},
     { &hf_camel_destinationAddress,
       { "destinationAddress", "camel.destinationAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyNumber", HFILL }},
     { &hf_camel_or_Call,
       { "or-Call", "camel.or_Call",
@@ -8172,7 +8172,7 @@ void proto_register_camel(void) {
         "camel.NULL", HFILL }},
     { &hf_camel_chargeIndicator,
       { "chargeIndicator", "camel.chargeIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ChargeIndicator", HFILL }},
     { &hf_camel_ext_basicServiceCode2,
       { "ext-basicServiceCode2", "camel.ext_basicServiceCode2",
@@ -8188,11 +8188,11 @@ void proto_register_camel(void) {
         "camel.T_omidCallEvents", HFILL }},
     { &hf_camel_dTMFDigitsCompleted,
       { "dTMFDigitsCompleted", "camel.dTMFDigitsCompleted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_dTMFDigitsTimeOut,
       { "dTMFDigitsTimeOut", "camel.dTMFDigitsTimeOut",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_oDisconnectSpecificInfo,
       { "oDisconnectSpecificInfo", "camel.oDisconnectSpecificInfo",
@@ -8200,7 +8200,7 @@ void proto_register_camel(void) {
         "camel.T_oDisconnectSpecificInfo", HFILL }},
     { &hf_camel_releaseCause,
       { "releaseCause", "camel.releaseCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Cause", HFILL }},
     { &hf_camel_tBusySpecificInfo,
       { "tBusySpecificInfo", "camel.tBusySpecificInfo",
@@ -8216,7 +8216,7 @@ void proto_register_camel(void) {
         "camel.NULL", HFILL }},
     { &hf_camel_forwardingDestinationNumber,
       { "forwardingDestinationNumber", "camel.forwardingDestinationNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyNumber", HFILL }},
     { &hf_camel_tNoAnswerSpecificInfo,
       { "tNoAnswerSpecificInfo", "camel.tNoAnswerSpecificInfo",
@@ -8288,7 +8288,7 @@ void proto_register_camel(void) {
         "camel.T_t_smsFailureSpecificInfo", HFILL }},
     { &hf_camel_t_smsfailureCause,
       { "failureCause", "camel.failureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.MT_SMSCause", HFILL }},
     { &hf_camel_t_smsDeliverySpecificInfo,
       { "t-smsDeliverySpecificInfo", "camel.t_smsDeliverySpecificInfo",
@@ -8312,11 +8312,11 @@ void proto_register_camel(void) {
         "camel.T_value", HFILL }},
     { &hf_camel_callDiversionTreatmentIndicator,
       { "callDiversionTreatmentIndicator", "camel.callDiversionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_callingPartyRestrictionIndicator,
       { "callingPartyRestrictionIndicator", "camel.callingPartyRestrictionIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_compoundGapCriteria,
       { "compoundGapCriteria", "camel.compoundGapCriteria",
@@ -8336,19 +8336,19 @@ void proto_register_camel(void) {
         "camel.InformationToSend", HFILL }},
     { &hf_camel_GenericNumbers_item,
       { "GenericNumber", "camel.GenericNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.GenericNumber", HFILL }},
     { &hf_camel_short_QoS_format,
       { "short-QoS-format", "camel.short_QoS_format",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.QoS_Subscribed", HFILL }},
     { &hf_camel_long_QoS_format,
       { "long-QoS-format", "camel.long_QoS_format",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_QoS_Subscribed", HFILL }},
     { &hf_camel_supplement_to_long_QoS_format,
       { "supplement-to-long-QoS-format", "camel.supplement_to_long_QoS_format",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext2_QoS_Subscribed", HFILL }},
     { &hf_camel_gPRSEventType,
       { "gPRSEventType", "camel.gPRSEventType",
@@ -8368,11 +8368,11 @@ void proto_register_camel(void) {
         "camel.T_pdp_ContextchangeOfPositionSpecificInformation", HFILL }},
     { &hf_camel_accessPointName,
       { "accessPointName", "camel.accessPointName",
-        FT_STRING, NONE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "camel.AccessPointName", HFILL }},
     { &hf_camel_chargingID,
       { "chargingID", "camel.chargingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GPRSChargingID", HFILL }},
     { &hf_camel_endUserAddress,
       { "endUserAddress", "camel.endUserAddress",
@@ -8384,11 +8384,11 @@ void proto_register_camel(void) {
         "camel.QualityOfService", HFILL }},
     { &hf_camel_timeAndTimeZone,
       { "timeAndTimeZone", "camel.timeAndTimeZone",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TimeAndTimezone", HFILL }},
     { &hf_camel_gGSNAddress,
       { "gGSNAddress", "camel.gGSNAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_camel_detachSpecificInformation,
       { "detachSpecificInformation", "camel.detachSpecificInformation",
@@ -8448,23 +8448,23 @@ void proto_register_camel(void) {
         "camel.Tone", HFILL }},
     { &hf_camel_cellGlobalIdOrServiceAreaIdOrLAI,
       { "cellGlobalIdOrServiceAreaIdOrLAI", "camel.cellGlobalIdOrServiceAreaIdOrLAI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.T_cellGlobalIdOrServiceAreaIdOrLAI", HFILL }},
     { &hf_camel_routeingAreaIdentity,
       { "routeingAreaIdentity", "camel.routeingAreaIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RAIdentity", HFILL }},
     { &hf_camel_geographicalInformation,
       { "geographicalInformation", "camel.geographicalInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GeographicalInformation", HFILL }},
     { &hf_camel_sgsn_Number,
       { "sgsn-Number", "camel.sgsn_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_selectedLSAIdentity,
       { "selectedLSAIdentity", "camel.selectedLSAIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_camel_extensionContainer,
       { "extensionContainer", "camel.extensionContainer",
@@ -8488,7 +8488,7 @@ void proto_register_camel(void) {
         "camel.IA5String_SIZE_bound__minMessageContentLength_bound__maxMessageContentLength", HFILL }},
     { &hf_camel_attributes,
       { "attributes", "camel.attributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_bound__minAttributesLength_bound__maxAttributesLength", HFILL }},
     { &hf_camel_elementaryMessageIDs,
       { "elementaryMessageIDs", "camel.elementaryMessageIDs",
@@ -8516,27 +8516,27 @@ void proto_register_camel(void) {
         "camel.MetDPCriterion", HFILL }},
     { &hf_camel_enteringCellGlobalId,
       { "enteringCellGlobalId", "camel.enteringCellGlobalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_leavingCellGlobalId,
       { "leavingCellGlobalId", "camel.leavingCellGlobalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_enteringServiceAreaId,
       { "enteringServiceAreaId", "camel.enteringServiceAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_leavingServiceAreaId,
       { "leavingServiceAreaId", "camel.leavingServiceAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_camel_enteringLocationAreaId,
       { "enteringLocationAreaId", "camel.enteringLocationAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_camel_leavingLocationAreaId,
       { "leavingLocationAreaId", "camel.leavingLocationAreaId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOverToUMTS,
       { "inter-SystemHandOverToUMTS", "camel.inter_SystemHandOverToUMTS",
@@ -8584,7 +8584,7 @@ void proto_register_camel(void) {
         "camel.GPRS_QoS_Extension", HFILL }},
     { &hf_camel_receivingSideID,
       { "receivingSideID", "camel.receivingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.LegType", HFILL }},
     { &hf_camel_RequestedInformationList_item,
       { "RequestedInformation", "camel.RequestedInformation",
@@ -8608,7 +8608,7 @@ void proto_register_camel(void) {
         "camel.INTEGER_0_255", HFILL }},
     { &hf_camel_callStopTimeValue,
       { "callStopTimeValue", "camel.callStopTimeValue",
-        FT_STRING, NONE, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "camel.DateAndTime", HFILL }},
     { &hf_camel_callConnectedElapsedTimeValue,
       { "callConnectedElapsedTimeValue", "camel.callConnectedElapsedTimeValue",
@@ -8616,11 +8616,11 @@ void proto_register_camel(void) {
         "inap.Integer4", HFILL }},
     { &hf_camel_releaseCauseValue,
       { "releaseCauseValue", "camel.releaseCauseValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Cause", HFILL }},
     { &hf_camel_sendingSideID,
       { "sendingSideID", "camel.sendingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.LegType", HFILL }},
     { &hf_camel_forwardServiceInteractionInd,
       { "forwardServiceInteractionInd", "camel.forwardServiceInteractionInd",
@@ -8720,19 +8720,19 @@ void proto_register_camel(void) {
         "inap.Integer4", HFILL }},
     { &hf_camel_number,
       { "number", "camel.number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_time,
       { "time", "camel.time",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_camel_date,
       { "date", "camel.date",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_camel_price,
       { "price", "camel.price",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_camel_par_cancelFailedProblem,
       { "problem", "camel.problem",
@@ -8752,15 +8752,15 @@ void proto_register_camel(void) {
         "inap.Integer4", HFILL }},
     { &hf_camel_disconnectFromIPForbidden,
       { "disconnectFromIPForbidden", "camel.disconnectFromIPForbidden",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_requestAnnouncementCompleteNotification,
       { "requestAnnouncementCompleteNotification", "camel.requestAnnouncementCompleteNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_requestAnnouncementStartedNotification,
       { "requestAnnouncementStartedNotification", "camel.requestAnnouncementStartedNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_collectedInfo,
       { "collectedInfo", "camel.collectedInfo",
@@ -8768,7 +8768,7 @@ void proto_register_camel(void) {
         "camel.CollectedInfo", HFILL }},
     { &hf_camel_digitsResponse,
       { "digitsResponse", "camel.digitsResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Digits", HFILL }},
     { &hf_camel_allAnnouncementsComplete,
       { "allAnnouncementsComplete", "camel.allAnnouncementsComplete",
@@ -8780,7 +8780,7 @@ void proto_register_camel(void) {
         "camel.NULL", HFILL }},
     { &hf_camel_aChBillingChargingCharacteristics,
       { "aChBillingChargingCharacteristics", "camel.aChBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.AChBillingChargingCharacteristics", HFILL }},
     { &hf_camel_partyToCharge,
       { "partyToCharge", "camel.partyToCharge",
@@ -8788,11 +8788,11 @@ void proto_register_camel(void) {
         "camel.SendingSideID", HFILL }},
     { &hf_camel_correlationID,
       { "correlationID", "camel.correlationID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CorrelationID", HFILL }},
     { &hf_camel_iPSSPCapabilities,
       { "iPSSPCapabilities", "camel.iPSSPCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.IPSSPCapabilities", HFILL }},
     { &hf_camel_gapCriteria,
       { "gapCriteria", "camel.gapCriteria",
@@ -8840,15 +8840,15 @@ void proto_register_camel(void) {
         "camel.DestinationRoutingAddress", HFILL }},
     { &hf_camel_alertingPattern,
       { "alertingPattern", "camel.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.AlertingPattern", HFILL }},
     { &hf_camel_originalCalledPartyID,
       { "originalCalledPartyID", "camel.originalCalledPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.OriginalCalledPartyID", HFILL }},
     { &hf_camel_carrier,
       { "carrier", "camel.carrier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.Carrier", HFILL }},
     { &hf_camel_callingPartysCategory,
       { "callingPartysCategory", "camel.callingPartysCategory",
@@ -8856,11 +8856,11 @@ void proto_register_camel(void) {
         "inap.CallingPartysCategory", HFILL }},
     { &hf_camel_redirectingPartyID,
       { "redirectingPartyID", "camel.redirectingPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.RedirectingPartyID", HFILL }},
     { &hf_camel_redirectionInformation,
       { "redirectionInformation", "camel.redirectionInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectionInformation", HFILL }},
     { &hf_camel_genericNumbers,
       { "genericNumbers", "camel.genericNumbers",
@@ -8872,7 +8872,7 @@ void proto_register_camel(void) {
         "camel.ServiceInteractionIndicatorsTwo", HFILL }},
     { &hf_camel_chargeNumber,
       { "chargeNumber", "camel.chargeNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.ChargeNumber", HFILL }},
     { &hf_camel_legToBeConnected,
       { "legToBeConnected", "camel.legToBeConnected",
@@ -8880,7 +8880,7 @@ void proto_register_camel(void) {
         "inap.LegID", HFILL }},
     { &hf_camel_cug_Interlock,
       { "cug-Interlock", "camel.cug_Interlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CUG_Interlock", HFILL }},
     { &hf_camel_cug_OutgoingAccess,
       { "cug-OutgoingAccess", "camel.cug_OutgoingAccess",
@@ -8896,7 +8896,7 @@ void proto_register_camel(void) {
         "camel.OCSIApplicable", HFILL }},
     { &hf_camel_naOliInfo,
       { "naOliInfo", "camel.naOliInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.NAOliInfo", HFILL }},
     { &hf_camel_bor_InterrogationRequested,
       { "bor-InterrogationRequested", "camel.bor_InterrogationRequested",
@@ -8912,7 +8912,7 @@ void proto_register_camel(void) {
         "camel.T_resourceAddress", HFILL }},
     { &hf_camel_ipRoutingAddress,
       { "ipRoutingAddress", "camel.ipRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.IPRoutingAddress", HFILL }},
     { &hf_camel_none,
       { "none", "camel.none",
@@ -8952,11 +8952,11 @@ void proto_register_camel(void) {
         "camel.BCSM_Failure", HFILL }},
     { &hf_camel_assistingSSPIPRoutingAddress,
       { "assistingSSPIPRoutingAddress", "camel.assistingSSPIPRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.AssistingSSPIPRoutingAddress", HFILL }},
     { &hf_camel_callingPartyNumber,
       { "callingPartyNumber", "camel.callingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CallingPartyNumber", HFILL }},
     { &hf_camel_eventSpecificInformationBCSM,
       { "eventSpecificInformationBCSM", "camel.eventSpecificInformationBCSM",
@@ -8972,15 +8972,15 @@ void proto_register_camel(void) {
         "camel.CGEncountered", HFILL }},
     { &hf_camel_locationNumber,
       { "locationNumber", "camel.locationNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.LocationNumber", HFILL }},
     { &hf_camel_highLayerCompatibility,
       { "highLayerCompatibility", "camel.highLayerCompatibility",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HighLayerCompatibility", HFILL }},
     { &hf_camel_additionalCallingPartyNumber,
       { "additionalCallingPartyNumber", "camel.additionalCallingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.AdditionalCallingPartyNumber", HFILL }},
     { &hf_camel_bearerCapability,
       { "bearerCapability", "camel.bearerCapability",
@@ -8992,7 +8992,7 @@ void proto_register_camel(void) {
         "gsm_map_ms.CUG_Index", HFILL }},
     { &hf_camel_iMSI,
       { "iMSI", "camel.iMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_camel_subscriberState,
       { "subscriberState", "camel.subscriberState",
@@ -9000,19 +9000,19 @@ void proto_register_camel(void) {
         "gsm_map_ms.SubscriberState", HFILL }},
     { &hf_camel_callReferenceNumber,
       { "callReferenceNumber", "camel.callReferenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.CallReferenceNumber", HFILL }},
     { &hf_camel_mscAddress,
       { "mscAddress", "camel.mscAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_calledPartyBCDNumber,
       { "calledPartyBCDNumber", "camel.calledPartyBCDNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyBCDNumber", HFILL }},
     { &hf_camel_timeAndTimezone,
       { "timeAndTimezone", "camel.timeAndTimezone",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TimeAndTimezone", HFILL }},
     { &hf_camel_callForwardingSS_Pending,
       { "callForwardingSS-Pending", "camel.callForwardingSS_Pending",
@@ -9024,23 +9024,23 @@ void proto_register_camel(void) {
         "camel.InitialDPArgExtension", HFILL }},
     { &hf_camel_gmscAddress,
       { "gmscAddress", "camel.gmscAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_ms_Classmark2,
       { "ms-Classmark2", "camel.ms_Classmark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MS_Classmark2", HFILL }},
     { &hf_camel_iMEI,
       { "iMEI", "camel.iMEI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMEI", HFILL }},
     { &hf_camel_supportedCamelPhases,
       { "supportedCamelPhases", "camel.supportedCamelPhases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_camel_offeredCamel4Functionalities,
       { "offeredCamel4Functionalities", "camel.offeredCamel4Functionalities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4Functionalities", HFILL }},
     { &hf_camel_bearerCapability2,
       { "bearerCapability2", "camel.bearerCapability2",
@@ -9048,15 +9048,15 @@ void proto_register_camel(void) {
         "camel.BearerCapability", HFILL }},
     { &hf_camel_highLayerCompatibility2,
       { "highLayerCompatibility2", "camel.highLayerCompatibility2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HighLayerCompatibility", HFILL }},
     { &hf_camel_lowLayerCompatibility,
       { "lowLayerCompatibility", "camel.lowLayerCompatibility",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.LowLayerCompatibility", HFILL }},
     { &hf_camel_lowLayerCompatibility2,
       { "lowLayerCompatibility2", "camel.lowLayerCompatibility2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.LowLayerCompatibility", HFILL }},
     { &hf_camel_enhancedDialledServicesAllowed,
       { "enhancedDialledServicesAllowed", "camel.enhancedDialledServicesAllowed",
@@ -9080,7 +9080,7 @@ void proto_register_camel(void) {
         "camel.CallSegmentID", HFILL }},
     { &hf_camel_gsmSCFAddress,
       { "gsmSCFAddress", "camel.gsmSCFAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_suppress_T_CSI,
       { "suppress-T-CSI", "camel.suppress_T_CSI",
@@ -9108,7 +9108,7 @@ void proto_register_camel(void) {
         "camel.TimerValue", HFILL }},
     { &hf_camel_sCIBillingChargingCharacteristics,
       { "sCIBillingChargingCharacteristics", "camel.sCIBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.SCIBillingChargingCharacteristics", HFILL }},
     { &hf_camel_legToBeSplit,
       { "legToBeSplit", "camel.legToBeSplit",
@@ -9128,7 +9128,7 @@ void proto_register_camel(void) {
         "camel.ChargingResult", HFILL }},
     { &hf_camel_active,
       { "active", "camel.active",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "camel.BOOLEAN", HFILL }},
     { &hf_camel_chargingRollOver,
       { "chargingRollOver", "camel.chargingRollOver",
@@ -9136,11 +9136,11 @@ void proto_register_camel(void) {
         "camel.ChargingRollOver", HFILL }},
     { &hf_camel_pdpID,
       { "pdpID", "camel.pdpID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.PDPID", HFILL }},
     { &hf_camel_gPRSCause,
       { "gPRSCause", "camel.gPRSCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.GPRSCause", HFILL }},
     { &hf_camel_miscGPRSInfo,
       { "miscGPRSInfo", "camel.miscGPRSInfo",
@@ -9152,7 +9152,7 @@ void proto_register_camel(void) {
         "camel.GPRSEventSpecificInformation", HFILL }},
     { &hf_camel_mSISDN,
       { "mSISDN", "camel.mSISDN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_gPRSMSClass,
       { "gPRSMSClass", "camel.gPRSMSClass",
@@ -9160,11 +9160,11 @@ void proto_register_camel(void) {
         "gsm_map_ms.GPRSMSClass", HFILL }},
     { &hf_camel_sGSNCapabilities,
       { "sGSNCapabilities", "camel.sGSNCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.SGSNCapabilities", HFILL }},
     { &hf_camel_gprsCause,
       { "gprsCause", "camel.gprsCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.GPRSCause", HFILL }},
     { &hf_camel_gPRSEvent,
       { "gPRSEvent", "camel.gPRSEvent",
@@ -9176,19 +9176,19 @@ void proto_register_camel(void) {
         "camel.GPRSEvent", HFILL }},
     { &hf_camel_sCIGPRSBillingChargingCharacteristics,
       { "sCIGPRSBillingChargingCharacteristics", "camel.sCIGPRSBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.SCIGPRSBillingChargingCharacteristics", HFILL }},
     { &hf_camel_callingPartysNumber,
       { "callingPartysNumber", "camel.callingPartysNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.SMS_AddressString", HFILL }},
     { &hf_camel_destinationSubscriberNumber,
       { "destinationSubscriberNumber", "camel.destinationSubscriberNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.CalledPartyBCDNumber", HFILL }},
     { &hf_camel_sMSCAddress,
       { "sMSCAddress", "camel.sMSCAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_eventSpecificInformationSMS,
       { "eventSpecificInformationSMS", "camel.eventSpecificInformationSMS",
@@ -9196,7 +9196,7 @@ void proto_register_camel(void) {
         "camel.EventSpecificInformationSMS", HFILL }},
     { &hf_camel_callingPartyNumber_01,
       { "callingPartyNumber", "camel.callingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.SMS_AddressString", HFILL }},
     { &hf_camel_locationInformationMSC,
       { "locationInformationMSC", "camel.locationInformationMSC",
@@ -9204,27 +9204,27 @@ void proto_register_camel(void) {
         "gsm_map_ms.LocationInformation", HFILL }},
     { &hf_camel_tPShortMessageSpecificInfo,
       { "tPShortMessageSpecificInfo", "camel.tPShortMessageSpecificInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TPShortMessageSpecificInfo", HFILL }},
     { &hf_camel_tPProtocolIdentifier,
       { "tPProtocolIdentifier", "camel.tPProtocolIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TPProtocolIdentifier", HFILL }},
     { &hf_camel_tPDataCodingScheme,
       { "tPDataCodingScheme", "camel.tPDataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TPDataCodingScheme", HFILL }},
     { &hf_camel_tPValidityPeriod,
       { "tPValidityPeriod", "camel.tPValidityPeriod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "camel.TPValidityPeriod", HFILL }},
     { &hf_camel_smsReferenceNumber,
       { "smsReferenceNumber", "camel.smsReferenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.CallReferenceNumber", HFILL }},
     { &hf_camel_calledPartyNumber_01,
       { "calledPartyNumber", "camel.calledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_camel_sMSEvents,
       { "sMSEvents", "camel.sMSEvents",
diff --git a/epan/dissectors/packet-capwap.c b/epan/dissectors/packet-capwap.c
index 5076afc3b8..3dcbb4d9c2 100644
--- a/epan/dissectors/packet-capwap.c
+++ b/epan/dissectors/packet-capwap.c
@@ -1198,7 +1198,7 @@ proto_register_capwap_control(void)
 
 		{ &hf_capwap_msg_element_type_wtp_board_data_wtp_model_number,
 		{ "WTP Model Number",	"capwap.control.message_element.wtp_board_data.wtp_model_number",
-			FT_STRING, BASE_DEC, NULL, 0x00,
+			FT_STRING, BASE_NONE, NULL, 0x00,
 			NULL, HFILL }},
 		{ &hf_capwap_msg_element_type_wtp_board_data_wtp_serial_number,
 		{ "WTP Serial Number",	"capwap.control.message_element.wtp_board_data.wtp_serial_number",
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index c1378187aa..a1ad238374 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -1294,7 +1294,7 @@ proto_register_cast(void)
     { &hf_cast_layout,
       { "Layout", "cast.layout",
 	FT_UINT32, BASE_DEC, VALS(cast_Layouts), 0x0,
-	"Layout",
+	NULL,
 	HFILL }
     },
 
@@ -1315,7 +1315,7 @@ proto_register_cast(void)
     { &hf_cast_transmitOrReceive,
       { "TransmitOrReceive", "cast.transmitOrReceive",
 	FT_UINT32, BASE_DEC, VALS(cast_transmitOrReceive), 0x0,
-	"TransmitOrReceive",
+	NULL,
 	HFILL }
     },
 
@@ -1483,7 +1483,7 @@ proto_register_cast(void)
     { &hf_cast_miscCommandType,
       { "MiscCommandType", "cast.miscCommandType",
 	FT_UINT32, BASE_DEC, VALS(cast_miscCommandType), 0x0,
-	"MiscCommandType",
+	NULL,
 	HFILL }
     },
 
@@ -1700,14 +1700,14 @@ proto_register_cast(void)
     { &hf_cast_requestorIpAddress,
       { "RequestorIpAddress", "cast.requestorIpAddress",
 	FT_IPv4, BASE_NONE, NULL, 0x0,
-	"RequestorIpAddress",
+	NULL,
 	HFILL }
     },
 
     { &hf_cast_stationIpAddress,
       { "StationIpAddress", "cast.stationIpAddress",
 	FT_IPv4, BASE_NONE, NULL, 0x0,
-	"StationIpAddress",
+	NULL,
 	HFILL }
     },
 
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 34505967bd..ab15d0c8fb 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -2326,7 +2326,7 @@ void proto_register_catapult_dct2000(void)
         { &hf_catapult_dct2000_sctpprim_addresses,
             { "SCTPPrim Addresses",
               "dct2000.sctpprim", FT_STRING, BASE_NONE, NULL, 0x0,
-              "SCTPPrim Addresses", HFILL
+              NULL, HFILL
             }
         },
         { &hf_catapult_dct2000_sctpprim_dst_addr_v4,
@@ -2363,7 +2363,7 @@ void proto_register_catapult_dct2000(void)
         { &hf_catapult_dct2000_tty,
             { "tty contents",
               "dct2000.tty", FT_NONE, BASE_NONE, NULL, 0x0,
-              "tty contents", HFILL
+              NULL, HFILL
             }
         },
         { &hf_catapult_dct2000_tty_line,
@@ -2412,7 +2412,7 @@ void proto_register_catapult_dct2000(void)
         { &hf_catapult_dct2000_lte_rlc_channel_type,
             { "RLC Logical Channel Type",
               "dct2000.lte.rlc-logchan-type", FT_UINT8, BASE_DEC, VALS(rlc_logical_channel_vals), 0x0,
-              "RLC Logical Channel Type", HFILL
+              NULL, HFILL
             }
         },
         { &hf_catapult_dct2000_lte_rlc_mui,
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index 37c7a78372..7f5b469050 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -1252,31 +1252,31 @@ proto_register_cdp(void)
     static hf_register_info hf[] = {
 	{ &hf_cdp_version,
 	{ "Version",		"cdp.version",  FT_UINT8, BASE_DEC, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_cdp_ttl,
 	{ "TTL",		"cdp.ttl", FT_UINT16, BASE_DEC, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_cdp_checksum,
 	{ "Checksum",		"cdp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_cdp_checksum_good,
 	  { "Good",       "cdp.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 	    "True: checksum matches packet content; False: doesn't match content or not checked", HFILL }},
 	
 	{ &hf_cdp_checksum_bad,
-	  { "Bad ",       "cdp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+	  { "Bad",       "cdp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 	    "True: checksum doesn't match packet content; False: matches content or not checked", HFILL }},
 	
 	{ &hf_cdp_tlvtype,
 	{ "Type",		"cdp.tlv.type", FT_UINT16, BASE_HEX, VALS(type_vals), 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_cdp_tlvlength,
 	{ "Length",		"cdp.tlv.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-	  "", HFILL }}
+	  NULL, HFILL }}
     };
     static gint *ett[] = {
 	&ett_cdp,
diff --git a/epan/dissectors/packet-cdt.c b/epan/dissectors/packet-cdt.c
index 6430d7359a..ff5b41c6a3 100644
--- a/epan/dissectors/packet-cdt.c
+++ b/epan/dissectors/packet-cdt.c
@@ -413,7 +413,7 @@ void proto_register_cdt (void) {
         "cdt.T_contentType_OID", HFILL }},
     { &hf_cdt_compressedContent,
       { "compressedContent", "cdt.compressedContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cdt.CompressedContent", HFILL }},
 
 /*--- End of included file: packet-cdt-hfarr.c ---*/
diff --git a/epan/dissectors/packet-cgmp.c b/epan/dissectors/packet-cgmp.c
index f788508649..95786f0588 100644
--- a/epan/dissectors/packet-cgmp.c
+++ b/epan/dissectors/packet-cgmp.c
@@ -104,23 +104,23 @@ proto_register_cgmp(void)
 	static hf_register_info hf[] = {
 		{ &hf_cgmp_version,
 		{ "Version",	"cgmp.version",	FT_UINT8, BASE_DEC, NULL, 0xF0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_cgmp_type,
 		{ "Type",	"cgmp.type",	FT_UINT8, BASE_DEC, VALS(type_vals), 0x0F,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_cgmp_count,
 		{ "Count",	"cgmp.count", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_cgmp_gda,
 		{ "Group Destination Address",	"cgmp.gda", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"Group Destination Address", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_cgmp_usa,
 		{ "Unicast Source Address",	"cgmp.usa", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"Unicast Source Address", HFILL }},
+			NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_cgmp,
diff --git a/epan/dissectors/packet-charging_ase.c b/epan/dissectors/packet-charging_ase.c
index a6cfedd042..595b04f0a1 100644
--- a/epan/dissectors/packet-charging_ase.c
+++ b/epan/dissectors/packet-charging_ase.c
@@ -902,7 +902,7 @@ proto_register_charging_ase(void)
         "charging_ase.StopCharging", HFILL }},
     { &hf_charging_ase_acknowledgementIndicators,
       { "acknowledgementIndicators", "charging_ase.acknowledgementIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_acknowledgementIndicators", HFILL }},
     { &hf_charging_ase_extensions,
       { "extensions", "charging_ase.extensions",
@@ -922,7 +922,7 @@ proto_register_charging_ase(void)
         "charging_ase.ChargingReferenceIdentification", HFILL }},
     { &hf_charging_ase_chargingControlIndicators,
       { "chargingControlIndicators", "charging_ase.chargingControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.ChargingControlIndicators", HFILL }},
     { &hf_charging_ase_addOncharge,
       { "addOncharge", "charging_ase.addOncharge",
@@ -934,7 +934,7 @@ proto_register_charging_ase(void)
         "charging_ase.CurrencyFactorScale", HFILL }},
     { &hf_charging_ase_addOnChargePulse,
       { "addOnChargePulse", "charging_ase.addOnChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_currency,
       { "currency", "charging_ase.currency",
@@ -970,15 +970,15 @@ proto_register_charging_ase(void)
         "charging_ase.TariffDuration", HFILL }},
     { &hf_charging_ase_subTariffControl,
       { "subTariffControl", "charging_ase.subTariffControl",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.SubTariffControl", HFILL }},
     { &hf_charging_ase_pulseUnits,
       { "pulseUnits", "charging_ase.pulseUnits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_chargeUnitTimeInterval,
       { "chargeUnitTimeInterval", "charging_ase.chargeUnitTimeInterval",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.ChargeUnitTimeInterval", HFILL }},
     { &hf_charging_ase_currencyFactor,
       { "currencyFactor", "charging_ase.currencyFactor",
@@ -1010,7 +1010,7 @@ proto_register_charging_ase(void)
         "charging_ase.NetworkIdentification", HFILL }},
     { &hf_charging_ase_stopIndicators,
       { "stopIndicators", "charging_ase.stopIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_stopIndicators", HFILL }},
     { &hf_charging_ase_currentTariffCurrency,
       { "currentTariffCurrency", "charging_ase.currentTariffCurrency",
@@ -1026,7 +1026,7 @@ proto_register_charging_ase(void)
         "charging_ase.TariffCurrencyFormat", HFILL }},
     { &hf_charging_ase_tariffSwitchoverTime,
       { "tariffSwitchoverTime", "charging_ase.tariffSwitchoverTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.TariffSwitchoverTime", HFILL }},
     { &hf_charging_ase_communicationChargeSequenceCurrency,
       { "communicationChargeSequenceCurrency", "charging_ase.communicationChargeSequenceCurrency",
@@ -1038,7 +1038,7 @@ proto_register_charging_ase(void)
         "charging_ase.CommunicationChargeCurrency", HFILL }},
     { &hf_charging_ase_tariffControlIndicators,
       { "tariffControlIndicators", "charging_ase.tariffControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_tariffControlIndicators", HFILL }},
     { &hf_charging_ase_callAttemptChargeCurrency,
       { "callAttemptChargeCurrency", "charging_ase.callAttemptChargeCurrency",
@@ -1070,15 +1070,15 @@ proto_register_charging_ase(void)
         "charging_ase.CommunicationChargePulse", HFILL }},
     { &hf_charging_ase_tariffControlIndicators_01,
       { "tariffControlIndicators", "charging_ase.tariffControlIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.T_tariffControlIndicators_01", HFILL }},
     { &hf_charging_ase_callAttemptChargePulse,
       { "callAttemptChargePulse", "charging_ase.callAttemptChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_callSetupChargePulse,
       { "callSetupChargePulse", "charging_ase.callSetupChargePulse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "charging_ase.PulseUnits", HFILL }},
     { &hf_charging_ase_networkIdentification,
       { "networkIdentification", "charging_ase.networkIdentification",
@@ -1091,35 +1091,35 @@ proto_register_charging_ase(void)
     { &hf_charging_ase_T_acknowledgementIndicators_accepted,
       { "accepted", "charging_ase.accepted",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_subscriberCharge,
       { "subscriberCharge", "charging_ase.subscriberCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_immediateChangeOfActuallyAppliedTariff,
       { "immediateChangeOfActuallyAppliedTariff", "charging_ase.immediateChangeOfActuallyAppliedTariff",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_ChargingControlIndicators_delayUntilStart,
       { "delayUntilStart", "charging_ase.delayUntilStart",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_stopIndicators_callAttemptChargesApplicable,
       { "callAttemptChargesApplicable", "charging_ase.callAttemptChargesApplicable",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_SubTariffControl_oneTimeCharge,
       { "oneTimeCharge", "charging_ase.oneTimeCharge",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_non_cyclicTariff,
       { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_charging_ase_T_tariffControlIndicators_01_non_cyclicTariff,
       { "non-cyclicTariff", "charging_ase.non-cyclicTariff",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-charging_ase-hfarr.c ---*/
 #line 85 "packet-charging_ase-template.c"
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 860325eeff..09bf56e868 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -345,18 +345,18 @@ proto_register_slarp(void)
   static hf_register_info hf[] = {
     { &hf_slarp_ptype,
       { "Packet type", "slarp.ptype", FT_UINT32, BASE_DEC,
-        VALS(slarp_ptype_vals), 0x0, "", HFILL }},
+        VALS(slarp_ptype_vals), 0x0, NULL, HFILL }},
     { &hf_slarp_address,
       { "Address", "slarp.address", FT_IPv4, BASE_NONE,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     /* XXX - need an FT_ for netmasks, which is like FT_IPV4 but doesn't
        get translated to a host name. */
     { &hf_slarp_mysequence,
       { "Outgoing sequence number", "slarp.mysequence", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_slarp_yoursequence,
       { "Returned sequence number", "slarp.yoursequence", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_chdlc,
diff --git a/epan/dissectors/packet-cigi.c b/epan/dissectors/packet-cigi.c
index c97a51eaf7..5fc2ec4733 100644
--- a/epan/dissectors/packet-cigi.c
+++ b/epan/dissectors/packet-cigi.c
@@ -6414,17 +6414,17 @@ proto_register_cigi(void)
         { &hf_cigi_src_port,
             { "Source Port", "cigi.srcport",
                 FT_UINT16, BASE_DEC, NULL, 0x0,
-                "Source Port", HFILL }
+                NULL, HFILL }
         },
         { &hf_cigi_dest_port,
             { "Destination Port", "cigi.destport",
                 FT_UINT16, BASE_DEC, NULL, 0x0,
-                "Destination Port", HFILL }
+                NULL, HFILL }
         },
         { &hf_cigi_port,
             { "Source or Destination Port", "cigi.port",
                 FT_UINT16, BASE_DEC, NULL, 0x0,
-                "Source or Destination Port", HFILL }
+                NULL, HFILL }
         },
 
         { &hf_cigi_frame_size,
diff --git a/epan/dissectors/packet-cimd.c b/epan/dissectors/packet-cimd.c
index a8150dd807..4e2910bcc3 100644
--- a/epan/dissectors/packet-cimd.c
+++ b/epan/dissectors/packet-cimd.c
@@ -748,7 +748,7 @@ proto_register_cimd(void)
     { &hf_cimd_packet_number_indicator,
       { "Packet Number", "cimd.pnumber", FT_UINT8, BASE_DEC, NULL, 0x00, "CIMD Packet Number", HFILL }},
     { &hf_cimd_pcode_indicator,
-      { "Code ", "cimd.pcode", FT_STRING, BASE_NONE, NULL, 0x00, "CIMD Parameter Code", HFILL }},
+      { "Code", "cimd.pcode", FT_STRING, BASE_NONE, NULL, 0x00, "CIMD Parameter Code", HFILL }},
     { &hf_cimd_checksum_indicator,
       { "Checksum", "cimd.chksum", FT_UINT8, BASE_HEX, NULL, 0x00, "CIMD Checksum", HFILL }},
     { &hf_cimd_dcs_coding_group_indicator,
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index b0cfe29464..c33a9017db 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -1673,13 +1673,13 @@ proto_register_cip(void)
 		},
 		{ &hf_cip_epath,
 			{ "EPath", "cip.epath",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"EPath", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 		},
 		{ &hf_cip_genstat,
 			{ "General Status", "cip.genstat",
 			FT_UINT8, BASE_HEX, VALS(cip_gs_vals), 0,
-			"General Status", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_port,
 			{ "Port", "cip.port",
@@ -1689,72 +1689,72 @@ proto_register_cip(void)
 		{ &hf_cip_link_address_byte,
 			{ "Link Address", "cip.linkaddress",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Link Address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_link_address_string,
 			{ "Link Address", "cip.linkaddress",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"Link Address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_class8,
 			{ "Class", "cip.class",
 			FT_UINT8, BASE_HEX, VALS(cip_class_names_vals), 0,
-			"Class", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_class16,
 			{ "Class", "cip.class",
 			FT_UINT16, BASE_HEX, VALS(cip_class_names_vals), 0,
-			"Class", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_class32,
 			{ "Class", "cip.class",
 			FT_UINT32, BASE_HEX, VALS(cip_class_names_vals), 0,
-			"Class", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_instance8,
 			{ "Instance", "cip.instance",
 			FT_UINT8, BASE_HEX, NULL, 0,
-			"Instance", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_instance16,
 			{ "Instance", "cip.instance",
 			FT_UINT16, BASE_HEX, NULL, 0,
-			"Instance", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_instance32,
 			{ "Instance", "cip.instance",
 			FT_UINT32, BASE_HEX, NULL, 0,
-			"Instance", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_attribute8,
 			{ "Attribute", "cip.attribute",
 			FT_UINT8, BASE_HEX, NULL, 0,
-			"Attribute", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_attribute16,
 			{ "Attribute", "cip.attribute",
 			FT_UINT16, BASE_HEX, NULL, 0,
-			"Attribute", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_attribute32,
 			{ "Attribute", "cip.attribute",
 			FT_UINT32, BASE_HEX, NULL, 0,
-			"Attribute", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_conpoint8,
 			{ "Connection Point", "cip.connpoint",
 			FT_UINT8, BASE_HEX, NULL, 0,
-			"Connection Point", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_conpoint16,
 			{ "Connection Point", "cip.connpoint",
 			FT_UINT16, BASE_HEX, NULL, 0,
-			"Connection Point", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_conpoint32,
 			{ "Connection Point", "cip.connpoint",
 			FT_UINT16, BASE_HEX, NULL, 0,
-			"Connection Point", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_symbol,
 			{ "Symbol", "cip.symbol",
@@ -1764,12 +1764,12 @@ proto_register_cip(void)
 		{ &hf_cip_vendor,
 			{ "Vendor ID", "cip.vendor",
 			FT_UINT16, BASE_HEX, VALS(cip_vendor_vals), 0,
-			"Vendor ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_devtype,
 			{ "Device Type", "cip.devtype",
 			FT_UINT16, BASE_DEC, VALS(cip_devtype_vals), 0,
-			"Device Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_cip_fwo_comp,
 			{ "Compatibility", "cip.fwo.cmp",
@@ -1824,7 +1824,7 @@ proto_register_cip(void)
 		{ &hf_cip_data,
 			{ "Data", "cip.data",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"Data", HFILL }
+			NULL, HFILL }
 		}
    };
 
diff --git a/epan/dissectors/packet-cisco-erspan.c b/epan/dissectors/packet-cisco-erspan.c
index 04d69934d7..8e9878acce 100644
--- a/epan/dissectors/packet-cisco-erspan.c
+++ b/epan/dissectors/packet-cisco-erspan.c
@@ -141,35 +141,35 @@ proto_register_erspan(void)
 
 		{ &hf_erspan_unknown1,
 		{ "Unknown1",	"erspan.unknown1", FT_UINT16, BASE_HEX, NULL,
-			0xf000, "", HFILL }},
+			0xf000, NULL, HFILL }},
 
 		{ &hf_erspan_vlan,
 		{ "Vlan",	"erspan.vlan", FT_UINT16, BASE_DEC, NULL,
-			0x0fff, "", HFILL }},
+			0x0fff, NULL, HFILL }},
 
 		{ &hf_erspan_priority,
 		{ "Priority",	"erspan.priority", FT_UINT16, BASE_DEC, NULL,
-			0xe000, "", HFILL }},
+			0xe000, NULL, HFILL }},
 
 		{ &hf_erspan_unknown2,
 		{ "Unknown2",	"erspan.unknown2", FT_UINT16, BASE_DEC, NULL,
-			0x1000, "", HFILL }},
+			0x1000, NULL, HFILL }},
 
 		{ &hf_erspan_direction,
 		{ "Direction",	"erspan.direction", FT_UINT16, BASE_DEC, VALS(erspan_direction_vals),
-			0x0800, "", HFILL }},
+			0x0800, NULL, HFILL }},
 
 		{ &hf_erspan_unknown3,
 		{ "Unknown3",	"erspan.unknown3", FT_UINT16, BASE_DEC, NULL,
-			0x0400, "", HFILL }},
+			0x0400, NULL, HFILL }},
 
 		{ &hf_erspan_spanid,
 		{ "SpanID",	"erspan.spanid", FT_UINT16, BASE_DEC, NULL,
-			0x03ff, "", HFILL }},
+			0x03ff, NULL, HFILL }},
 
 		{ &hf_erspan_unknown4,
 		{ "Unknown4",	"erspan.unknown4", FT_BYTES, BASE_NONE, NULL,
-			0, "", HFILL }},
+			0, NULL, HFILL }},
 
         };
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-cisco-sm.c b/epan/dissectors/packet-cisco-sm.c
index 53dd994f46..cc4b309ed9 100644
--- a/epan/dissectors/packet-cisco-sm.c
+++ b/epan/dissectors/packet-cisco-sm.c
@@ -302,42 +302,42 @@ proto_register_sm(void)
 		{ &hf_sm_sm_msg_type,
 			{ "SM Message Type",           "sm.sm_msg_type",
 			FT_UINT32, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_protocol,
 			{ "Protocol Type",           "sm.protocol",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_msg_id,
 			{ "Message ID",           "sm.msgid",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_msg_type,
 			{ "Message Type",           "sm.msg_type",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_channel,
 			{ "Channel ID",           "sm.channel",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_bearer,
 			{ "Bearer ID",           "sm.bearer",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_len,
 			{ "Length",           "sm.len",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_ip_addr,
 			{ "IPv4 address","sm.ip_addr",
 			FT_IPv4,BASE_NONE,  NULL, 0x0,          
-			"IPv4 address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sm_context,
 			{ "Context","sm.context",
diff --git a/epan/dissectors/packet-clearcase.c b/epan/dissectors/packet-clearcase.c
index a1d78616ff..8490b405de 100644
--- a/epan/dissectors/packet-clearcase.c
+++ b/epan/dissectors/packet-clearcase.c
@@ -56,7 +56,7 @@ proto_register_clearcase(void)
 	static hf_register_info hf[] = {
 		{ &hf_clearcase_procedure_v3, {
 			"V3 Procedure", "clearcase.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(clearcase3_proc_vals), 0, "V3 Procedure", HFILL }}
+			VALS(clearcase3_proc_vals), 0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-clnp.c b/epan/dissectors/packet-clnp.c
index 9f2dda5cac..84a5c7b865 100644
--- a/epan/dissectors/packet-clnp.c
+++ b/epan/dissectors/packet-clnp.c
@@ -566,37 +566,37 @@ void proto_register_clnp(void)
   static hf_register_info hf[] = {
     { &hf_clnp_id,
       { "Network Layer Protocol Identifier", "clnp.nlpi", FT_UINT8, BASE_HEX,
-        VALS(nlpid_vals), 0x0, "", HFILL }},
+        VALS(nlpid_vals), 0x0, NULL, HFILL }},
 
     { &hf_clnp_length,
-      { "HDR Length   ", "clnp.len",	   FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "HDR Length", "clnp.len",	   FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_version,
-      { "Version      ", "clnp.version",  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Version", "clnp.version",  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_ttl,
-      { "Holding Time ", "clnp.ttl",	   FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Holding Time", "clnp.ttl",	   FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_type,
-      { "PDU Type     ", "clnp.type",     FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "PDU Type", "clnp.type",     FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_pdu_length,
-      { "PDU length   ", "clnp.pdu.len",  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "PDU length", "clnp.pdu.len",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_checksum,
-      { "Checksum     ", "clnp.checksum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Checksum", "clnp.checksum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_dest_length,
-      { "DAL ", "clnp.dsap.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "DAL", "clnp.dsap.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_dest,
-      { " DA ", "clnp.dsap",     FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "DA", "clnp.dsap",     FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_src_length,
-      { "SAL ", "clnp.ssap.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "SAL", "clnp.ssap.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_src,
-      { " SA ", "clnp.ssap",     FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "SA", "clnp.ssap",     FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_clnp_segment_overlap,
       { "Segment overlap", "clnp.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
@@ -620,11 +620,11 @@ void proto_register_clnp(void)
 
     { &hf_clnp_segment,
       { "CLNP Segment", "clnp.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-	"CLNP Segment", HFILL }},
+	NULL, HFILL }},
 
     { &hf_clnp_segments,
-      { "CLNP Segments", "clnp.segments", FT_NONE, BASE_DEC, NULL, 0x0,
-	"CLNP Segments", HFILL }},
+      { "CLNP Segments", "clnp.segments", FT_NONE, BASE_NONE, NULL, 0x0,
+	NULL, HFILL }},
 
     { &hf_clnp_reassembled_in,
       { "Reassembled CLNP in frame", "clnp.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index ed887a748d..25ebb9ad4d 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -4455,35 +4455,35 @@ void proto_register_cmip(void) {
     { &hf_cmip_actionType_OID,
       { "actionType", "cmip.actionType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "actionType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_eventType_OID,
       { "eventType", "cmip.eventType_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "eventType", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_attributeId_OID,
       { "attributeId", "cmip.attributeId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "attributeId", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_errorId_OID,
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
-        "errorId", HFILL }},
+        NULL, HFILL }},
    { &hf_DiscriminatorConstruct,
       { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_Destination,
       { "Destination", "cmip.Destination",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_NameBinding,
       { "NameBinding", "cmip.NameBinding",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ObjectClass,
       { "ObjectClass", "cmip.ObjectClass",
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
 
 
 /*--- Included file: packet-cmip-hfarr.c ---*/
@@ -4542,7 +4542,7 @@ void proto_register_cmip(void) {
         "cmip.AvailabilityStatus", HFILL }},
     { &hf_cmip_BackedUpStatus_PDU,
       { "BackedUpStatus", "cmip.BackedUpStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.BackedUpStatus", HFILL }},
     { &hf_cmip_BackUpDestinationList_PDU,
       { "BackUpDestinationList", "cmip.BackUpDestinationList",
@@ -4558,7 +4558,7 @@ void proto_register_cmip(void) {
         "cmip.CapacityAlarmThreshold", HFILL }},
     { &hf_cmip_ConfirmedMode_PDU,
       { "ConfirmedMode", "cmip.ConfirmedMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.ConfirmedMode", HFILL }},
     { &hf_cmip_ControlStatus_PDU,
       { "ControlStatus", "cmip.ControlStatus",
@@ -4722,7 +4722,7 @@ void proto_register_cmip(void) {
         "cmip.TrendIndication", HFILL }},
     { &hf_cmip_UnknownStatus_PDU,
       { "UnknownStatus", "cmip.UnknownStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.UnknownStatus", HFILL }},
     { &hf_cmip_UsageState_PDU,
       { "UsageState", "cmip.UsageState",
@@ -5066,7 +5066,7 @@ void proto_register_cmip(void) {
         "cmip.DistinguishedName", HFILL }},
     { &hf_cmip_nonSpecificForm,
       { "nonSpecificForm", "cmip.nonSpecificForm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.OCTET_STRING", HFILL }},
     { &hf_cmip_localDistinguishedName,
       { "localDistinguishedName", "cmip.localDistinguishedName",
@@ -5126,11 +5126,11 @@ void proto_register_cmip(void) {
         "cmip.EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
       { "protocolVersion", "cmip.protocolVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.ProtocolVersion", HFILL }},
     { &hf_cmip_functionalUnits,
       { "functionalUnits", "cmip.functionalUnits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.FunctionalUnits", HFILL }},
     { &hf_cmip_cmipUserInfoaccessControl,
       { "accessControl", "cmip.accessControl",
@@ -5242,7 +5242,7 @@ void proto_register_cmip(void) {
         "cmip.T_managementExtensionidentifier", HFILL }},
     { &hf_cmip_significance,
       { "significance", "cmip.significance",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "cmip.BOOLEAN", HFILL }},
     { &hf_cmip_information,
       { "information", "cmip.information",
@@ -5406,7 +5406,7 @@ void proto_register_cmip(void) {
         "cmip.WeekMask_item", HFILL }},
     { &hf_cmip_daysOfWeek,
       { "daysOfWeek", "cmip.daysOfWeek",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmip.T_daysOfWeek", HFILL }},
     { &hf_cmip_intervalsOfDay,
       { "intervalsOfDay", "cmip.intervalsOfDay",
@@ -5535,59 +5535,59 @@ void proto_register_cmip(void) {
     { &hf_cmip_FunctionalUnits_multipleObjectSelection,
       { "multipleObjectSelection", "cmip.multipleObjectSelection",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_filter,
       { "filter", "cmip.filter",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_multipleReply,
       { "multipleReply", "cmip.multipleReply",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_extendedService,
       { "extendedService", "cmip.extendedService",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_FunctionalUnits_cancelGet,
       { "cancelGet", "cmip.cancelGet",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version1,
       { "version1", "cmip.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_ProtocolVersion_version2,
       { "version2", "cmip.version2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_sunday,
       { "sunday", "cmip.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_monday,
       { "monday", "cmip.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_tuesday,
       { "tuesday", "cmip.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_wednesday,
       { "wednesday", "cmip.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_thursday,
       { "thursday", "cmip.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_friday,
       { "friday", "cmip.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmip_T_daysOfWeek_saturday,
       { "saturday", "cmip.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
 #line 193 "packet-cmip-template.c"
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 4c88ef087d..c22ae6dbc0 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1721,7 +1721,7 @@ void proto_register_cmp(void) {
 		{ &hf_cmp_tcptrans_next_poll_ref,
 			{ "Next Polling Reference", "cmp.tcptrans.next_poll_ref",
 				FT_UINT32, BASE_HEX, NULL, 0,
-				"TCP transport Next Polling Reference ", HFILL }},
+				"TCP transport Next Polling Reference", HFILL }},
 		{ &hf_cmp_tcptrans_ttcb,
 			{ "Time to check Back", "cmp.tcptrans.ttcb",
 				FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0,
@@ -1815,7 +1815,7 @@ void proto_register_cmp(void) {
         "cmp.PKIBody", HFILL }},
     { &hf_cmp_protection,
       { "protection", "cmp.protection",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.PKIProtection", HFILL }},
     { &hf_cmp_extraCerts,
       { "extraCerts", "cmp.extraCerts",
@@ -1851,23 +1851,23 @@ void proto_register_cmp(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_cmp_senderKID,
       { "senderKID", "cmp.senderKID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1implicit.KeyIdentifier", HFILL }},
     { &hf_cmp_recipKID,
       { "recipKID", "cmp.recipKID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1implicit.KeyIdentifier", HFILL }},
     { &hf_cmp_transactionID,
       { "transactionID", "cmp.transactionID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_senderNonce,
       { "senderNonce", "cmp.senderNonce",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_recipNonce,
       { "recipNonce", "cmp.recipNonce",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_freeText,
       { "freeText", "cmp.freeText",
@@ -1995,7 +1995,7 @@ void proto_register_cmp(void) {
         "cmp.PollRepContent", HFILL }},
     { &hf_cmp_salt,
       { "salt", "cmp.salt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_owf,
       { "owf", "cmp.owf",
@@ -2019,7 +2019,7 @@ void proto_register_cmp(void) {
         "cmp.PKIFreeText", HFILL }},
     { &hf_cmp_failInfo,
       { "failInfo", "cmp.failInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.PKIFailureInfo", HFILL }},
     { &hf_cmp_hashAlg,
       { "hashAlg", "cmp.hashAlg",
@@ -2031,7 +2031,7 @@ void proto_register_cmp(void) {
         "crmf.CertId", HFILL }},
     { &hf_cmp_hashVal,
       { "hashVal", "cmp.hashVal",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.BIT_STRING", HFILL }},
     { &hf_cmp_POPODecKeyChallContent_item,
       { "Challenge", "cmp.Challenge",
@@ -2039,11 +2039,11 @@ void proto_register_cmp(void) {
         "cmp.Challenge", HFILL }},
     { &hf_cmp_witness,
       { "witness", "cmp.witness",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_challenge,
       { "challenge", "cmp.challenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_POPODecKeyRespContent_item,
       { "POPODecKeyRespContent item", "cmp.POPODecKeyRespContent_item",
@@ -2079,7 +2079,7 @@ void proto_register_cmp(void) {
         "cmp.CertifiedKeyPair", HFILL }},
     { &hf_cmp_rspInfo,
       { "rspInfo", "cmp.rspInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_certOrEncCert,
       { "certOrEncCert", "cmp.certOrEncCert",
@@ -2191,7 +2191,7 @@ void proto_register_cmp(void) {
         "cmp.CertStatus", HFILL }},
     { &hf_cmp_certHash,
       { "certHash", "cmp.certHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cmp.OCTET_STRING", HFILL }},
     { &hf_cmp_statusInfo,
       { "statusInfo", "cmp.statusInfo",
@@ -2260,111 +2260,111 @@ void proto_register_cmp(void) {
     { &hf_cmp_PKIFailureInfo_badAlg,
       { "badAlg", "cmp.badAlg",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badMessageCheck,
       { "badMessageCheck", "cmp.badMessageCheck",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badRequest,
       { "badRequest", "cmp.badRequest",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badTime,
       { "badTime", "cmp.badTime",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badCertId,
       { "badCertId", "cmp.badCertId",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badDataFormat,
       { "badDataFormat", "cmp.badDataFormat",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_wrongAuthority,
       { "wrongAuthority", "cmp.wrongAuthority",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_incorrectData,
       { "incorrectData", "cmp.incorrectData",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_missingTimeStamp,
       { "missingTimeStamp", "cmp.missingTimeStamp",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badPOP,
       { "badPOP", "cmp.badPOP",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_certRevoked,
       { "certRevoked", "cmp.certRevoked",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_certConfirmed,
       { "certConfirmed", "cmp.certConfirmed",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_wrongIntegrity,
       { "wrongIntegrity", "cmp.wrongIntegrity",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badRecipientNonce,
       { "badRecipientNonce", "cmp.badRecipientNonce",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_timeNotAvailable,
       { "timeNotAvailable", "cmp.timeNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unacceptedPolicy,
       { "unacceptedPolicy", "cmp.unacceptedPolicy",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unacceptedExtension,
       { "unacceptedExtension", "cmp.unacceptedExtension",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_addInfoNotAvailable,
       { "addInfoNotAvailable", "cmp.addInfoNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badSenderNonce,
       { "badSenderNonce", "cmp.badSenderNonce",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_badCertTemplate,
       { "badCertTemplate", "cmp.badCertTemplate",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_signerNotTrusted,
       { "signerNotTrusted", "cmp.signerNotTrusted",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_transactionIdInUse,
       { "transactionIdInUse", "cmp.transactionIdInUse",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_unsupportedVersion,
       { "unsupportedVersion", "cmp.unsupportedVersion",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_notAuthorized,
       { "notAuthorized", "cmp.notAuthorized",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_systemUnavail,
       { "systemUnavail", "cmp.systemUnavail",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_systemFailure,
       { "systemFailure", "cmp.systemFailure",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_cmp_PKIFailureInfo_duplicateCertReq,
       { "duplicateCertReq", "cmp.duplicateCertReq",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-cmp-hfarr.c ---*/
 #line 352 "packet-cmp-template.c"
diff --git a/epan/dissectors/packet-cmpp.c b/epan/dissectors/packet-cmpp.c
index 81c5bb8fb4..bd80421826 100644
--- a/epan/dissectors/packet-cmpp.c
+++ b/epan/dissectors/packet-cmpp.c
@@ -774,14 +774,14 @@ proto_register_cmpp(void) {
 		},
 		{ &hf_cmpp_submit_Registered_Delivery,
 			{ "Registered Delivery", "cmpp.submit.Registered_Delivery",
-			  FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			  FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			  "Registered Delivery flag",
 			  HFILL }
 		},
 		{ &hf_cmpp_submit_Msg_level,
 			{ "Message Level", "cmpp.submit.Msg_level",
 			  FT_UINT8, BASE_DEC, NULL, 0x00,
-			  "Message Level",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_Service_Id,
@@ -804,7 +804,7 @@ proto_register_cmpp(void) {
 		},
 		{ &hf_cmpp_submit_Fee_terminal_type,
 			{ "Fake Fee Terminal", "cmpp.submit.Fee_terminal_type",
-			  FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			  FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			  "Fee terminal type, 0 is real, 1 is fake",
 			  HFILL }
 		},
@@ -823,7 +823,7 @@ proto_register_cmpp(void) {
 		{ &hf_cmpp_Msg_Fmt,
 			{ "Message Format", "cmpp.Msg_Fmt",
 			  FT_UINT8, BASE_DEC, VALS(vals_Msg_Fmt), 0x00,
-			  "Message Format",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_submit_Msg_src,
@@ -835,13 +835,13 @@ proto_register_cmpp(void) {
 		{ &hf_cmpp_submit_FeeType, /* TODO Replace this with a vals_string*/
 			{ "Fee Type", "cmpp.submit.FeeType",
 			  FT_STRING, BASE_NONE, NULL, 0x00,
-			  "Fee Type",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_submit_FeeCode,
 			{ "Fee Code", "cmpp.submit.FeeCode",
 			  FT_STRING, BASE_NONE, NULL, 0x00,
-			  "Fee Code",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_submit_Valld_Time,
@@ -876,7 +876,7 @@ proto_register_cmpp(void) {
 		},
 		{ &hf_cmpp_submit_Dest_terminal_type,
 			{ "Fake Destination Terminal", "cmpp.submit.Dest_terminal_type",
-			  FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			  FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			  "destination terminal type, 0 is real, 1 is fake",
 			  HFILL }
 		},
@@ -889,13 +889,13 @@ proto_register_cmpp(void) {
 		{ &hf_cmpp_Msg_Content,
 			{ "Message Content", "cmpp.Msg_Content",
 			  FT_STRING, BASE_NONE, NULL, 0x00,
-			  "Message Content",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_LinkID,
 			{ "Link ID", "cmpp.LinkID",
 			  FT_STRING, BASE_NONE, NULL, 0x00,
-			  "Link ID",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_submit_resp_Result,
@@ -918,13 +918,13 @@ proto_register_cmpp(void) {
 		},
 		{ &hf_cmpp_deliver_Src_terminal_type,
 			{ "Fake source terminal type", "cmpp.deliver.Src_terminal_type",
-			  FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			  FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			  "Type of the source terminal, can be 0 (real) or 1 (fake)",
 			  HFILL }
 		},
 		{ &hf_cmpp_deliver_Registered_Delivery,
 			{ "Deliver Report", "cmpp.deliver.Registered_Delivery",
-			  FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			  FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			  "The message is a deliver report if this value = 1",
 			  HFILL }
 		},
@@ -937,7 +937,7 @@ proto_register_cmpp(void) {
 		{ &hf_cmpp_deliver_Report_Stat,
 			{ "Deliver Status", "cmpp.deliver.Report.Status",
 			  FT_STRING, BASE_NONE, NULL, 0x00,
-			  "Deliver Status",
+			  NULL,
 			  HFILL }
 		},
 		{ &hf_cmpp_deliver_Report_Submit_time,
diff --git a/epan/dissectors/packet-cms.c b/epan/dissectors/packet-cms.c
index 9d6951f9a1..f0619b9249 100644
--- a/epan/dissectors/packet-cms.c
+++ b/epan/dissectors/packet-cms.c
@@ -1628,7 +1628,7 @@ void proto_register_cms(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_cms_MessageDigest_PDU,
       { "MessageDigest", "cms.MessageDigest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.MessageDigest", HFILL }},
     { &hf_cms_SigningTime_PDU,
       { "SigningTime", "cms.SigningTime",
@@ -1700,7 +1700,7 @@ void proto_register_cms(void) {
         "cms.ContentType", HFILL }},
     { &hf_cms_eContent,
       { "eContent", "cms.eContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.T_eContent", HFILL }},
     { &hf_cms_sid,
       { "sid", "cms.sid",
@@ -1720,7 +1720,7 @@ void proto_register_cms(void) {
         "cms.SignatureAlgorithmIdentifier", HFILL }},
     { &hf_cms_signatureValue,
       { "signature", "cms.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SignatureValue", HFILL }},
     { &hf_cms_unsignedAttrs,
       { "unsignedAttrs", "cms.unsignedAttrs",
@@ -1732,7 +1732,7 @@ void proto_register_cms(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_cms_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "cms.subjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_SignedAttributes_item,
       { "Attribute", "cms.Attribute",
@@ -1788,7 +1788,7 @@ void proto_register_cms(void) {
         "cms.ContentEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedContent,
       { "encryptedContent", "cms.encryptedContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.EncryptedContent", HFILL }},
     { &hf_cms_UnprotectedAttributes_item,
       { "Attribute", "cms.Attribute",
@@ -1816,7 +1816,7 @@ void proto_register_cms(void) {
         "cms.KeyEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedKey,
       { "encryptedKey", "cms.encryptedKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.EncryptedKey", HFILL }},
     { &hf_cms_originator,
       { "originator", "cms.originator",
@@ -1824,7 +1824,7 @@ void proto_register_cms(void) {
         "cms.OriginatorIdentifierOrKey", HFILL }},
     { &hf_cms_ukm,
       { "ukm", "cms.ukm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.UserKeyingMaterial", HFILL }},
     { &hf_cms_recipientEncryptedKeys,
       { "recipientEncryptedKeys", "cms.recipientEncryptedKeys",
@@ -1840,7 +1840,7 @@ void proto_register_cms(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_cms_publicKey,
       { "publicKey", "cms.publicKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.BIT_STRING", HFILL }},
     { &hf_cms_RecipientEncryptedKeys_item,
       { "RecipientEncryptedKey", "cms.RecipientEncryptedKey",
@@ -1868,11 +1868,11 @@ void proto_register_cms(void) {
         "cms.KEKIdentifier", HFILL }},
     { &hf_cms_keyIdentifier,
       { "keyIdentifier", "cms.keyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.OCTET_STRING", HFILL }},
     { &hf_cms_digest,
       { "digest", "cms.digest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.Digest", HFILL }},
     { &hf_cms_macAlgorithm,
       { "macAlgorithm", "cms.macAlgorithm",
@@ -1884,7 +1884,7 @@ void proto_register_cms(void) {
         "cms.AuthAttributes", HFILL }},
     { &hf_cms_mac,
       { "mac", "cms.mac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.MessageAuthenticationCode", HFILL }},
     { &hf_cms_unauthenticatedAttributes,
       { "unauthenticatedAttributes", "cms.unauthenticatedAttributes",
@@ -1948,7 +1948,7 @@ void proto_register_cms(void) {
         "cms.INTEGER", HFILL }},
     { &hf_cms_iv,
       { "iv", "cms.iv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.OCTET_STRING", HFILL }},
     { &hf_cms_extendedCertificateInfo,
       { "extendedCertificateInfo", "cms.extendedCertificateInfo",
@@ -1956,7 +1956,7 @@ void proto_register_cms(void) {
         "cms.ExtendedCertificateInfo", HFILL }},
     { &hf_cms_signature,
       { "signature", "cms.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.Signature", HFILL }},
     { &hf_cms_attributes,
       { "attributes", "cms.attributes",
@@ -1980,7 +1980,7 @@ void proto_register_cms(void) {
         "cms.RecipientKeyIdentifier", HFILL }},
     { &hf_cms_subjectAltKeyIdentifier,
       { "subjectAltKeyIdentifier", "cms.subjectAltKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.SubjectKeyIdentifier", HFILL }},
     { &hf_cms_rc2WrapParameter,
       { "rc2WrapParameter", "cms.rc2WrapParameter",
diff --git a/epan/dissectors/packet-componentstatus.c b/epan/dissectors/packet-componentstatus.c
index 460fdab7f9..230a64e576 100644
--- a/epan/dissectors/packet-componentstatus.c
+++ b/epan/dissectors/packet-componentstatus.c
@@ -250,23 +250,23 @@ proto_register_componentstatusprotocol(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,                           { "Type",             "componentstatusprotocol.message_type",                           FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
-    { &hf_message_flags,                          { "Flags",            "componentstatusprotocol.message_flags",                          FT_UINT8,  BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_length,                         { "Length",           "componentstatusprotocol.message_length",                         FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_version,                        { "Version",          "componentstatusprotocol.message_version",                        FT_UINT32, BASE_HEX, NULL,                      0x0, "", HFILL } },
-    { &hf_message_senderid,                       { "SenderID",         "componentstatusprotocol.message_senderid",                       FT_UINT64, BASE_HEX, NULL,                      0x0, "", HFILL } },
-    { &hf_message_sendertimestamp,                { "SenderTimeStamp",  "componentstatusprotocol.message_sendertimestamp",                FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentstatusreport_reportinterval,   { "ReportInterval",   "componentstatusprotocol.componentstatusreport_reportinterval",   FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentstatusreport_location,         { "Location",         "componentstatusprotocol.componentstatusreport_location",         FT_STRING, 0, NULL,                             0x0, "", HFILL } },
-    { &hf_componentstatusreport_status,           { "Status",           "componentstatusprotocol.componentstatusreport_status",           FT_STRING, 0, NULL,                             0x0, "", HFILL } },
-    { &hf_componentstatusreport_workload,         { "Workload",         "componentstatusprotocol.componentstatusreport_workload",         FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentstatusreport_associations,     { "Associations",     "componentstatusprotocol.componentstatusreport_associations",     FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentstatusreport_associationarray, { "AssociationArray", "componentstatusprotocol.componentstatusreport_AssociationArray", FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentassociation_receiverid,        { "ReceiverID",       "componentstatusprotocol.componentassociation_receiverid",        FT_UINT64, BASE_HEX, NULL,                      0x0, "", HFILL } },
-    { &hf_componentassociation_duration,          { "Duration",         "componentstatusprotocol.componentassociation_duration",          FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentassociation_flags,             { "Flags",            "componentstatusprotocol.componentassociation_flags",             FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentassociation_protocolid,        { "ProtocolID",       "componentstatusprotocol.componentassociation_protocolid",        FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_componentassociation_ppid,              { "PPID",             "componentstatusprotocol.componentassociation_ppid",              FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
+    { &hf_message_type,                           { "Type",             "componentstatusprotocol.message_type",                           FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } },
+    { &hf_message_flags,                          { "Flags",            "componentstatusprotocol.message_flags",                          FT_UINT8,  BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_length,                         { "Length",           "componentstatusprotocol.message_length",                         FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_version,                        { "Version",          "componentstatusprotocol.message_version",                        FT_UINT32, BASE_HEX, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_senderid,                       { "SenderID",         "componentstatusprotocol.message_senderid",                       FT_UINT64, BASE_HEX, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_sendertimestamp,                { "SenderTimeStamp",  "componentstatusprotocol.message_sendertimestamp",                FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_reportinterval,   { "ReportInterval",   "componentstatusprotocol.componentstatusreport_reportinterval",   FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_location,         { "Location",         "componentstatusprotocol.componentstatusreport_location",         FT_STRING, BASE_NONE, NULL,                             0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_status,           { "Status",           "componentstatusprotocol.componentstatusreport_status",           FT_STRING, BASE_NONE, NULL,                             0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_workload,         { "Workload",         "componentstatusprotocol.componentstatusreport_workload",         FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_associations,     { "Associations",     "componentstatusprotocol.componentstatusreport_associations",     FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentstatusreport_associationarray, { "AssociationArray", "componentstatusprotocol.componentstatusreport_AssociationArray", FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentassociation_receiverid,        { "ReceiverID",       "componentstatusprotocol.componentassociation_receiverid",        FT_UINT64, BASE_HEX, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentassociation_duration,          { "Duration",         "componentstatusprotocol.componentassociation_duration",          FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentassociation_flags,             { "Flags",            "componentstatusprotocol.componentassociation_flags",             FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentassociation_protocolid,        { "ProtocolID",       "componentstatusprotocol.componentassociation_protocolid",        FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_componentassociation_ppid,              { "PPID",             "componentstatusprotocol.componentassociation_ppid",              FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 9c0b14ad51..5fae3b919c 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -1656,22 +1656,22 @@ void proto_register_cops(void)
     },
     { &hf_cops_in_int_ipv4,
       { "IPv4 address",           "cops.in-int.ipv4",
-      FT_IPv4, 0, NULL, 0,
+      FT_IPv4, BASE_NONE, NULL, 0,
       "IPv4 address in COPS IN-Int object", HFILL }
     },
     { &hf_cops_in_int_ipv6,
       { "IPv6 address",           "cops.in-int.ipv6",
-      FT_IPv6, 0, NULL, 0,
+      FT_IPv6, BASE_NONE, NULL, 0,
       "IPv6 address in COPS IN-Int object", HFILL }
     },
     { &hf_cops_out_int_ipv4,
       { "IPv4 address",           "cops.out-int.ipv4",
-      FT_IPv4, 0, NULL, 0,
+      FT_IPv4, BASE_NONE, NULL, 0,
       "IPv4 address in COPS OUT-Int object", HFILL }
     },
     { &hf_cops_out_int_ipv6,
       { "IPv6 address",           "cops.out-int.ipv6",
-      FT_IPv6, 0, NULL, 0,
+      FT_IPv6, BASE_NONE, NULL, 0,
       "IPv6 address in COPS OUT-Int", HFILL }
     },
     { &hf_cops_int_ifindex,
@@ -1726,22 +1726,22 @@ void proto_register_cops(void)
     },
     { &hf_cops_pdprediraddr_ipv4,
       { "IPv4 address",           "cops.pdprediraddr.ipv4",
-      FT_IPv4, 0, NULL, 0,
+      FT_IPv4, BASE_NONE, NULL, 0,
       "IPv4 address in COPS PDPRedirAddr object", HFILL }
     },
     { &hf_cops_pdprediraddr_ipv6,
       { "IPv6 address",           "cops.pdprediraddr.ipv6",
-      FT_IPv6, 0, NULL, 0,
+      FT_IPv6, BASE_NONE, NULL, 0,
       "IPv6 address in COPS PDPRedirAddr object", HFILL }
     },
     { &hf_cops_lastpdpaddr_ipv4,
       { "IPv4 address",           "cops.lastpdpaddr.ipv4",
-      FT_IPv4, 0, NULL, 0,
+      FT_IPv4, BASE_NONE, NULL, 0,
       "IPv4 address in COPS LastPDPAddr object", HFILL }
     },
     { &hf_cops_lastpdpaddr_ipv6,
       { "IPv6 address",           "cops.lastpdpaddr.ipv6",
-      FT_IPv6, 0, NULL, 0,
+      FT_IPv6, BASE_NONE, NULL, 0,
       "IPv6 address in COPS LastPDPAddr object", HFILL }
     },
     { &hf_cops_pdp_tcp_port,
@@ -1784,262 +1784,262 @@ void proto_register_cops(void)
       FT_UINT16, BASE_HEX, NULL, 0,
       "Error Sub-code in Error object", HFILL }
     },
-  { &hf_cops_prid_oid, { "PRID Instance Identifier", "cops.prid.instance_id", FT_OID, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_pprid_oid, { "Prefix Identifier", "cops.pprid.prefix_id", FT_OID, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_errprid_oid, { "ErrorPRID Instance Identifier", "cops.errprid.instance_id", FT_OID, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_unknown, { "EPD Unknown Data", "cops.epd.unknown", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_null, { "EPD Null Data", "cops.epd.null", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_int, { "EPD Integer Data", "cops.epd.int", FT_INT64, BASE_DEC, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_octets, { "EPD Octet String Data", "cops.epd.octets", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_oid, { "EPD OID Data", "cops.epd.oid", FT_OID, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_ipv4, { "EPD IPAddress Data", "cops.epd.ipv4", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_u32, { "EPD Unsigned32 Data", "cops.epd.unsigned32", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_ticks, { "EPD TimeTicks Data", "cops.epd.timeticks", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_opaque, { "EPD Opaque Data", "cops.epd.opaque", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_i64, { "EPD Inetger64 Data", "cops.epd.integer64", FT_INT64, BASE_DEC, NULL, 0, "", HFILL } },
-  { &hf_cops_epd_u64, { "EPD Unsigned64 Data", "cops.epd.unsigned64", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL } },
+  { &hf_cops_prid_oid, { "PRID Instance Identifier", "cops.prid.instance_id", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_pprid_oid, { "Prefix Identifier", "cops.pprid.prefix_id", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_errprid_oid, { "ErrorPRID Instance Identifier", "cops.errprid.instance_id", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_unknown, { "EPD Unknown Data", "cops.epd.unknown", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_null, { "EPD Null Data", "cops.epd.null", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_int, { "EPD Integer Data", "cops.epd.int", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_octets, { "EPD Octet String Data", "cops.epd.octets", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_oid, { "EPD OID Data", "cops.epd.oid", FT_OID, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_ipv4, { "EPD IPAddress Data", "cops.epd.ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_u32, { "EPD Unsigned32 Data", "cops.epd.unsigned32", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_ticks, { "EPD TimeTicks Data", "cops.epd.timeticks", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_opaque, { "EPD Opaque Data", "cops.epd.opaque", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_i64, { "EPD Inetger64 Data", "cops.epd.integer64", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL } },
+  { &hf_cops_epd_u64, { "EPD Unsigned64 Data", "cops.epd.unsigned64", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL } },
 
     /* Added for PacketCable */
 
     { &hf_cops_subtree,
       { "Object Subtree", "cops.pc_subtree",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Object Subtree", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_ds_field,
       { "DS Field (DSCP or TOS)", "cops.pc_ds_field",
         FT_UINT8, BASE_HEX, NULL, 0x00,
-        "DS Field (DSCP or TOS)", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_direction,
       { "Direction", "cops.pc_direction",
         FT_UINT8, BASE_HEX, NULL, 0x00,
-        "Direction", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_gate_spec_flags,
       { "Flags", "cops.pc_gate_spec_flags",
         FT_UINT8, BASE_HEX, NULL, 0x00,
-        "Flags", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_protocol_id,
       { "Protocol ID", "cops.pc_protocol_id",
         FT_UINT8, BASE_HEX, NULL, 0x00,
-        "Protocol ID", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_session_class,
       { "Session Class", "cops.pc_session_class",
         FT_UINT8, BASE_HEX, NULL, 0x00,
-        "Session Class", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_algorithm,
       { "Algorithm", "cops.pc_algorithm",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Algorithm", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_cmts_ip_port,
       { "CMTS IP Port", "cops.pc_cmts_ip_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "CMTS IP Port", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_prks_ip_port,
       { "PRKS IP Port", "cops.pc_prks_ip_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "PRKS IP Port", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_srks_ip_port,
       { "SRKS IP Port", "cops.pc_srks_ip_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "SRKS IP Port", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_dest_port,
       { "Destination IP Port", "cops.pc_dest_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Destination IP Port", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_packetcable_err_code,
       { "Error Code", "cops.pc_packetcable_err_code",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Error Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_packetcable_sub_code,
       { "Error Sub Code", "cops.pc_packetcable_sub_code",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Error Sub Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_remote_flags,
       { "Flags", "cops.pc_remote_flags",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Flags", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_close_subcode,
       { "Reason Sub Code", "cops.pc_close_subcode",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Reason Sub Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_gate_command_type,
       { "Gate Command Type", "cops.pc_gate_command_type",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Gate Command Type", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_reason_code,
       { "Reason Code", "cops.pc_reason_code",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Reason Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_delete_subcode,
       { "Reason Sub Code", "cops.pc_delete_subcode",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Reason Sub Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_src_port,
       { "Source IP Port", "cops.pc_src_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Source IP Port", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_t1_value,
       { "Timer T1 Value (sec)", "cops.pc_t1_value",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Timer T1 Value (sec)", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_t7_value,
       { "Timer T7 Value (sec)", "cops.pc_t7_value",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Timer T7 Value (sec)", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_t8_value,
       { "Timer T8 Value (sec)", "cops.pc_t8_value",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Timer T8 Value (sec)", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_transaction_id,
       { "Transaction Identifier", "cops.pc_transaction_id",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "Transaction Identifier", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_cmts_ip,
       { "CMTS IP Address", "cops.pc_cmts_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "CMTS IP Address", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_prks_ip,
       { "PRKS IP Address", "cops.pc_prks_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "PRKS IP Address", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_srks_ip,
       { "SRKS IP Address", "cops.pc_srks_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "SRKS IP Address", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_dfcdc_ip,
       { "DF IP Address CDC", "cops.pc_dfcdc_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "DF IP Address CDC", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_dfccc_ip,
       { "DF IP Address CCC", "cops.pc_dfccc_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "DF IP Address CCC", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_dfcdc_ip_port,
       { "DF IP Port CDC", "cops.pc_dfcdc_ip_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "DF IP Port CDC", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_dfccc_ip_port,
       { "DF IP Port CCC", "cops.pc_dfccc_ip_port",
         FT_UINT16, BASE_HEX, NULL, 0x00,
-        "DF IP Port CCC", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_dfccc_id,
       { "CCC ID", "cops.pc_dfccc_id",
         FT_UINT32, BASE_DEC, NULL, 0x00,
-        "CCC ID", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_activity_count,
       { "Count", "cops.pc_activity_count",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Count", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_dest_ip,
       { "Destination IP Address", "cops.pc_dest_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "Destination IP Address", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_gate_id,
       { "Gate Identifier", "cops.pc_gate_id",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Gate Identifier", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_max_packet_size,
       { "Maximum Packet Size", "cops.pc_max_packet_size",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Maximum Packet Size", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_min_policed_unit,
       { "Minimum Policed Unit", "cops.pc_min_policed_unit",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Minimum Policed Unit", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_peak_data_rate,
       { "Peak Data Rate", "cops.pc_peak_data_rate",
         FT_FLOAT, BASE_NONE, NULL, 0x00,
-        "Peak Data Rate", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_spec_rate,
       { "Rate", "cops.pc_spec_rate",
         FT_FLOAT, BASE_NONE, NULL, 0x00,
-        "Rate", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_remote_gate_id,
       { "Remote Gate ID", "cops.pc_remote_gate_id",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Remote Gate ID", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_reserved,
       { "Reserved", "cops.pc_reserved",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Reserved", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_key,
       { "Security Key", "cops.pc_key",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Security Key", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_slack_term,
       { "Slack Term", "cops.pc_slack_term",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Slack Term", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_src_ip,
       { "Source IP Address", "cops.pc_src_ip",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "Source IP Address", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_subscriber_id_ipv4,
       { "Subscriber Identifier (IPv4)", "cops.pc_subscriber_id4",
-        FT_IPv4, BASE_HEX, NULL, 0x00,
-        "Subscriber Identifier (IPv4)", HFILL }
+        FT_IPv4, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_subscriber_id_ipv6,
       { "Subscriber Identifier (IPv6)", "cops.pc_subscriber_id6",
-        FT_IPv6, BASE_HEX, NULL, 0x00,
-        "Subscriber Identifier (IPv6)", HFILL }
+        FT_IPv6, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }
     },
     { &hf_cops_pc_token_bucket_rate,
       { "Token Bucket Rate", "cops.pc_token_bucket_rate",
         FT_FLOAT, BASE_NONE, NULL, 0x00,
-        "Token Bucket Rate", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_token_bucket_size,
       { "Token Bucket Size", "cops.pc_token_bucket_size",
         FT_FLOAT, BASE_NONE, NULL, 0x00,
-        "Token Bucket Size", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_bcid,
       { "Billing Correlation ID", "cops.pc_bcid",
         FT_UINT32, BASE_HEX, NULL, 0x00,
-        "Billing Correlation ID", HFILL }
+        NULL, HFILL }
     },
     { &hf_cops_pc_bcid_ts,
       { "BDID Timestamp", "cops.pc_bcid_ts",
@@ -2136,22 +2136,22 @@ void proto_register_cops(void)
     },
     { &hf_cops_pcmm_classifier_src_addr,
 	    { "Source address", "cops.pc_mm_classifier_src_addr",
-	    FT_IPv4, 0, NULL, 0,
+	    FT_IPv4, BASE_NONE, NULL, 0,
 	    "PacketCable Multimedia Classifier Source IP Address", HFILL }
     },
     { &hf_cops_pcmm_classifier_src_mask,
 	    { "Source mask", "cops.pc_mm_classifier_src_mask",
-	    FT_IPv4, 0, NULL, 0,
+	    FT_IPv4, BASE_NONE, NULL, 0,
 	    "PacketCable Multimedia Classifier Source Mask", HFILL }
     },
     { &hf_cops_pcmm_classifier_dst_addr,
 	    { "Destination address", "cops.pc_mm_classifier_dst_addr",
-	    FT_IPv4, 0, NULL, 0,
+	    FT_IPv4, BASE_NONE, NULL, 0,
 	    "PacketCable Multimedia Classifier Destination IP Address", HFILL }
     },
     { &hf_cops_pcmm_classifier_dst_mask,
 	    { "Destination address", "cops.pc_mm_classifier_dst_mask",
-	    FT_IPv4, 0, NULL, 0,
+	    FT_IPv4, BASE_NONE, NULL, 0,
 	    "PacketCable Multimedia Classifier Destination Mask", HFILL }
     },
     { &hf_cops_pcmm_classifier_src_port,
@@ -2208,7 +2208,7 @@ void proto_register_cops(void)
 
     { &hf_cops_pcmm_docsis_scn,
 	    { "Service Class Name", "cops.pc_mm_docsis_scn",
-	    FT_STRINGZ, BASE_DEC, NULL, 0,
+	    FT_STRINGZ, BASE_NONE, NULL, 0,
 	    "PacketCable Multimedia DOCSIS Service Class Name", HFILL }
     },
 
@@ -2396,7 +2396,7 @@ void proto_register_cops(void)
 
     { &hf_cops_pcmm_userid,
     	{ "UserID", "cops.pc_mm_userid",
-    	FT_STRING, BASE_CUSTOM, NULL, 0,
+    	FT_STRING, BASE_NONE, NULL, 0,
     	"PacketCable Multimedia UserID", HFILL }
     },
 
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 7eec895bcd..9e8a4e7e55 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -152,15 +152,15 @@ proto_register_cosine(void)
 {
   static hf_register_info hf[] = {
     { &hf_pro,
-      { "Protocol", "cosine.pro", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Protocol", "cosine.pro", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_off,
-      { "Offset", "cosine.off", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Offset", "cosine.off", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_pri,
-      { "Priority", "cosine.pri", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Priority", "cosine.pri", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_rm,
-      { "Rate Marking",	"cosine.rm",  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Rate Marking",	"cosine.rm",  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_err,
-      { "Error Code", "cosine.err", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Error Code", "cosine.err", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-cpfi.c b/epan/dissectors/packet-cpfi.c
index 9f7ae45a97..49cd7584a0 100644
--- a/epan/dissectors/packet-cpfi.c
+++ b/epan/dissectors/packet-cpfi.c
@@ -401,11 +401,11 @@ proto_register_cpfi(void)
     { &hf_cpfi_word_one,
       { "Word one", "cpfi.word_one",
         FT_UINT32, BASE_HEX, NULL, 0x0,
-        "", HFILL}},
+        NULL, HFILL}},
     { &hf_cpfi_word_two,
       { "Word two", "cfpi.word_two",
         FT_UINT32, BASE_HEX, NULL, 0x0,
-        "", HFILL}},
+        NULL, HFILL}},
 
     { &hf_cpfi_frame_type,
       { "FrmType", "cpfi.frmtype",
@@ -439,7 +439,7 @@ proto_register_cpfi(void)
     { &hf_cpfi_CRC_32,
       { "CRC-32", "cpfi.crc-32",
         FT_UINT32, BASE_HEX, NULL, 0x0,
-        "", HFILL}},
+        NULL, HFILL}},
 
     { &hf_cpfi_EOF_type,
       { "EOFtype", "cpfi.EOFtype",
@@ -448,48 +448,48 @@ proto_register_cpfi(void)
 
     { &hf_cpfi_t_instance,
       { "Instance", "cpfi.instance",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_src_instance,
       { "Source Instance", "cpfi.src_instance",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_dst_instance,
       { "Destination Instance", "cpfi.dst_instance",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_board,
       { "Board", "cpfi.board",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_src_board,
       { "Source Board", "cpfi.src_board",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_dst_board,
       { "Destination Board", "cpfi.dst_board",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_port,
       { "Port", "cpfi.port",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_src_port,
       { "Source Port", "cpfi.src_port",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
 
     { &hf_cpfi_t_dst_port,
       { "Destination Port", "cpfi.dst_port",
-        FT_BYTES, BASE_DEC,
-       NULL, 0x0, "", HFILL}},
+        FT_BYTES, BASE_NONE,
+       NULL, 0x0, NULL, HFILL}},
   };
 
 
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 3b669227a6..bab150b473 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -520,7 +520,7 @@ proto_register_cpha(void)
     { &hf_is_if_trusted,
     { "Interface Trusted", "cpha.if_trusted", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     { &hf_ip,
-    { "IP Address", "cpha.ip", FT_IPv4, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { "IP Address", "cpha.ip", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     { &hf_slot_num,
     { "Slot Number", "cpha.slot_num", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_machine_num,
diff --git a/epan/dissectors/packet-crmf.c b/epan/dissectors/packet-crmf.c
index 0e5ecfdf0e..e8ff8ef7f7 100644
--- a/epan/dissectors/packet-crmf.c
+++ b/epan/dissectors/packet-crmf.c
@@ -967,11 +967,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.SubjectPublicKeyInfo", HFILL }},
     { &hf_crmf_issuerUID,
       { "issuerUID", "crmf.issuerUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.UniqueIdentifier", HFILL }},
     { &hf_crmf_subjectUID,
       { "subjectUID", "crmf.subjectUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.UniqueIdentifier", HFILL }},
     { &hf_crmf_extensions,
       { "extensions", "crmf.extensions",
@@ -1023,7 +1023,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_sk_signature,
       { "signature", "crmf.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_authInfo,
       { "authInfo", "crmf.authInfo",
@@ -1043,11 +1043,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_pkmac_value,
       { "value", "crmf.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_salt,
       { "salt", "crmf.salt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_owf,
       { "owf", "crmf.owf",
@@ -1063,7 +1063,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_thisMessage,
       { "thisMessage", "crmf.thisMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_subsequentMessage,
       { "subsequentMessage", "crmf.subsequentMessage",
@@ -1071,7 +1071,7 @@ void proto_register_crmf(void) {
         "crmf.SubsequentMessage", HFILL }},
     { &hf_crmf_dhMAC,
       { "dhMAC", "crmf.dhMAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_agreeMAC,
       { "agreeMAC", "crmf.agreeMAC",
@@ -1107,11 +1107,11 @@ void proto_register_crmf(void) {
         "crmf.EncryptedKey", HFILL }},
     { &hf_crmf_keyGenParameters,
       { "keyGenParameters", "crmf.keyGenParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.KeyGenParameters", HFILL }},
     { &hf_crmf_archiveRemGenPrivKey,
       { "archiveRemGenPrivKey", "crmf.archiveRemGenPrivKey",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "crmf.BOOLEAN", HFILL }},
     { &hf_crmf_encryptedValue,
       { "encryptedValue", "crmf.encryptedValue",
@@ -1131,7 +1131,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_encSymmKey,
       { "encSymmKey", "crmf.encSymmKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_keyAlg,
       { "keyAlg", "crmf.keyAlg",
@@ -1139,11 +1139,11 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_valueHint,
       { "valueHint", "crmf.valueHint",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_encValue,
       { "encValue", "crmf.encValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.BIT_STRING", HFILL }},
     { &hf_crmf_issuer,
       { "issuer", "crmf.issuer",
@@ -1175,7 +1175,7 @@ void proto_register_crmf(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_crmf_privateKey,
       { "privateKey", "crmf.privateKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "crmf.OCTET_STRING", HFILL }},
     { &hf_crmf_attributes,
       { "attributes", "crmf.attributes",
diff --git a/epan/dissectors/packet-ctdb.c b/epan/dissectors/packet-ctdb.c
index ebb11e2c70..ef966fde6c 100644
--- a/epan/dissectors/packet-ctdb.c
+++ b/epan/dissectors/packet-ctdb.c
@@ -1117,10 +1117,10 @@ proto_register_ctdb(void)
 	  NULL, 0x0, "Size of CTDB PDU", HFILL }},
 	{ &hf_ctdb_dst, { 
 	  "Destination", "ctdb.dst", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_src, { 
 	  "Source", "ctdb.src", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_id, { 
 	  "Id", "ctdb.id", FT_UINT32, BASE_DEC, 
 	  NULL, 0x0, "Transaction ID", HFILL }},
@@ -1138,91 +1138,91 @@ proto_register_ctdb(void)
 	  NULL, 0x0, "Call ID", HFILL }},
 	{ &hf_ctdb_status, { 
 	  "Status", "ctdb.status", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_datalen, { 
 	  "Data Length", "ctdb.datalen", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_errorlen, { 
 	  "Error Length", "ctdb.errorlen", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_keylen, { 
 	  "Key Length", "ctdb.keylen", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_magic, { 
 	  "Magic", "ctdb.magic", FT_UINT32, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_version, { 
 	  "Version", "ctdb.version", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_dmaster, { 
 	  "Dmaster", "ctdb.dmaster", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_generation, { 
 	  "Generation", "ctdb.generation", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_key, { 
-	  "Key", "ctdb.key", FT_BYTES, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  "Key", "ctdb.key", FT_BYTES, BASE_NONE, 
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_keyhash, { 
 	  "KeyHash", "ctdb.keyhash", FT_UINT32, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_data, { 
-	  "Data", "ctdb.data", FT_BYTES, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  "Data", "ctdb.data", FT_BYTES, BASE_NONE, 
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_error, { 
-	  "Error", "ctdb.error", FT_BYTES, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  "Error", "ctdb.error", FT_BYTES, BASE_NONE, 
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_request_in, { 
 	  "Request In", "ctdb.request_in", FT_FRAMENUM, BASE_NONE, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_response_in, { 
 	  "Response In", "ctdb.response_in", FT_FRAMENUM, BASE_NONE, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_time, { 
 	  "Time since request", "ctdb.time", FT_RELATIVE_TIME, BASE_NONE, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_hopcount, { 
 	  "Hopcount", "ctdb.hopcount", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_rsn, { 
 	  "RSN", "ctdb.rsn", FT_UINT64, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_ctrl_opcode, { 
 	  "CTRL Opcode", "ctdb.ctrl_opcode", FT_UINT32, BASE_DEC, 
-	  VALS(ctrl_opcode_vals), 0x0, "", HFILL }},
+	  VALS(ctrl_opcode_vals), 0x0, NULL, HFILL }},
 	{ &hf_ctdb_srvid, { 
 	  "SrvId", "ctdb.srvid", FT_UINT64, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_clientid, { 
 	  "ClientId", "ctdb.clientid", FT_UINT32, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_ctrl_flags, { 
 	  "CTRL Flags", "ctdb.ctrl_flags", FT_UINT32, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_recmaster, { 
 	  "Recovery Master", "ctdb.recmaster", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_recmode, { 
 	  "Recovery Mode", "ctdb.recmode", FT_UINT32, BASE_DEC, 
-	  VALS(recmode_vals), 0x0, "", HFILL }},
+	  VALS(recmode_vals), 0x0, NULL, HFILL }},
 	{ &hf_ctdb_num_nodes, { 
 	  "Num Nodes", "ctdb.num_nodes", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_vnn, { 
 	  "VNN", "ctdb.vnn", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_node_flags, { 
 	  "Node Flags", "ctdb.node_flags", FT_UINT32, BASE_HEX, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_node_ip, { 
 	  "Node IP", "ctdb.node_ip", FT_IPv4, BASE_NONE, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_pid, { 
 	  "PID", "ctdb.pid", FT_UINT32, BASE_DEC, 
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 	{ &hf_ctdb_process_exists, { 
 	  "Process Exists", "ctdb.process_exists", FT_BOOLEAN, 32, 
-	  TFS(&process_exists_tfs), 0x01, "", HFILL }},
+	  TFS(&process_exists_tfs), 0x01, NULL, HFILL }},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-cups.c b/epan/dissectors/packet-cups.c
index 85982095ef..b11c7ba04d 100644
--- a/epan/dissectors/packet-cups.c
+++ b/epan/dissectors/packet-cups.c
@@ -362,11 +362,11 @@ proto_register_cups(void)
 		/* This one could be split in separate fields. */
 		{ &hf_cups_ptype,
 			{ "Type", 	"cups.ptype", FT_UINT32, BASE_HEX,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_cups_state,
 			{ "State",	"cups.state", FT_UINT8, BASE_HEX,
-			  VALS(cups_state_values), 0x0, "", HFILL }}
+			  VALS(cups_state_values), 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index 1aa2f08f76..9a6d9552c4 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -4957,7 +4957,7 @@ void proto_register_dap(void) {
         "dap.UpdateError", HFILL }},
     { &hf_dap_options,
       { "options", "dap.options",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.ServiceControlOptions", HFILL }},
     { &hf_dap_priority,
       { "priority", "dap.priority",
@@ -5041,7 +5041,7 @@ void proto_register_dap(void) {
         "dap.ContextSelection", HFILL }},
     { &hf_dap_returnContexts,
       { "returnContexts", "dap.returnContexts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_familyReturn,
       { "familyReturn", "dap.familyReturn",
@@ -5101,7 +5101,7 @@ void proto_register_dap(void) {
         "dap.Name", HFILL }},
     { &hf_dap_fromEntry,
       { "fromEntry", "dap.fromEntry",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_entry_information,
       { "information", "dap.information",
@@ -5121,15 +5121,15 @@ void proto_register_dap(void) {
         "x509if.Attribute", HFILL }},
     { &hf_dap_incompleteEntry,
       { "incompleteEntry", "dap.incompleteEntry",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_partialName,
       { "partialName", "dap.partialName",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_derivedEntry,
       { "derivedEntry", "dap.derivedEntry",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_family_class,
       { "family-class", "dap.family_class",
@@ -5257,7 +5257,7 @@ void proto_register_dap(void) {
         "dap.T_matchValue", HFILL }},
     { &hf_dap_dnAttributes,
       { "dnAttributes", "dap.dnAttributes",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_newRequest,
       { "newRequest", "dap.newRequest",
@@ -5277,15 +5277,15 @@ void proto_register_dap(void) {
         "dap.SortKey", HFILL }},
     { &hf_dap_reverse,
       { "reverse", "dap.reverse",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_unmerged,
       { "unmerged", "dap.unmerged",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_pagedResultsQueryReference,
       { "queryReference", "dap.queryReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.T_pagedResultsQueryReference", HFILL }},
     { &hf_dap_orderingRule,
       { "orderingRule", "dap.orderingRule",
@@ -5305,7 +5305,7 @@ void proto_register_dap(void) {
         "dap.Time", HFILL }},
     { &hf_dap_random,
       { "random", "dap.random",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_target,
       { "target", "dap.target",
@@ -5313,7 +5313,7 @@ void proto_register_dap(void) {
         "dap.ProtectionRequest", HFILL }},
     { &hf_dap_response,
       { "response", "dap.response",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_operationCode,
       { "operationCode", "dap.operationCode",
@@ -5345,7 +5345,7 @@ void proto_register_dap(void) {
         "dap.Credentials", HFILL }},
     { &hf_dap_versions,
       { "versions", "dap.versions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.Versions", HFILL }},
     { &hf_dap_simple,
       { "simple", "dap.simple",
@@ -5385,11 +5385,11 @@ void proto_register_dap(void) {
         "dap.T_time2", HFILL }},
     { &hf_dap_random1,
       { "random1", "dap.random1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_random2,
       { "random2", "dap.random2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_password,
       { "password", "dap.password",
@@ -5397,7 +5397,7 @@ void proto_register_dap(void) {
         "dap.T_password", HFILL }},
     { &hf_dap_unprotected,
       { "unprotected", "dap.unprotected",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.OCTET_STRING", HFILL }},
     { &hf_dap_protected,
       { "protected", "dap.protected",
@@ -5405,7 +5405,7 @@ void proto_register_dap(void) {
         "dap.T_protected", HFILL }},
     { &hf_dap_protectedPassword,
       { "protectedPassword", "dap.protectedPassword",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.OCTET_STRING", HFILL }},
     { &hf_dap_algorithmIdentifier,
       { "algorithmIdentifier", "dap.algorithmIdentifier",
@@ -5413,7 +5413,7 @@ void proto_register_dap(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dap_encrypted,
       { "encrypted", "dap.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_bind_token,
       { "bind-token", "dap.bind_token",
@@ -5445,7 +5445,7 @@ void proto_register_dap(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindIntKeyInfo,
       { "bindIntKeyInfo", "dap.bindIntKeyInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BindKeyInfo", HFILL }},
     { &hf_dap_bindConfAlgorithm,
       { "bindConfAlgorithm", "dap.bindConfAlgorithm",
@@ -5457,7 +5457,7 @@ void proto_register_dap(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindConfKeyInfo,
       { "bindConfKeyInfo", "dap.bindConfKeyInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BindKeyInfo", HFILL }},
     { &hf_dap_token_data,
       { "token-data", "dap.token_data",
@@ -5501,7 +5501,7 @@ void proto_register_dap(void) {
         "dap.EntryInformationSelection", HFILL }},
     { &hf_dap_modifyRightsRequest,
       { "modifyRightsRequest", "dap.modifyRightsRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_serviceControls,
       { "serviceControls", "dap.serviceControls",
@@ -5525,7 +5525,7 @@ void proto_register_dap(void) {
         "dap.INTEGER", HFILL }},
     { &hf_dap_criticalExtensions,
       { "criticalExtensions", "dap.criticalExtensions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.BIT_STRING", HFILL }},
     { &hf_dap_referenceType,
       { "referenceType", "dap.referenceType",
@@ -5533,11 +5533,11 @@ void proto_register_dap(void) {
         "dsp.ReferenceType", HFILL }},
     { &hf_dap_entryOnly,
       { "entryOnly", "dap.entryOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_nameResolveOnMaster,
       { "nameResolveOnMaster", "dap.nameResolveOnMaster",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_operationContexts,
       { "operationContexts", "dap.operationContexts",
@@ -5577,7 +5577,7 @@ void proto_register_dap(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_dap_aliasDereferenced,
       { "aliasDereferenced", "dap.aliasDereferenced",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_notification,
       { "notification", "dap.notification",
@@ -5621,7 +5621,7 @@ void proto_register_dap(void) {
         "x509if.AttributeValueAssertion", HFILL }},
     { &hf_dap_permission,
       { "permission", "dap.permission",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.T_permission", HFILL }},
     { &hf_dap_purported,
       { "purported", "dap.purported",
@@ -5641,7 +5641,7 @@ void proto_register_dap(void) {
         "dap.CompareArgumentData", HFILL }},
     { &hf_dap_matched,
       { "matched", "dap.matched",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_matchedSubtype,
       { "matchedSubtype", "dap.matchedSubtype",
@@ -5701,7 +5701,7 @@ void proto_register_dap(void) {
         "dap.PagedResultsRequest", HFILL }},
     { &hf_dap_listFamily,
       { "listFamily", "dap.listFamily",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_unsignedListArgument,
       { "unsignedListArgument", "dap.unsignedListArgument",
@@ -5729,7 +5729,7 @@ void proto_register_dap(void) {
         "dap.T_subordinates_item", HFILL }},
     { &hf_dap_aliasEntry,
       { "aliasEntry", "dap.aliasEntry",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_partialOutcomeQualifier,
       { "partialOutcomeQualifier", "dap.partialOutcomeQualifier",
@@ -5769,7 +5769,7 @@ void proto_register_dap(void) {
         "dsp.ContinuationReference", HFILL }},
     { &hf_dap_unavailableCriticalExtensions,
       { "unavailableCriticalExtensions", "dap.unavailableCriticalExtensions",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_unknownErrors,
       { "unknownErrors", "dap.unknownErrors",
@@ -5781,7 +5781,7 @@ void proto_register_dap(void) {
         "dap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_queryReference,
       { "queryReference", "dap.queryReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.OCTET_STRING", HFILL }},
     { &hf_dap_overspecFilter,
       { "overspecFilter", "dap.overspecFilter",
@@ -5805,7 +5805,7 @@ void proto_register_dap(void) {
         "dap.INTEGER", HFILL }},
     { &hf_dap_streamedResult,
       { "streamedResult", "dap.streamedResult",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_baseObject,
       { "baseObject", "dap.baseObject",
@@ -5821,11 +5821,11 @@ void proto_register_dap(void) {
         "dap.Filter", HFILL }},
     { &hf_dap_searchAliases,
       { "searchAliases", "dap.searchAliases",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_matchedValuesOnly,
       { "matchedValuesOnly", "dap.matchedValuesOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_extendedFilter,
       { "extendedFilter", "dap.extendedFilter",
@@ -5833,7 +5833,7 @@ void proto_register_dap(void) {
         "dap.Filter", HFILL }},
     { &hf_dap_checkOverspecified,
       { "checkOverspecified", "dap.checkOverspecified",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_relaxation,
       { "relaxation", "dap.relaxation",
@@ -5845,11 +5845,11 @@ void proto_register_dap(void) {
         "dap.INTEGER", HFILL }},
     { &hf_dap_hierarchySelections,
       { "hierarchySelections", "dap.hierarchySelections",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.HierarchySelections", HFILL }},
     { &hf_dap_searchControlOptions,
       { "searchControlOptions", "dap.searchControlOptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dap.SearchControlOptions", HFILL }},
     { &hf_dap_joinArguments,
       { "joinArguments", "dap.joinArguments",
@@ -5933,7 +5933,7 @@ void proto_register_dap(void) {
         "dap.EntryInformation", HFILL }},
     { &hf_dap_altMatching,
       { "altMatching", "dap.altMatching",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_uncorrelatedSearchInfo,
       { "uncorrelatedSearchInfo", "dap.uncorrelatedSearchInfo",
@@ -6089,7 +6089,7 @@ void proto_register_dap(void) {
         "x509if.RelativeDistinguishedName", HFILL }},
     { &hf_dap_deleteOldRDN,
       { "deleteOldRDN", "dap.deleteOldRDN",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dap.BOOLEAN", HFILL }},
     { &hf_dap_newSuperior,
       { "newSuperior", "dap.newSuperior",
@@ -6270,163 +6270,163 @@ void proto_register_dap(void) {
     { &hf_dap_ServiceControlOptions_preferChaining,
       { "preferChaining", "dap.preferChaining",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_chainingProhibited,
       { "chainingProhibited", "dap.chainingProhibited",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_localScope,
       { "localScope", "dap.localScope",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontUseCopy,
       { "dontUseCopy", "dap.dontUseCopy",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_dontDereferenceAliases,
       { "dontDereferenceAliases", "dap.dontDereferenceAliases",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_subentries,
       { "subentries", "dap.subentries",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_copyShallDo,
       { "copyShallDo", "dap.copyShallDo",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_partialNameResolution,
       { "partialNameResolution", "dap.partialNameResolution",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_manageDSAIT,
       { "manageDSAIT", "dap.manageDSAIT",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_noSubtypeMatch,
       { "noSubtypeMatch", "dap.noSubtypeMatch",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_noSubtypeSelection,
       { "noSubtypeSelection", "dap.noSubtypeSelection",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_ServiceControlOptions_countFamily,
       { "countFamily", "dap.countFamily",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_Versions_v1,
       { "v1", "dap.v1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_Versions_v2,
       { "v2", "dap.v2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_T_permission_add,
       { "add", "dap.add",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_T_permission_remove,
       { "remove", "dap.remove",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_T_permission_rename,
       { "rename", "dap.rename",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_T_permission_move,
       { "move", "dap.move",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_self,
       { "self", "dap.self",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_children,
       { "children", "dap.children",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_parent,
       { "parent", "dap.parent",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_hierarchy,
       { "hierarchy", "dap.hierarchy",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_top,
       { "top", "dap.top",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_subtree,
       { "subtree", "dap.subtree",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblings,
       { "siblings", "dap.siblings",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblingChildren,
       { "siblingChildren", "dap.siblingChildren",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_siblingSubtree,
       { "siblingSubtree", "dap.siblingSubtree",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_HierarchySelections_all,
       { "all", "dap.all",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_searchAliases,
       { "searchAliases", "dap.searchAliases",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_matchedValuesOnly,
       { "matchedValuesOnly", "dap.matchedValuesOnly",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_checkOverspecified,
       { "checkOverspecified", "dap.checkOverspecified",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_performExactly,
       { "performExactly", "dap.performExactly",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_includeAllAreas,
       { "includeAllAreas", "dap.includeAllAreas",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_noSystemRelaxation,
       { "noSystemRelaxation", "dap.noSystemRelaxation",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_dnAttribute,
       { "dnAttribute", "dap.dnAttribute",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_matchOnResidualName,
       { "matchOnResidualName", "dap.matchOnResidualName",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_entryCount,
       { "entryCount", "dap.entryCount",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_useSubset,
       { "useSubset", "dap.useSubset",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_separateFamilyMembers,
       { "separateFamilyMembers", "dap.separateFamilyMembers",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dap_SearchControlOptions_searchFamily,
       { "searchFamily", "dap.searchFamily",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-dap-hfarr.c ---*/
 #line 101 "packet-dap-template.c"
diff --git a/epan/dissectors/packet-data.c b/epan/dissectors/packet-data.c
index e827be0f05..27d49b3638 100644
--- a/epan/dissectors/packet-data.c
+++ b/epan/dissectors/packet-data.c
@@ -68,7 +68,7 @@ proto_register_data(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_data_data,
-		  { "Data", "data.data", FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+		  { "Data", "data.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 		{ &hf_data_len,
 		  { "Length", "data.len", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL } }
 	};
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index 55371468e1..56d9bb6f14 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -432,51 +432,51 @@ proto_register_dcc(void)
 	static hf_register_info hf[] = {
 			{ &hf_dcc_len, {
 				"Packet Length", "dcc.len", FT_UINT16, BASE_DEC,
-				NULL, 0, "Packet Length", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_pkt_vers, {
 				"Packet Version", "dcc.pkt_vers", FT_UINT16, BASE_DEC,
-				NULL, 0, "Packet Version", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_op, {
 				"Operation Type", "dcc.op", FT_UINT8, BASE_DEC,
-				VALS(dcc_op_vals), 0, "Operation Type", HFILL }},
+				VALS(dcc_op_vals), 0, NULL, HFILL }},
 
 			{ &hf_dcc_clientid, {
 				"Client ID", "dcc.clientid", FT_UINT32, BASE_DEC,
-				NULL, 0, "Client ID", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_opnums_host, {
 				"Host", "dcc.opnums.host", FT_UINT32, BASE_DEC,
-				NULL, 0, "Host", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_opnums_pid, {
 				"Process ID", "dcc.opnums.pid", FT_UINT32, BASE_DEC,
-				NULL, 0, "Process ID", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_opnums_report, {
 				"Report", "dcc.opnums.report", FT_UINT32, BASE_DEC,
-				NULL, 0, "Report", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_opnums_retrans, {
 				"Retransmission", "dcc.opnums.retrans", FT_UINT32, BASE_DEC,
-				NULL, 0, "Retransmission", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_signature, {
-				"Signature", "dcc.signature", FT_BYTES, BASE_HEX,
-				NULL, 0, "Signature", HFILL }},
+				"Signature", "dcc.signature", FT_BYTES, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_max_pkt_vers, {
 				"Maximum Packet Version", "dcc.max_pkt_vers", FT_UINT8, BASE_DEC,
-				NULL, 0, "Maximum Packet Version", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_qdelay_ms, {
 				"Client Delay", "dcc.qdelay_ms", FT_UINT16, BASE_DEC,
-				NULL, 0, "Client Delay", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_brand, {
-				"Server Brand", "dcc.brand", FT_STRING, BASE_DEC,
-				NULL, 0, "Server Brand", HFILL }},
+				"Server Brand", "dcc.brand", FT_STRING, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_ck_type, {
 				"Type", "dcc.checksum.type", FT_UINT8, BASE_DEC,
@@ -487,60 +487,60 @@ proto_register_dcc(void)
 				NULL, 0, "Checksum Length", HFILL }},
 
 			{ &hf_dcc_ck_sum, {
-				"Sum", "dcc.checksum.sum", FT_BYTES, BASE_HEX,
+				"Sum", "dcc.checksum.sum", FT_BYTES, BASE_NONE,
 				NULL, 0, "Checksum", HFILL }},
 
 			{ &hf_dcc_target, {
 				"Target", "dcc.target", FT_UINT32, BASE_HEX,
-				NULL, 0, "Target", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_date, {
-				"Date", "dcc.date", FT_ABSOLUTE_TIME, BASE_DEC,
-				NULL, 0, "Date", HFILL }},
+				"Date", "dcc.date", FT_ABSOLUTE_TIME, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_adminop, {
 				"Admin Op", "dcc.adminop", FT_UINT8, BASE_DEC,
-				VALS(dcc_adminop_vals), 0, "Admin Op", HFILL }},
+				VALS(dcc_adminop_vals), 0, NULL, HFILL }},
 
 			{ &hf_dcc_adminval, {
 				"Admin Value", "dcc.adminval", FT_UINT32, BASE_DEC,
-				NULL, 0, "Admin Value", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_trace, {
 				"Trace Bits", "dcc.trace", FT_UINT32, BASE_HEX,
-				NULL, 0, "Trace Bits", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 			{ &hf_dcc_trace_admin, {
 				"Admin Requests", "dcc.trace.admin", FT_BOOLEAN, 32,
-				NULL, 0x00000001, "Admin Requests", HFILL }},
+				NULL, 0x00000001, NULL, HFILL }},
 
 			{ &hf_dcc_trace_anon, {
 				"Anonymous Requests", "dcc.trace.anon", FT_BOOLEAN, 32,
-				NULL, 0x00000002, "Anonymous Requests", HFILL }},
+				NULL, 0x00000002, NULL, HFILL }},
 
 			{ &hf_dcc_trace_client, {
 				"Authenticated Client Requests", "dcc.trace.client", FT_BOOLEAN, 32,
-				NULL, 0x00000004, "Authenticated Client Requests", HFILL }},
+				NULL, 0x00000004, NULL, HFILL }},
 
 			{ &hf_dcc_trace_rlim, {
 				"Rate-Limited Requests", "dcc.trace.rlim", FT_BOOLEAN, 32,
-				NULL, 0x00000008, "Rate-Limited Requests", HFILL }},
+				NULL, 0x00000008, NULL, HFILL }},
 
 			{ &hf_dcc_trace_query, {
 				"Queries and Reports", "dcc.trace.query", FT_BOOLEAN, 32,
-				NULL, 0x00000010, "Queries and Reports", HFILL }},
+				NULL, 0x00000010, NULL, HFILL }},
 
 			{ &hf_dcc_trace_ridc, {
 				"RID Cache Messages", "dcc.trace.ridc", FT_BOOLEAN, 32,
-				NULL, 0x00000020, "RID Cache Messages", HFILL }},
+				NULL, 0x00000020, NULL, HFILL }},
 
 			{ &hf_dcc_trace_flood, {
 				"Input/Output Flooding", "dcc.trace.flood", FT_BOOLEAN, 32,
-				NULL, 0x00000040, "Input/Output Flooding", HFILL }},
+				NULL, 0x00000040, NULL, HFILL }},
 
 			{ &hf_dcc_floodop, {
 				"Flood Control Operation", "dcc.floodop", FT_UINT32, BASE_DEC,
-				VALS(dcc_floodop_vals), 0, "Flood Control Operation", HFILL }},
+				VALS(dcc_floodop_vals), 0, NULL, HFILL }},
 
         };
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dccp.c b/epan/dissectors/packet-dccp.c
index e90dad2372..b5ba348f8b 100644
--- a/epan/dissectors/packet-dccp.c
+++ b/epan/dissectors/packet-dccp.c
@@ -1010,118 +1010,118 @@ void proto_register_dccp(void)
 	static hf_register_info hf[] = {
 		{ &hf_dccp_srcport,
 		{ "Source Port",	"dccp.srcport", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_dstport,
 		{ "Destination Port",	"dccp.dstport", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
                 { &hf_dccp_port,
 		{ "Source or Destination Port", "dccp.port", FT_UINT16, BASE_DEC,  NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_data_offset,
 		{ "Data Offset",        "dccp.data_offset", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_ccval,
 		{ "CCVal",	        "dccp.ccval", FT_UINT8, BASE_DEC,  NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_cscov,
 		{ "Checksum Coverage",	"dccp.cscov", FT_UINT8, BASE_DEC,  NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_checksum_bad,
 		{ "Bad Checksum",	"dccp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_checksum,
 		{ "Checksum",		"dccp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_res1,
 		{ "Reserved",		"dccp.res1", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_res2,
 		{ "Reserved",		"dccp.res2", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_type,
 		{ "Type",	        "dccp.type", FT_UINT8, BASE_DEC, VALS(dccp_packet_type_vals), 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_x,
 		{ "Extended Sequence Numbers", "dccp.x", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_seq,
 		{ "Sequence Number",    "dccp.seq", FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_ack_res,
 		{ "Reserved",		"dccp.ack_res", FT_UINT16, BASE_HEX, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_ack,
 		{ "Acknowledgement Number", "dccp.ack", FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_service_code,
 		{ "Service Code", "dccp.service_code", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_reset_code,
 		{ "Reset Code", "dccp.reset_code", FT_UINT8, BASE_DEC, VALS(dccp_reset_code_vals), 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_data1,
 		{ "Data 1",     "dccp.data1", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_data2,
 		{ "Data 2",     "dccp.data2", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_data3,
 		{ "Data 3",     "dccp.data3", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_option_type,
 		{ "Option Type",     "dccp.option_type", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_feature_number,
 		{ "Feature Number",   "dccp.feature_number", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_ndp_count,
 		{ "NDP Count",   "dccp.ndp_count", FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_timestamp,
 		{ "Timestamp",   "dccp.timestamp", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_timestamp_echo,
 		{ "Timestamp Echo",   "dccp.timestamp_echo", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_elapsed_time,
 		{ "Elapsed Time",   "dccp.elapsed_time", FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_data_checksum,
 		{ "Data Checksum",  "dccp.checksum_data", FT_UINT32, BASE_HEX, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_malformed,
 		{ "Malformed", "dccp.malformed", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_dccp_options,
-		{ "Options", "dccp.options", FT_NONE, BASE_DEC, NULL, 0x0,
+		{ "Options", "dccp.options", FT_NONE, BASE_NONE, NULL, 0x0,
 		  "DCCP Options fields", HFILL }}
 
 	};
diff --git a/epan/dissectors/packet-dcerpc-atsvc.c b/epan/dissectors/packet-dcerpc-atsvc.c
index 2e7150c109..4fcb617446 100644
--- a/epan/dissectors/packet-dcerpc-atsvc.c
+++ b/epan/dissectors/packet-dcerpc-atsvc.c
@@ -1445,137 +1445,137 @@ void proto_register_dcerpc_atsvc(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_atsvc_atsvc_Flags_JOB_NONINTERACTIVE, 
-	  { "Job Noninteractive", "atsvc.Flags.JOB_NONINTERACTIVE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_NONINTERACTIVE_tfs), ( 0x10 ), "", HFILL }},
+	  { "Job Noninteractive", "atsvc.Flags.JOB_NONINTERACTIVE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_NONINTERACTIVE_tfs), ( 0x10 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Fourteenth, 
-	  { "Fourteenth", "atsvc.DaysOfMonth.Fourteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourteenth_tfs), ( 0x00002000 ), "", HFILL }},
+	  { "Fourteenth", "atsvc.DaysOfMonth.Fourteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourteenth_tfs), ( 0x00002000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_Flags_JOB_RUN_PERIODICALLY, 
-	  { "Job Run Periodically", "atsvc.Flags.JOB_RUN_PERIODICALLY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUN_PERIODICALLY_tfs), ( 0x01 ), "", HFILL }},
+	  { "Job Run Periodically", "atsvc.Flags.JOB_RUN_PERIODICALLY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUN_PERIODICALLY_tfs), ( 0x01 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_enum_ctr_entries_read, 
-	  { "Entries Read", "atsvc.enum_ctr.entries_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entries Read", "atsvc.enum_ctr.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyeighth, 
-	  { "Twentyeighth", "atsvc.DaysOfMonth.Twentyeighth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyeighth_tfs), ( 0x08000000 ), "", HFILL }},
+	  { "Twentyeighth", "atsvc.DaysOfMonth.Twentyeighth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyeighth_tfs), ( 0x08000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY, 
-	  { "Daysofweek Monday", "atsvc.DaysOfWeek.DAYSOFWEEK_MONDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY_tfs), ( 0x01 ), "", HFILL }},
+	  { "Daysofweek Monday", "atsvc.DaysOfWeek.DAYSOFWEEK_MONDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_MONDAY_tfs), ( 0x01 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY, 
-	  { "Daysofweek Sunday", "atsvc.DaysOfWeek.DAYSOFWEEK_SUNDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY_tfs), ( 0x40 ), "", HFILL }},
+	  { "Daysofweek Sunday", "atsvc.DaysOfWeek.DAYSOFWEEK_SUNDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SUNDAY_tfs), ( 0x40 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Second, 
-	  { "Second", "atsvc.DaysOfMonth.Second", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Second_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Second", "atsvc.DaysOfMonth.Second", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Second_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyth, 
-	  { "Twentyth", "atsvc.DaysOfMonth.Twentyth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyth_tfs), ( 0x00080000 ), "", HFILL }},
+	  { "Twentyth", "atsvc.DaysOfMonth.Twentyth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyth_tfs), ( 0x00080000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Ninth, 
-	  { "Ninth", "atsvc.DaysOfMonth.Ninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninth_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Ninth", "atsvc.DaysOfMonth.Ninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninth_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_atsvc_servername, 
-	  { "Server", "atsvc.server", FT_STRING, BASE_HEX, NULL, 0, "Name of the server", HFILL }},
+	  { "Server", "atsvc.server", FT_STRING, BASE_NONE, NULL, 0, "Name of the server", HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY, 
-	  { "Daysofweek Wednesday", "atsvc.DaysOfWeek.DAYSOFWEEK_WEDNESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY_tfs), ( 0x04 ), "", HFILL }},
+	  { "Daysofweek Wednesday", "atsvc.DaysOfWeek.DAYSOFWEEK_WEDNESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_WEDNESDAY_tfs), ( 0x04 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyninth, 
-	  { "Twentyninth", "atsvc.DaysOfMonth.Twentyninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyninth_tfs), ( 0x10000000 ), "", HFILL }},
+	  { "Twentyninth", "atsvc.DaysOfMonth.Twentyninth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyninth_tfs), ( 0x10000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY, 
-	  { "Daysofweek Tuesday", "atsvc.DaysOfWeek.DAYSOFWEEK_TUESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY_tfs), ( 0x02 ), "", HFILL }},
+	  { "Daysofweek Tuesday", "atsvc.DaysOfWeek.DAYSOFWEEK_TUESDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_TUESDAY_tfs), ( 0x02 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Tenth, 
-	  { "Tenth", "atsvc.DaysOfMonth.Tenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Tenth_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Tenth", "atsvc.DaysOfMonth.Tenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Tenth_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnum_resume_handle, 
-	  { "Resume Handle", "atsvc.JobEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "atsvc.JobEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyseventh, 
-	  { "Twentyseventh", "atsvc.DaysOfMonth.Twentyseventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyseventh_tfs), ( 0x04000000 ), "", HFILL }},
+	  { "Twentyseventh", "atsvc.DaysOfMonth.Twentyseventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyseventh_tfs), ( 0x04000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Fifteenth, 
-	  { "Fifteenth", "atsvc.DaysOfMonth.Fifteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifteenth_tfs), ( 0x00004000 ), "", HFILL }},
+	  { "Fifteenth", "atsvc.DaysOfMonth.Fifteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifteenth_tfs), ( 0x00004000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobInfo_command, 
-	  { "Command", "atsvc.JobInfo.command", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Command", "atsvc.JobInfo.command", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Ninteenth, 
-	  { "Ninteenth", "atsvc.DaysOfMonth.Ninteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninteenth_tfs), ( 0x00040000 ), "", HFILL }},
+	  { "Ninteenth", "atsvc.DaysOfMonth.Ninteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Ninteenth_tfs), ( 0x00040000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Seventh, 
-	  { "Seventh", "atsvc.DaysOfMonth.Seventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventh_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Seventh", "atsvc.DaysOfMonth.Seventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventh_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfourth, 
-	  { "Twentyfourth", "atsvc.DaysOfMonth.Twentyfourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfourth_tfs), ( 0x00800000 ), "", HFILL }},
+	  { "Twentyfourth", "atsvc.DaysOfMonth.Twentyfourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfourth_tfs), ( 0x00800000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Seventeenth, 
-	  { "Seventeenth", "atsvc.DaysOfMonth.Seventeenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventeenth_tfs), ( 0x00010000 ), "", HFILL }},
+	  { "Seventeenth", "atsvc.DaysOfMonth.Seventeenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Seventeenth_tfs), ( 0x00010000 ), NULL, HFILL }},
 	{ &hf_atsvc_opnum, 
-	  { "Operation", "atsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "atsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twelfth, 
-	  { "Twelfth", "atsvc.DaysOfMonth.Twelfth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twelfth_tfs), ( 0x00000800 ), "", HFILL }},
+	  { "Twelfth", "atsvc.DaysOfMonth.Twelfth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twelfth_tfs), ( 0x00000800 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Eighteenth, 
-	  { "Eighteenth", "atsvc.DaysOfMonth.Eighteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eighteenth_tfs), ( 0x00020000 ), "", HFILL }},
+	  { "Eighteenth", "atsvc.DaysOfMonth.Eighteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eighteenth_tfs), ( 0x00020000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_Flags_JOB_RUNS_TODAY, 
-	  { "Job Runs Today", "atsvc.Flags.JOB_RUNS_TODAY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUNS_TODAY_tfs), ( 0x04 ), "", HFILL }},
+	  { "Job Runs Today", "atsvc.Flags.JOB_RUNS_TODAY", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_RUNS_TODAY_tfs), ( 0x04 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnum_total_entries, 
-	  { "Total Entries", "atsvc.JobEnum.total_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total Entries", "atsvc.JobEnum.total_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_enum_ctr_first_entry, 
-	  { "First Entry", "atsvc.enum_ctr.first_entry", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "First Entry", "atsvc.enum_ctr.first_entry", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnumInfo_job_time, 
-	  { "Job Time", "atsvc.JobEnumInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Job Time", "atsvc.JobEnumInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtyfirst, 
-	  { "Thirtyfirst", "atsvc.DaysOfMonth.Thirtyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtyfirst_tfs), ( 0x40000000 ), "", HFILL }},
+	  { "Thirtyfirst", "atsvc.DaysOfMonth.Thirtyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtyfirst_tfs), ( 0x40000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Third, 
-	  { "Third", "atsvc.DaysOfMonth.Third", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Third_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Third", "atsvc.DaysOfMonth.Third", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Third_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnum_preferred_max_len, 
-	  { "Preferred Max Len", "atsvc.JobEnum.preferred_max_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Preferred Max Len", "atsvc.JobEnum.preferred_max_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_month, 
-	  { "Days Of Month", "atsvc.JobEnumInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Days Of Month", "atsvc.JobEnumInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY, 
-	  { "Daysofweek Thursday", "atsvc.DaysOfWeek.DAYSOFWEEK_THURSDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY_tfs), ( 0x08 ), "", HFILL }},
+	  { "Daysofweek Thursday", "atsvc.DaysOfWeek.DAYSOFWEEK_THURSDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_THURSDAY_tfs), ( 0x08 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY, 
-	  { "Daysofweek Friday", "atsvc.DaysOfWeek.DAYSOFWEEK_FRIDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY_tfs), ( 0x10 ), "", HFILL }},
+	  { "Daysofweek Friday", "atsvc.DaysOfWeek.DAYSOFWEEK_FRIDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_FRIDAY_tfs), ( 0x10 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentythird, 
-	  { "Twentythird", "atsvc.DaysOfMonth.Twentythird", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentythird_tfs), ( 0x00400000 ), "", HFILL }},
+	  { "Twentythird", "atsvc.DaysOfMonth.Twentythird", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentythird_tfs), ( 0x00400000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobInfo_job_time, 
-	  { "Job Time", "atsvc.JobInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Job Time", "atsvc.JobInfo.job_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_status, 
-	  { "NT Error", "atsvc.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, "", HFILL }},
+	  { "NT Error", "atsvc.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobInfo_flags, 
-	  { "Flags", "atsvc.JobInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "atsvc.JobInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY, 
-	  { "Daysofweek Saturday", "atsvc.DaysOfWeek.DAYSOFWEEK_SATURDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY_tfs), ( 0x20 ), "", HFILL }},
+	  { "Daysofweek Saturday", "atsvc.DaysOfWeek.DAYSOFWEEK_SATURDAY", FT_BOOLEAN, 8, TFS(&atsvc_DaysOfWeek_DAYSOFWEEK_SATURDAY_tfs), ( 0x20 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Sixth, 
-	  { "Sixth", "atsvc.DaysOfMonth.Sixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixth_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Sixth", "atsvc.DaysOfMonth.Sixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixth_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_atsvc_job_id, 
 	  { "Job Id", "atsvc.job_id", FT_UINT32, BASE_DEC, NULL, 0, "Identifier of the scheduled job", HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysixth, 
-	  { "Twentysixth", "atsvc.DaysOfMonth.Twentysixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysixth_tfs), ( 0x02000000 ), "", HFILL }},
+	  { "Twentysixth", "atsvc.DaysOfMonth.Twentysixth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysixth_tfs), ( 0x02000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Fifth, 
-	  { "Fifth", "atsvc.DaysOfMonth.Fifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifth_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Fifth", "atsvc.DaysOfMonth.Fifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fifth_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Fourth, 
-	  { "Fourth", "atsvc.DaysOfMonth.Fourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourth_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Fourth", "atsvc.DaysOfMonth.Fourth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Fourth_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_atsvc_job_info, 
-	  { "JobInfo", "atcvs.job_info", FT_NONE, BASE_HEX, NULL, 0, "JobInfo structure", HFILL }},
+	  { "JobInfo", "atcvs.job_info", FT_NONE, BASE_NONE, NULL, 0, "JobInfo structure", HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Eleventh, 
-	  { "Eleventh", "atsvc.DaysOfMonth.Eleventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eleventh_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Eleventh", "atsvc.DaysOfMonth.Eleventh", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eleventh_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Sixteenth, 
-	  { "Sixteenth", "atsvc.DaysOfMonth.Sixteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixteenth_tfs), ( 0x00008000 ), "", HFILL }},
+	  { "Sixteenth", "atsvc.DaysOfMonth.Sixteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Sixteenth_tfs), ( 0x00008000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_Flags_JOB_ADD_CURRENT_DATE, 
-	  { "Job Add Current Date", "atsvc.Flags.JOB_ADD_CURRENT_DATE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_ADD_CURRENT_DATE_tfs), ( 0x08 ), "", HFILL }},
+	  { "Job Add Current Date", "atsvc.Flags.JOB_ADD_CURRENT_DATE", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_ADD_CURRENT_DATE_tfs), ( 0x08 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnum_ctr, 
-	  { "Ctr", "atsvc.JobEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "atsvc.JobEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfifth, 
-	  { "Twentyfifth", "atsvc.DaysOfMonth.Twentyfifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfifth_tfs), ( 0x01000000 ), "", HFILL }},
+	  { "Twentyfifth", "atsvc.DaysOfMonth.Twentyfifth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfifth_tfs), ( 0x01000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobInfo_days_of_month, 
-	  { "Days Of Month", "atsvc.JobInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Days Of Month", "atsvc.JobInfo.days_of_month", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentysecond, 
-	  { "Twentysecond", "atsvc.DaysOfMonth.Twentysecond", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysecond_tfs), ( 0x00200000 ), "", HFILL }},
+	  { "Twentysecond", "atsvc.DaysOfMonth.Twentysecond", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentysecond_tfs), ( 0x00200000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_First, 
-	  { "First", "atsvc.DaysOfMonth.First", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_First_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "First", "atsvc.DaysOfMonth.First", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_First_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnumInfo_command, 
-	  { "Command", "atsvc.JobEnumInfo.command", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Command", "atsvc.JobEnumInfo.command", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Thirtieth, 
-	  { "Thirtieth", "atsvc.DaysOfMonth.Thirtieth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtieth_tfs), ( 0x20000000 ), "", HFILL }},
+	  { "Thirtieth", "atsvc.DaysOfMonth.Thirtieth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thirtieth_tfs), ( 0x20000000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Eight, 
-	  { "Eight", "atsvc.DaysOfMonth.Eight", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eight_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Eight", "atsvc.DaysOfMonth.Eight", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Eight_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Twentyfirst, 
-	  { "Twentyfirst", "atsvc.DaysOfMonth.Twentyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfirst_tfs), ( 0x00100000 ), "", HFILL }},
+	  { "Twentyfirst", "atsvc.DaysOfMonth.Twentyfirst", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Twentyfirst_tfs), ( 0x00100000 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_Flags_JOB_EXEC_ERROR, 
-	  { "Job Exec Error", "atsvc.Flags.JOB_EXEC_ERROR", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_EXEC_ERROR_tfs), ( 0x02 ), "", HFILL }},
+	  { "Job Exec Error", "atsvc.Flags.JOB_EXEC_ERROR", FT_BOOLEAN, 8, TFS(&atsvc_Flags_JOB_EXEC_ERROR_tfs), ( 0x02 ), NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobInfo_days_of_week, 
-	  { "Days Of Week", "atsvc.JobInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Days Of Week", "atsvc.JobInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobDel_min_job_id, 
-	  { "Min Job Id", "atsvc.JobDel.min_job_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Min Job Id", "atsvc.JobDel.min_job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnumInfo_days_of_week, 
-	  { "Days Of Week", "atsvc.JobEnumInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Days Of Week", "atsvc.JobEnumInfo.days_of_week", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobEnumInfo_flags, 
-	  { "Flags", "atsvc.JobEnumInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "atsvc.JobEnumInfo.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_JobDel_max_job_id, 
-	  { "Max Job Id", "atsvc.JobDel.max_job_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Job Id", "atsvc.JobDel.max_job_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_atsvc_atsvc_DaysOfMonth_Thitteenth, 
-	  { "Thitteenth", "atsvc.DaysOfMonth.Thitteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thitteenth_tfs), ( 0x00001000 ), "", HFILL }},
+	  { "Thitteenth", "atsvc.DaysOfMonth.Thitteenth", FT_BOOLEAN, 32, TFS(&atsvc_DaysOfMonth_Thitteenth_tfs), ( 0x00001000 ), NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-bossvr.c b/epan/dissectors/packet-dcerpc-bossvr.c
index 4ecbbe5f09..94a087c8e5 100644
--- a/epan/dissectors/packet-dcerpc-bossvr.c
+++ b/epan/dissectors/packet-dcerpc-bossvr.c
@@ -97,7 +97,7 @@ proto_register_bossvr (void)
 	static hf_register_info hf[] = {
 	  { &hf_bossvr_opnum,
 	    { "Operation", "bossvr.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-browser.c b/epan/dissectors/packet-dcerpc-browser.c
index 39cffa8d31..c4b696b6c6 100644
--- a/epan/dissectors/packet-dcerpc-browser.c
+++ b/epan/dissectors/packet-dcerpc-browser.c
@@ -1147,7 +1147,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_browser_opnum, { 
 		"Operation", "rpc_browser.opnum", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Operation", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_browser_rc, {
 		"Return code", "rpc_browser.rc", FT_UINT32, BASE_HEX,
@@ -1162,11 +1162,11 @@ static hf_register_info hf[] = {
 		NULL, 0x0, "Unknown hyper. If you know what this is, contact wireshark developers.", HFILL }},
 
 	{ &hf_browser_unknown_bytes, {
-		"Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_HEX,
+		"Unknown bytes", "rpc_browser.unknown.bytes", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Unknown bytes. If you know what this is, contact wireshark developers.", HFILL }},
 
 	{ &hf_browser_unknown_string, {
-		"Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_HEX,
+		"Unknown string", "rpc_browser.unknown.string", FT_STRING, BASE_NONE,
 		NULL, 0x0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }}
 
 	};
diff --git a/epan/dissectors/packet-dcerpc-budb.c b/epan/dissectors/packet-dcerpc-budb.c
index 5bdd17ca38..438eac1f70 100644
--- a/epan/dissectors/packet-dcerpc-budb.c
+++ b/epan/dissectors/packet-dcerpc-budb.c
@@ -3753,1072 +3753,1072 @@ proto_register_budb(void)
         { &hf_budb_opnum,
           { "Operation", "budb.opnum", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_rc,
           { "Return code", "budb.rc", FT_UINT32, BASE_HEX,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_name,
           { "name", "budb.principal.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_instance,
           { "instance", "budb.principal.instance", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_cell,
           { "cell", "budb.principal.cell", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_spare,
           { "spare", "budb.principal.spare", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_spare1,
           { "spare1", "budb.principal.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_spare2,
           { "spare2", "budb.principal.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_spare3,
           { "spare3", "budb.principal.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_principal_spare4,
           { "spare4", "budb.principal.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_id,
           { "id", "budb.tapeSet.id", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_tapeServer,
           { "tapeServer", "budb.tapeSet.tapeServer", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_format,
           { "format", "budb.tapeSet.format", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_maxTapes,
           { "maxTapes", "budb.tapeSet.maxTapes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_a,
           { "a", "budb.tapeSet.a", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_b,
           { "b", "budb.tapeSet.b", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_spare1,
           { "spare1", "budb.tapeSet.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_spare2,
           { "spare2", "budb.tapeSet.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_spare3,
           { "spare3", "budb.tapeSet.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeSet_spare4,
           { "spare4", "budb.tapeSet.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_id,
           { "id", "budb.dumpEntry.id", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_parent,
           { "parent", "budb.dumpEntry.parent", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_level,
           { "level", "budb.dumpEntry.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_flags,
           { "flags", "budb.dumpEntry.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_volumeSetName,
           { "volumeSetName", "budb.dumpEntry.volumeSetName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_dumpPath,
           { "dumpPath", "budb.dumpEntry.dumpPath", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_name,
           { "name", "budb.dumpEntry.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_created,
-          { "created", "budb.dumpEntry.created", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "created", "budb.dumpEntry.created", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_incTime,
-          { "incTime", "budb.dumpEntry.incTime", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "incTime", "budb.dumpEntry.incTime", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_nVolumes,
           { "nVolumes", "budb.dumpEntry.nVolumes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_tapes,
           { "tapes", "budb.dumpEntry.tapes", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_dumper,
           { "dumper", "budb.dumpEntry.dumper", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_spare1,
           { "spare1", "budb.dumpEntry.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_spare2,
           { "spare2", "budb.dumpEntry.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_spare3,
           { "spare3", "budb.dumpEntry.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpEntry_spare4,
           { "spare4", "budb.dumpEntry.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_name,
           { "name", "budb.tapeEntry.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_flags,
           { "flags", "budb.tapeEntry.flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_written,
-          { "written", "budb.tapeEntry.written", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "written", "budb.tapeEntry.written", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_expires,
-          { "expires", "budb.tapeEntry.expires", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "expires", "budb.tapeEntry.expires", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_nMBytes,
           { "nMBytes", "budb.tapeEntry.nMBytes", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_nBytes,
           { "nBytes", "budb.tapeEntry.nBytes", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_nFiles,
           { "nFiles", "budb.tapeEntry.nFiles", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_nVolumes,
           { "nVolumes", "budb.tapeEntry.nVolumes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_seq,
           { "seq", "budb.tapeEntry.seq", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_tapeid,
           { "tapeid", "budb.tapeEntry.tapeid", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_useCount,
           { "useCount", "budb.tapeEntry.useCount", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_mediaType,
           { "mediaType", "budb.tapeEntry.mediaType", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_dump,
           { "dump", "budb.tapeEntry.dump", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_spare1,
           { "spare1", "budb.tapeEntry.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_spare2,
           { "spare2", "budb.tapeEntry.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_spare3,
           { "spare3", "budb.tapeEntry.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeEntry_spare4,
           { "spare4", "budb.tapeEntry.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_name,
           { "name", "budb.volumeEntry.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_flags,
           { "flags", "budb.volumeEntry.flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_id,
           { "id", "budb.volumeEntry.id", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_server,
           { "server", "budb.volumeEntry.server", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_partition,
           { "partition", "budb.volumeEntry.partition", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_nFrags,
           { "nFrags", "budb.volumeEntry.nFrags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_position,
           { "position", "budb.volumeEntry.position", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_clone,
-          { "clone", "budb.volumeEntry.clone", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "clone", "budb.volumeEntry.clone", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_incTime,
-          { "incTime", "budb.volumeEntry.incTime", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "incTime", "budb.volumeEntry.incTime", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_startByte,
           { "startByte", "budb.volumeEntry.startByte", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_nBytes,
           { "nBytes", "budb.volumeEntry.nBytes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_seq,
           { "seq", "budb.volumeEntry.seq", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_dump,
           { "dump", "budb.volumeEntry.dump", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_tape,
           { "tape", "budb.volumeEntry.tape", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_spare1,
           { "spare1", "budb.volumeEntry.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_spare2,
           { "spare2", "budb.volumeEntry.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_spare3,
           { "spare3", "budb.volumeEntry.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeEntry_spare4,
           { "spare4", "budb.volumeEntry.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeList_volumeList_len,
           { "volumeList_len", "budb.volumeList.volumeList_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_volumeList_volumeList_val,
           { "volumeList_val", "budb.volumeList.volumeList_val", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpList_dumpList_len,
           { "dumpList_len", "budb.dumpList.dumpList_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dumpList_dumpList_val,
           { "dumpList_val", "budb.dumpList.dumpList_val", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeList_tapeList_len,
           { "tapeList_len", "budb.tapeList.tapeList_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_tapeList_tapeList_val,
           { "tapeList_val", "budb.tapeList.tapeList_val", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_charListT_charListT_len,
           { "charListT_len", "budb.charListT.charListT_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_charListT_charListT_val,
           { "charListT_val", "budb.charListT.charListT_val", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_dbversion,
           { "dbversion", "budb.DbHeader.dbversion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_created,
           { "created", "budb.DbHeader.created", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_cell,
           { "cell", "budb.DbHeader.cell", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_lastDumpId,
           { "lastDumpId", "budb.DbHeader.lastDumpId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_lastInstanceId,
           { "lastInstanceId", "budb.DbHeader.lastInstanceId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_lastTapeId,
           { "lastTapeId", "budb.DbHeader.lastTapeId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_spare1,
           { "spare1", "budb.DbHeader.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_spare2,
           { "spare2", "budb.DbHeader.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_spare3,
           { "spare3", "budb.DbHeader.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbHeader_spare4,
           { "spare4", "budb.DbHeader.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_name,
           { "name", "budb.dbVolume.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_flags,
           { "flags", "budb.dbVolume.flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_id,
           { "id", "budb.dbVolume.id", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_server,
           { "server", "budb.dbVolume.server", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_partition,
           { "partition", "budb.dbVolume.partition", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_nFrags,
           { "nFrags", "budb.dbVolume.nFrags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_position,
           { "position", "budb.dbVolume.position", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_clone,
-          { "clone", "budb.dbVolume.clone", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "clone", "budb.dbVolume.clone", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_incTime,
-          { "incTime", "budb.dbVolume.incTime", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "incTime", "budb.dbVolume.incTime", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_startByte,
           { "startByte", "budb.dbVolume.startByte", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_nBytes,
           { "nBytes", "budb.dbVolume.nBytes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_seq,
           { "seq", "budb.dbVolume.seq", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_dump,
           { "dump", "budb.dbVolume.dump", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_tape,
           { "tape", "budb.dbVolume.tape", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_spare1,
           { "spare1", "budb.dbVolume.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_spare2,
           { "spare2", "budb.dbVolume.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_spare3,
           { "spare3", "budb.dbVolume.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dbVolume_spare4,
           { "spare4", "budb.dbVolume.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_type,
           { "type", "budb.structDumpHeader.type", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_structversion,
           { "structversion", "budb.structDumpHeader.structversion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_size,
           { "size", "budb.structDumpHeader.size", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_spare1,
           { "spare1", "budb.structDumpHeader.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_spare2,
           { "spare2", "budb.structDumpHeader.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_spare3,
           { "spare3", "budb.structDumpHeader.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_structDumpHeader_spare4,
           { "spare4", "budb.structDumpHeader.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_AddVolume_vol,
           { "vol", "budb.AddVolume.vol", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_CreateDump_dump,
           { "dump", "budb.CreateDump.dump", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DeleteDump_id,
           { "id", "budb.DeleteDump.id", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DeleteTape_tape,
           { "tape", "budb.DeleteTape.tape", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DeleteVDP_dsname,
           { "dsname", "budb.DeleteVDP.dsname", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DeleteVDP_dumpPath,
           { "dumpPath", "budb.DeleteVDP.dumpPath", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DeleteVDP_curDumpId,
           { "curDumpId", "budb.DeleteVDP.curDumpId", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindClone_dumpID,
           { "dumpID", "budb.FindClone.dumpID", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindClone_volName,
           { "volName", "budb.FindClone.volName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindClone_clonetime,
           { "clonetime", "budb.FindClone.clonetime", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindClone_cloneSpare,
           { "cloneSpare", "budb.FindClone.cloneSpare", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindDump_volName,
           { "volName", "budb.FindDump.volName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindDump_beforeDate,
           { "beforeDate", "budb.FindDump.beforeDate", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindDump_dateSpare,
           { "dateSpare", "budb.FindDump.dateSpare", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindDump_deptr,
           { "deptr", "budb.FindDump.deptr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindLatestDump_vsname,
           { "vsname", "budb.FindLatestDump.vsname", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindLatestDump_dname,
           { "dname", "budb.FindLatestDump.dname", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FindLatestDump_dumpentry,
           { "dumpentry", "budb.FindLatestDump.dumpentry", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FinishDump_dump,
           { "dump", "budb.FinishDump.dump", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FinishTape_tape,
           { "tape", "budb.FinishTape.tape", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_majorVersion,
           { "majorVersion", "budb.GetDumps.majorVersion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_flags,
           { "flags", "budb.GetDumps.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_name,
           { "name", "budb.GetDumps.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_start,
           { "start", "budb.GetDumps.start", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_end,
           { "end", "budb.GetDumps.end", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_index,
           { "index", "budb.GetDumps.index", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_nextIndex,
           { "nextIndex", "budb.GetDumps.nextIndex", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_dbUpdate,
           { "dbUpdate", "budb.GetDumps.dbUpdate", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetDumps_dumps,
           { "dumps", "budb.GetDumps.dumps", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_majorVersion,
           { "majorVersion", "budb.GetTapes.majorVersion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_flags,
           { "flags", "budb.GetTapes.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_name,
           { "name", "budb.GetTapes.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_start,
           { "start", "budb.GetTapes.start", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_end,
           { "end", "budb.GetTapes.end", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_index,
           { "index", "budb.GetTapes.index", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_nextIndex,
           { "nextIndex", "budb.GetTapes.nextIndex", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_dbUpdate,
           { "dbUpdate", "budb.GetTapes.dbUpdate", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTapes_tapes,
           { "tapes", "budb.GetTapes.tapes", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_majorVersion,
           { "majorVersion", "budb.GetVolumes.majorVersion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_flags,
           { "flags", "budb.GetVolumes.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_name,
           { "name", "budb.GetVolumes.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_start,
           { "start", "budb.GetVolumes.start", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_end,
           { "end", "budb.GetVolumes.end", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_index,
           { "index", "budb.GetVolumes.index", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_nextIndex,
           { "nextIndex", "budb.GetVolumes.nextIndex", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_dbUpdate,
           { "dbUpdate", "budb.GetVolumes.dbUpdate", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetVolumes_volumes,
           { "volumes", "budb.GetVolumes.volumes", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_UseTape_tape,
           { "tape", "budb.UseTape.tape", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_UseTape_new,
           { "new", "budb.UseTape.new", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_lockHandle,
           { "lockHandle", "budb.GetText.lockHandle", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_textType,
           { "textType", "budb.GetText.textType", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_maxLength,
           { "maxLength", "budb.GetText.maxLength", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_offset,
           { "offset", "budb.GetText.offset", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_nextOffset,
           { "nextOffset", "budb.GetText.nextOffset", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetText_charListPtr,
           { "charListPtr", "budb.GetText.charListPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTextVersion_textType,
           { "textType", "budb.GetTextVersion.textType", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetTextVersion_tversion,
           { "tversion", "budb.GetTextVersion.tversion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_SaveText_lockHandle,
           { "lockHandle", "budb.SaveText.lockHandle", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_SaveText_textType,
           { "textType", "budb.SaveText.textType", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_SaveText_offset,
           { "offset", "budb.SaveText.offset", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_SaveText_flags,
           { "flags", "budb.SaveText.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_SaveText_charListPtr,
           { "charListPtr", "budb.SaveText.charListPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FreeAllLocks_instanceId,
           { "instanceId", "budb.FreeAllLocks.instanceId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_FreeLock_lockHandle,
           { "lockHandle", "budb.FreeLock.lockHandle", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetInstanceId_instanceId,
           { "instanceId", "budb.GetInstanceId.instanceId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetLock_instanceId,
           { "instanceId", "budb.GetLock.instanceId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetLock_lockName,
           { "lockName", "budb.GetLock.lockName", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetLock_expiration,
           { "expiration", "budb.GetLock.expiration", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetLock_lockHandle,
           { "lockHandle", "budb.GetLock.lockHandle", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbVerify_status,
           { "status", "budb.DbVerify.status", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbVerify_orphans,
           { "orphans", "budb.DbVerify.orphans", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DbVerify_host,
           { "host", "budb.DbVerify.host", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DumpDB_maxLength,
           { "maxLength", "budb.DumpDB.maxLength", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DumpDB_flags,
           { "flags", "budb.DumpDB.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_DumpDB_charListPtr,
           { "charListPtr", "budb.DumpDB.charListPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_RestoreDbHeader_header,
           { "header", "budb.RestoreDbHeader.header", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_T_GetVersion_majorVersion,
           { "majorVersion", "budb.T_GetVersion.majorVersion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_T_DumpHashTable_type,
           { "type", "budb.T_DumpHashTable.type", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_T_DumpHashTable_filename,
           { "filename", "budb.T_DumpHashTable.filename", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_T_DumpDatabase_filename,
           { "filename", "budb.T_DumpDatabase.filename", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_interface_uuid,
           { "interface_uuid", "budb.dfs_interfaceDescription.interface_uuid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_vers_major,
           { "vers_major", "budb.dfs_interfaceDescription.vers_major", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_vers_minor,
           { "vers_minor", "budb.dfs_interfaceDescription.vers_minor", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_vers_provider,
           { "vers_provider", "budb.dfs_interfaceDescription.vers_provider", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare0,
           { "spare0", "budb.dfs_interfaceDescription.spare0", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare1,
           { "spare1", "budb.dfs_interfaceDescription.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare2,
           { "spare2", "budb.dfs_interfaceDescription.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare3,
           { "spare3", "budb.dfs_interfaceDescription.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare4,
           { "spare4", "budb.dfs_interfaceDescription.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare5,
           { "spare5", "budb.dfs_interfaceDescription.spare5", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare6,
           { "spare6", "budb.dfs_interfaceDescription.spare6", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare7,
           { "spare7", "budb.dfs_interfaceDescription.spare7", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare8,
           { "spare8", "budb.dfs_interfaceDescription.spare8", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spare9,
           { "spare9", "budb.dfs_interfaceDescription.spare9", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceDescription_spareText,
           { "spareText", "budb.dfs_interfaceDescription.spareText", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceList_dfs_interfaceList_len,
           { "dfs_interfaceList_len", "budb.dfs_interfaceList.dfs_interfaceList_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_dfs_interfaceList_dfs_interfaceList_val,
           { "dfs_interfaceList_val", "budb.dfs_interfaceList.dfs_interfaceList_val", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_GetServerInterfaces_serverInterfacesP,
           { "serverInterfacesP", "budb.GetServerInterfaces.serverInterfacesP", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_AddVolumes_cnt,
           { "cnt", "budb.AddVolumes.cnt", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_budb_AddVolumes_vol,
           { "vol", "budb.AddVolumes.vol", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
 /* END OF INCLUDED FILE : ETH_HFARR */
 
diff --git a/epan/dissectors/packet-dcerpc-butc.c b/epan/dissectors/packet-dcerpc-butc.c
index 31aa696332..16ad33e7d6 100644
--- a/epan/dissectors/packet-dcerpc-butc.c
+++ b/epan/dissectors/packet-dcerpc-butc.c
@@ -2227,622 +2227,622 @@ proto_register_butc(void)
         { &hf_butc_opnum,
           { "Operation", "butc.opnum", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_rc,
           { "Return code", "butc.rc", FT_UINT32, BASE_HEX,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_Restore_flags_TC_RESTORE_CREATE,
           { "TC_RESTORE_CREATE", "butc.Restore_flags.TC_RESTORE_CREATE", FT_BOOLEAN, 32,
           TFS(&TC_RESTORE_CREATE_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_Restore_flags_TC_RESTORE_INCR,
           { "TC_RESTORE_INCR", "butc.Restore_flags.TC_RESTORE_INCR", FT_BOOLEAN, 32,
           TFS(&TC_RESTORE_INCR_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_afsNetAddr_type,
           { "type", "butc.afsNetAddr.type", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_afsNetAddr_data,
           { "data", "butc.afsNetAddr.data", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_vid,
           { "vid", "butc.tc_dumpDesc.vid", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_name,
           { "name", "butc.tc_dumpDesc.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_partition,
           { "partition", "butc.tc_dumpDesc.partition", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_date,
-          { "date", "butc.tc_dumpDesc.date", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "date", "butc.tc_dumpDesc.date", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_cloneDate,
-          { "cloneDate", "butc.tc_dumpDesc.cloneDate", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "cloneDate", "butc.tc_dumpDesc.cloneDate", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_hostAddr,
           { "hostAddr", "butc.tc_dumpDesc.hostAddr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_spare1,
           { "spare1", "butc.tc_dumpDesc.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_spare2,
           { "spare2", "butc.tc_dumpDesc.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_spare3,
           { "spare3", "butc.tc_dumpDesc.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpDesc_spare4,
           { "spare4", "butc.tc_dumpDesc.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_frag,
           { "frag", "butc.tc_restoreDesc.frag", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_tapeName,
           { "tapeName", "butc.tc_restoreDesc.tapeName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_position,
           { "position", "butc.tc_restoreDesc.position", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_origVid,
           { "origVid", "butc.tc_restoreDesc.origVid", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_vid,
           { "vid", "butc.tc_restoreDesc.vid", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_partition,
           { "partition", "butc.tc_restoreDesc.partition", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_flags,
           { "flags", "butc.tc_restoreDesc.flags", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_hostAddr,
           { "hostAddr", "butc.tc_restoreDesc.hostAddr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_realDumpId,
           { "realDumpId", "butc.tc_restoreDesc.realDumpId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_spare2,
           { "spare2", "butc.tc_restoreDesc.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_spare3,
           { "spare3", "butc.tc_restoreDesc.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_spare4,
           { "spare4", "butc.tc_restoreDesc.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_oldName,
           { "oldName", "butc.tc_restoreDesc.oldName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreDesc_newName,
           { "newName", "butc.tc_restoreDesc.newName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_dumpID,
           { "dumpID", "butc.tc_dumpStat.dumpID", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_bytesDumped,
           { "bytesDumped", "butc.tc_dumpStat.bytesDumped", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_volumeBeingDumped,
           { "volumeBeingDumped", "butc.tc_dumpStat.volumeBeingDumped", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_numVolErrs,
           { "numVolErrs", "butc.tc_dumpStat.numVolErrs", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_flags,
           { "flags", "butc.tc_dumpStat.flags", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_spare1,
           { "spare1", "butc.tc_dumpStat.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_spare2,
           { "spare2", "butc.tc_dumpStat.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_spare3,
           { "spare3", "butc.tc_dumpStat.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpStat_spare4,
           { "spare4", "butc.tc_dumpStat.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_size,
           { "size", "butc.tc_tapeLabel.size", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_size_ext,
           { "size_ext", "butc.tc_tapeLabel.size_ext", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_spare1,
           { "spare1", "butc.tc_tapeLabel.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_spare2,
           { "spare2", "butc.tc_tapeLabel.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_spare3,
           { "spare3", "butc.tc_tapeLabel.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_spare4,
           { "spare4", "butc.tc_tapeLabel.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_nameLen,
           { "nameLen", "butc.tc_tapeLabel.nameLen", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeLabel_name,
           { "name", "butc.tc_tapeLabel.name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_id,
           { "id", "butc.tc_tapeSet.id", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_tapeServer,
           { "tapeServer", "butc.tc_tapeSet.tapeServer", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_format,
           { "format", "butc.tc_tapeSet.format", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_maxTapes,
           { "maxTapes", "butc.tc_tapeSet.maxTapes", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_a,
           { "a", "butc.tc_tapeSet.a", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_b,
           { "b", "butc.tc_tapeSet.b", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_expDate,
           { "expDate", "butc.tc_tapeSet.expDate", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_expType,
           { "expType", "butc.tc_tapeSet.expType", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_spare1,
           { "spare1", "butc.tc_tapeSet.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_spare2,
           { "spare2", "butc.tc_tapeSet.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_spare3,
           { "spare3", "butc.tc_tapeSet.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tapeSet_spare4,
           { "spare4", "butc.tc_tapeSet.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tcInfo_tcVersion,
           { "tcVersion", "butc.tc_tcInfo.tcVersion", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tcInfo_spare1,
           { "spare1", "butc.tc_tcInfo.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tcInfo_spare2,
           { "spare2", "butc.tc_tcInfo.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tcInfo_spare3,
           { "spare3", "butc.tc_tcInfo.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_tcInfo_spare4,
           { "spare4", "butc.tc_tcInfo.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreArray_tc_restoreArray_len,
           { "tc_restoreArray_len", "butc.tc_restoreArray.tc_restoreArray_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_restoreArray_tc_restoreArray_val,
           { "tc_restoreArray_val", "butc.tc_restoreArray.tc_restoreArray_val", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpArray_tc_dumpArray_len,
           { "tc_dumpArray_len", "butc.tc_dumpArray.tc_dumpArray_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpArray_tc_dumpArray,
           { "tc_dumpArray", "butc.tc_dumpArray.tc_dumpArray", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_dumpPath,
           { "dumpPath", "butc.tc_dumpInterface.dumpPath", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_volumeSetName,
           { "volumeSetName", "butc.tc_dumpInterface.volumeSetName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_dumpName,
           { "dumpName", "butc.tc_dumpInterface.dumpName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_tapeSet,
           { "tapeSet", "butc.tc_dumpInterface.tapeSet", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_parentDumpId,
           { "parentDumpId", "butc.tc_dumpInterface.parentDumpId", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_dumpLevel,
           { "dumpLevel", "butc.tc_dumpInterface.dumpLevel", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_spare1,
           { "spare1", "butc.tc_dumpInterface.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_spare2,
           { "spare2", "butc.tc_dumpInterface.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_spare3,
           { "spare3", "butc.tc_dumpInterface.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_dumpInterface_spare4,
           { "spare4", "butc.tc_dumpInterface.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchVol_nKBytes,
           { "nKBytes", "butc.tc_statusInfoSwitchVol.nKBytes", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchVol_volumeName,
           { "volumeName", "butc.tc_statusInfoSwitchVol.volumeName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchVol_volsFailed,
           { "volsFailed", "butc.tc_statusInfoSwitchVol.volsFailed", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchVol_spare1,
           { "spare1", "butc.tc_statusInfoSwitchVol.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchLabel_tapeLabel,
           { "tapeLabel", "butc.tc_statusInfoSwitchLabel.tapeLabel", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitchLabel_spare1,
           { "spare1", "butc.tc_statusInfoSwitchLabel.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_NONE_none,
           { "none", "butc.tc_statusInfoSwitch.none", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_DUMP_vol,
           { "vol", "butc.tc_statusInfoSwitch.vol", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_RESTORE_vol,
           { "vol", "butc.tc_statusInfoSwitch.vol", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_LABELTAPE_label,
           { "label", "butc.tc_statusInfoSwitch.label", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_READLABEL_label,
           { "label", "butc.tc_statusInfoSwitch.label", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_SCANTAPE_spare1,
           { "spare1", "butc.tc_statusInfoSwitch.spare1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_STATUS_spare2,
           { "spare2", "butc.tc_statusInfoSwitch.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_SAVEDB_spare3,
           { "spare3", "butc.tc_statusInfoSwitch.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_RESTOREDB_spare4,
           { "spare4", "butc.tc_statusInfoSwitch.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tc_statusInfoSwitch_TCOP_SPARE_spare5,
           { "spare5", "butc.tc_statusInfoSwitch.spare5", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_taskName,
           { "taskName", "butc.tciStatusS.taskName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_flags,
           { "flags", "butc.tciStatusS.flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_lastPolled,
-          { "lastPolled", "butc.tciStatusS.lastPolled", FT_ABSOLUTE_TIME, BASE_DEC,
+          { "lastPolled", "butc.tciStatusS.lastPolled", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_info,
           { "info", "butc.tciStatusS.info", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_taskId,
           { "taskId", "butc.tciStatusS.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_spare2,
           { "spare2", "butc.tciStatusS.spare2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_spare3,
           { "spare3", "butc.tciStatusS.spare3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_tciStatusS_spare4,
           { "spare4", "butc.tciStatusS.spare4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformDump_tcdiPtr,
           { "tcdiPtr", "butc.BUTC_PerformDump.tcdiPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformDump_dumps,
           { "dumps", "butc.BUTC_PerformDump.dumps", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformDump_dumpID,
           { "dumpID", "butc.BUTC_PerformDump.dumpID", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformRestore_dumpSetName,
           { "dumpSetName", "butc.BUTC_PerformRestore.dumpSetName", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformRestore_restores,
           { "restores", "butc.BUTC_PerformRestore.restores", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_PerformRestore_dumpID,
           { "dumpID", "butc.BUTC_PerformRestore.dumpID", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_AbortDump_dumpID,
           { "dumpID", "butc.BUTC_AbortDump.dumpID", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_LabelTape_label,
           { "label", "butc.BUTC_LabelTape.label", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_LabelTape_taskId,
           { "taskId", "butc.BUTC_LabelTape.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ReadLabel_taskId,
           { "taskId", "butc.BUTC_ReadLabel.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ScanDumps_addDbFlag,
           { "addDbFlag", "butc.BUTC_ScanDumps.addDbFlag", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ScanDumps_taskId,
           { "taskId", "butc.BUTC_ScanDumps.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_TCInfo_tciptr,
           { "tciptr", "butc.BUTC_TCInfo.tciptr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_SaveDb_taskId,
           { "taskId", "butc.BUTC_SaveDb.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_RestoreDb_taskId,
           { "taskId", "butc.BUTC_RestoreDb.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_EndStatus_taskId,
           { "taskId", "butc.BUTC_EndStatus.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_GetStatus_taskId,
           { "taskId", "butc.BUTC_GetStatus.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_GetStatus_statusPtr,
           { "statusPtr", "butc.BUTC_GetStatus.statusPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_RequestAbort_taskId,
           { "taskId", "butc.BUTC_RequestAbort.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ScanStatus_taskId,
           { "taskId", "butc.BUTC_ScanStatus.taskId", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ScanStatus_statusPtr,
           { "statusPtr", "butc.BUTC_ScanStatus.statusPtr", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_butc_BUTC_ScanStatus_flags,
           { "flags", "butc.BUTC_ScanStatus.flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
 /* END OF INCLUDED FILE : ETH_HFARR */
 
diff --git a/epan/dissectors/packet-dcerpc-cds_clerkserver.c b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
index a1312513e7..625336afe5 100644
--- a/epan/dissectors/packet-dcerpc-cds_clerkserver.c
+++ b/epan/dissectors/packet-dcerpc-cds_clerkserver.c
@@ -92,7 +92,7 @@ proto_register_cds_clerkserver (void)
 	static hf_register_info hf[] = {
 	  { &hf_cds_clerkserver_opnum,
 	    { "Operation", "cds_clerkserver.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-cds_solicit.c b/epan/dissectors/packet-dcerpc-cds_solicit.c
index e0e89fba3e..df45dedc4e 100644
--- a/epan/dissectors/packet-dcerpc-cds_solicit.c
+++ b/epan/dissectors/packet-dcerpc-cds_solicit.c
@@ -64,7 +64,7 @@ proto_register_cds_solicit (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_cds_solicit_opnum,
-		{ "Operation", "cds_solicit.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "cds_solicit.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index abe7d11518..5ab2272ad5 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -176,23 +176,23 @@ proto_register_conv (void)
 {
 	static hf_register_info hf[] = {
         { &hf_conv_opnum,
-            { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+            { "Operation", "conv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_conv_rc,
-            {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, "", HFILL }},
+            {"Status", "conv.status", FT_UINT32, BASE_DEC, VALS(dce_error_vals), 0x0, NULL, HFILL }},
 
         { &hf_conv_who_are_you_rqst_actuid,
             {"Activity UID", "conv.who_are_you_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }},
         { &hf_conv_who_are_you_rqst_boot_time,
-            {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+            {"Boot time", "conv.who_are_you_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_conv_who_are_you2_rqst_actuid,
             {"Activity UID", "conv.who_are_you2_rqst_actuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }},
         { &hf_conv_who_are_you2_rqst_boot_time,
-            {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+            {"Boot time", "conv.who_are_you2_rqst_boot_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
         { &hf_conv_who_are_you_resp_seq,
-            {"Sequence Number", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+            {"Sequence Number", "conv.who_are_you_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_conv_who_are_you2_resp_seq,
-            {"Sequence Number", "conv.who_are_you2_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+            {"Sequence Number", "conv.who_are_you2_resp_seq", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_conv_who_are_you2_resp_casuuid,
             {"Client's address space UUID", "conv.who_are_you2_resp_casuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }}
 	};
diff --git a/epan/dissectors/packet-dcerpc-cprpc_server.c b/epan/dissectors/packet-dcerpc-cprpc_server.c
index e07a88c034..4bb40db1f8 100644
--- a/epan/dissectors/packet-dcerpc-cprpc_server.c
+++ b/epan/dissectors/packet-dcerpc-cprpc_server.c
@@ -63,7 +63,7 @@ proto_register_cprpc_server (void)
 	static hf_register_info hf[] = {
 	  { &hf_cprpc_server_opnum,
 	    { "Operation", "cprpc_server.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-dfs.c b/epan/dissectors/packet-dcerpc-dfs.c
index c604a49675..e3b01f1609 100644
--- a/epan/dissectors/packet-dcerpc-dfs.c
+++ b/epan/dissectors/packet-dcerpc-dfs.c
@@ -4776,343 +4776,343 @@ void proto_register_dcerpc_netdfs(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_netdfs_dfs_EnumEx_level, 
-	  { "Level", "netdfs.dfs_EnumEx.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "netdfs.dfs_EnumEx.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_pktsize, 
-	  { "Pktsize", "netdfs.dfs_Info5.pktsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pktsize", "netdfs.dfs_Info5.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ONLINE, 
-	  { "Dfs Storage State Online", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ONLINE_tfs), ( 2 ), "", HFILL }},
+	  { "Dfs Storage State Online", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ONLINE_tfs), ( 2 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumEx_bufsize, 
-	  { "Bufsize", "netdfs.dfs_EnumEx.bufsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bufsize", "netdfs.dfs_EnumEx.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_comment, 
-	  { "Comment", "netdfs.dfs_Info4.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info4.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_dns_servername, 
-	  { "Dns Servername", "netdfs.dfs_AddFtRoot.dns_servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dns Servername", "netdfs.dfs_AddFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING, 
-	  { "Dfs Property Flag Site Costing", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_SITE_COSTING", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING_tfs), ( 0x04 ), "", HFILL }},
+	  { "Dfs Property Flag Site Costing", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_SITE_COSTING", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_SITE_COSTING_tfs), ( 0x04 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY, 
-	  { "Dfs Property Flag Root Scalability", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_ROOT_SCALABILITY", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY_tfs), ( 0x02 ), "", HFILL }},
+	  { "Dfs Property Flag Root Scalability", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_ROOT_SCALABILITY", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_ROOT_SCALABILITY_tfs), ( 0x02 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE, 
-	  { "Dfs Volume State Offline", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE_tfs), ( 0x4 ), "", HFILL }},
+	  { "Dfs Volume State Offline", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OFFLINE_tfs), ( 0x4 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_guid, 
-	  { "Guid", "netdfs.dfs_Info5.guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Guid", "netdfs.dfs_Info5.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Target_Priority_target_priority_rank, 
-	  { "Target Priority Rank", "netdfs.dfs_Target_Priority.target_priority_rank", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Target Priority Rank", "netdfs.dfs_Target_Priority.target_priority_rank", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRootForced_servername, 
-	  { "Servername", "netdfs.dfs_AddStdRootForced.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_AddStdRootForced.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info200, 
-	  { "Info200", "netdfs.dfs_EnumInfo.info200", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info200", "netdfs.dfs_EnumInfo.info200", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK, 
-	  { "Dfs Property Flag Target Failback", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_TARGET_FAILBACK", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK_tfs), ( 0x08 ), "", HFILL }},
+	  { "Dfs Property Flag Target Failback", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_TARGET_FAILBACK", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_TARGET_FAILBACK_tfs), ( 0x08 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Target_Priority_reserved, 
-	  { "Reserved", "netdfs.dfs_Target_Priority.reserved", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "netdfs.dfs_Target_Priority.reserved", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Enum_bufsize, 
-	  { "Bufsize", "netdfs.dfs_Enum.bufsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bufsize", "netdfs.dfs_Enum.bufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRootForced_rootshare, 
-	  { "Rootshare", "netdfs.dfs_AddStdRootForced.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_AddStdRootForced.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_servername, 
-	  { "Servername", "netdfs.dfs_RemoveFtRoot.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_RemoveFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_unknown1, 
-	  { "Unknown1", "netdfs.dfs_AddFtRoot.unknown1", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "netdfs.dfs_AddFtRoot.unknown1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray4_s, 
-	  { "S", "netdfs.dfs_EnumArray4.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray4.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_unknown2, 
-	  { "Unknown2", "netdfs.dfs_AddFtRoot.unknown2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown2", "netdfs.dfs_AddFtRoot.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_comment, 
-	  { "Comment", "netdfs.dfs_Info6.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info6.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_entry_path, 
-	  { "Entry Path", "netdfs.dfs_Info6.entry_path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entry Path", "netdfs.dfs_Info6.entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info1_path, 
-	  { "Path", "netdfs.dfs_Info1.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Info1.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumStruct_level, 
-	  { "Level", "netdfs.dfs_EnumStruct.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "netdfs.dfs_EnumStruct.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_sharename, 
-	  { "Sharename", "netdfs.dfs_GetInfo.sharename", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sharename", "netdfs.dfs_GetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_comment, 
-	  { "Comment", "netdfs.dfs_Info105.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info105.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRoot_rootshare, 
-	  { "Rootshare", "netdfs.dfs_AddStdRoot.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_AddStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_SetInfo_level, 
-	  { "Level", "netdfs.dfs_SetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "netdfs.dfs_SetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_flags, 
-	  { "Flags", "netdfs.dfs_Info6.flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_Info6.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_state, 
-	  { "State", "netdfs.dfs_Info4.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info4.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_guid, 
-	  { "Guid", "netdfs.dfs_Info4.guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Guid", "netdfs.dfs_Info4.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_property_flags, 
-	  { "Property Flags", "netdfs.dfs_Info105.property_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Property Flags", "netdfs.dfs_Info105.property_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Enum_total, 
-	  { "Total", "netdfs.dfs_Enum.total", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total", "netdfs.dfs_Enum.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumStruct_e, 
-	  { "E", "netdfs.dfs_EnumStruct.e", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "E", "netdfs.dfs_EnumStruct.e", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray4_count, 
-	  { "Count", "netdfs.dfs_EnumArray4.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray4.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo2_info, 
-	  { "Info", "netdfs.dfs_StorageInfo2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "netdfs.dfs_StorageInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_state, 
-	  { "State", "netdfs.dfs_Info105.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info105.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_FlushFtTable_servername, 
-	  { "Servername", "netdfs.dfs_FlushFtTable.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_FlushFtTable.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_stores, 
-	  { "Stores", "netdfs.dfs_Info4.stores", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Stores", "netdfs.dfs_Info4.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_num_stores, 
-	  { "Num Stores", "netdfs.dfs_Info4.num_stores", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Stores", "netdfs.dfs_Info4.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_dfs_entry_path, 
-	  { "Dfs Entry Path", "netdfs.dfs_GetInfo.dfs_entry_path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfs Entry Path", "netdfs.dfs_GetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray1_count, 
-	  { "Count", "netdfs.dfs_EnumArray1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo_state, 
-	  { "State", "netdfs.dfs_StorageInfo.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_StorageInfo.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_FlushFtTable_rootshare, 
-	  { "Rootshare", "netdfs.dfs_FlushFtTable.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_FlushFtTable.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRoot_servername, 
-	  { "Servername", "netdfs.dfs_AddStdRoot.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_AddStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray200_s, 
-	  { "S", "netdfs.dfs_EnumArray200.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray200.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_servername, 
-	  { "Servername", "netdfs.dfs_AddFtRoot.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_AddFtRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_stores, 
-	  { "Stores", "netdfs.dfs_Info6.stores", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Stores", "netdfs.dfs_Info6.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_servername, 
-	  { "Servername", "netdfs.dfs_GetInfo.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_GetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo2_target_priority, 
-	  { "Target Priority", "netdfs.dfs_StorageInfo2.target_priority", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Target Priority", "netdfs.dfs_StorageInfo2.target_priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray2_s, 
-	  { "S", "netdfs.dfs_EnumArray2.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray2.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_flags, 
-	  { "Flags", "netdfs.dfs_RemoveFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_RemoveFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray200_count, 
-	  { "Count", "netdfs.dfs_EnumArray200.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray200.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumEx_info, 
-	  { "Info", "netdfs.dfs_EnumEx.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "netdfs.dfs_EnumEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info104_priority, 
-	  { "Priority", "netdfs.dfs_Info104.priority", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Priority", "netdfs.dfs_Info104.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_timeout, 
-	  { "Timeout", "netdfs.dfs_Info4.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "netdfs.dfs_Info4.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_comment, 
-	  { "Comment", "netdfs.dfs_AddFtRoot.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_AddFtRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED, 
-	  { "Dfs Property Flag Cluster Enabled", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_CLUSTER_ENABLED", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED_tfs), ( 0x10 ), "", HFILL }},
+	  { "Dfs Property Flag Cluster Enabled", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_CLUSTER_ENABLED", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_CLUSTER_ENABLED_tfs), ( 0x10 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Enum_info, 
-	  { "Info", "netdfs.dfs_Enum.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "netdfs.dfs_Enum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRoot_comment, 
-	  { "Comment", "netdfs.dfs_AddStdRoot.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_AddStdRoot.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_info, 
-	  { "Info", "netdfs.dfs_GetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "netdfs.dfs_GetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Add_share, 
-	  { "Share", "netdfs.dfs_Add.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "netdfs.dfs_Add.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info100_comment, 
-	  { "Comment", "netdfs.dfs_Info100.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info100.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info300, 
-	  { "Info300", "netdfs.dfs_EnumInfo.info300", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info300", "netdfs.dfs_EnumInfo.info300", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_state, 
-	  { "State", "netdfs.dfs_Info6.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info6.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB, 
-	  { "Dfs Volume State Ad Blob", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_AD_BLOB", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB_tfs), ( DFS_VOLUME_FLAVOR_AD_BLOB ), "", HFILL }},
+	  { "Dfs Volume State Ad Blob", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_AD_BLOB", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_AD_BLOB_tfs), ( DFS_VOLUME_FLAVOR_AD_BLOB ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Add_comment, 
-	  { "Comment", "netdfs.dfs_Add.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Add.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_timeout, 
-	  { "Timeout", "netdfs.dfs_Info6.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "netdfs.dfs_Info6.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_rootshare, 
-	  { "Rootshare", "netdfs.dfs_RemoveFtRoot.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_RemoveFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_timeout, 
-	  { "Timeout", "netdfs.dfs_Info105.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "netdfs.dfs_Info105.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_comment, 
-	  { "Comment", "netdfs.dfs_Info3.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info3.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_state, 
-	  { "State", "netdfs.dfs_Info3.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info3.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_flags, 
-	  { "Flags", "netdfs.dfs_Info5.flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_Info5.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info7_generation_guid, 
-	  { "Generation Guid", "netdfs.dfs_Info7.generation_guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Generation Guid", "netdfs.dfs_Info7.generation_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_unknown, 
-	  { "Unknown", "netdfs.dfs_RemoveFtRoot.unknown", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown", "netdfs.dfs_RemoveFtRoot.unknown", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumEx_total, 
-	  { "Total", "netdfs.dfs_EnumEx.total", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total", "netdfs.dfs_EnumEx.total", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetInfo_level, 
-	  { "Level", "netdfs.dfs_GetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "netdfs.dfs_GetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_num_stores, 
-	  { "Num Stores", "netdfs.dfs_Info5.num_stores", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Stores", "netdfs.dfs_Info5.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_pktsize, 
-	  { "Pktsize", "netdfs.dfs_Info6.pktsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pktsize", "netdfs.dfs_Info6.pktsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray300_s, 
-	  { "S", "netdfs.dfs_EnumArray300.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray300.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Add_server, 
-	  { "Server", "netdfs.dfs_Add.server", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server", "netdfs.dfs_Add.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_comment, 
-	  { "Comment", "netdfs.dfs_Info5.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info5.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_werror, 
-	  { "Windows Error", "netdfs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "netdfs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray3_count, 
-	  { "Count", "netdfs.dfs_EnumArray3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT, 
-	  { "Dfs Volume State Inconsistent", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_INCONSISTENT", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT_tfs), ( 0x2 ), "", HFILL }},
+	  { "Dfs Volume State Inconsistent", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_INCONSISTENT", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_INCONSISTENT_tfs), ( 0x2 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_rootshare, 
-	  { "Rootshare", "netdfs.dfs_AddFtRoot.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_AddFtRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Add_flags, 
-	  { "Flags", "netdfs.dfs_Add.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_Add.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveStdRoot_servername, 
-	  { "Servername", "netdfs.dfs_RemoveStdRoot.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_RemoveStdRoot.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_dfsname, 
-	  { "Dfsname", "netdfs.dfs_RemoveFtRoot.dfsname", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfsname", "netdfs.dfs_RemoveFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_dfs_config_dn, 
-	  { "Dfs Config Dn", "netdfs.dfs_AddFtRoot.dfs_config_dn", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfs Config Dn", "netdfs.dfs_AddFtRoot.dfs_config_dn", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_dfsname, 
-	  { "Dfsname", "netdfs.dfs_AddFtRoot.dfsname", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfsname", "netdfs.dfs_AddFtRoot.dfsname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Remove_sharename, 
-	  { "Sharename", "netdfs.dfs_Remove.sharename", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sharename", "netdfs.dfs_Remove.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info101_state, 
-	  { "State", "netdfs.dfs_Info101.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info101.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info103_flags, 
-	  { "Flags", "netdfs.dfs_Info103.flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_Info103.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info200_dom_root, 
-	  { "Dom Root", "netdfs.dfs_Info200.dom_root", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dom Root", "netdfs.dfs_Info200.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_OFFLINE, 
-	  { "Dfs Storage State Offline", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_OFFLINE_tfs), ( 1 ), "", HFILL }},
+	  { "Dfs Storage State Offline", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_OFFLINE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_OFFLINE_tfs), ( 1 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_ONLINE, 
-	  { "Dfs Volume State Online", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_ONLINE_tfs), ( 0x8 ), "", HFILL }},
+	  { "Dfs Volume State Online", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_ONLINE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_ONLINE_tfs), ( 0x8 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info0, 
-	  { "Info0", "netdfs.dfs_Info.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "netdfs.dfs_Info.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_SetInfo_servername, 
-	  { "Servername", "netdfs.dfs_SetInfo.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_SetInfo.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info1, 
-	  { "Info1", "netdfs.dfs_Info.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "netdfs.dfs_Info.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info2_num_stores, 
-	  { "Num Stores", "netdfs.dfs_Info2.num_stores", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Stores", "netdfs.dfs_Info2.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info2, 
-	  { "Info2", "netdfs.dfs_Info.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "netdfs.dfs_Info.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveFtRoot_dns_servername, 
-	  { "Dns Servername", "netdfs.dfs_RemoveFtRoot.dns_servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dns Servername", "netdfs.dfs_RemoveFtRoot.dns_servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info3, 
-	  { "Info3", "netdfs.dfs_Info.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "netdfs.dfs_Info.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info4, 
-	  { "Info4", "netdfs.dfs_Info.info4", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info4", "netdfs.dfs_Info.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info5, 
-	  { "Info5", "netdfs.dfs_Info.info5", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info5", "netdfs.dfs_Info.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageState_DFS_STORAGE_STATE_ACTIVE, 
-	  { "Dfs Storage State Active", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ACTIVE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ACTIVE_tfs), ( 4 ), "", HFILL }},
+	  { "Dfs Storage State Active", "netdfs.dfs_StorageState.DFS_STORAGE_STATE_ACTIVE", FT_BOOLEAN, 32, TFS(&dfs_StorageState_DFS_STORAGE_STATE_ACTIVE_tfs), ( 4 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info6, 
-	  { "Info6", "netdfs.dfs_Info.info6", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info6", "netdfs.dfs_Info.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Enum_level, 
-	  { "Level", "netdfs.dfs_Enum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "netdfs.dfs_Enum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info7, 
-	  { "Info7", "netdfs.dfs_Info.info7", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info7", "netdfs.dfs_Info.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info300_flavor, 
-	  { "Flavor", "netdfs.dfs_Info300.flavor", FT_UINT16, BASE_DEC, VALS(netdfs_dfs_VolumeFlavor_vals), 0, "", HFILL }},
+	  { "Flavor", "netdfs.dfs_Info300.flavor", FT_UINT16, BASE_DEC, VALS(netdfs_dfs_VolumeFlavor_vals), 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRootForced_store, 
-	  { "Store", "netdfs.dfs_AddStdRootForced.store", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Store", "netdfs.dfs_AddStdRootForced.store", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_path, 
-	  { "Path", "netdfs.dfs_Info5.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Info5.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_GetManagerVersion_version, 
-	  { "Version", "netdfs.dfs_GetManagerVersion.version", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_ManagerVersion_vals), 0, "", HFILL }},
+	  { "Version", "netdfs.dfs_GetManagerVersion.version", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_ManagerVersion_vals), 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_stores, 
-	  { "Stores", "netdfs.dfs_Info3.stores", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Stores", "netdfs.dfs_Info3.stores", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE, 
-	  { "Dfs Volume State Standalone", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_STANDALONE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE_tfs), ( DFS_VOLUME_FLAVOR_STANDALONE ), "", HFILL }},
+	  { "Dfs Volume State Standalone", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_STANDALONE", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_STANDALONE_tfs), ( DFS_VOLUME_FLAVOR_STANDALONE ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray3_s, 
-	  { "S", "netdfs.dfs_EnumArray3.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray3.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info106_priority, 
-	  { "Priority", "netdfs.dfs_Info106.priority", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Priority", "netdfs.dfs_Info106.priority", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_UnknownStruct_unknown1, 
-	  { "Unknown1", "netdfs.dfs_UnknownStruct.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "netdfs.dfs_UnknownStruct.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_UnknownStruct_unknown2, 
-	  { "Unknown2", "netdfs.dfs_UnknownStruct.unknown2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "netdfs.dfs_UnknownStruct.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_VolumeState_DFS_VOLUME_STATE_OK, 
-	  { "Dfs Volume State Ok", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OK", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OK_tfs), ( 0x1 ), "", HFILL }},
+	  { "Dfs Volume State Ok", "netdfs.dfs_VolumeState.DFS_VOLUME_STATE_OK", FT_BOOLEAN, 32, TFS(&dfs_VolumeState_DFS_VOLUME_STATE_OK_tfs), ( 0x1 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo_server, 
-	  { "Server", "netdfs.dfs_StorageInfo.server", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server", "netdfs.dfs_StorageInfo.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_SetInfo_dfs_entry_path, 
-	  { "Dfs Entry Path", "netdfs.dfs_SetInfo.dfs_entry_path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfs Entry Path", "netdfs.dfs_SetInfo.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveStdRoot_flags, 
-	  { "Flags", "netdfs.dfs_RemoveStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_RemoveStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddFtRoot_flags, 
-	  { "Flags", "netdfs.dfs_AddFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_AddFtRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_ManagerInitialize_flags, 
-	  { "Flags", "netdfs.dfs_ManagerInitialize.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_ManagerInitialize.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info4_path, 
-	  { "Path", "netdfs.dfs_Info4.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Info4.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_state, 
-	  { "State", "netdfs.dfs_Info5.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info5.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_StorageInfo_share, 
-	  { "Share", "netdfs.dfs_StorageInfo.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "netdfs.dfs_StorageInfo.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRoot_flags, 
-	  { "Flags", "netdfs.dfs_AddStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "netdfs.dfs_AddStdRoot.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_num_stores, 
-	  { "Num Stores", "netdfs.dfs_Info6.num_stores", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Stores", "netdfs.dfs_Info6.num_stores", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Target_Priority_target_priority_class, 
-	  { "Target Priority Class", "netdfs.dfs_Target_Priority.target_priority_class", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_Target_PriorityClass_vals), 0, "", HFILL }},
+	  { "Target Priority Class", "netdfs.dfs_Target_Priority.target_priority_class", FT_UINT32, BASE_DEC, VALS(netdfs_dfs_Target_PriorityClass_vals), 0, NULL, HFILL }},
 	{ &hf_netdfs_opnum, 
-	  { "Operation", "netdfs.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "netdfs.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS, 
-	  { "Dfs Property Flag Insite Referrals", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_INSITE_REFERRALS", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS_tfs), ( 0x01 ), "", HFILL }},
+	  { "Dfs Property Flag Insite Referrals", "netdfs.dfs_PropertyFlags.DFS_PROPERTY_FLAG_INSITE_REFERRALS", FT_BOOLEAN, 32, TFS(&dfs_PropertyFlags_DFS_PROPERTY_FLAG_INSITE_REFERRALS_tfs), ( 0x01 ), NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info2_state, 
-	  { "State", "netdfs.dfs_Info2.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info2.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info106_state, 
-	  { "State", "netdfs.dfs_Info106.state", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "State", "netdfs.dfs_Info106.state", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info100, 
-	  { "Info100", "netdfs.dfs_Info.info100", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info100", "netdfs.dfs_Info.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_AddStdRootForced_comment, 
-	  { "Comment", "netdfs.dfs_AddStdRootForced.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_AddStdRootForced.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info101, 
-	  { "Info101", "netdfs.dfs_Info.info101", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info101", "netdfs.dfs_Info.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Add_path, 
-	  { "Path", "netdfs.dfs_Add.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Add.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info102_timeout, 
-	  { "Timeout", "netdfs.dfs_Info102.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "netdfs.dfs_Info102.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info102, 
-	  { "Info102", "netdfs.dfs_Info.info102", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info102", "netdfs.dfs_Info.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info103, 
-	  { "Info103", "netdfs.dfs_Info.info103", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info103", "netdfs.dfs_Info.info103", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info104, 
-	  { "Info104", "netdfs.dfs_Info.info104", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info104", "netdfs.dfs_Info.info104", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_path, 
-	  { "Path", "netdfs.dfs_Info3.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Info3.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info105, 
-	  { "Info105", "netdfs.dfs_Info.info105", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info105", "netdfs.dfs_Info.info105", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info_info106, 
-	  { "Info106", "netdfs.dfs_Info.info106", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info106", "netdfs.dfs_Info.info106", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_SetInfo_sharename, 
-	  { "Sharename", "netdfs.dfs_SetInfo.sharename", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sharename", "netdfs.dfs_SetInfo.sharename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_ManagerInitialize_servername, 
-	  { "Servername", "netdfs.dfs_ManagerInitialize.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_ManagerInitialize.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info1, 
-	  { "Info1", "netdfs.dfs_EnumInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "netdfs.dfs_EnumInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info300_dom_root, 
-	  { "Dom Root", "netdfs.dfs_Info300.dom_root", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dom Root", "netdfs.dfs_Info300.dom_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray2_count, 
-	  { "Count", "netdfs.dfs_EnumArray2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray300_count, 
-	  { "Count", "netdfs.dfs_EnumArray300.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "netdfs.dfs_EnumArray300.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info2, 
-	  { "Info2", "netdfs.dfs_EnumInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "netdfs.dfs_EnumInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Remove_dfs_entry_path, 
-	  { "Dfs Entry Path", "netdfs.dfs_Remove.dfs_entry_path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfs Entry Path", "netdfs.dfs_Remove.dfs_entry_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info3, 
-	  { "Info3", "netdfs.dfs_EnumInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "netdfs.dfs_EnumInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumEx_dfs_name, 
-	  { "Dfs Name", "netdfs.dfs_EnumEx.dfs_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dfs Name", "netdfs.dfs_EnumEx.dfs_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_RemoveStdRoot_rootshare, 
-	  { "Rootshare", "netdfs.dfs_RemoveStdRoot.rootshare", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rootshare", "netdfs.dfs_RemoveStdRoot.rootshare", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumInfo_info4, 
-	  { "Info4", "netdfs.dfs_EnumInfo.info4", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info4", "netdfs.dfs_EnumInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info5_timeout, 
-	  { "Timeout", "netdfs.dfs_Info5.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "netdfs.dfs_Info5.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_EnumArray1_s, 
-	  { "S", "netdfs.dfs_EnumArray1.s", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "S", "netdfs.dfs_EnumArray1.s", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Remove_servername, 
-	  { "Servername", "netdfs.dfs_Remove.servername", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "netdfs.dfs_Remove.servername", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info3_num_stores, 
-	  { "Num Stores", "netdfs.dfs_Info3.num_stores", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Stores", "netdfs.dfs_Info3.num_stores", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info105_property_flag_mask, 
-	  { "Property Flag Mask", "netdfs.dfs_Info105.property_flag_mask", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Property Flag Mask", "netdfs.dfs_Info105.property_flag_mask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info2_comment, 
-	  { "Comment", "netdfs.dfs_Info2.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "netdfs.dfs_Info2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info6_guid, 
-	  { "Guid", "netdfs.dfs_Info6.guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Guid", "netdfs.dfs_Info6.guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_Info2_path, 
-	  { "Path", "netdfs.dfs_Info2.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "netdfs.dfs_Info2.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_netdfs_dfs_SetInfo_info, 
-	  { "Info", "netdfs.dfs_SetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "netdfs.dfs_SetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-dnsserver.c b/epan/dissectors/packet-dcerpc-dnsserver.c
index 529bfd136c..42d9cb27e7 100644
--- a/epan/dissectors/packet-dcerpc-dnsserver.c
+++ b/epan/dissectors/packet-dcerpc-dnsserver.c
@@ -3290,287 +3290,287 @@ void proto_register_dcerpc_dnsserver(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_dnsserver_DnssrvEnumRecords2_start_child, 
-	  { "Start Child", "dnsserver.DnssrvEnumRecords2.start_child", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Start Child", "dnsserver.DnssrvEnumRecords2.start_child", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LocalNetPriority, 
-	  { "Localnetpriority", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LocalNetPriority", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Localnetpriority", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LocalNetPriority", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AGING_ON, 
-	  { "Dns Rpc Flag Aging On", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_AGING_ON", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AGING_ON_tfs), ( 0x00020000 ), "", HFILL }},
+	  { "Dns Rpc Flag Aging On", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_AGING_ON", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AGING_ON_tfs), ( 0x00020000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_WRITE_THROUGH, 
-	  { "Dns Log Level Write Through", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_WRITE_THROUGH", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_WRITE_THROUGH_tfs), ( 0x80000000 ), "", HFILL }},
+	  { "Dns Log Level Write Through", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_WRITE_THROUGH", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_WRITE_THROUGH_tfs), ( 0x80000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_reserved0, 
-	  { "Reserved0", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserved0", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved0", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserved0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DefaultNoRefreshInterval, 
-	  { "Defaultnorefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultNoRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Defaultnorefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultNoRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LogFilter, 
-	  { "Logfilter", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFilter", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logfilter", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFilter", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_ANSWERS, 
-	  { "Dns Log Level Answers", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_ANSWERS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_ANSWERS_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Dns Log Level Answers", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_ANSWERS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_ANSWERS_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN, 
-	  { "Dns Rpc View Only Children", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ONLY_CHILDREN", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN_tfs), ( 0x00020000 ), "", HFILL }},
+	  { "Dns Rpc View Only Children", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ONLY_CHILDREN", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ONLY_CHILDREN_tfs), ( 0x00020000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_BootMethod, 
-	  { "Bootmethod", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.BootMethod", FT_UINT8, BASE_DEC, VALS(dnsserver_DNS_RPC_BOOT_METHOD_vals), 0, "", HFILL }},
+	  { "Bootmethod", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.BootMethod", FT_UINT8, BASE_DEC, VALS(dnsserver_DNS_RPC_BOOT_METHOD_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA, 
-	  { "Dns Rpc View Authority Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_AUTHORITY_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Dns Rpc View Authority Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_AUTHORITY_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_AUTHORITY_DATA_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension1, 
-	  { "Extension1", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension1", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension1", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ListenAddrs, 
-	  { "Listenaddrs", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ListenAddrs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Listenaddrs", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ListenAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUESTIONS, 
-	  { "Dns Log Level Questions", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_QUESTIONS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUESTIONS_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Dns Log Level Questions", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_QUESTIONS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUESTIONS_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_COMPLETE, 
-	  { "Dns Rpc Flag Node Complete", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_NODE_COMPLETE", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_COMPLETE_tfs), ( 0x00800000 ), "", HFILL }},
+	  { "Dns Rpc Flag Node Complete", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_NODE_COMPLETE", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_COMPLETE_tfs), ( 0x00800000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_Forwarders, 
-	  { "Forwarders", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.Forwarders", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Forwarders", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.Forwarders", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_server_name, 
-	  { "Server Name", "dnsserver.DnssrvQuery2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "dnsserver.DnssrvQuery2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_STICKY, 
-	  { "Dns Rpc Flag Node Sticky", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_NODE_STICKY", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_STICKY_tfs), ( 0x01000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Node Sticky", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_NODE_STICKY", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_NODE_STICKY_tfs), ( 0x01000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_WriteAuthorityNs, 
-	  { "Writeauthorityns", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.WriteAuthorityNs", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Writeauthorityns", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.WriteAuthorityNs", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_AutoCacheUpdate, 
-	  { "Autocacheupdate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AutoCacheUpdate", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Autocacheupdate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AutoCacheUpdate", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_status, 
-	  { "NT Error", "dnsserver.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, "", HFILL }},
+	  { "NT Error", "dnsserver.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_DataLength, 
-	  { "Datalength", "dnsserver.DNS_RPC_RECORD.DataLength", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Datalength", "dnsserver.DNS_RPC_RECORD.DataLength", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_AdminConfigured, 
-	  { "Adminconfigured", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AdminConfigured", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Adminconfigured", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AdminConfigured", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_RECV, 
-	  { "Dns Log Level Recv", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_RECV", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_RECV_tfs), ( 0x00002000 ), "", HFILL }},
+	  { "Dns Log Level Recv", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_RECV", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_RECV_tfs), ( 0x00002000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_buffer_length, 
-	  { "Buffer Length", "dnsserver.DnssrvEnumRecords2.buffer_length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buffer Length", "dnsserver.DnssrvEnumRecords2.buffer_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension3, 
-	  { "Extension3", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension3", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension3", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension3", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_LPC, 
-	  { "Dns Rpc Use Lpc", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_LPC", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_LPC_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Dns Rpc Use Lpc", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_LPC", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_LPC_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NAME_name, 
-	  { "Name", "dnsserver.DNS_RPC_NAME.name", FT_STRING, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Name", "dnsserver.DNS_RPC_NAME.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_CREATE_PTR, 
-	  { "Dns Rpc Flag Record Create Ptr", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECORD_CREATE_PTR", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_CREATE_PTR_tfs), ( 0x02000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Record Create Ptr", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECORD_CREATE_PTR", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_CREATE_PTR_tfs), ( 0x02000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RpcProtocol, 
-	  { "Rpcprotocol", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RpcProtocol", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Rpcprotocol", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RpcProtocol", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_Childcount, 
-	  { "Childcount", "dnsserver.DNS_RPC_NODE.Childcount", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Childcount", "dnsserver.DNS_RPC_NODE.Childcount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RpcStructureVersion, 
-	  { "Rpcstructureversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rpcstructureversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RpcStructureVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DefaultAgingState, 
-	  { "Defaultagingstate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultAgingState", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Defaultagingstate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultAgingState", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsDsaVersion, 
-	  { "Dsdsaversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsDsaVersion", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dsdsaversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsDsaVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension0, 
-	  { "Extension0", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension0", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension0", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension0", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RoundRobin, 
-	  { "Roundrobin", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RoundRobin", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Roundrobin", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RoundRobin", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_BindSecondaries, 
-	  { "Bindsecondaries", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.BindSecondaries", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bindsecondaries", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.BindSecondaries", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension5, 
-	  { "Extension5", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension5", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension5", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension5", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_AutoReverseZones, 
-	  { "Autoreversezones", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AutoReverseZones", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Autoreversezones", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AutoReverseZones", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_data, 
-	  { "Data", "dnsserver.DnssrvQuery2.data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Data", "dnsserver.DnssrvQuery2.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNSSRV_RPC_UNION_dword, 
-	  { "Dword", "dnsserver.DNSSRV_RPC_UNION.dword", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dword", "dnsserver.DNSSRV_RPC_UNION.dword", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_VERSION_OSMajorVersion, 
-	  { "Osmajorversion", "dnsserver.DNS_RPC_VERSION.OSMajorVersion", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Osmajorversion", "dnsserver.DNS_RPC_VERSION.OSMajorVersion", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsDomainVersion, 
-	  { "Dsdomainversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsDomainVersion", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dsdomainversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsDomainVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_DELEGATION, 
-	  { "Dns Rpc Flag Zone Delegation", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_ZONE_DELEGATION", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_DELEGATION_tfs), ( 0x10000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Zone Delegation", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_ZONE_DELEGATION", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_DELEGATION_tfs), ( 0x10000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RecursionTimeout, 
-	  { "Recursiontimeout", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecursionTimeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Recursiontimeout", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecursionTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_UPDATE, 
-	  { "Dns Log Level Update", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_UPDATE", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_UPDATE_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Dns Log Level Update", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_UPDATE", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_UPDATE_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LooseWildcarding, 
-	  { "Loosewildcarding", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LooseWildcarding", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Loosewildcarding", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LooseWildcarding", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsContainer, 
-	  { "Dscontainer", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsContainer", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dscontainer", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsContainer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_client_version, 
-	  { "Client Version", "dnsserver.DnssrvQuery2.client_version", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_CLIENT_VERSION_vals), 0, "", HFILL }},
+	  { "Client Version", "dnsserver.DnssrvQuery2.client_version", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_CLIENT_VERSION_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ADDITIONAL_DATA, 
-	  { "Dns Rpc View Additional Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ADDITIONAL_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ADDITIONAL_DATA_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Dns Rpc View Additional Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ADDITIONAL_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ADDITIONAL_DATA_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_records, 
-	  { "Records", "dnsserver.DNS_RPC_NODE.records", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Records", "dnsserver.DNS_RPC_NODE.records", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_NODE_NAME_Name, 
-	  { "Name", "dnsserver.DNS_RPC_RECORD_NODE_NAME.Name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "dnsserver.DNS_RPC_RECORD_NODE_NAME.Name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_TimeStamp, 
-	  { "Timestamp", "dnsserver.DNS_RPC_RECORD.TimeStamp", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timestamp", "dnsserver.DNS_RPC_RECORD.TimeStamp", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_TtlSeconds, 
-	  { "Ttlseconds", "dnsserver.DNS_RPC_RECORD.TtlSeconds", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ttlseconds", "dnsserver.DNS_RPC_RECORD.TtlSeconds", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_VERSION_OSMinorVersion, 
-	  { "Osminorversion", "dnsserver.DNS_RPC_VERSION.OSMinorVersion", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Osminorversion", "dnsserver.DNS_RPC_VERSION.OSMinorVersion", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_NameCheckFlag, 
-	  { "Namecheckflag", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.NameCheckFlag", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_NAME_CHECK_FLAGS_vals), 0, "", HFILL }},
+	  { "Namecheckflag", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.NameCheckFlag", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_NAME_CHECK_FLAGS_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DomainName, 
-	  { "Domainname", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DomainName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domainname", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DomainName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AUTH_ZONE_ROOT, 
-	  { "Dns Rpc Flag Auth Zone Root", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_AUTH_ZONE_ROOT", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AUTH_ZONE_ROOT_tfs), ( 0x20000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Auth Zone Root", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_AUTH_ZONE_ROOT", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_AUTH_ZONE_ROOT_tfs), ( 0x20000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_filter_stop, 
-	  { "Filter Stop", "dnsserver.DnssrvEnumRecords2.filter_stop", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filter Stop", "dnsserver.DnssrvEnumRecords2.filter_stop", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_setting_flags, 
-	  { "Setting Flags", "dnsserver.DnssrvEnumRecords2.setting_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Setting Flags", "dnsserver.DnssrvEnumRecords2.setting_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_SEND, 
-	  { "Dns Log Level Send", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_SEND", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_SEND_tfs), ( 0x00001000 ), "", HFILL }},
+	  { "Dns Log Level Send", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_SEND", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_SEND_tfs), ( 0x00001000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DomainDirectoryPartition, 
-	  { "Domaindirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DomainDirectoryPartition", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domaindirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DomainDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_NoRecursion, 
-	  { "Norecursion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.NoRecursion", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Norecursion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.NoRecursion", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_client_version, 
-	  { "Client Version", "dnsserver.DnssrvEnumRecords2.client_version", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_CLIENT_VERSION_vals), 0, "", HFILL }},
+	  { "Client Version", "dnsserver.DnssrvEnumRecords2.client_version", FT_UINT32, BASE_DEC, VALS(dnsserver_DNS_RPC_CLIENT_VERSION_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ServerAddrs, 
-	  { "Serveraddrs", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ServerAddrs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Serveraddrs", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ServerAddrs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_select_flag, 
-	  { "Select Flag", "dnsserver.DnssrvEnumRecords2.select_flag", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Select Flag", "dnsserver.DnssrvEnumRecords2.select_flag", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LogFilePath, 
-	  { "Logfilepath", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFilePath", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logfilepath", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFilePath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_NAMED_PIPE, 
-	  { "Dns Rpc Use Named Pipe", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_NAMED_PIPE", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_NAMED_PIPE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Dns Rpc Use Named Pipe", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_NAMED_PIPE", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_NAMED_PIPE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_NodeName, 
-	  { "Nodename", "dnsserver.DNS_RPC_NODE.NodeName", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nodename", "dnsserver.DNS_RPC_NODE.NodeName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_NO_CHILDREN, 
-	  { "Dns Rpc View No Children", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_NO_CHILDREN", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_NO_CHILDREN_tfs), ( 0x00010000 ), "", HFILL }},
+	  { "Dns Rpc View No Children", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_NO_CHILDREN", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_NO_CHILDREN_tfs), ( 0x00010000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension4, 
-	  { "Extension4", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension4", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension4", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension4", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_IP4_ARRAY_AddrCount, 
-	  { "Addrcount", "dnsserver.IP4_ARRAY.AddrCount", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addrcount", "dnsserver.IP4_ARRAY.AddrCount", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ForestName, 
-	  { "Forestname", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForestName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Forestname", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForestName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_record_type, 
-	  { "Record Type", "dnsserver.DnssrvEnumRecords2.record_type", FT_UINT16, BASE_DEC, VALS(dnsserver_DNS_RECORD_TYPE_vals), 0, "", HFILL }},
+	  { "Record Type", "dnsserver.DnssrvEnumRecords2.record_type", FT_UINT16, BASE_DEC, VALS(dnsserver_DNS_RECORD_TYPE_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_NOTIFY, 
-	  { "Dns Log Level Notify", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_NOTIFY", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_NOTIFY_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Dns Log Level Notify", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_NOTIFY", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_NOTIFY_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_Flags, 
-	  { "Flags", "dnsserver.DNS_RPC_RECORD.Flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "dnsserver.DNS_RPC_RECORD.Flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_server_name, 
-	  { "Server Name", "dnsserver.DnssrvEnumRecords2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "dnsserver.DnssrvEnumRecords2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_record_buffer, 
-	  { "Record Buffer", "dnsserver.DnssrvEnumRecords2.record_buffer", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Record Buffer", "dnsserver.DnssrvEnumRecords2.record_buffer", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_node_name, 
-	  { "Node Name", "dnsserver.DnssrvEnumRecords2.node_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Node Name", "dnsserver.DnssrvEnumRecords2.node_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RECORD_BUFFER_rpc_node, 
-	  { "Rpc Node", "dnsserver.DNS_RECORD_BUFFER.rpc_node", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rpc Node", "dnsserver.DNS_RECORD_BUFFER.rpc_node", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LastScavengeTime, 
-	  { "Lastscavengetime", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LastScavengeTime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lastscavengetime", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LastScavengeTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_Length, 
-	  { "Length", "dnsserver.DNS_RPC_NODE.Length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "dnsserver.DNS_RPC_NODE.Length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_filter_start, 
-	  { "Filter Start", "dnsserver.DnssrvEnumRecords2.filter_start", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filter Start", "dnsserver.DnssrvEnumRecords2.filter_start", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ForestDirectoryPartition, 
-	  { "Forestdirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForestDirectoryPartition", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Forestdirectorypartition", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForestDirectoryPartition", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvEnumRecords2_zone, 
-	  { "Zone", "dnsserver.DnssrvEnumRecords2.zone", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Zone", "dnsserver.DnssrvEnumRecords2.zone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_reserve_array, 
-	  { "Reserve Array", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserve_array", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserve Array", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserve_array", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_TTL_CHANGE, 
-	  { "Dns Rpc Flag Record Ttl Change", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECORD_TTL_CHANGE", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_TTL_CHANGE_tfs), ( 0x04000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Record Ttl Change", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECORD_TTL_CHANGE", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECORD_TTL_CHANGE_tfs), ( 0x04000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_CACHE_DATA, 
-	  { "Dns Rpc View Cache Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_CACHE_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_CACHE_DATA_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Dns Rpc View Cache Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_CACHE_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_CACHE_DATA_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ForwardTimeout, 
-	  { "Forwardtimeout", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForwardTimeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Forwardtimeout", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForwardTimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_reserve_array2, 
-	  { "Reserve Array2", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserve_array2", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserve Array2", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.reserve_array2", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_extension2, 
-	  { "Extension2", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Extension2", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.extension2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_UNION_NodeName, 
-	  { "Nodename", "dnsserver.DNS_RPC_RECORD_UNION.NodeName", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nodename", "dnsserver.DNS_RPC_RECORD_UNION.NodeName", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_FULL_PACKETS, 
-	  { "Dns Log Level Full Packets", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_FULL_PACKETS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_FULL_PACKETS_tfs), ( 0x01000000 ), "", HFILL }},
+	  { "Dns Log Level Full Packets", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_FULL_PACKETS", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_FULL_PACKETS_tfs), ( 0x01000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RecursionRetry, 
-	  { "Recursionretry", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecursionRetry", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Recursionretry", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecursionRetry", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_zone, 
-	  { "Zone", "dnsserver.DnssrvQuery2.zone", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Zone", "dnsserver.DnssrvQuery2.zone", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DefaultRefreshInterval, 
-	  { "Defaultrefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Defaultrefreshinterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DefaultRefreshInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_ROOT, 
-	  { "Dns Rpc Flag Zone Root", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_ZONE_ROOT", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_ROOT_tfs), ( 0x40000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Zone Root", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_ZONE_ROOT", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_ZONE_ROOT_tfs), ( 0x40000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_StrictFileParsing, 
-	  { "Strictfileparsing", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.StrictFileParsing", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Strictfileparsing", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.StrictFileParsing", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA, 
-	  { "Dns Rpc View Root Hint Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ROOT_HINT_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Dns Rpc View Root Hint Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_ROOT_HINT_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_ROOT_HINT_DATA_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA, 
-	  { "Dns Rpc View Glue Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_GLUE_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Dns Rpc View Glue Data", "dnsserver.DNS_SELECT_FLAGS.DNS_RPC_VIEW_GLUE_DATA", FT_BOOLEAN, 32, TFS(&DNS_SELECT_FLAGS_DNS_RPC_VIEW_GLUE_DATA_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsForestVersion, 
-	  { "Dsforestversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsForestVersion", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dsforestversion", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsForestVersion", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNSSRV_RPC_UNION_ServerInfoDotnet, 
-	  { "Serverinfodotnet", "dnsserver.DNSSRV_RPC_UNION.ServerInfoDotnet", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Serverinfodotnet", "dnsserver.DNSSRV_RPC_UNION.ServerInfoDotnet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LogFileMaxSize, 
-	  { "Logfilemaxsize", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFileMaxSize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logfilemaxsize", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogFileMaxSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_MaxCacheTtl, 
-	  { "Maxcachettl", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.MaxCacheTtl", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcachettl", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.MaxCacheTtl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_record, 
-	  { "Record", "dnsserver.DNS_RPC_RECORD.record", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Record", "dnsserver.DNS_RPC_RECORD.record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ScavengingInterval, 
-	  { "Scavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavenginginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ScavengingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_RecurseAfterForwarding, 
-	  { "Recurseafterforwarding", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecurseAfterForwarding", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Recurseafterforwarding", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.RecurseAfterForwarding", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_SUPPRESS_NOTIFY, 
-	  { "Dns Rpc Flag Suppress Notify", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_SUPPRESS_NOTIFY", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_SUPPRESS_NOTIFY_tfs), ( 0x00010000 ), "", HFILL }},
+	  { "Dns Rpc Flag Suppress Notify", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_SUPPRESS_NOTIFY", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_SUPPRESS_NOTIFY_tfs), ( 0x00010000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_Version, 
-	  { "Version", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.Version", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Version", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.Version", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_setting_flags, 
-	  { "Setting Flags", "dnsserver.DnssrvQuery2.setting_flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Setting Flags", "dnsserver.DnssrvQuery2.setting_flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_reserved, 
-	  { "Reserved", "dnsserver.DNS_RPC_RECORD.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "dnsserver.DNS_RPC_RECORD.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_CACHE_DATA, 
-	  { "Dns Rpc Flag Cache Data", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_CACHE_DATA", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_CACHE_DATA_tfs), ( 0x80000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Cache Data", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_CACHE_DATA", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_CACHE_DATA_tfs), ( 0x80000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ServerName, 
-	  { "Servername", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ServerName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servername", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ServerName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_AddressAnswerLimit, 
-	  { "Addressanswerlimit", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AddressAnswerLimit", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addressanswerlimit", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AddressAnswerLimit", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_AllowUpdate, 
-	  { "Allowupdate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AllowUpdate", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Allowupdate", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.AllowUpdate", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_PROTOCOLS_DNS_RPC_USE_TCPIP, 
-	  { "Dns Rpc Use Tcpip", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_TCPIP", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_TCPIP_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Dns Rpc Use Tcpip", "dnsserver.DNS_RPC_PROTOCOLS.DNS_RPC_USE_TCPIP", FT_BOOLEAN, 32, TFS(&DNS_RPC_PROTOCOLS_DNS_RPC_USE_TCPIP_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_SecureResponses, 
-	  { "Secureresponses", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.SecureResponses", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Secureresponses", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.SecureResponses", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_IP4_ARRAY_AddrArray, 
-	  { "Addrarray", "dnsserver.IP4_ARRAY.AddrArray", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addrarray", "dnsserver.IP4_ARRAY.AddrArray", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_VERSION_ServicePackVersion, 
-	  { "Servicepackversion", "dnsserver.DNS_RPC_VERSION.ServicePackVersion", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servicepackversion", "dnsserver.DNS_RPC_VERSION.ServicePackVersion", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DebugLevel, 
-	  { "Debuglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DebugLevel", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Debuglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DebugLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_Type, 
-	  { "Type", "dnsserver.DNS_RPC_RECORD.Type", FT_UINT16, BASE_DEC, VALS(dnsserver_DNS_RECORD_TYPE_vals), 0, "", HFILL }},
+	  { "Type", "dnsserver.DNS_RPC_RECORD.Type", FT_UINT16, BASE_DEC, VALS(dnsserver_DNS_RECORD_TYPE_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNSSRV_RPC_UNION_null, 
-	  { "Null", "dnsserver.DNSSRV_RPC_UNION.null", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Null", "dnsserver.DNSSRV_RPC_UNION.null", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NAME_Name, 
-	  { "Name", "dnsserver.DNS_RPC_NAME.Name", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "dnsserver.DNS_RPC_NAME.Name", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LogLevel, 
-	  { "Loglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogLevel", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Loglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LogLevel", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_RecordCount, 
-	  { "Recordcount", "dnsserver.DNS_RPC_NODE.RecordCount", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Recordcount", "dnsserver.DNS_RPC_NODE.RecordCount", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_Flags, 
-	  { "Flags", "dnsserver.DNS_RPC_NODE.Flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "dnsserver.DNS_RPC_NODE.Flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUERY, 
-	  { "Dns Log Level Query", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_QUERY", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUERY_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Dns Log Level Query", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_QUERY", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_QUERY_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_UDP, 
-	  { "Dns Log Level Udp", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_UDP", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_UDP_tfs), ( 0x00004000 ), "", HFILL }},
+	  { "Dns Log Level Udp", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_UDP", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_UDP_tfs), ( 0x00004000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_LOG_LEVELS_DNS_LOG_LEVEL_TCP, 
-	  { "Dns Log Level Tcp", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_TCP", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_TCP_tfs), ( 0x00008000 ), "", HFILL }},
+	  { "Dns Log Level Tcp", "dnsserver.DNS_LOG_LEVELS.DNS_LOG_LEVEL_TCP", FT_BOOLEAN, 32, TFS(&DNS_LOG_LEVELS_DNS_LOG_LEVEL_TCP_tfs), ( 0x00008000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsPollingInterval, 
-	  { "Dspollinginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsPollingInterval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dspollinginterval", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsPollingInterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_opnum, 
-	  { "Operation", "dnsserver.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "dnsserver.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_DsAvailable, 
-	  { "Dsavailable", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsAvailable", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dsavailable", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.DsAvailable", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_ForwardDelegations, 
-	  { "Forwarddelegations", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForwardDelegations", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Forwarddelegations", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.ForwardDelegations", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_RECORD_Serial, 
-	  { "Serial", "dnsserver.DNS_RPC_RECORD.Serial", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Serial", "dnsserver.DNS_RPC_RECORD.Serial", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_operation, 
-	  { "Operation", "dnsserver.DnssrvQuery2.operation", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "dnsserver.DnssrvQuery2.operation", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DnssrvQuery2_type_id, 
-	  { "Type Id", "dnsserver.DnssrvQuery2.type_id", FT_UINT32, BASE_DEC, VALS(dnsserver_DnssrvRpcTypeId_vals), 0, "", HFILL }},
+	  { "Type Id", "dnsserver.DnssrvQuery2.type_id", FT_UINT32, BASE_DEC, VALS(dnsserver_DnssrvRpcTypeId_vals), 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NAME_NameLength, 
-	  { "Namelength", "dnsserver.DNS_RPC_NAME.NameLength", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Namelength", "dnsserver.DNS_RPC_NAME.NameLength", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_OPEN_ACL, 
-	  { "Dns Rpc Flag Open Acl", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_OPEN_ACL", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_OPEN_ACL_tfs), ( 0x00040000 ), "", HFILL }},
+	  { "Dns Rpc Flag Open Acl", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_OPEN_ACL", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_OPEN_ACL_tfs), ( 0x00040000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECOR_DEFAULT_TTL, 
-	  { "Dns Rpc Flag Recor Default Ttl", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECOR_DEFAULT_TTL", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECOR_DEFAULT_TTL_tfs), ( 0x08000000 ), "", HFILL }},
+	  { "Dns Rpc Flag Recor Default Ttl", "dnsserver.DNS_RPC_NODE_FLAGS.DNS_RPC_FLAG_RECOR_DEFAULT_TTL", FT_BOOLEAN, 32, TFS(&DNS_RPC_NODE_FLAGS_DNS_RPC_FLAG_RECOR_DEFAULT_TTL_tfs), ( 0x08000000 ), NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_EventLogLevel, 
-	  { "Eventloglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.EventLogLevel", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Eventloglevel", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.EventLogLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dnsserver_DNS_RPC_SERVER_INFO_DOTNET_LocalNetPriorityNetmask, 
-	  { "Localnetprioritynetmask", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LocalNetPriorityNetmask", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Localnetprioritynetmask", "dnsserver.DNS_RPC_SERVER_INFO_DOTNET.LocalNetPriorityNetmask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-drsuapi.c b/epan/dissectors/packet-dcerpc-drsuapi.c
index e0fba86fde..3027a0e2f2 100644
--- a/epan/dissectors/packet-dcerpc-drsuapi.c
+++ b/epan/dissectors/packet-dcerpc-drsuapi.c
@@ -8073,9 +8073,9 @@ proto_register_drsuapi(void)
 {
         static hf_register_info hf[] = {
         { &hf_drsuapi_DsReplicaSyncRequest1Info_nc_dn,
-          { "nc_dn", "drsuapi.DsReplicaSyncRequest1Info.nc_dn", FT_STRING, BASE_DEC,
+          { "nc_dn", "drsuapi.DsReplicaSyncRequest1Info.nc_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
 
 
@@ -8083,2072 +8083,2072 @@ proto_register_drsuapi(void)
         { &hf_drsuapi_opnum,
           { "Operation", "drsuapi.opnum", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_rc,
           { "Return code", "drsuapi.rc", FT_UINT32, BASE_HEX,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_BASE,
           { "DRSUAPI_SUPPORTED_EXTENSION_BASE", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_BASE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_BASE_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION,
           { "DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_ASYNC_REPLICATION_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI,
           { "DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_REMOVEAPI_tfs), 0x00000004,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2,
           { "DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_MOVEREQ_V2_tfs), 0x00000008,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHG_COMPRESS_tfs), 0x00000010,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1,
           { "DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V1_tfs), 0x00000020,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION,
           { "DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_RESTORE_USN_OPTIMIZATION_tfs), 0x00000040,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_00000080,
           { "DRSUAPI_SUPPORTED_EXTENSION_00000080", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_00000080", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_00000080_tfs), 0x00000080,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE,
           { "DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_KCC_EXECUTE_tfs), 0x00000100,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2,
           { "DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_ADDENTRY_V2_tfs), 0x00000200,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION,
           { "DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_LINKED_VALUE_REPLICATION_tfs), 0x00000400,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2,
           { "DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V2_tfs), 0x00000800,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD,
           { "DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_INSTANCE_TYPE_NOT_REQ_ON_MOD_tfs), 0x00001000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND,
           { "DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_CRYPTO_BIND_tfs), 0x00002000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO,
           { "DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GET_REPL_INFO_tfs), 0x00004000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION,
           { "DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_STRONG_ENCRYPTION_tfs), 0x00008000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01,
           { "DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_DCINFO_V01_tfs), 0x00010000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP,
           { "DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_TRANSITIVE_MEMBERSHIP_tfs), 0x00020000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY,
           { "DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_ADD_SID_HISTORY_tfs), 0x00040000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3,
           { "DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_POST_BETA3_tfs), 0x00080000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_00100000,
           { "DRSUAPI_SUPPORTED_EXTENSION_00100000", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_00100000", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_00100000_tfs), 0x00100000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2,
           { "DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GET_MEMBERSHIPS2_tfs), 0x00200000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V6_tfs), 0x00400000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS,
           { "DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_NONDOMAIN_NCS_tfs), 0x00800000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHGREQ_V8_tfs), 0x01000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V5_tfs), 0x02000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V6_tfs), 0x04000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3,
           { "DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_ADDENTRYREPLY_V3_tfs), 0x08000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7,
           { "DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_GETCHGREPLY_V7_tfs), 0x08000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT,
           { "DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_VERIFY_OBJECT_tfs), 0x08000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS,
           { "DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_XPRESS_COMPRESS_tfs), 0x10000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_20000000,
           { "DRSUAPI_SUPPORTED_EXTENSION_20000000", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_20000000", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_20000000_tfs), 0x20000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_40000000,
           { "DRSUAPI_SUPPORTED_EXTENSION_40000000", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_40000000", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_40000000_tfs), 0x40000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_SupportedExtensions_DRSUAPI_SUPPORTED_EXTENSION_80000000,
           { "DRSUAPI_SUPPORTED_EXTENSION_80000000", "drsuapi.SupportedExtensions.DRSUAPI_SUPPORTED_EXTENSION_80000000", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_SUPPORTED_EXTENSION_80000000_tfs), 0x80000000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo24_supported_extensions,
           { "supported_extensions", "drsuapi.DsBindInfo24.supported_extensions", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo24_site_guid,
           { "site_guid", "drsuapi.DsBindInfo24.site_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo24_u1,
           { "u1", "drsuapi.DsBindInfo24.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo28_supported_extensions,
           { "supported_extensions", "drsuapi.DsBindInfo28.supported_extensions", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo28_site_guid,
           { "site_guid", "drsuapi.DsBindInfo28.site_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo28_u1,
           { "u1", "drsuapi.DsBindInfo28.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo28_repl_epoch,
           { "repl_epoch", "drsuapi.DsBindInfo28.repl_epoch", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo_24_info24,
           { "info24", "drsuapi.DsBindInfo.info24", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfo_28_info28,
           { "info28", "drsuapi.DsBindInfo.info28", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfoCtr_length,
           { "length", "drsuapi.DsBindInfoCtr.length", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBindInfoCtr_info,
           { "info", "drsuapi.DsBindInfoCtr.info", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBind_bind_guid,
           { "bind_guid", "drsuapi.DsBind.bind_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBind_bind_info,
           { "bind_info", "drsuapi.DsBind.bind_info", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsBind_bind_handle,
           { "bind_handle", "drsuapi.DsBind.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsUnbind_bind_handle,
           { "bind_handle", "drsuapi.DsUnbind.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1Info_unknown1,
           { "unknown1", "drsuapi.DsReplicaSyncRequest1Info.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1Info_unknown2,
           { "unknown2", "drsuapi.DsReplicaSyncRequest1Info.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1Info_guid1,
           { "guid1", "drsuapi.DsReplicaSyncRequest1Info.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1Info_byte_array,
           { "byte_array", "drsuapi.DsReplicaSyncRequest1Info.byte_array", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1Info_str_len,
           { "str_len", "drsuapi.DsReplicaSyncRequest1Info.str_len", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION,
           { "DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_OPERATION_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_WRITEABLE,
           { "DRSUAPI_DS_REPLICA_SYNC_WRITEABLE", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_WRITEABLE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_WRITEABLE_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_PERIODIC,
           { "DRSUAPI_DS_REPLICA_SYNC_PERIODIC", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_PERIODIC", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_PERIODIC_tfs), 0x00000004,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING,
           { "DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_INTERSITE_MESSAGING_tfs), 0x00000008,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES,
           { "DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_ALL_SOURCES_tfs), 0x00000010,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_FULL,
           { "DRSUAPI_DS_REPLICA_SYNC_FULL", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_FULL", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_FULL_tfs), 0x00000020,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_URGENT,
           { "DRSUAPI_DS_REPLICA_SYNC_URGENT", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_URGENT", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_URGENT_tfs), 0x00000040,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD,
           { "DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_NO_DISCARD_tfs), 0x00000080,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_FORCE,
           { "DRSUAPI_DS_REPLICA_SYNC_FORCE", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_FORCE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_FORCE_tfs), 0x00000100,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE,
           { "DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_ADD_REFERENCE_tfs), 0x00000200,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED,
           { "DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_NEVER_COMPLETED_tfs), 0x00000400,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_TWO_WAY,
           { "DRSUAPI_DS_REPLICA_SYNC_TWO_WAY", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_TWO_WAY", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_TWO_WAY_tfs), 0x00000800,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY,
           { "DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_NEVER_NOTIFY_tfs), 0x00001000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_INITIAL,
           { "DRSUAPI_DS_REPLICA_SYNC_INITIAL", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_INITIAL", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_INITIAL_tfs), 0x00002000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION,
           { "DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_USE_COMPRESSION_tfs), 0x00004000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_ABANDONED,
           { "DRSUAPI_DS_REPLICA_SYNC_ABANDONED", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_ABANDONED", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_ABANDONED_tfs), 0x00008000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS,
           { "DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_INITIAL_IN_PROGRESS_tfs), 0x00010000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET,
           { "DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_PARTIAL_ATTRIBUTE_SET_tfs), 0x00020000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_REQUEUE,
           { "DRSUAPI_DS_REPLICA_SYNC_REQUEUE", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_REQUEUE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_REQUEUE_tfs), 0x00040000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION,
           { "DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_NOTIFICATION_tfs), 0x00080000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA,
           { "DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_ASYNCHRONOUS_REPLICA_tfs), 0x00100000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_CRITICAL,
           { "DRSUAPI_DS_REPLICA_SYNC_CRITICAL", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_CRITICAL", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_CRITICAL_tfs), 0x00200000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS,
           { "DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_FULL_IN_PROGRESS_tfs), 0x00400000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncOptions_DRSUAPI_DS_REPLICA_SYNC_PREEMPTED,
           { "DRSUAPI_DS_REPLICA_SYNC_PREEMPTED", "drsuapi.DsReplicaSyncOptions.DRSUAPI_DS_REPLICA_SYNC_PREEMPTED", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_SYNC_PREEMPTED_tfs), 0x00800000,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1_info,
           { "info", "drsuapi.DsReplicaSyncRequest1.info", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1_guid1,
           { "guid1", "drsuapi.DsReplicaSyncRequest1.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1_string1,
           { "string1", "drsuapi.DsReplicaSyncRequest1.string1", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest1_options,
           { "options", "drsuapi.DsReplicaSyncRequest1.options", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSyncRequest_1_req1,
           { "req1", "drsuapi.DsReplicaSyncRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSync_bind_handle,
           { "bind_handle", "drsuapi.DsReplicaSync.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSync_level,
           { "level", "drsuapi.DsReplicaSync.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaSync_req,
           { "req", "drsuapi.DsReplicaSync.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesUsnTriple_usn1,
           { "usn1", "drsuapi.DsGetNCChangesUsnTriple.usn1", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesUsnTriple_usn2,
           { "usn2", "drsuapi.DsGetNCChangesUsnTriple.usn2", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesUsnTriple_usn3,
           { "usn3", "drsuapi.DsGetNCChangesUsnTriple.usn3", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor_source_dsa_invocation_id,
           { "source_dsa_invocation_id", "drsuapi.DsReplicaCoursor.source_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor_highest_usn,
           { "highest_usn", "drsuapi.DsReplicaCoursor.highest_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor05Ctr_u1,
           { "u1", "drsuapi.DsReplicaCoursor05Ctr.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor05Ctr_u2,
           { "u2", "drsuapi.DsReplicaCoursor05Ctr.u2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor05Ctr_count,
           { "count", "drsuapi.DsReplicaCoursor05Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor05Ctr_u3,
           { "u3", "drsuapi.DsReplicaCoursor05Ctr.u3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor05Ctr_array,
           { "array", "drsuapi.DsReplicaCoursor05Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_guid1,
           { "guid1", "drsuapi.DsGetNCChangesRequest5.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_guid2,
           { "guid2", "drsuapi.DsGetNCChangesRequest5.guid2", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_sync_req_info1,
           { "sync_req_info1", "drsuapi.DsGetNCChangesRequest5.sync_req_info1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_usn1,
           { "usn1", "drsuapi.DsGetNCChangesRequest5.usn1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_coursor,
           { "coursor", "drsuapi.DsGetNCChangesRequest5.coursor", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_unknown1,
           { "unknown1", "drsuapi.DsGetNCChangesRequest5.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_unknown2,
           { "unknown2", "drsuapi.DsGetNCChangesRequest5.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_unknown3,
           { "unknown3", "drsuapi.DsGetNCChangesRequest5.unknown3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_unknown4,
           { "unknown4", "drsuapi.DsGetNCChangesRequest5.unknown4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest5_h1,
           { "h1", "drsuapi.DsGetNCChangesRequest5.h1", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr14_length,
           { "length", "drsuapi.DsGetNCChangesRequest_Ctr14.length", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr14_byte_array,
           { "byte_array", "drsuapi.DsGetNCChangesRequest_Ctr14.byte_array", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr13_unknown1,
           { "unknown1", "drsuapi.DsGetNCChangesRequest_Ctr13.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr13_data,
           { "data", "drsuapi.DsGetNCChangesRequest_Ctr13.data", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr12_count,
           { "count", "drsuapi.DsGetNCChangesRequest_Ctr12.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_Ctr12_array,
           { "array", "drsuapi.DsGetNCChangesRequest_Ctr12.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_guid1,
           { "guid1", "drsuapi.DsGetNCChangesRequest8.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_guid2,
           { "guid2", "drsuapi.DsGetNCChangesRequest8.guid2", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_sync_req_info1,
           { "sync_req_info1", "drsuapi.DsGetNCChangesRequest8.sync_req_info1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_usn1,
           { "usn1", "drsuapi.DsGetNCChangesRequest8.usn1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_coursor,
           { "coursor", "drsuapi.DsGetNCChangesRequest8.coursor", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unknown1,
           { "unknown1", "drsuapi.DsGetNCChangesRequest8.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unknown2,
           { "unknown2", "drsuapi.DsGetNCChangesRequest8.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unknown3,
           { "unknown3", "drsuapi.DsGetNCChangesRequest8.unknown3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unknown4,
           { "unknown4", "drsuapi.DsGetNCChangesRequest8.unknown4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_h1,
           { "h1", "drsuapi.DsGetNCChangesRequest8.h1", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unique_ptr1,
           { "unique_ptr1", "drsuapi.DsGetNCChangesRequest8.unique_ptr1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_unique_ptr2,
           { "unique_ptr2", "drsuapi.DsGetNCChangesRequest8.unique_ptr2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest8_ctr12,
           { "ctr12", "drsuapi.DsGetNCChangesRequest8.ctr12", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_5_req5,
           { "req5", "drsuapi.DsGetNCChangesRequest.req5", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesRequest_8_req8,
           { "req8", "drsuapi.DsGetNCChangesRequest.req8", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx_coursor,
           { "coursor", "drsuapi.DsReplicaCoursorEx.coursor", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx_time1,
           { "time1", "drsuapi.DsReplicaCoursorEx.time1", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx05Ctr_u1,
           { "u1", "drsuapi.DsReplicaCoursorEx05Ctr.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx05Ctr_u2,
           { "u2", "drsuapi.DsReplicaCoursorEx05Ctr.u2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx05Ctr_count,
           { "count", "drsuapi.DsReplicaCoursorEx05Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx05Ctr_u3,
           { "u3", "drsuapi.DsReplicaCoursorEx05Ctr.u3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorEx05Ctr_array,
           { "array", "drsuapi.DsReplicaCoursorEx05Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_guid1,
           { "guid1", "drsuapi.DsGetNCChangesCtr6.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_guid2,
           { "guid2", "drsuapi.DsGetNCChangesCtr6.guid2", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_sync_req_info1,
           { "sync_req_info1", "drsuapi.DsGetNCChangesCtr6.sync_req_info1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_usn1,
           { "usn1", "drsuapi.DsGetNCChangesCtr6.usn1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_usn2,
           { "usn2", "drsuapi.DsGetNCChangesCtr6.usn2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_coursor_ex,
           { "coursor_ex", "drsuapi.DsGetNCChangesCtr6.coursor_ex", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_ctr12,
           { "ctr12", "drsuapi.DsGetNCChangesCtr6.ctr12", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_u1,
           { "u1", "drsuapi.DsGetNCChangesCtr6.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_ptr1,
           { "ptr1", "drsuapi.DsGetNCChangesCtr6.ptr1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_u2,
           { "u2", "drsuapi.DsGetNCChangesCtr6.u2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_len1,
           { "len1", "drsuapi.DsGetNCChangesCtr6.len1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_array_ptr1,
           { "array_ptr1", "drsuapi.DsGetNCChangesCtr6.array_ptr1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr6_u3,
           { "u3", "drsuapi.DsGetNCChangesCtr6.u3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr_6_ctr6,
           { "ctr6", "drsuapi.DsGetNCChangesCtr.ctr6", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChangesCtr_7_ctr7,
           { "ctr7", "drsuapi.DsGetNCChangesCtr.ctr7", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChanges_bind_handle,
           { "bind_handle", "drsuapi.DsGetNCChanges.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChanges_level,
           { "level", "drsuapi.DsGetNCChanges.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChanges_req,
           { "req", "drsuapi.DsGetNCChanges.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetNCChanges_ctr,
           { "ctr", "drsuapi.DsGetNCChanges.ctr", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsOptions_DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION,
           { "DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION", "drsuapi.DsReplicaUpdateRefsOptions.DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_UPDATE_ASYNCHRONOUS_OPERATION_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsOptions_DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE,
           { "DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE", "drsuapi.DsReplicaUpdateRefsOptions.DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_UPDATE_WRITEABLE_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsOptions_DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE,
           { "DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE", "drsuapi.DsReplicaUpdateRefsOptions.DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_UPDATE_ADD_REFERENCE_tfs), 0x00000004,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsOptions_DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE,
           { "DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE", "drsuapi.DsReplicaUpdateRefsOptions.DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_UPDATE_DELETE_REFERENCE_tfs), 0x00000008,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsOptions_DRSUAPI_DS_REPLICA_UPDATE_0x00000010,
           { "DRSUAPI_DS_REPLICA_UPDATE_0x00000010", "drsuapi.DsReplicaUpdateRefsOptions.DRSUAPI_DS_REPLICA_UPDATE_0x00000010", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_UPDATE_0x00000010_tfs), 0x00000010,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_unknown1,
           { "unknown1", "drsuapi.DsReplicaUpdateRefsRequest1.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_unknown2,
           { "unknown2", "drsuapi.DsReplicaUpdateRefsRequest1.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_dest_dsa_guid,
           { "dest_dsa_guid", "drsuapi.DsReplicaUpdateRefsRequest1.dest_dsa_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_options,
           { "options", "drsuapi.DsReplicaUpdateRefsRequest1.options", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_sync_req_info1,
           { "sync_req_info1", "drsuapi.DsReplicaUpdateRefsRequest1.sync_req_info1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest1_dest_dsa_dns_name,
-          { "dest_dsa_dns_name", "drsuapi.DsReplicaUpdateRefsRequest1.dest_dsa_dns_name", FT_STRING, BASE_DEC,
+          { "dest_dsa_dns_name", "drsuapi.DsReplicaUpdateRefsRequest1.dest_dsa_dns_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefsRequest_1_req1,
           { "req1", "drsuapi.DsReplicaUpdateRefsRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefs_bind_handle,
           { "bind_handle", "drsuapi.DsReplicaUpdateRefs.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefs_level,
           { "level", "drsuapi.DsReplicaUpdateRefs.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaUpdateRefs_req,
           { "req", "drsuapi.DsReplicaUpdateRefs.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAddOptions_DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION,
           { "DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION", "drsuapi.DsReplicaAddOptions.DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_ADD_ASYNCHRONOUS_OPERATION_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAddOptions_DRSUAPI_DS_REPLICA_ADD_WRITEABLE,
           { "DRSUAPI_DS_REPLICA_ADD_WRITEABLE", "drsuapi.DsReplicaAddOptions.DRSUAPI_DS_REPLICA_ADD_WRITEABLE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_ADD_WRITEABLE_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaDeleteOptions_DRSUAPI_DS_REPLICA_DELETE_ASYNCHRONOUS_OPERATION,
           { "DRSUAPI_DS_REPLICA_DELETE_ASYNCHRONOUS_OPERATION", "drsuapi.DsReplicaDeleteOptions.DRSUAPI_DS_REPLICA_DELETE_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_DELETE_ASYNCHRONOUS_OPERATION_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaDeleteOptions_DRSUAPI_DS_REPLICA_DELETE_WRITEABLE,
           { "DRSUAPI_DS_REPLICA_DELETE_WRITEABLE", "drsuapi.DsReplicaDeleteOptions.DRSUAPI_DS_REPLICA_DELETE_WRITEABLE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_DELETE_WRITEABLE_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaModifyOptions_DRSUAPI_DS_REPLICA_MODIFY_ASYNCHRONOUS_OPERATION,
           { "DRSUAPI_DS_REPLICA_MODIFY_ASYNCHRONOUS_OPERATION", "drsuapi.DsReplicaModifyOptions.DRSUAPI_DS_REPLICA_MODIFY_ASYNCHRONOUS_OPERATION", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_MODIFY_ASYNCHRONOUS_OPERATION_tfs), 0x00000001,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaModifyOptions_DRSUAPI_DS_REPLICA_MODIFY_WRITEABLE,
           { "DRSUAPI_DS_REPLICA_MODIFY_WRITEABLE", "drsuapi.DsReplicaModifyOptions.DRSUAPI_DS_REPLICA_MODIFY_WRITEABLE", FT_BOOLEAN, 32,
           TFS(&DRSUAPI_DS_REPLICA_MODIFY_WRITEABLE_tfs), 0x00000002,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameString_str,
-          { "str", "drsuapi.DsNameString.str", FT_STRING, BASE_DEC,
+          { "str", "drsuapi.DsNameString.str", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_unknown1,
           { "unknown1", "drsuapi.DsNameRequest1.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_unknown2,
           { "unknown2", "drsuapi.DsNameRequest1.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_format_flags,
           { "format_flags", "drsuapi.DsNameRequest1.format_flags", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsNameFlags_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_format_offered,
           { "format_offered", "drsuapi.DsNameRequest1.format_offered", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsNameFormat_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_format_desired,
           { "format_desired", "drsuapi.DsNameRequest1.format_desired", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsNameFormat_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_count,
           { "count", "drsuapi.DsNameRequest1.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest1_names,
           { "names", "drsuapi.DsNameRequest1.names", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameRequest_1_req1,
           { "req1", "drsuapi.DsNameRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameInfo1_status,
           { "status", "drsuapi.DsNameInfo1.status", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsNameStatus_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameInfo1_dns_domain_name,
-          { "dns_domain_name", "drsuapi.DsNameInfo1.dns_domain_name", FT_STRING, BASE_DEC,
+          { "dns_domain_name", "drsuapi.DsNameInfo1.dns_domain_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameInfo1_result_name,
-          { "result_name", "drsuapi.DsNameInfo1.result_name", FT_STRING, BASE_DEC,
+          { "result_name", "drsuapi.DsNameInfo1.result_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameCtr1_count,
           { "count", "drsuapi.DsNameCtr1.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameCtr1_array,
           { "array", "drsuapi.DsNameCtr1.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsNameCtr_1_ctr1,
           { "ctr1", "drsuapi.DsNameCtr.ctr1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsCrackNames_bind_handle,
           { "bind_handle", "drsuapi.DsCrackNames.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsCrackNames_level,
           { "level", "drsuapi.DsCrackNames.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsCrackNames_req,
           { "req", "drsuapi.DsCrackNames.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsCrackNames_ctr,
           { "ctr", "drsuapi.DsCrackNames.ctr", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest1_operation,
           { "operation", "drsuapi.DsWriteAccountSpnRequest1.operation", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsSpnOperation_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest1_unknown1,
           { "unknown1", "drsuapi.DsWriteAccountSpnRequest1.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest1_object_dn,
-          { "object_dn", "drsuapi.DsWriteAccountSpnRequest1.object_dn", FT_STRING, BASE_DEC,
+          { "object_dn", "drsuapi.DsWriteAccountSpnRequest1.object_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest1_count,
           { "count", "drsuapi.DsWriteAccountSpnRequest1.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest1_spn_names,
           { "spn_names", "drsuapi.DsWriteAccountSpnRequest1.spn_names", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnRequest_1_req1,
           { "req1", "drsuapi.DsWriteAccountSpnRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnResult1_status,
           { "status", "drsuapi.DsWriteAccountSpnResult1.status", FT_UINT32, BASE_DEC,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpnResult_1_res1,
           { "res1", "drsuapi.DsWriteAccountSpnResult.res1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpn_bind_handle,
           { "bind_handle", "drsuapi.DsWriteAccountSpn.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpn_level,
           { "level", "drsuapi.DsWriteAccountSpn.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpn_req,
           { "req", "drsuapi.DsWriteAccountSpn.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsWriteAccountSpn_res,
           { "res", "drsuapi.DsWriteAccountSpn.res", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoRequest1_domain_name,
-          { "domain_name", "drsuapi.DsGetDCInfoRequest1.domain_name", FT_STRING, BASE_DEC,
+          { "domain_name", "drsuapi.DsGetDCInfoRequest1.domain_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoRequest1_level,
           { "level", "drsuapi.DsGetDCInfoRequest1.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoRequest_1_req1,
           { "req1", "drsuapi.DsGetDCInfoRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_netbios_name,
-          { "netbios_name", "drsuapi.DsGetDCInfo1.netbios_name", FT_STRING, BASE_DEC,
+          { "netbios_name", "drsuapi.DsGetDCInfo1.netbios_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_dns_name,
-          { "dns_name", "drsuapi.DsGetDCInfo1.dns_name", FT_STRING, BASE_DEC,
+          { "dns_name", "drsuapi.DsGetDCInfo1.dns_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_site_name,
-          { "site_name", "drsuapi.DsGetDCInfo1.site_name", FT_STRING, BASE_DEC,
+          { "site_name", "drsuapi.DsGetDCInfo1.site_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_computer_dn,
-          { "computer_dn", "drsuapi.DsGetDCInfo1.computer_dn", FT_STRING, BASE_DEC,
+          { "computer_dn", "drsuapi.DsGetDCInfo1.computer_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_server_dn,
-          { "server_dn", "drsuapi.DsGetDCInfo1.server_dn", FT_STRING, BASE_DEC,
+          { "server_dn", "drsuapi.DsGetDCInfo1.server_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_is_pdc,
           { "is_pdc", "drsuapi.DsGetDCInfo1.is_pdc", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo1_is_enabled,
           { "is_enabled", "drsuapi.DsGetDCInfo1.is_enabled", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr1_count,
           { "count", "drsuapi.DsGetDCInfoCtr1.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr1_array,
           { "array", "drsuapi.DsGetDCInfoCtr1.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_netbios_name,
-          { "netbios_name", "drsuapi.DsGetDCInfo2.netbios_name", FT_STRING, BASE_DEC,
+          { "netbios_name", "drsuapi.DsGetDCInfo2.netbios_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_dns_name,
-          { "dns_name", "drsuapi.DsGetDCInfo2.dns_name", FT_STRING, BASE_DEC,
+          { "dns_name", "drsuapi.DsGetDCInfo2.dns_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_site_name,
-          { "site_name", "drsuapi.DsGetDCInfo2.site_name", FT_STRING, BASE_DEC,
+          { "site_name", "drsuapi.DsGetDCInfo2.site_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_site_dn,
-          { "site_dn", "drsuapi.DsGetDCInfo2.site_dn", FT_STRING, BASE_DEC,
+          { "site_dn", "drsuapi.DsGetDCInfo2.site_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_computer_dn,
-          { "computer_dn", "drsuapi.DsGetDCInfo2.computer_dn", FT_STRING, BASE_DEC,
+          { "computer_dn", "drsuapi.DsGetDCInfo2.computer_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_server_dn,
-          { "server_dn", "drsuapi.DsGetDCInfo2.server_dn", FT_STRING, BASE_DEC,
+          { "server_dn", "drsuapi.DsGetDCInfo2.server_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_ntds_dn,
-          { "ntds_dn", "drsuapi.DsGetDCInfo2.ntds_dn", FT_STRING, BASE_DEC,
+          { "ntds_dn", "drsuapi.DsGetDCInfo2.ntds_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_is_pdc,
           { "is_pdc", "drsuapi.DsGetDCInfo2.is_pdc", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_is_enabled,
           { "is_enabled", "drsuapi.DsGetDCInfo2.is_enabled", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_is_gc,
           { "is_gc", "drsuapi.DsGetDCInfo2.is_gc", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_site_guid,
           { "site_guid", "drsuapi.DsGetDCInfo2.site_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_computer_guid,
           { "computer_guid", "drsuapi.DsGetDCInfo2.computer_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_server_guid,
           { "server_guid", "drsuapi.DsGetDCInfo2.server_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo2_ntds_guid,
           { "ntds_guid", "drsuapi.DsGetDCInfo2.ntds_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr2_count,
           { "count", "drsuapi.DsGetDCInfoCtr2.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr2_array,
           { "array", "drsuapi.DsGetDCInfoCtr2.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown1,
           { "unknown1", "drsuapi.DsGetDCInfo01.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown2,
           { "unknown2", "drsuapi.DsGetDCInfo01.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown3,
           { "unknown3", "drsuapi.DsGetDCInfo01.unknown3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown4,
           { "unknown4", "drsuapi.DsGetDCInfo01.unknown4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown5,
           { "unknown5", "drsuapi.DsGetDCInfo01.unknown5", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_unknown6,
           { "unknown6", "drsuapi.DsGetDCInfo01.unknown6", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfo01_server_nt4_account,
-          { "server_nt4_account", "drsuapi.DsGetDCInfo01.server_nt4_account", FT_STRING, BASE_DEC,
+          { "server_nt4_account", "drsuapi.DsGetDCInfo01.server_nt4_account", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr01_count,
           { "count", "drsuapi.DsGetDCInfoCtr01.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr01_array,
           { "array", "drsuapi.DsGetDCInfoCtr01.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr_DRSUAPI_DC_INFO_CTR_1_ctr1,
           { "ctr1", "drsuapi.DsGetDCInfoCtr.ctr1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr_DRSUAPI_DC_INFO_CTR_2_ctr2,
           { "ctr2", "drsuapi.DsGetDCInfoCtr.ctr2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDCInfoCtr_DRSUAPI_DC_INFO_CTR_01_ctr01,
           { "ctr01", "drsuapi.DsGetDCInfoCtr.ctr01", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDomainControllerInfo_bind_handle,
           { "bind_handle", "drsuapi.DsGetDomainControllerInfo.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDomainControllerInfo_level,
           { "level", "drsuapi.DsGetDomainControllerInfo.level", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDomainControllerInfo_req,
           { "req", "drsuapi.DsGetDomainControllerInfo.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsGetDomainControllerInfo_ctr,
           { "ctr", "drsuapi.DsGetDomainControllerInfo.ctr", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest1_info_type,
           { "info_type", "drsuapi.DsReplicaGetInfoRequest1.info_type", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsReplicaInfoType_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest1_object_dn,
-          { "object_dn", "drsuapi.DsReplicaGetInfoRequest1.object_dn", FT_STRING, BASE_DEC,
+          { "object_dn", "drsuapi.DsReplicaGetInfoRequest1.object_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest1_guid1,
           { "guid1", "drsuapi.DsReplicaGetInfoRequest1.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_info_type,
           { "info_type", "drsuapi.DsReplicaGetInfoRequest2.info_type", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsReplicaInfoType_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_object_dn,
-          { "object_dn", "drsuapi.DsReplicaGetInfoRequest2.object_dn", FT_STRING, BASE_DEC,
+          { "object_dn", "drsuapi.DsReplicaGetInfoRequest2.object_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_guid1,
           { "guid1", "drsuapi.DsReplicaGetInfoRequest2.guid1", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_unknown1,
           { "unknown1", "drsuapi.DsReplicaGetInfoRequest2.unknown1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_string1,
-          { "string1", "drsuapi.DsReplicaGetInfoRequest2.string1", FT_STRING, BASE_DEC,
+          { "string1", "drsuapi.DsReplicaGetInfoRequest2.string1", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_string2,
-          { "string2", "drsuapi.DsReplicaGetInfoRequest2.string2", FT_STRING, BASE_DEC,
+          { "string2", "drsuapi.DsReplicaGetInfoRequest2.string2", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest2_unknown2,
           { "unknown2", "drsuapi.DsReplicaGetInfoRequest2.unknown2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest_DRSUAPI_DS_REPLICA_GET_INFO_req1,
           { "req1", "drsuapi.DsReplicaGetInfoRequest.req1", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfoRequest_DRSUAPI_DS_REPLICA_GET_INFO2_req2,
           { "req2", "drsuapi.DsReplicaGetInfoRequest.req2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_naming_context_dn,
-          { "naming_context_dn", "drsuapi.DsReplicaNeighbour.naming_context_dn", FT_STRING, BASE_DEC,
+          { "naming_context_dn", "drsuapi.DsReplicaNeighbour.naming_context_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_source_dsa_obj_dn,
-          { "source_dsa_obj_dn", "drsuapi.DsReplicaNeighbour.source_dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "source_dsa_obj_dn", "drsuapi.DsReplicaNeighbour.source_dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_source_dsa_address,
-          { "source_dsa_address", "drsuapi.DsReplicaNeighbour.source_dsa_address", FT_STRING, BASE_DEC,
+          { "source_dsa_address", "drsuapi.DsReplicaNeighbour.source_dsa_address", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_transport_obj_dn,
-          { "transport_obj_dn", "drsuapi.DsReplicaNeighbour.transport_obj_dn", FT_STRING, BASE_DEC,
+          { "transport_obj_dn", "drsuapi.DsReplicaNeighbour.transport_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_replica_flags,
           { "replica_flags", "drsuapi.DsReplicaNeighbour.replica_flags", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_reserved,
           { "reserved", "drsuapi.DsReplicaNeighbour.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_naming_context_obj_guid,
           { "naming_context_obj_guid", "drsuapi.DsReplicaNeighbour.naming_context_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_source_dsa_obj_guid,
           { "source_dsa_obj_guid", "drsuapi.DsReplicaNeighbour.source_dsa_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_source_dsa_invocation_id,
           { "source_dsa_invocation_id", "drsuapi.DsReplicaNeighbour.source_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_transport_obj_guid,
           { "transport_obj_guid", "drsuapi.DsReplicaNeighbour.transport_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_tmp_highest_usn,
           { "tmp_highest_usn", "drsuapi.DsReplicaNeighbour.tmp_highest_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_highest_usn,
           { "highest_usn", "drsuapi.DsReplicaNeighbour.highest_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_last_success,
           { "last_success", "drsuapi.DsReplicaNeighbour.last_success", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_last_attempt,
           { "last_attempt", "drsuapi.DsReplicaNeighbour.last_attempt", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_result_last_attempt,
           { "result_last_attempt", "drsuapi.DsReplicaNeighbour.result_last_attempt", FT_UINT32, BASE_DEC,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbour_consecutive_sync_failures,
           { "consecutive_sync_failures", "drsuapi.DsReplicaNeighbour.consecutive_sync_failures", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbourCtr_count,
           { "count", "drsuapi.DsReplicaNeighbourCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbourCtr_reserved,
           { "reserved", "drsuapi.DsReplicaNeighbourCtr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaNeighbourCtr_array,
           { "array", "drsuapi.DsReplicaNeighbourCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorCtr_count,
           { "count", "drsuapi.DsReplicaCoursorCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorCtr_reserved,
           { "reserved", "drsuapi.DsReplicaCoursorCtr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursorCtr_array,
           { "array", "drsuapi.DsReplicaCoursorCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_attribute_name,
-          { "attribute_name", "drsuapi.DsReplicaObjMetaData.attribute_name", FT_STRING, BASE_DEC,
+          { "attribute_name", "drsuapi.DsReplicaObjMetaData.attribute_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_version,
           { "version", "drsuapi.DsReplicaObjMetaData.version", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_originating_last_changed,
           { "originating_last_changed", "drsuapi.DsReplicaObjMetaData.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_originating_dsa_invocation_id,
           { "originating_dsa_invocation_id", "drsuapi.DsReplicaObjMetaData.originating_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_originating_usn,
           { "originating_usn", "drsuapi.DsReplicaObjMetaData.originating_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData_local_usn,
           { "local_usn", "drsuapi.DsReplicaObjMetaData.local_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaDataCtr_count,
           { "count", "drsuapi.DsReplicaObjMetaDataCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaDataCtr_reserved,
           { "reserved", "drsuapi.DsReplicaObjMetaDataCtr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaDataCtr_array,
           { "array", "drsuapi.DsReplicaObjMetaDataCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailure_dsa_obj_dn,
-          { "dsa_obj_dn", "drsuapi.DsReplicaKccDsaFailure.dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "dsa_obj_dn", "drsuapi.DsReplicaKccDsaFailure.dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailure_dsa_obj_guid,
           { "dsa_obj_guid", "drsuapi.DsReplicaKccDsaFailure.dsa_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailure_first_failure,
           { "first_failure", "drsuapi.DsReplicaKccDsaFailure.first_failure", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailure_num_failures,
           { "num_failures", "drsuapi.DsReplicaKccDsaFailure.num_failures", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailure_last_result,
           { "last_result", "drsuapi.DsReplicaKccDsaFailure.last_result", FT_UINT32, BASE_DEC,
           VALS(NT_errors), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailuresCtr_count,
           { "count", "drsuapi.DsReplicaKccDsaFailuresCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailuresCtr_reserved,
           { "reserved", "drsuapi.DsReplicaKccDsaFailuresCtr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaKccDsaFailuresCtr_array,
           { "array", "drsuapi.DsReplicaKccDsaFailuresCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_DRSUAPI_DS_REPLICA_OP_TYPE_SYNC_sync,
           { "sync", "drsuapi.DsRplicaOpOptions.sync", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_DRSUAPI_DS_REPLICA_OP_TYPE_ADD_add,
           { "add", "drsuapi.DsRplicaOpOptions.add", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_DRSUAPI_DS_REPLICA_OP_TYPE_DELETE_delete,
           { "delete", "drsuapi.DsRplicaOpOptions.delete", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_DRSUAPI_DS_REPLICA_OP_TYPE_MODIFY_modify,
           { "modify", "drsuapi.DsRplicaOpOptions.modify", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_DRSUAPI_DS_REPLICA_OP_TYPE_UPDATE_REFS_update_refs,
           { "update_refs", "drsuapi.DsRplicaOpOptions.update_refs", FT_UINT32, BASE_HEX,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsRplicaOpOptions_default_unknown,
           { "unknown", "drsuapi.DsRplicaOpOptions.unknown", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_operation_start,
           { "operation_start", "drsuapi.DsReplicaOp.operation_start", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_serial_num,
           { "serial_num", "drsuapi.DsReplicaOp.serial_num", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_priority,
           { "priority", "drsuapi.DsReplicaOp.priority", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_operation_type,
           { "operation_type", "drsuapi.DsReplicaOp.operation_type", FT_INT16, BASE_DEC,
           VALS(drsuapi_DsReplicaOpType_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_options,
           { "options", "drsuapi.DsReplicaOp.options", FT_UINT16, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_nc_dn,
-          { "nc_dn", "drsuapi.DsReplicaOp.nc_dn", FT_STRING, BASE_DEC,
+          { "nc_dn", "drsuapi.DsReplicaOp.nc_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_remote_dsa_obj_dn,
-          { "remote_dsa_obj_dn", "drsuapi.DsReplicaOp.remote_dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "remote_dsa_obj_dn", "drsuapi.DsReplicaOp.remote_dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_remote_dsa_address,
-          { "remote_dsa_address", "drsuapi.DsReplicaOp.remote_dsa_address", FT_STRING, BASE_DEC,
+          { "remote_dsa_address", "drsuapi.DsReplicaOp.remote_dsa_address", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_nc_obj_guid,
           { "nc_obj_guid", "drsuapi.DsReplicaOp.nc_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOp_remote_dsa_obj_guid,
           { "remote_dsa_obj_guid", "drsuapi.DsReplicaOp.remote_dsa_obj_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOpCtr_time,
           { "time", "drsuapi.DsReplicaOpCtr.time", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOpCtr_count,
           { "count", "drsuapi.DsReplicaOpCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaOpCtr_array,
           { "array", "drsuapi.DsReplicaOpCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_attribute_name,
-          { "attribute_name", "drsuapi.DsReplicaAttrValMetaData.attribute_name", FT_STRING, BASE_DEC,
+          { "attribute_name", "drsuapi.DsReplicaAttrValMetaData.attribute_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_object_dn,
-          { "object_dn", "drsuapi.DsReplicaAttrValMetaData.object_dn", FT_STRING, BASE_DEC,
+          { "object_dn", "drsuapi.DsReplicaAttrValMetaData.object_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_value_length,
           { "value_length", "drsuapi.DsReplicaAttrValMetaData.value_length", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_value,
           { "value", "drsuapi.DsReplicaAttrValMetaData.value", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_deleted,
           { "deleted", "drsuapi.DsReplicaAttrValMetaData.deleted", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_created,
           { "created", "drsuapi.DsReplicaAttrValMetaData.created", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_version,
           { "version", "drsuapi.DsReplicaAttrValMetaData.version", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_originating_last_changed,
           { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_originating_dsa_invocation_id,
           { "originating_dsa_invocation_id", "drsuapi.DsReplicaAttrValMetaData.originating_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_originating_usn,
           { "originating_usn", "drsuapi.DsReplicaAttrValMetaData.originating_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData_local_usn,
           { "local_usn", "drsuapi.DsReplicaAttrValMetaData.local_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaDataCtr_count,
           { "count", "drsuapi.DsReplicaAttrValMetaDataCtr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaDataCtr_enumeration_context,
           { "enumeration_context", "drsuapi.DsReplicaAttrValMetaDataCtr.enumeration_context", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaDataCtr_array,
           { "array", "drsuapi.DsReplicaAttrValMetaDataCtr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2_source_dsa_invocation_id,
           { "source_dsa_invocation_id", "drsuapi.DsReplicaCoursor2.source_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2_highest_usn,
           { "highest_usn", "drsuapi.DsReplicaCoursor2.highest_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2_last_sync_success,
           { "last_sync_success", "drsuapi.DsReplicaCoursor2.last_sync_success", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2Ctr_count,
           { "count", "drsuapi.DsReplicaCoursor2Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2Ctr_enumeration_context,
           { "enumeration_context", "drsuapi.DsReplicaCoursor2Ctr.enumeration_context", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor2Ctr_array,
           { "array", "drsuapi.DsReplicaCoursor2Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3_source_dsa_invocation_id,
           { "source_dsa_invocation_id", "drsuapi.DsReplicaCoursor3.source_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3_highest_usn,
           { "highest_usn", "drsuapi.DsReplicaCoursor3.highest_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3_last_sync_success,
           { "last_sync_success", "drsuapi.DsReplicaCoursor3.last_sync_success", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3_source_dsa_obj_dn,
-          { "source_dsa_obj_dn", "drsuapi.DsReplicaCoursor3.source_dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "source_dsa_obj_dn", "drsuapi.DsReplicaCoursor3.source_dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3Ctr_count,
           { "count", "drsuapi.DsReplicaCoursor3Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3Ctr_enumeration_context,
           { "enumeration_context", "drsuapi.DsReplicaCoursor3Ctr.enumeration_context", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaCoursor3Ctr_array,
           { "array", "drsuapi.DsReplicaCoursor3Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_attribute_name,
-          { "attribute_name", "drsuapi.DsReplicaObjMetaData2.attribute_name", FT_STRING, BASE_DEC,
+          { "attribute_name", "drsuapi.DsReplicaObjMetaData2.attribute_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_version,
           { "version", "drsuapi.DsReplicaObjMetaData2.version", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_originating_last_changed,
           { "originating_last_changed", "drsuapi.DsReplicaObjMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_originating_dsa_invocation_id,
           { "originating_dsa_invocation_id", "drsuapi.DsReplicaObjMetaData2.originating_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_originating_usn,
           { "originating_usn", "drsuapi.DsReplicaObjMetaData2.originating_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_local_usn,
           { "local_usn", "drsuapi.DsReplicaObjMetaData2.local_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2_originating_dsa_obj_dn,
-          { "originating_dsa_obj_dn", "drsuapi.DsReplicaObjMetaData2.originating_dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "originating_dsa_obj_dn", "drsuapi.DsReplicaObjMetaData2.originating_dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2Ctr_count,
           { "count", "drsuapi.DsReplicaObjMetaData2Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2Ctr_enumeration_context,
           { "enumeration_context", "drsuapi.DsReplicaObjMetaData2Ctr.enumeration_context", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaObjMetaData2Ctr_array,
           { "array", "drsuapi.DsReplicaObjMetaData2Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_attribute_name,
-          { "attribute_name", "drsuapi.DsReplicaAttrValMetaData2.attribute_name", FT_STRING, BASE_DEC,
+          { "attribute_name", "drsuapi.DsReplicaAttrValMetaData2.attribute_name", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_object_dn,
-          { "object_dn", "drsuapi.DsReplicaAttrValMetaData2.object_dn", FT_STRING, BASE_DEC,
+          { "object_dn", "drsuapi.DsReplicaAttrValMetaData2.object_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_value_length,
           { "value_length", "drsuapi.DsReplicaAttrValMetaData2.value_length", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_value,
           { "value", "drsuapi.DsReplicaAttrValMetaData2.value", FT_UINT8, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_deleted,
           { "deleted", "drsuapi.DsReplicaAttrValMetaData2.deleted", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_created,
           { "created", "drsuapi.DsReplicaAttrValMetaData2.created", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_version,
           { "version", "drsuapi.DsReplicaAttrValMetaData2.version", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_originating_last_changed,
           { "originating_last_changed", "drsuapi.DsReplicaAttrValMetaData2.originating_last_changed", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_originating_dsa_invocation_id,
           { "originating_dsa_invocation_id", "drsuapi.DsReplicaAttrValMetaData2.originating_dsa_invocation_id", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_originating_usn,
           { "originating_usn", "drsuapi.DsReplicaAttrValMetaData2.originating_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_local_usn,
           { "local_usn", "drsuapi.DsReplicaAttrValMetaData2.local_usn", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2_originating_dsa_obj_dn,
-          { "originating_dsa_obj_dn", "drsuapi.DsReplicaAttrValMetaData2.originating_dsa_obj_dn", FT_STRING, BASE_DEC,
+          { "originating_dsa_obj_dn", "drsuapi.DsReplicaAttrValMetaData2.originating_dsa_obj_dn", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2Ctr_count,
           { "count", "drsuapi.DsReplicaAttrValMetaData2Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2Ctr_enumeration_context,
           { "enumeration_context", "drsuapi.DsReplicaAttrValMetaData2Ctr.enumeration_context", FT_INT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaAttrValMetaData2Ctr_array,
           { "array", "drsuapi.DsReplicaAttrValMetaData2Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_u1,
           { "u1", "drsuapi.DsReplicaConnection04.u1", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_u2,
           { "u2", "drsuapi.DsReplicaConnection04.u2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_u3,
           { "u3", "drsuapi.DsReplicaConnection04.u3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_bind_guid,
           { "bind_guid", "drsuapi.DsReplicaConnection04.bind_guid", FT_GUID, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_bind_time,
           { "bind_time", "drsuapi.DsReplicaConnection04.bind_time", FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_u4,
           { "u4", "drsuapi.DsReplicaConnection04.u4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04_u5,
           { "u5", "drsuapi.DsReplicaConnection04.u5", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04Ctr_count,
           { "count", "drsuapi.DsReplicaConnection04Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04Ctr_reserved,
           { "reserved", "drsuapi.DsReplicaConnection04Ctr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaConnection04Ctr_array,
           { "array", "drsuapi.DsReplicaConnection04Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_str1,
-          { "str1", "drsuapi.DsReplica06.str1", FT_STRING, BASE_DEC,
+          { "str1", "drsuapi.DsReplica06.str1", FT_STRING, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u1,
           { "u1", "drsuapi.DsReplica06.u1", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u2,
           { "u2", "drsuapi.DsReplica06.u2", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u3,
           { "u3", "drsuapi.DsReplica06.u3", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u4,
           { "u4", "drsuapi.DsReplica06.u4", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u5,
           { "u5", "drsuapi.DsReplica06.u5", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u6,
           { "u6", "drsuapi.DsReplica06.u6", FT_UINT64, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06_u7,
           { "u7", "drsuapi.DsReplica06.u7", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06Ctr_count,
           { "count", "drsuapi.DsReplica06Ctr.count", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06Ctr_reserved,
           { "reserved", "drsuapi.DsReplica06Ctr.reserved", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplica06Ctr_array,
           { "array", "drsuapi.DsReplica06Ctr.array", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_NEIGHBORS_neighbours,
           { "neighbours", "drsuapi.DsReplicaInfo.neighbours", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_CURSORS_coursors,
           { "coursors", "drsuapi.DsReplicaInfo.coursors", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA_objmetadata,
           { "objmetadata", "drsuapi.DsReplicaInfo.objmetadata", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_KCC_DSA_CONNECT_FAILURES_connectfailures,
           { "connectfailures", "drsuapi.DsReplicaInfo.connectfailures", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_KCC_DSA_LINK_FAILURES_linkfailures,
           { "linkfailures", "drsuapi.DsReplicaInfo.linkfailures", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_PENDING_OPS_pendingops,
           { "pendingops", "drsuapi.DsReplicaInfo.pendingops", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA_attrvalmetadata,
           { "attrvalmetadata", "drsuapi.DsReplicaInfo.attrvalmetadata", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_CURSORS2_coursors2,
           { "coursors2", "drsuapi.DsReplicaInfo.coursors2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_CURSORS3_coursors3,
           { "coursors3", "drsuapi.DsReplicaInfo.coursors3", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_OBJ_METADATA2_objmetadata2,
           { "objmetadata2", "drsuapi.DsReplicaInfo.objmetadata2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_ATTRIBUTE_VALUE_METADATA2_attrvalmetadata2,
           { "attrvalmetadata2", "drsuapi.DsReplicaInfo.attrvalmetadata2", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_NEIGHBORS02_neighbours02,
           { "neighbours02", "drsuapi.DsReplicaInfo.neighbours02", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_CONNECTIONS04_connections04,
           { "connections04", "drsuapi.DsReplicaInfo.connections04", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_CURSURS05_coursors05,
           { "coursors05", "drsuapi.DsReplicaInfo.coursors05", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaInfo_DRSUAPI_DS_REPLICA_INFO_06_i06,
           { "i06", "drsuapi.DsReplicaInfo.i06", FT_NONE, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfo_bind_handle,
           { "bind_handle", "drsuapi.DsReplicaGetInfo.bind_handle", FT_BYTES, BASE_NONE,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfo_level,
           { "level", "drsuapi.DsReplicaGetInfo.level", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsReplicaGetInfoLevel_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfo_req,
           { "req", "drsuapi.DsReplicaGetInfo.req", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfo_info_type,
           { "info_type", "drsuapi.DsReplicaGetInfo.info_type", FT_INT32, BASE_DEC,
           VALS(drsuapi_DsReplicaInfoType_vals), 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
         { &hf_drsuapi_DsReplicaGetInfo_info,
           { "info", "drsuapi.DsReplicaGetInfo.info", FT_UINT32, BASE_DEC,
           NULL, 0,
-         "", HFILL }},
+         NULL, HFILL }},
 
 /* END OF INCLUDED FILE : ETH_HFARR */
 
diff --git a/epan/dissectors/packet-dcerpc-dssetup.c b/epan/dissectors/packet-dcerpc-dssetup.c
index 4117e68ccb..7e4c9d7e02 100644
--- a/epan/dissectors/packet-dcerpc-dssetup.c
+++ b/epan/dissectors/packet-dcerpc-dssetup.c
@@ -848,45 +848,45 @@ void proto_register_dcerpc_dssetup(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_level, 
-	  { "Level", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.level", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRoleInfoLevel_vals), 0, "", HFILL }},
+	  { "Level", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.level", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRoleInfoLevel_vals), 0, NULL, HFILL }},
 	{ &hf_dssetup_opnum, 
-	  { "Operation", "dssetup.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "dssetup.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_flags, 
-	  { "Flags", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Flags", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleUpgradeStatus_previous_role, 
-	  { "Previous Role", "dssetup.dssetup_DsRoleUpgradeStatus.previous_role", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsPrevious_vals), 0, "", HFILL }},
+	  { "Previous Role", "dssetup.dssetup_DsRoleUpgradeStatus.previous_role", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsPrevious_vals), 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleInfo_opstatus, 
-	  { "Opstatus", "dssetup.dssetup_DsRoleInfo.opstatus", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Opstatus", "dssetup.dssetup_DsRoleInfo.opstatus", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_domain_guid, 
-	  { "Domain Guid", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.domain_guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Guid", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.domain_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleOpStatus_status, 
-	  { "Status", "dssetup.dssetup_DsRoleOpStatus.status", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRoleOp_vals), 0, "", HFILL }},
+	  { "Status", "dssetup.dssetup_DsRoleOpStatus.status", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRoleOp_vals), 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleInfo_upgrade, 
-	  { "Upgrade", "dssetup.dssetup_DsRoleInfo.upgrade", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Upgrade", "dssetup.dssetup_DsRoleInfo.upgrade", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleGetPrimaryDomainInformation_info, 
-	  { "Info", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "dssetup.dssetup_DsRoleGetPrimaryDomainInformation.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS, 
-	  { "Ds Role Upgrade In Progress", "dssetup.dssetup_DsRoleFlags.DS_ROLE_UPGRADE_IN_PROGRESS", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Ds Role Upgrade In Progress", "dssetup.dssetup_DsRoleFlags.DS_ROLE_UPGRADE_IN_PROGRESS", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_UPGRADE_IN_PROGRESS_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT, 
-	  { "Ds Role Primary Domain Guid Present", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT_tfs), ( 0x01000000 ), "", HFILL }},
+	  { "Ds Role Primary Domain Guid Present", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DOMAIN_GUID_PRESENT_tfs), ( 0x01000000 ), NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleInfo_basic, 
-	  { "Basic", "dssetup.dssetup_DsRoleInfo.basic", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Basic", "dssetup.dssetup_DsRoleInfo.basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_role, 
-	  { "Role", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.role", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRole_vals), 0, "", HFILL }},
+	  { "Role", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.role", FT_UINT16, BASE_DEC, VALS(dssetup_dssetup_DsRole_vals), 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING, 
-	  { "Ds Role Primary Ds Running", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DS_RUNNING", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Ds Role Primary Ds Running", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DS_RUNNING", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_RUNNING_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_dns_domain, 
-	  { "Dns Domain", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.dns_domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dns Domain", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.dns_domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleUpgradeStatus_upgrading, 
-	  { "Upgrading", "dssetup.dssetup_DsRoleUpgradeStatus.upgrading", FT_UINT32, BASE_DEC, VALS(dssetup_dssetup_DsUpgrade_vals), 0, "", HFILL }},
+	  { "Upgrading", "dssetup.dssetup_DsRoleUpgradeStatus.upgrading", FT_UINT32, BASE_DEC, VALS(dssetup_dssetup_DsUpgrade_vals), 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_domain, 
-	  { "Domain", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_dssetup_werror, 
-	  { "Windows Error", "dssetup.werror", FT_UINT32, BASE_HEX, VALS(DOS_errors), 0, "", HFILL }},
+	  { "Windows Error", "dssetup.werror", FT_UINT32, BASE_HEX, VALS(DOS_errors), 0, NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_MIXED_MODE, 
-	  { "Ds Role Primary Ds Mixed Mode", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DS_MIXED_MODE", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_MIXED_MODE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Ds Role Primary Ds Mixed Mode", "dssetup.dssetup_DsRoleFlags.DS_ROLE_PRIMARY_DS_MIXED_MODE", FT_BOOLEAN, 32, TFS(&dssetup_DsRoleFlags_DS_ROLE_PRIMARY_DS_MIXED_MODE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_dssetup_dssetup_DsRolePrimaryDomInfoBasic_forest, 
-	  { "Forest", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.forest", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Forest", "dssetup.dssetup_DsRolePrimaryDomInfoBasic.forest", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-dtsprovider.c b/epan/dissectors/packet-dcerpc-dtsprovider.c
index 3a48000abd..51965c3800 100644
--- a/epan/dissectors/packet-dcerpc-dtsprovider.c
+++ b/epan/dissectors/packet-dcerpc-dtsprovider.c
@@ -65,7 +65,7 @@ proto_register_dtsprovider (void)
 	static hf_register_info hf[] = {
 	  { &hf_dtsprovider_opnum,
 	    { "Operation", "dtsprovider.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }},
+	      NULL, 0x0, NULL, HFILL }},
 	  { &hf_dtsprovider_status,
 	    { "Status", "dtsprovider.status", FT_UINT32, BASE_DEC,
 	      VALS(dce_error_vals), 0x0, "Return code, status of executed command", HFILL }}
diff --git a/epan/dissectors/packet-dcerpc-dtsstime_req.c b/epan/dissectors/packet-dcerpc-dtsstime_req.c
index a86c9349fc..0f593285c3 100644
--- a/epan/dissectors/packet-dcerpc-dtsstime_req.c
+++ b/epan/dissectors/packet-dcerpc-dtsstime_req.c
@@ -63,7 +63,7 @@ proto_register_dtsstime_req (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_dtsstime_req_opnum,
-		{ "Operation", "dtsstime_req.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}
+		{ "Operation", "dtsstime_req.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-efs.c b/epan/dissectors/packet-dcerpc-efs.c
index b706cf49fb..d138398bb6 100644
--- a/epan/dissectors/packet-dcerpc-efs.c
+++ b/epan/dissectors/packet-dcerpc-efs.c
@@ -1163,69 +1163,69 @@ void proto_register_dcerpc_efs(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_efs_EfsRpcCloseRaw_pvContext, 
-	  { "Pvcontext", "efs.EfsRpcCloseRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pvcontext", "efs.EfsRpcCloseRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcSetFileEncryptionKey_pEncryptionCertificate, 
-	  { "Pencryptioncertificate", "efs.EfsRpcSetFileEncryptionKey.pEncryptionCertificate", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pencryptioncertificate", "efs.EfsRpcSetFileEncryptionKey.pEncryptionCertificate", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcOpenFileRaw_pvContext, 
-	  { "Pvcontext", "efs.EfsRpcOpenFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pvcontext", "efs.EfsRpcOpenFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_pUserSid, 
-	  { "Pusersid", "efs.ENCRYPTION_CERTIFICATE_HASH.pUserSid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Pusersid", "efs.ENCRYPTION_CERTIFICATE_HASH.pUserSid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcReadFileRaw_pvContext, 
-	  { "Pvcontext", "efs.EfsRpcReadFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pvcontext", "efs.EfsRpcReadFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcQueryRecoveryAgents_FileName, 
-	  { "Filename", "efs.EfsRpcQueryRecoveryAgents.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcQueryRecoveryAgents.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcQueryUsersOnFile_FileName, 
-	  { "Filename", "efs.EfsRpcQueryUsersOnFile.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcQueryUsersOnFile.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcOpenFileRaw_FileName, 
-	  { "Filename", "efs.EfsRpcOpenFileRaw.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcOpenFileRaw.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_pCertBlob, 
-	  { "Pcertblob", "efs.ENCRYPTION_CERTIFICATE.pCertBlob", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pcertblob", "efs.ENCRYPTION_CERTIFICATE.pCertBlob", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_opnum, 
-	  { "Operation", "efs.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "efs.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EFS_HASH_BLOB_pbData, 
-	  { "Pbdata", "efs.EFS_HASH_BLOB.pbData", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pbdata", "efs.EFS_HASH_BLOB.pbData", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_lpDisplayInformation, 
-	  { "Lpdisplayinformation", "efs.ENCRYPTION_CERTIFICATE_HASH.lpDisplayInformation", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpdisplayinformation", "efs.ENCRYPTION_CERTIFICATE_HASH.lpDisplayInformation", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcOpenFileRaw_Flags, 
-	  { "Flags", "efs.EfsRpcOpenFileRaw.Flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "efs.EfsRpcOpenFileRaw.Flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EFS_CERTIFICATE_BLOB_pbData, 
-	  { "Pbdata", "efs.EFS_CERTIFICATE_BLOB.pbData", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pbdata", "efs.EFS_CERTIFICATE_BLOB.pbData", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_LIST_nCert_Hash, 
-	  { "Ncert Hash", "efs.ENCRYPTION_CERTIFICATE_HASH_LIST.nCert_Hash", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ncert Hash", "efs.ENCRYPTION_CERTIFICATE_HASH_LIST.nCert_Hash", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcEncryptFileSrv_Filename, 
-	  { "Filename", "efs.EfsRpcEncryptFileSrv.Filename", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcEncryptFileSrv.Filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcRemoveUsersFromFile_FileName, 
-	  { "Filename", "efs.EfsRpcRemoveUsersFromFile.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcRemoveUsersFromFile.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcQueryUsersOnFile_pUsers, 
-	  { "Pusers", "efs.EfsRpcQueryUsersOnFile.pUsers", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pusers", "efs.EfsRpcQueryUsersOnFile.pUsers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcDecryptFileSrv_FileName, 
-	  { "Filename", "efs.EfsRpcDecryptFileSrv.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcDecryptFileSrv.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_TotalLength, 
-	  { "Totallength", "efs.ENCRYPTION_CERTIFICATE.TotalLength", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totallength", "efs.ENCRYPTION_CERTIFICATE.TotalLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcAddUsersToFile_FileName, 
-	  { "Filename", "efs.EfsRpcAddUsersToFile.FileName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Filename", "efs.EfsRpcAddUsersToFile.FileName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcQueryRecoveryAgents_pRecoveryAgents, 
-	  { "Precoveryagents", "efs.EfsRpcQueryRecoveryAgents.pRecoveryAgents", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Precoveryagents", "efs.EfsRpcQueryRecoveryAgents.pRecoveryAgents", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_pHash, 
-	  { "Phash", "efs.ENCRYPTION_CERTIFICATE_HASH.pHash", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Phash", "efs.ENCRYPTION_CERTIFICATE_HASH.pHash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_cbTotalLength, 
-	  { "Cbtotallength", "efs.ENCRYPTION_CERTIFICATE_HASH.cbTotalLength", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbtotallength", "efs.ENCRYPTION_CERTIFICATE_HASH.cbTotalLength", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_werror, 
-	  { "Windows Error", "efs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "efs.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_efs_EFS_HASH_BLOB_cbData, 
-	  { "Cbdata", "efs.EFS_HASH_BLOB.cbData", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbdata", "efs.EFS_HASH_BLOB.cbData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcWriteFileRaw_pvContext, 
-	  { "Pvcontext", "efs.EfsRpcWriteFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pvcontext", "efs.EfsRpcWriteFileRaw.pvContext", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_HASH_LIST_pUsers, 
-	  { "Pusers", "efs.ENCRYPTION_CERTIFICATE_HASH_LIST.pUsers", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pusers", "efs.ENCRYPTION_CERTIFICATE_HASH_LIST.pUsers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_ENCRYPTION_CERTIFICATE_pUserSid, 
-	  { "Pusersid", "efs.ENCRYPTION_CERTIFICATE.pUserSid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Pusersid", "efs.ENCRYPTION_CERTIFICATE.pUserSid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EFS_CERTIFICATE_BLOB_dwCertEncodingType, 
-	  { "Dwcertencodingtype", "efs.EFS_CERTIFICATE_BLOB.dwCertEncodingType", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwcertencodingtype", "efs.EFS_CERTIFICATE_BLOB.dwCertEncodingType", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EfsRpcDecryptFileSrv_Reserved, 
-	  { "Reserved", "efs.EfsRpcDecryptFileSrv.Reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "efs.EfsRpcDecryptFileSrv.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_efs_EFS_CERTIFICATE_BLOB_cbData, 
-	  { "Cbdata", "efs.EFS_CERTIFICATE_BLOB.cbData", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbdata", "efs.EFS_CERTIFICATE_BLOB.cbData", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-epm.c b/epan/dissectors/packet-dcerpc-epm.c
index c3241e6f21..661e0321fd 100644
--- a/epan/dissectors/packet-dcerpc-epm.c
+++ b/epan/dissectors/packet-dcerpc-epm.c
@@ -709,29 +709,29 @@ proto_register_epm (void)
     static hf_register_info hf[] = {
         { &hf_epm_opnum,
 	  { "Operation", "epm.opnum", FT_UINT16, BASE_DEC,
-	    NULL, 0x0, "Operation", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
         { &hf_epm_inquiry_type,
-          { "Inquiry type", "epm.inq_type", FT_UINT32, BASE_DEC, VALS(ep_service), 0x0, "", HFILL }},
+          { "Inquiry type", "epm.inq_type", FT_UINT32, BASE_DEC, VALS(ep_service), 0x0, NULL, HFILL }},
         { &hf_epm_object,
-          { "Object", "epm.object", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Object", "epm.object", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_if_id,
-          { "Interface", "epm.if_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Interface", "epm.if_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_ver_maj,
-          { "Version Major", "epm.ver_maj", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Version Major", "epm.ver_maj", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_ver_min,
-          { "Version Minor", "epm.ver_min", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Version Minor", "epm.ver_min", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_ver_opt,
-          { "Version Option", "epm.ver_opt", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Version Option", "epm.ver_opt", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_hnd,
           { "Handle", "epm.hnd", FT_BYTES, BASE_NONE, NULL, 0x0, "Context handle", HFILL }},
         { &hf_epm_max_ents,
-          { "Max entries", "epm.max_ents", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Max entries", "epm.max_ents", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_num_ents,
-          { "Num entries", "epm.num_ents", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Num entries", "epm.num_ents", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_uuid,
-          { "UUID", "epm.uuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL }},
+          { "UUID", "epm.uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_annotation,
-          { "Annotation", "epm.annotation", FT_STRING, BASE_NONE, NULL, 0x0, "Annotation", HFILL }},
+          { "Annotation", "epm.annotation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_proto_named_pipes,
           { "Named Pipe", "epm.proto.named_pipe", FT_STRING, BASE_NONE, NULL, 0x0, "Name of the named pipe for this service", HFILL }},
         { &hf_epm_proto_netbios_name,
@@ -739,15 +739,15 @@ proto_register_epm (void)
         { &hf_epm_tower_length,
           { "Length", "epm.tower.len", FT_UINT32, BASE_DEC, NULL, 0x0, "Length of tower data", HFILL }},
         { &hf_epm_tower_data,
-          { "Tower", "epm.tower", FT_BYTES, BASE_HEX, NULL, 0x0, "Tower data", HFILL }},
+          { "Tower", "epm.tower", FT_BYTES, BASE_NONE, NULL, 0x0, "Tower data", HFILL }},
         { &hf_epm_max_towers,
           { "Max Towers", "epm.max_towers", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum number of towers to return", HFILL }},
         { &hf_epm_num_towers,
           { "Num Towers", "epm.num_towers", FT_UINT32, BASE_DEC, NULL, 0x0, "Number number of towers to return", HFILL }},
         { &hf_epm_ann_offset,
-          { "Annotation offset", "epm.ann_offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Annotation offset", "epm.ann_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_ann_len,
-          { "Annotation length", "epm.ann_len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Annotation length", "epm.ann_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_epm_rc,
           { "Return code", "epm.rc", FT_UINT32, BASE_HEX, NULL, 0x0, "EPM return value", HFILL }},
         { &hf_epm_replace,
diff --git a/epan/dissectors/packet-dcerpc-eventlog.c b/epan/dissectors/packet-dcerpc-eventlog.c
index 7f90a7627a..817b32e3d5 100644
--- a/epan/dissectors/packet-dcerpc-eventlog.c
+++ b/epan/dissectors/packet-dcerpc-eventlog.c
@@ -2175,173 +2175,173 @@ void proto_register_dcerpc_eventlog(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_eventlog_eventlog_ReadEventLogW_offset, 
-	  { "Offset", "eventlog.eventlog_ReadEventLogW.offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Offset", "eventlog.eventlog_ReadEventLogW.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ChangeNotify_unknown2, 
-	  { "Unknown2", "eventlog.eventlog_ChangeNotify.unknown2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown2", "eventlog.eventlog_ChangeNotify.unknown2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ChangeNotify_unknown3, 
-	  { "Unknown3", "eventlog.eventlog_ChangeNotify.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "eventlog.eventlog_ChangeNotify.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_data_offset, 
-	  { "Data Offset", "eventlog.eventlog_Record.data_offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data Offset", "eventlog.eventlog_Record.data_offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_sid_length, 
-	  { "Sid Length", "eventlog.eventlog_Record.sid_length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Length", "eventlog.eventlog_Record.sid_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_handle, 
-	  { "Handle", "eventlog.eventlog_RegisterEventSourceW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_RegisterEventSourceW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_BackupEventLogW_backupfilename, 
-	  { "Backupfilename", "eventlog.eventlog_BackupEventLogW.backupfilename", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Backupfilename", "eventlog.eventlog_BackupEventLogW.backupfilename", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ChangeUnknown0_unknown0, 
-	  { "Unknown0", "eventlog.eventlog_ChangeUnknown0.unknown0", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown0", "eventlog.eventlog_ChangeUnknown0.unknown0", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_computer_name, 
-	  { "Computer Name", "eventlog.eventlog_Record.computer_name", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Computer Name", "eventlog.eventlog_Record.computer_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_SUCCESS, 
-	  { "Eventlog Success", "eventlog.eventlogEventTypes.EVENTLOG_SUCCESS", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_SUCCESS_tfs), ( 0x0000 ), "", HFILL }},
+	  { "Eventlog Success", "eventlog.eventlogEventTypes.EVENTLOG_SUCCESS", FT_BOOLEAN, BASE_NONE, TFS(&eventlogEventTypes_EVENTLOG_SUCCESS_tfs), ( 0x0 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ChangeUnknown0_unknown1, 
-	  { "Unknown1", "eventlog.eventlog_ChangeUnknown0.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "eventlog.eventlog_ChangeUnknown0.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_strings, 
-	  { "Strings", "eventlog.eventlog_Record.strings", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Strings", "eventlog.eventlog_Record.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetLogIntormation_cbBytesNeeded, 
-	  { "Cbbytesneeded", "eventlog.eventlog_GetLogIntormation.cbBytesNeeded", FT_INT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbbytesneeded", "eventlog.eventlog_GetLogIntormation.cbBytesNeeded", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetNumRecords_handle, 
-	  { "Handle", "eventlog.eventlog_GetNumRecords.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_GetNumRecords.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_status, 
-	  { "NT Error", "eventlog.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, "", HFILL }},
+	  { "NT Error", "eventlog.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_sid_offset, 
-	  { "Sid Offset", "eventlog.eventlog_Record.sid_offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Offset", "eventlog.eventlog_Record.sid_offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenBackupEventLogW_logname, 
-	  { "Logname", "eventlog.eventlog_OpenBackupEventLogW.logname", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Logname", "eventlog.eventlog_OpenBackupEventLogW.logname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_source_name, 
-	  { "Source Name", "eventlog.eventlog_Record.source_name", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Source Name", "eventlog.eventlog_Record.source_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_handle, 
-	  { "Handle", "eventlog.eventlog_ReadEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_ReadEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ClearEventLogW_backupfilename, 
-	  { "Backupfilename", "eventlog.eventlog_ClearEventLogW.backupfilename", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Backupfilename", "eventlog.eventlog_ClearEventLogW.backupfilename", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_Record_string, 
-	  { "string", "eventlog.Record.string", FT_STRING, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "string", "eventlog.Record.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_servername, 
-	  { "Servername", "eventlog.eventlog_OpenEventLogW.servername", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Servername", "eventlog.eventlog_OpenEventLogW.servername", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_event_type, 
-	  { "Event Type", "eventlog.eventlog_Record.event_type", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Event Type", "eventlog.eventlog_Record.event_type", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_real_size, 
-	  { "Real Size", "eventlog.eventlog_ReadEventLogW.real_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Real Size", "eventlog.eventlog_ReadEventLogW.real_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_CloseEventLog_handle, 
-	  { "Handle", "eventlog.eventlog_CloseEventLog.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_CloseEventLog.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_SUCCESS, 
-	  { "Eventlog Audit Success", "eventlog.eventlogEventTypes.EVENTLOG_AUDIT_SUCCESS", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_AUDIT_SUCCESS_tfs), ( 0x0008 ), "", HFILL }},
+	  { "Eventlog Audit Success", "eventlog.eventlogEventTypes.EVENTLOG_AUDIT_SUCCESS", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_AUDIT_SUCCESS_tfs), ( 0x0008 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_logname, 
-	  { "Logname", "eventlog.eventlog_RegisterEventSourceW.logname", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Logname", "eventlog.eventlog_RegisterEventSourceW.logname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_num_of_strings, 
-	  { "Num Of Strings", "eventlog.eventlog_Record.num_of_strings", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Of Strings", "eventlog.eventlog_Record.num_of_strings", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_time_written, 
-	  { "Time Written", "eventlog.eventlog_Record.time_written", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time Written", "eventlog.eventlog_Record.time_written", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_flags, 
-	  { "Flags", "eventlog.eventlog_ReadEventLogW.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "eventlog.eventlog_ReadEventLogW.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_size, 
-	  { "Size", "eventlog.eventlog_Record.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "eventlog.eventlog_Record.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_record_number, 
-	  { "Record Number", "eventlog.eventlog_Record.record_number", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Record Number", "eventlog.eventlog_Record.record_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetLogIntormation_cbBufSize, 
-	  { "Cbbufsize", "eventlog.eventlog_GetLogIntormation.cbBufSize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbbufsize", "eventlog.eventlog_GetLogIntormation.cbBufSize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetLogIntormation_handle, 
-	  { "Handle", "eventlog.eventlog_GetLogIntormation.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_GetLogIntormation.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_number_of_bytes, 
-	  { "Number Of Bytes", "eventlog.eventlog_ReadEventLogW.number_of_bytes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Number Of Bytes", "eventlog.eventlog_ReadEventLogW.number_of_bytes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_servername, 
-	  { "Servername", "eventlog.eventlog_RegisterEventSourceW.servername", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Servername", "eventlog.eventlog_RegisterEventSourceW.servername", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_reserved, 
-	  { "Reserved", "eventlog.eventlog_Record.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "eventlog.eventlog_Record.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_AUDIT_FAILURE, 
-	  { "Eventlog Audit Failure", "eventlog.eventlogEventTypes.EVENTLOG_AUDIT_FAILURE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_AUDIT_FAILURE_tfs), ( 0x0010 ), "", HFILL }},
+	  { "Eventlog Audit Failure", "eventlog.eventlogEventTypes.EVENTLOG_AUDIT_FAILURE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_AUDIT_FAILURE_tfs), ( 0x0010 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_raw_data, 
-	  { "Raw Data", "eventlog.eventlog_Record.raw_data", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Raw Data", "eventlog.eventlog_Record.raw_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ChangeNotify_handle, 
-	  { "Handle", "eventlog.eventlog_ChangeNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_ChangeNotify.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_WARNING_TYPE, 
-	  { "Eventlog Warning Type", "eventlog.eventlogEventTypes.EVENTLOG_WARNING_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_WARNING_TYPE_tfs), ( 0x0002 ), "", HFILL }},
+	  { "Eventlog Warning Type", "eventlog.eventlogEventTypes.EVENTLOG_WARNING_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_WARNING_TYPE_tfs), ( 0x0002 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenUnknown0_unknown0, 
-	  { "Unknown0", "eventlog.eventlog_OpenUnknown0.unknown0", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown0", "eventlog.eventlog_OpenUnknown0.unknown0", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenUnknown0_unknown1, 
-	  { "Unknown1", "eventlog.eventlog_OpenUnknown0.unknown1", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "eventlog.eventlog_OpenUnknown0.unknown1", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_Record_length, 
-	  { "Record Length", "eventlog.Record.length", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Record Length", "eventlog.Record.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogReadFlags_EVENTLOG_SEEK_READ, 
-	  { "Eventlog Seek Read", "eventlog.eventlogReadFlags.EVENTLOG_SEEK_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_SEEK_READ_tfs), ( 0x0002 ), "", HFILL }},
+	  { "Eventlog Seek Read", "eventlog.eventlogReadFlags.EVENTLOG_SEEK_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_SEEK_READ_tfs), ( 0x0002 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlogReadFlags_EVENTLOG_BACKWARDS_READ, 
-	  { "Eventlog Backwards Read", "eventlog.eventlogReadFlags.EVENTLOG_BACKWARDS_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_BACKWARDS_READ_tfs), ( 0x0008 ), "", HFILL }},
+	  { "Eventlog Backwards Read", "eventlog.eventlogReadFlags.EVENTLOG_BACKWARDS_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_BACKWARDS_READ_tfs), ( 0x0008 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_data, 
-	  { "Data", "eventlog.eventlog_ReadEventLogW.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "eventlog.eventlog_ReadEventLogW.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_event_category, 
-	  { "Event Category", "eventlog.eventlog_Record.event_category", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Event Category", "eventlog.eventlog_Record.event_category", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_DeregisterEventSource_handle, 
-	  { "Handle", "eventlog.eventlog_DeregisterEventSource.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_DeregisterEventSource.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_ERROR_TYPE, 
-	  { "Eventlog Error Type", "eventlog.eventlogEventTypes.EVENTLOG_ERROR_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_ERROR_TYPE_tfs), ( 0x0001 ), "", HFILL }},
+	  { "Eventlog Error Type", "eventlog.eventlogEventTypes.EVENTLOG_ERROR_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_ERROR_TYPE_tfs), ( 0x0001 ), NULL, HFILL }},
 	{ &hf_eventlog_Record_source_name, 
-	  { "Source Name", "eventlog.Record.source_name", FT_STRING, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Source Name", "eventlog.Record.source_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ReadEventLogW_sent_size, 
-	  { "Sent Size", "eventlog.eventlog_ReadEventLogW.sent_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sent Size", "eventlog.eventlog_ReadEventLogW.sent_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogEventTypes_EVENTLOG_INFORMATION_TYPE, 
-	  { "Eventlog Information Type", "eventlog.eventlogEventTypes.EVENTLOG_INFORMATION_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_INFORMATION_TYPE_tfs), ( 0x0004 ), "", HFILL }},
+	  { "Eventlog Information Type", "eventlog.eventlogEventTypes.EVENTLOG_INFORMATION_TYPE", FT_BOOLEAN, 32, TFS(&eventlogEventTypes_EVENTLOG_INFORMATION_TYPE_tfs), ( 0x0004 ), NULL, HFILL }},
 	{ &hf_eventlog_opnum, 
-	  { "Operation", "eventlog.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "eventlog.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_time_generated, 
-	  { "Time Generated", "eventlog.eventlog_Record.time_generated", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time Generated", "eventlog.eventlog_Record.time_generated", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_stringoffset, 
-	  { "Stringoffset", "eventlog.eventlog_Record.stringoffset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Stringoffset", "eventlog.eventlog_Record.stringoffset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_Record_computer_name, 
-	  { "Computer Name", "eventlog.Record.computer_name", FT_STRING, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Computer Name", "eventlog.Record.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenBackupEventLogW_unknown0, 
-	  { "Unknown0", "eventlog.eventlog_OpenBackupEventLogW.unknown0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown0", "eventlog.eventlog_OpenBackupEventLogW.unknown0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogReadFlags_EVENTLOG_FORWARDS_READ, 
-	  { "Eventlog Forwards Read", "eventlog.eventlogReadFlags.EVENTLOG_FORWARDS_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_FORWARDS_READ_tfs), ( 0x0004 ), "", HFILL }},
+	  { "Eventlog Forwards Read", "eventlog.eventlogReadFlags.EVENTLOG_FORWARDS_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_FORWARDS_READ_tfs), ( 0x0004 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenBackupEventLogW_unknown2, 
-	  { "Unknown2", "eventlog.eventlog_OpenBackupEventLogW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "eventlog.eventlog_OpenBackupEventLogW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenBackupEventLogW_unknown3, 
-	  { "Unknown3", "eventlog.eventlog_OpenBackupEventLogW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "eventlog.eventlog_OpenBackupEventLogW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_event_id, 
-	  { "Event Id", "eventlog.eventlog_Record.event_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Event Id", "eventlog.eventlog_Record.event_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetNumRecords_number, 
-	  { "Number", "eventlog.eventlog_GetNumRecords.number", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Number", "eventlog.eventlog_GetNumRecords.number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_unknown0, 
-	  { "Unknown0", "eventlog.eventlog_OpenEventLogW.unknown0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown0", "eventlog.eventlog_OpenEventLogW.unknown0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetLogIntormation_dwInfoLevel, 
-	  { "Dwinfolevel", "eventlog.eventlog_GetLogIntormation.dwInfoLevel", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwinfolevel", "eventlog.eventlog_GetLogIntormation.dwInfoLevel", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_unknown2, 
-	  { "Unknown2", "eventlog.eventlog_OpenEventLogW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "eventlog.eventlog_OpenEventLogW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_unknown3, 
-	  { "Unknown3", "eventlog.eventlog_OpenEventLogW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "eventlog.eventlog_OpenEventLogW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_reserved_flags, 
-	  { "Reserved Flags", "eventlog.eventlog_Record.reserved_flags", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved Flags", "eventlog.eventlog_Record.reserved_flags", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_logname, 
-	  { "Logname", "eventlog.eventlog_OpenEventLogW.logname", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Logname", "eventlog.eventlog_OpenEventLogW.logname", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetLogIntormation_lpBuffer, 
-	  { "Lpbuffer", "eventlog.eventlog_GetLogIntormation.lpBuffer", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpbuffer", "eventlog.eventlog_GetLogIntormation.lpBuffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlogReadFlags_EVENTLOG_SEQUENTIAL_READ, 
-	  { "Eventlog Sequential Read", "eventlog.eventlogReadFlags.EVENTLOG_SEQUENTIAL_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_SEQUENTIAL_READ_tfs), ( 0x0001 ), "", HFILL }},
+	  { "Eventlog Sequential Read", "eventlog.eventlogReadFlags.EVENTLOG_SEQUENTIAL_READ", FT_BOOLEAN, 32, TFS(&eventlogReadFlags_EVENTLOG_SEQUENTIAL_READ_tfs), ( 0x0001 ), NULL, HFILL }},
 	{ &hf_eventlog_eventlog_FlushEventLog_handle, 
-	  { "Handle", "eventlog.eventlog_FlushEventLog.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_FlushEventLog.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetOldestRecord_oldest, 
-	  { "Oldest", "eventlog.eventlog_GetOldestRecord.oldest", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oldest", "eventlog.eventlog_GetOldestRecord.oldest", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_unknown0, 
-	  { "Unknown0", "eventlog.eventlog_RegisterEventSourceW.unknown0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown0", "eventlog.eventlog_RegisterEventSourceW.unknown0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_BackupEventLogW_handle, 
-	  { "Handle", "eventlog.eventlog_BackupEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_BackupEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenEventLogW_handle, 
-	  { "Handle", "eventlog.eventlog_OpenEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_OpenEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_unknown2, 
-	  { "Unknown2", "eventlog.eventlog_RegisterEventSourceW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "eventlog.eventlog_RegisterEventSourceW.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_data_length, 
-	  { "Data Length", "eventlog.eventlog_Record.data_length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data Length", "eventlog.eventlog_Record.data_length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_GetOldestRecord_handle, 
-	  { "Handle", "eventlog.eventlog_GetOldestRecord.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_GetOldestRecord.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_RegisterEventSourceW_unknown3, 
-	  { "Unknown3", "eventlog.eventlog_RegisterEventSourceW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "eventlog.eventlog_RegisterEventSourceW.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_ClearEventLogW_handle, 
-	  { "Handle", "eventlog.eventlog_ClearEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_ClearEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_Record, 
-	  { "Record", "eventlog.Record", FT_NONE, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Record", "eventlog.Record", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_Record_closing_record_number, 
-	  { "Closing Record Number", "eventlog.eventlog_Record.closing_record_number", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Closing Record Number", "eventlog.eventlog_Record.closing_record_number", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_eventlog_eventlog_OpenBackupEventLogW_handle, 
-	  { "Handle", "eventlog.eventlog_OpenBackupEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "eventlog.eventlog_OpenBackupEventLogW.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-fileexp.c b/epan/dissectors/packet-dcerpc-fileexp.c
index a3ad46f6f5..5ff842ef7e 100644
--- a/epan/dissectors/packet-dcerpc-fileexp.c
+++ b/epan/dissectors/packet-dcerpc-fileexp.c
@@ -4351,122 +4351,122 @@ proto_register_fileexp (void)
 
 
   static hf_register_info hf[] = {
-    { &hf_error_st, {"AFS4Int Error Status Code", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_flags, {"DFS Flags", "fileexp.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_tn_string, {"String ", "fileexp.string", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_tn_size, {"String Size", "fileexp.tn_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_opnum, {"Operation", "fileexp.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL}},
-    { &hf_fileexp_setcontext_rqst_epochtime, {"EpochTime:", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL}},
+    { &hf_error_st, {"AFS4Int Error Status Code", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_flags, {"DFS Flags", "fileexp.flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_tn_string, {"String", "fileexp.string", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_tn_size, {"String Size", "fileexp.tn_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_opnum, {"Operation", "fileexp.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_setcontext_rqst_epochtime, {"EpochTime:", "fileexp.setcontext_rqst_epochtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     { &hf_fileexp_setcontext_rqst_secobjectid, { "SetObjectid:", "fileexp.setcontext_secobjextid", FT_STRING, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
-    { &hf_fileexp_setcontext_rqst_clientsizesattrs, { "ClientSizeAttrs:", "fileexp.setcontext_clientsizesattrs", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_setcontext_rqst_parm7, { "Parm7:", "fileexp.setcontext.parm7", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_acl_len, {"Acl Length", "fileexp.acl_len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_acltype, {"fileexp.acltype", "fileexp.acltype", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_minvvp_high, {"fileexp.minvvp_high", "fileexp.minvvp_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_minvvp_low, {"fileexp.minvvp_low", "fileexp.minvvp_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_volume_low, { "fileexp.volume_low", "fileexp.volume_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_volume_high, { "fileexp.volume_high", "fileexp.volume_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vnode, { "fileexp.vnode", "fileexp.vnode", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_unique, { "fileexp.unique", "fileexp.unique", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_accesstime_msec, { "fileexp.accesstime_msec", "fileexp.accesstime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_accesstime_sec, { "fileexp.accesstime_sec", "fileexp.accesstime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_aclexpirationtime, { "fileexp.aclexpirationtime", "fileexp.aclexpirationtime", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_agtypeunique, { "fileexp.agtypeunique", "fileexp.agtypeunique", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_anonymousaccess, { "fileexp.anonymousaccess", "fileexp.anonymousaccess", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_author, { "fileexp.author", "fileexp.author", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_blocksused, { "fileexp.blocksused", "fileexp.blocksused", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} },
-    { &hf_fileexp_calleraccess, { "fileexp.calleraccess", "fileexp.calleraccess", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_changetime_msec, { "fileexp.changetime_msec", "fileexp.changetime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_changetime_sec, { "fileexp.changetime_sec", "fileexp.changetime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_clientspare1, { "fileexp.clientspare1", "fileexp.clientspare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_dataversion_high, { "fileexp.dataversion_high", "fileexp.dataversion_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_dataversion_low, { "fileexp.dataversion_low", "fileexp.dataversion_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_devicenumber, { "fileexp.devicenumber", "fileexp.devicenumber", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_devicenumberhighbits, { "fileexp.devicenumberhighbits", "fileexp.devicenumberhighbits", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_filetype, { "fileexp.filetype", "fileexp.filetype", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_group, { "fileexp.group", "fileexp.group", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_himaxspare, { "fileexp.himaxspare", "fileexp.himaxspare", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_interfaceversion, { "fileexp.interfaceversion", "fileexp.interfaceversion", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_length_high, { "fileexp.length_high", "fileexp.length_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_length_low, { "fileexp.length_low", "fileexp.length_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } , 
-    { &hf_fileexp_linkcount, { "fileexp.linkcount", "fileexp.linkcount", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_lomaxspare, { "fileexp.lomaxspare", "fileexp.lomaxspare", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_mode, { "fileexp.mode", "fileexp.mode", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_modtime_msec, { "fileexp.modtime_msec", "fileexp.modtime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_modtime_sec, { "fileexp.modtime_sec", "fileexp.modtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
+    { &hf_fileexp_setcontext_rqst_clientsizesattrs, { "ClientSizeAttrs:", "fileexp.setcontext_clientsizesattrs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_setcontext_rqst_parm7, { "Parm7:", "fileexp.setcontext.parm7", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_acl_len, {"Acl Length", "fileexp.acl_len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_acltype, {"fileexp.acltype", "fileexp.acltype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_minvvp_high, {"fileexp.minvvp_high", "fileexp.minvvp_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_minvvp_low, {"fileexp.minvvp_low", "fileexp.minvvp_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_volume_low, { "fileexp.volume_low", "fileexp.volume_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_volume_high, { "fileexp.volume_high", "fileexp.volume_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vnode, { "fileexp.vnode", "fileexp.vnode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_unique, { "fileexp.unique", "fileexp.unique", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_accesstime_msec, { "fileexp.accesstime_msec", "fileexp.accesstime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_accesstime_sec, { "fileexp.accesstime_sec", "fileexp.accesstime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_aclexpirationtime, { "fileexp.aclexpirationtime", "fileexp.aclexpirationtime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_agtypeunique, { "fileexp.agtypeunique", "fileexp.agtypeunique", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_anonymousaccess, { "fileexp.anonymousaccess", "fileexp.anonymousaccess", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_author, { "fileexp.author", "fileexp.author", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_blocksused, { "fileexp.blocksused", "fileexp.blocksused", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} },
+    { &hf_fileexp_calleraccess, { "fileexp.calleraccess", "fileexp.calleraccess", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_changetime_msec, { "fileexp.changetime_msec", "fileexp.changetime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_changetime_sec, { "fileexp.changetime_sec", "fileexp.changetime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_clientspare1, { "fileexp.clientspare1", "fileexp.clientspare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_dataversion_high, { "fileexp.dataversion_high", "fileexp.dataversion_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_dataversion_low, { "fileexp.dataversion_low", "fileexp.dataversion_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_devicenumber, { "fileexp.devicenumber", "fileexp.devicenumber", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_devicenumberhighbits, { "fileexp.devicenumberhighbits", "fileexp.devicenumberhighbits", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_filetype, { "fileexp.filetype", "fileexp.filetype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_group, { "fileexp.group", "fileexp.group", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_himaxspare, { "fileexp.himaxspare", "fileexp.himaxspare", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_interfaceversion, { "fileexp.interfaceversion", "fileexp.interfaceversion", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_length_high, { "fileexp.length_high", "fileexp.length_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_length_low, { "fileexp.length_low", "fileexp.length_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } , 
+    { &hf_fileexp_linkcount, { "fileexp.linkcount", "fileexp.linkcount", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_lomaxspare, { "fileexp.lomaxspare", "fileexp.lomaxspare", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_mode, { "fileexp.mode", "fileexp.mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_modtime_msec, { "fileexp.modtime_msec", "fileexp.modtime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_modtime_sec, { "fileexp.modtime_sec", "fileexp.modtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
     { &hf_fileexp_objectuuid, { "fileexp.objectuuid", "fileexp.objectuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
-    { &hf_fileexp_owner, { "fileexp.owner", "fileexp.owner", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_parentunique, { "fileexp.parentunique", "fileexp.parentunique", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_parentvnode, { "fileexp.parentvnode", "fileexp.parentvnode", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_pathconfspare, { "fileexp.pathconfspare", "fileexp.pathconfspare", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_servermodtime_msec, { "fileexp.servermodtime_msec", "fileexp.servermodtime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_servermodtime_sec, { "fileexp.servermodtime_sec", "fileexp.servermodtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_spare4, { "fileexp.spare4", "fileexp.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_spare5, { "fileexp.spare5", "fileexp.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_spare6, { "fileexp.spare6", "fileexp.spare6", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
+    { &hf_fileexp_owner, { "fileexp.owner", "fileexp.owner", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_parentunique, { "fileexp.parentunique", "fileexp.parentunique", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_parentvnode, { "fileexp.parentvnode", "fileexp.parentvnode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_pathconfspare, { "fileexp.pathconfspare", "fileexp.pathconfspare", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_servermodtime_msec, { "fileexp.servermodtime_msec", "fileexp.servermodtime_msec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_servermodtime_sec, { "fileexp.servermodtime_sec", "fileexp.servermodtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_spare4, { "fileexp.spare4", "fileexp.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_spare5, { "fileexp.spare5", "fileexp.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_spare6, { "fileexp.spare6", "fileexp.spare6", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
     { &hf_fileexp_typeuuid, { "fileexp.typeuuid", "fileexp.typeuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
-    { &hf_fileexp_volid_hi, { "fileexp.volid_hi", "fileexp.volid_hi", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_volid_low, { "fileexp.volid_low", "fileexp.volid_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vvage, { "fileexp.vvage", "fileexp.vvage", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vv_hi, { "fileexp.vv_hi", "fileexp.vv_hi", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vv_low, { "fileexp.vv_low", "fileexp.vv_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vvpingage, { "fileexp.vvpingage", "fileexp.vvpingage", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vvspare1, { "fileexp.vvspare1", "fileexp.vvspare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_vvspare2, { "fileexp.vvspare2", "fileexp.vvspare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_beginrange, { "fileexp.beginrange", "fileexp.beginrange", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_beginrangeext, { "fileexp.beginrangeext", "fileexp.beginrangeext", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_endrange, { "fileexp.endrange", "fileexp.endrange", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_endrangeext, { "fileexp.endrangeext", "fileexp.endrangeext", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_expirationtime, { "fileexp.expirationtime", "fileexp.expirationtime", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_tokenid_hi, { "fileexp.tokenid_hi", "fileexp.tokenid_hi", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_tokenid_low, { "fileexp.tokenid_low", "fileexp.tokenid_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_type_hi, { "fileexp.type_hi", "fileexp.type_hi", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_type_low, { "fileexp.type_low", "fileexp.type_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_tn_length, { "fileexp.tn_length", "fileexp.tn_length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL} } , 
-    { &hf_fileexp_tn_tag, { "fileexp.tn_tag", "fileexp.tn_tag", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_accesstime_sec, { "fileexp.storestatus_accesstime_sec", "fileexp.storestatus_accesstime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_accesstime_usec, { "fileexp.storestatus_accesstime_usec", "fileexp.storestatus_accesstime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_changetime_sec, { "fileexp.storestatus_changetime_sec", "fileexp.storestatus_changetime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_changetime_usec, { "fileexp.storestatus_changetime_usec", "fileexp.storestatus_changetime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_clientspare1, { "fileexp.storestatus_clientspare1", "fileexp.storestatus_clientspare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_cmask, { "fileexp.storestatus_cmask", "fileexp.storestatus_cmask", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_devicenumber, { "fileexp.storestatus_devicenumber", "fileexp.storestatus_devicenumber", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_devicenumberhighbits, { "fileexp.storestatus_devicenumberhighbits", "fileexp.storestatus_devicenumberhighbits", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_devicetype, { "fileexp.storestatus_devicetype", "fileexp.storestatus_devicetype", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_group, { "fileexp.storestatus_group", "fileexp.storestatus_group", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_length_high, { "fileexp.storestatus_length_high", "fileexp.storestatus_length_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_length_low, { "fileexp.storestatus_length_low", "fileexp.storestatus_length_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_mask, { "fileexp.storestatus_mask", "fileexp.storestatus_mask", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_mode, { "fileexp.storestatus_mode", "fileexp.storestatus_mode", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_modtime_sec, { "fileexp.storestatus_modtime_sec", "fileexp.storestatus_modtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_modtime_usec, { "fileexp.storestatus_modtime_usec", "fileexp.storestatus_modtime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_owner, { "fileexp.storestatus_owner", "fileexp.storestatus_owner", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare1, { "fileexp.storestatus_spare1", "fileexp.storestatus_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare2, { "fileexp.storestatus_spare2", "fileexp.storestatus_spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare3, { "fileexp.storestatus_spare3", "fileexp.storestatus_spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare4, { "fileexp.storestatus_spare4", "fileexp.storestatus_spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare5, { "fileexp.storestatus_spare5", "fileexp.storestatus_spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_spare6, { "fileexp.storestatus_spare6", "fileexp.storestatus_spare6", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_trunc_high, { "fileexp.storestatus_trunc_high", "fileexp.storestatus_trunc_high", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_storestatus_trunc_low, { "fileexp.storestatus_trunc_low", "fileexp.storestatus_trunc_low", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
+    { &hf_fileexp_volid_hi, { "fileexp.volid_hi", "fileexp.volid_hi", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_volid_low, { "fileexp.volid_low", "fileexp.volid_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vvage, { "fileexp.vvage", "fileexp.vvage", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vv_hi, { "fileexp.vv_hi", "fileexp.vv_hi", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vv_low, { "fileexp.vv_low", "fileexp.vv_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vvpingage, { "fileexp.vvpingage", "fileexp.vvpingage", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vvspare1, { "fileexp.vvspare1", "fileexp.vvspare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_vvspare2, { "fileexp.vvspare2", "fileexp.vvspare2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_beginrange, { "fileexp.beginrange", "fileexp.beginrange", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_beginrangeext, { "fileexp.beginrangeext", "fileexp.beginrangeext", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_endrange, { "fileexp.endrange", "fileexp.endrange", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_endrangeext, { "fileexp.endrangeext", "fileexp.endrangeext", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_expirationtime, { "fileexp.expirationtime", "fileexp.expirationtime", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_tokenid_hi, { "fileexp.tokenid_hi", "fileexp.tokenid_hi", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_tokenid_low, { "fileexp.tokenid_low", "fileexp.tokenid_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_type_hi, { "fileexp.type_hi", "fileexp.type_hi", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_type_low, { "fileexp.type_low", "fileexp.type_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_tn_length, { "fileexp.tn_length", "fileexp.tn_length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL} } , 
+    { &hf_fileexp_tn_tag, { "fileexp.tn_tag", "fileexp.tn_tag", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_accesstime_sec, { "fileexp.storestatus_accesstime_sec", "fileexp.storestatus_accesstime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_accesstime_usec, { "fileexp.storestatus_accesstime_usec", "fileexp.storestatus_accesstime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_changetime_sec, { "fileexp.storestatus_changetime_sec", "fileexp.storestatus_changetime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_changetime_usec, { "fileexp.storestatus_changetime_usec", "fileexp.storestatus_changetime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_clientspare1, { "fileexp.storestatus_clientspare1", "fileexp.storestatus_clientspare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_cmask, { "fileexp.storestatus_cmask", "fileexp.storestatus_cmask", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_devicenumber, { "fileexp.storestatus_devicenumber", "fileexp.storestatus_devicenumber", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_devicenumberhighbits, { "fileexp.storestatus_devicenumberhighbits", "fileexp.storestatus_devicenumberhighbits", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_devicetype, { "fileexp.storestatus_devicetype", "fileexp.storestatus_devicetype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_group, { "fileexp.storestatus_group", "fileexp.storestatus_group", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_length_high, { "fileexp.storestatus_length_high", "fileexp.storestatus_length_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_length_low, { "fileexp.storestatus_length_low", "fileexp.storestatus_length_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_mask, { "fileexp.storestatus_mask", "fileexp.storestatus_mask", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_mode, { "fileexp.storestatus_mode", "fileexp.storestatus_mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_modtime_sec, { "fileexp.storestatus_modtime_sec", "fileexp.storestatus_modtime_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_modtime_usec, { "fileexp.storestatus_modtime_usec", "fileexp.storestatus_modtime_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_owner, { "fileexp.storestatus_owner", "fileexp.storestatus_owner", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare1, { "fileexp.storestatus_spare1", "fileexp.storestatus_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare2, { "fileexp.storestatus_spare2", "fileexp.storestatus_spare2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare3, { "fileexp.storestatus_spare3", "fileexp.storestatus_spare3", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare4, { "fileexp.storestatus_spare4", "fileexp.storestatus_spare4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare5, { "fileexp.storestatus_spare5", "fileexp.storestatus_spare5", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_spare6, { "fileexp.storestatus_spare6", "fileexp.storestatus_spare6", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_trunc_high, { "fileexp.storestatus_trunc_high", "fileexp.storestatus_trunc_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_storestatus_trunc_low, { "fileexp.storestatus_trunc_low", "fileexp.storestatus_trunc_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
     { &hf_fileexp_storestatus_typeuuid, { "fileexp.storestatus_typeuuid", "fileexp.storestatus_typeuuid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID", HFILL} } ,
-    { &hf_fileexp_st, { "fileexp.st", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_uint, {"fileexp.uint", "fileexp.uint", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
-    { &hf_fileexp_l_end_pos, { "fileexp.l_end_pos", "fileexp.l_end_pos", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_end_pos_ext, { "fileexp.l_end_pos_ext", "fileexp.l_end_pos_ext", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_fstype, { "fileexp.l_fstype", "fileexp.l_fstype", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_pid, { "fileexp.l_pid", "fileexp.l_pid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_start_pos, { "fileexp.l_start_pos", "fileexp.l_start_pos", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_start_pos_ext, { "fileexp.l_start_pos_ext", "fileexp.l_start_pos_ext", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_sysid, { "fileexp.l_sysid", "fileexp.l_sysid", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_type, { "fileexp.l_type", "fileexp.l_type", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
-    { &hf_fileexp_l_whence, { "fileexp.l_whence", "fileexp.l_whence", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL} } ,
+    { &hf_fileexp_st, { "fileexp.st", "fileexp.st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_uint, {"fileexp.uint", "fileexp.uint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+    { &hf_fileexp_l_end_pos, { "fileexp.l_end_pos", "fileexp.l_end_pos", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_end_pos_ext, { "fileexp.l_end_pos_ext", "fileexp.l_end_pos_ext", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_fstype, { "fileexp.l_fstype", "fileexp.l_fstype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_pid, { "fileexp.l_pid", "fileexp.l_pid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_start_pos, { "fileexp.l_start_pos", "fileexp.l_start_pos", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_start_pos_ext, { "fileexp.l_start_pos_ext", "fileexp.l_start_pos_ext", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_sysid, { "fileexp.l_sysid", "fileexp.l_sysid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_type, { "fileexp.l_type", "fileexp.l_type", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
+    { &hf_fileexp_l_whence, { "fileexp.l_whence", "fileexp.l_whence", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL} } ,
     {&hf_afsconnparams_mask,
      {"hf_afsconnparams_mask", "hf_afsconnparams_mask",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_afsconnparams_values,
      {"hf_afsconnparams_values", "hf_afsconnparams_values",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsFid_cell_high,
      {"Cell High", "fileexp.afsFid.cell_high", FT_UINT32, BASE_HEX, NULL, 0x0,
       "afsFid Cell High", HFILL}},
@@ -4486,91 +4486,91 @@ proto_register_fileexp (void)
      {"Unique", "fileexp.afsFid.Unique", FT_UINT32, BASE_HEX, NULL, 0x0,
       "afsFid Unique", HFILL}},
     {&hf_fileexp_afsNetAddr_type,
-     {"Type", "afsNetAddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Type", "afsNetAddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsNetAddr_data,
-     {"IP Data", "afsNetAddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+     {"IP Data", "afsNetAddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fileexp_position_high,
      {"Position High", "fileexp.position_high", FT_UINT32, BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fileexp_position_low,
      {"Position Low", "fileexp.position_low", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_afsreturndesc_tokenid_high,
      {"Tokenid High", "fileexp.afsreturndesc_tokenid_high", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsreturndesc_tokenid_low,
      {"Tokenid low", "fileexp.afsreturndesc_tokenid_low", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsreturndesc_type_high,
-     {"Type high", "fileexp.type_high", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+     {"Type high", "fileexp.type_high", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fileexp_afsreturndesc_type_low,
-     {"Type low", "fileexp.type_low", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+     {"Type low", "fileexp.type_low", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fileexp_offsetp_high,
      {"offset high", "fileexp.offset_high", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_offsetp_low,
      {"offset high", "fileexp.offset_high", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_nextoffsetp_high,
      {"next offset high", "fileexp.nextoffset_high", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_nextoffsetp_low,
      {"next offset low", "fileexp.nextoffset_low", FT_UINT32, BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fileexp_returntokenidp_high,
      {"return token idp high", "fileexp.returntokenidp_high", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_returntokenidp_low,
      {"return token idp low", "fileexp.returntokenidp_low", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_cellidp_high,
      {"cellidp high", "fileexp.cellidp_high", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_cellidp_low,
      {"cellidp low", "fileexp.cellidp_low", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_afserrorstatus_st,
      {"AFS Error Code", "fileexp.afserrortstatus_st", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_length,
      {"Length", "fileexp.length", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsTaggedPath_tp_chars,
      {"AFS Tagged Path", "fileexp.TaggedPath_tp_chars", FT_STRING, BASE_NONE,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsTaggedPath_tp_tag,
      {"AFS Tagged Path Name", "fileexp.TaggedPath_tp_tag", FT_UINT32,
       BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsacl_uuid1,
      {"AFS ACL UUID1", "fileexp.afsacl_uuid1", FT_GUID, BASE_NONE,
       NULL, 0x0, "UUID", HFILL}},
     {&hf_fileexp_bulkfetchstatus_size,
      {"BulkFetchStatus Size", "fileexp.bulkfetchstatus_size", FT_UINT32,
       BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkfetchvv_numvols,
      {"fileexp.bulkfetchvv_numvols", "fileexp.bulkfetchvv_numvols",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkfetchvv_spare1,
      {"fileexp.bulkfetchvv_spare1", "fileexp.bulkfetchvv_spare1",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkfetchvv_spare2,
      {"fileexp.bulkfetchvv_spare2", "fileexp.bulkfetchvv_spare2",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
-    {&hf_fileexp_bulkkeepalive_numexecfids, {"BulkKeepAlive numexecfids", "fileexp.bulkkeepalive_numexecfids", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+    {&hf_fileexp_bulkkeepalive_numexecfids, {"BulkKeepAlive numexecfids", "fileexp.bulkkeepalive_numexecfids", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkkeepalive_spare4,
      {"BulkKeepAlive spare4", "fileexp.bulkfetchkeepalive_spare2",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkkeepalive_spare2,
      {"BulkKeepAlive spare2", "fileexp.bulkfetchkeepalive_spare2",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_bulkkeepalive_spare1,
      {"BulkFetch KeepAlive spare1", "fileexp.bulkfetchkeepalive_spare1",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsacl_defaultcell_uuid,
      {"Default Cell UUID",
       "fileexp.defaultcell_uuid", FT_GUID, BASE_NONE, NULL, 0x0,
@@ -4582,43 +4582,43 @@ proto_register_fileexp (void)
     {&hf_fileexp_gettime_syncdispersion,
      {"GetTime Syncdispersion",
       "fileexp.gettime_syncdispersion", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_gettime_syncdistance,
      {"SyncDistance", "fileexp.gettime.syncdistance",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_gettime_usecondsp,
      {"GetTime usecondsp", "fileexp.gettime_usecondsp",
-      FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_readdir_size,
      {"Readdir Size", "fileexp.readdir.size", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsNameString_t_principalName_size,
      {"Principal Name Size",
       "fileexp.principalName_size", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsNameString_t_principalName_size2,
      {"Principal Name Size2",
       "fileexp.principalName_size2", FT_UINT32, BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fileexp_afsTaggedPath_tp_length,
      {"Tagged Path Length",
       "fileexp.afsTaggedPath_length", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fileexp_fstype,
      {"Filetype", "fileexp.fstype", FT_UINT32, BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fileexp_gettime_secondsp,
      {"GetTime secondsp", "fileexp.gettime_secondsp", FT_UINT32,
       BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fileexp_afsNameString_t_principalName_string,
      {"Principal Name", "fileexp.NameString_principal", FT_STRING,
       BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fileexp_fetchdata_pipe_t_size,
      {"FetchData Pipe_t size", "fileexp.fetchdata_pipe_t_size", FT_STRING,
       BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
   };
   static gint *ett[] = {
     &ett_fileexp,
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c
index e657733457..e2a4d2964e 100644
--- a/epan/dissectors/packet-dcerpc-fldb.c
+++ b/epan/dissectors/packet-dcerpc-fldb.c
@@ -1732,240 +1732,240 @@ proto_register_fldb (void)
   static hf_register_info hf[] = {
     {&hf_fldb_releaselock_rqst_fsid_low,
      {"FSID releaselock Low", "fldb.releaselock_rqst_fsid_low", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_releaselock_rqst_voltype,
      {"voltype", "fldb.releaselock_rqst_voltype", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_releaselock_rqst_voloper,
      {"voloper", "fldb.releaselock_rqst_voloper", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_setlock_rqst_fsid_high,
      {"FSID setlock Hi", "fldb.setlock_rqst_fsid_high", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_setlock_rqst_fsid_low,
      {"FSID setlock Low", "fldb.setlock_rqst_fsid_low", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_setlock_rqst_voltype,
      {"voltype", "fldb.setlock_rqst_voltype", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_setlock_rqst_voloper,
      {"voloper", "fldb.setlock_rqst_voloper", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_setlock_resp_st,
-     {"Error", "fldb.setlock_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Error", "fldb.setlock_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_setlock_resp_st2,
-     {"Error", "fldb.setlock_resp_st2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Error", "fldb.setlock_resp_st2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_listentry_rqst_previous_index,
      {"Previous Index", "fldb.listentry_rqst_previous_index", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_listentry_rqst_var1,
      {"Var 1", "fldb.listentry_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_listentry_resp_count,
      {"Count", "fldb.listentry_resp_count", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_listentry_resp_next_index,
      {"Next Index", "fldb.listentry_resp_next_index", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_listentry_resp_key_size,
      {"Key Size", "fldb.listentry_resp_key_size", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_listentry_resp_key_t,
      {"Volume", "fldb.listentry_resp_key_t", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_listentry_resp_voltype,
      {"VolType", "fldb.listentry_resp_voltype", FT_UINT32, BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_listentry_resp_key_size2,
      {"key_size2", "fldb.listentry_resp_key_size2", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_listentry_resp_key_t2,
      {"Server", "fldb.listentry_resp_key_t2", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_createentry_rqst_key_t,
      {"Volume", "fldb.createentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_createentry_rqst_key_size,
      {"Volume Size", "fldb.createentry_rqst_key_size", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_deleteentry_rqst_fsid_high,
      {"FSID deleteentry Hi", "fldb.deleteentry_rqst_fsid_high", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_deleteentry_rqst_fsid_low,
      {"FSID deleteentry Low", "fldb.deleteentry_rqst_fsid_low", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_deleteentry_rqst_voltype,
      {"voltype", "fldb.deleteentry_rqst_voltype", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_deleteentry_rqst_voloper,
      {"voloper", "fldb.deleteentry_rqst_voloper", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyid_rqst_fsid_high,
      {"FSID deleteentry Hi", "fldb.getentrybyid_rqst_fsid_high", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyid_rqst_fsid_low,
      {"FSID getentrybyid Low", "fldb.getentrybyid_rqst_fsid_low",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyid_rqst_voltype,
      {"voltype", "fldb.getentrybyid_rqst_voltype", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyid_rqst_voloper,
      {"voloper", "fldb.getentrybyid_rqst_voloper", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_rqst_fsid_high,
      {"FSID replaceentry Hi", "fldb.replaceentry_rqst_fsid_high",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_rqst_fsid_low,
      {"FSID  replaceentry Low", "fldb.replaceentry_rqst_fsid_low",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_rqst_voltype,
      {"voltype", "fldb.replaceentry_rqst_voltype", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_rqst_key_t,
      {"Key", "fldb.replaceentry_rqst_key_t", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_rqst_key_size,
      {"Key Size", "fldb.replaceentry_rqst_key_size", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_replaceentry_resp_st,
      {"Error", "fldb.replaceentry_resp_st", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_replaceentry_resp_st2,
      {"Error", "fldb.replaceentry_resp_st2", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_volumetype,
      {"fldb_getentrybyname_resp_volumetype",
       "fldb.getentrybyname_resp_volumetype", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_numservers,
      {"fldb_getentrybyname_resp_numservers",
       "fldb.getentrybyname_resp_numservers", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_sitecookies,
      {"fldb_getentrybyname_resp_sitecookies",
       "fldb.getentrybyname_resp_sitecookies", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_sitepartition,
      {"fldb_getentrybyname_resp_sitepartition",
       "fldb.getentrybyname_resp_sitepartition", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_siteflags,
      {"fldb_getentrybyname_resp_siteflags",
       "fldb.getentrybyname_resp_siteflags", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_sitemaxreplat,
      {"fldb_getentrybyname_resp_sitemaxreplat",
       "fldb.getentrybyname_resp_sitemaxreplat", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_volid_high,
      {"fldb_getentrybyname_resp_volid_high",
       "fldb.getentrybyname_resp_volid_high", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_volid_low,
      {"fldb_getentrybyname_resp_volid_low",
       "fldb.getentrybyname_resp_volid_low", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_voltype,
      {"fldb_getentrybyname_resp_voltype",
       "fldb.getentrybyname_resp_voltype", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_cloneid_high,
      {"fldb_getentrybyname_resp_cloneid_high",
       "fldb.getentrybyname_resp_cloneid_high", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_cloneid_low,
      {"fldb_getentrybyname_resp_cloneid_low",
       "fldb.getentrybyname_resp_cloneid_low", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_flags,
      {"fldb_getentrybyname_resp_flags",
-      "fldb.getentrybyname_resp_flags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+      "fldb.getentrybyname_resp_flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_getentrybyname_resp_maxtotallat,
      {"fldb_getentrybyname_resp_maxtotallat",
       "fldb.getentrybyname_resp_maxtotallat", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_hardmaxtotlat,
      {"fldb_getentrybyname_resp_hardmaxtotlat",
       "fldb.getentrybyname_resp_hardmaxtotlat", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_minpouncedally,
      {"fldb_getentrybyname_resp_minpouncedally",
       "fldb.getentrybyname_resp_minpouncedally", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_defaultmaxreplat,
      {"fldb_getentrybyname_resp_defaultmaxreplat",
       "fldb.getentrybyname_resp_defaultmaxreplat", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_reclaimdally,
      {"fldb_getentrybyname_resp_reclaimdally",
       "fldb.getentrybyname_resp_reclaimdally", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_whenlocked,
      {"fldb_getentrybyname_resp_whenlocked",
       "fldb.getentrybyname_resp_whenlocked", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_spare1,
      {"fldb_getentrybyname_resp_spare1",
       "fldb.getentrybyname_resp_spare1", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_spare2,
      {"fldb_getentrybyname_resp_spare2",
       "fldb.getentrybyname_resp_spare2", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_spare3,
      {"fldb_getentrybyname_resp_spare3",
       "fldb.getentrybyname_resp_spare3", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_spare4,
      {"fldb_getentrybyname_resp_spare4",
       "fldb.getentrybyname_resp_spare4", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_key_t,
      {"fldb_getentrybyname_resp_key_t",
       "fldb.getentrybyname_resp_key_t", FT_STRING, BASE_NONE, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_key_size,
      {"fldb_getentrybyname_resp_key_size",
       "fldb.getentrybyname_resp_key_size", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_getentrybyname_resp_test,
      {"fldb_getentrybyname_resp_test", "fldb.getentrybyname_resp_test",
-      FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_releaselock_rqst_fsid_high,
      {"FSID releaselock Hi", "fldb.releaselock_rqst_fsid_high", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_opnum,
-     {"Operation", "fldb.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation",
+     {"Operation", "fldb.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_volumename,
      {"VolumeName", "fldb.vldbentry.volumename", FT_STRING, BASE_NONE, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_volumetype,
      {"VolumeType", "fldb.vldbentry.volumetype", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_nservers,
      {"Number of Servers", "fldb.vldbentry.nservers", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_afsnetaddr_type,
-     {"Type", "fldb.afsnetaddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Type", "fldb.afsnetaddr.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_afsnetaddr_data,
-     {"IP Data", "fldb.afsnetaddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+     {"IP Data", "fldb.afsnetaddr.data", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_sitepartition,
      {"Site Partition", "fldb.vldbentry.sitepartition", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_siteflags,
-     {"Site Flags", "fldb.vldbentry.siteflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Site Flags", "fldb.vldbentry.siteflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_sitemaxreplicalatency,
      {"Site Max Replica Latench", "fldb.vldbentry.sitemaxreplatency", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_siteprincipal,
      {"Principal Name", "fldb.vldbentry.siteprincipal", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_siteowner,
      {"Site Owner", "fldb.vldbentry.siteowner", FT_GUID, BASE_NONE, NULL, 0x0,
       "UUID", HFILL}},
@@ -1974,134 +1974,134 @@ proto_register_fldb (void)
       0x0, "UUID", HFILL}},
     {&hf_fldb_vldbentry_volids_high,
      {"VolIDs high", "fldb.vldbentry.volidshigh", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_volids_low,
-     {"VolIDs low", "fldb.vldbentry.volidslow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"VolIDs low", "fldb.vldbentry.volidslow", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_voltypes,
-     {"VolTypes", "fldb.vldbentry.voltypes", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"VolTypes", "fldb.vldbentry.voltypes", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_cloneid_high,
      {"CloneID High", "fldb.vldbentry.cloneidhigh", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_cloneid_low,
      {"CloneID Low", "fldb.vldbentry.cloneidlow", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_afsflags_flags,
-     {"AFS Flags", "fldb.vldbentry.afsflags", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"AFS Flags", "fldb.vldbentry.afsflags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_maxtotallatency,
      {"Max Total Latency", "fldb.vldbentry.maxtotallatency", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_hardmaxtotallatency,
      {"Hard Max Total Latency", "fldb.vldbentry.hardmaxtotallatency", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_minimumpouncedally,
      {"Minimum Pounce Dally", "fldb.vldbentry.minimumpouncedally", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_defaultmaxreplicalatency,
      {"Default Max Replica Latency", "fldb.vldbentry.defaultmaxreplicalatency",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_reclaimdally,
      {"Reclaim Dally", "fldb.vldbentry.reclaimdally", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_vldbentry_whenlocked,
      {"When Locked", "fldb.vldbentry.whenlocked", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_spare1,
-     {"Spare 1", "fldb.vldbentry.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 1", "fldb.vldbentry.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_spare2,
-     {"Spare 2", "fldb.vldbentry.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 2", "fldb.vldbentry.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_spare3,
-     {"Spare 3", "fldb.vldbentry.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 3", "fldb.vldbentry.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_spare4,
-     {"Spare 4", "fldb.vldbentry.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Spare 4", "fldb.vldbentry.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vldbentry_lockername,
      {"Locker Name", "fldb.vldbentry.lockername", FT_STRING, BASE_NONE, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vldbentry_charspares,
      {"Char Spares", "fldb.vldbentry.charspares", FT_STRING, BASE_NONE, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_vlconf_cell_name,
-     {"Name", "fldb.vlconf.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Name", "fldb.vlconf.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_cellid_high,
-     {"CellID High", "fldb.vlconf.cellidhigh", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"CellID High", "fldb.vlconf.cellidhigh", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vlconf_cell_cellid_low,
-     {"CellID Low", "fldb.vlconf.cellidlow", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"CellID Low", "fldb.vlconf.cellidlow", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vlconf_cell_numservers,
      {"Number of Servers", "fldb.vlconf.numservers", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_hostname,
-     {"hostName", "fldb.vlconf.hostname", FT_STRING, BASE_NONE, NULL, 0x0, "",
+     {"hostName", "fldb.vlconf.hostname", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_vlconf_cell_spare1,
-     {"Spare1", "fldb.vlconf.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare1", "fldb.vlconf.spare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_spare2,
-     {"Spare2", "fldb.vlconf.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare2", "fldb.vlconf.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_spare3,
-     {"Spare3", "fldb.vlconf.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare3", "fldb.vlconf.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_spare4,
-     {"Spare4", "fldb.vlconf.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare4", "fldb.vlconf.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_vlconf_cell_spare5,
-     {"Spare5", "fldb.vlconf.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Spare5", "fldb.vlconf.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_flagsp,
-     {"flagsp", "fldb.flagsp", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"flagsp", "fldb.flagsp", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_nextstartp,
-     {"nextstartp", "fldb.nextstartp", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"nextstartp", "fldb.nextstartp", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_afsNameString_t_principalName_size,
      {"Principal Name Size", "fldb.principalName_size", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_afsNameString_t_principalName_size2,
      {"Principal Name Size2", "fldb.principalName_size2", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_afsNameString_t_principalName_string,
      {"Principal Name", "fldb.NameString_principal", FT_STRING, BASE_NONE,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_namestring,
      {"Name string", "fldb.NameString_principal", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_dcerpc_error_status,
      {"Error Status", "fldb.NameString_principal", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_error_st,
-     {"Error Status 2", "fldb.error_st", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"Error Status 2", "fldb.error_st", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_creationquota,
      {"creation quota", "fldb.creationquota", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_creationuses,
      {"creation uses", "fldb.creationuses", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_fldb_deletedflag,
-     {"deletedflag", "fldb.deletedflag", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"deletedflag", "fldb.deletedflag", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_getentrybyname_rqst_key_size,
      {"getentrybyname", "fldb.getentrybyname_rqst_key_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_getentrybyname_rqst_var1,
      {"getentrybyname var1", "fldb.getentrybyname_rqst_var1", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_namestring_size,
      {"namestring size", "fldb.namestring_size", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_fldb_numwanted,
-     {"number wanted", "fldb.numwanted", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"number wanted", "fldb.numwanted", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_spare2,
-     {"spare2", "fldb.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"spare2", "fldb.spare2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_spare3,
-     {"spare3", "fldb.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"spare3", "fldb.spare3", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_spare4,
-     {"spare4", "fldb.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"spare4", "fldb.spare4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_spare5,
-     {"spare5", "fldb.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"spare5", "fldb.spare5", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_fldb_uuid_objid,
      {"objid", "fldb.uuid_objid", FT_GUID, BASE_NONE, NULL, 0x0, "UUID",
       HFILL}},
@@ -2109,13 +2109,13 @@ proto_register_fldb (void)
      {"owner", "fldb.uuid_owner", FT_GUID, BASE_NONE, NULL, 0x0, "UUID",
       HFILL}},
     {&hf_fldb_volid_high,
-     {"volid high", "fldb.volid_high", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"volid high", "fldb.volid_high", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_volid_low,
-     {"volid low", "fldb.volid_low", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"volid low", "fldb.volid_low", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_fldb_voltype,
-     {"voltype", "fldb.voltype", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"voltype", "fldb.voltype", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-frsapi.c b/epan/dissectors/packet-dcerpc-frsapi.c
index 8532c55a29..f37b00fbbe 100644
--- a/epan/dissectors/packet-dcerpc-frsapi.c
+++ b/epan/dissectors/packet-dcerpc-frsapi.c
@@ -76,7 +76,7 @@ proto_register_dcerpc_frsapi(void)
 
 		{ &hf_frsapi_opnum, 
 		  { "Operation", "frsapi.opnum", FT_UINT16, BASE_DEC,
-		   NULL, 0x0, "Operation", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-frsrpc.c b/epan/dissectors/packet-dcerpc-frsrpc.c
index b8b473cf75..5cbe063668 100644
--- a/epan/dissectors/packet-dcerpc-frsrpc.c
+++ b/epan/dissectors/packet-dcerpc-frsrpc.c
@@ -266,7 +266,7 @@ proto_register_dcerpc_frsrpc(void)
 
 		{ &hf_frsrpc_opnum, 
 		  { "Operation", "frsrpc.opnum", FT_UINT16, BASE_DEC,
-		   NULL, 0x0, "Operation", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_unknown32, 
 		  { "unknown32", "frsrpc.unknown32", FT_UINT32, BASE_HEX,
@@ -286,47 +286,47 @@ proto_register_dcerpc_frsrpc(void)
 
 		{ &hf_frsrpc_tlv_tag, 
 		  { "TLV Tag", "frsrpc.tlv.tag", FT_UINT16, BASE_DEC,
-		   NULL, 0x0, "", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_tlv_size, 
 		  { "TLV Size", "frsrpc.tlv.size", FT_UINT32, BASE_DEC,
-		   NULL, 0x0, "", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_tlv_data, 
-		  { "TLV Data", "frsrpc.tlv.data", FT_BYTES, BASE_HEX,
-		   NULL, 0x0, "", HFILL }},	
+		  { "TLV Data", "frsrpc.tlv.data", FT_BYTES, BASE_NONE,
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_unknownbytes, 
-		  { "unknown", "frsrpc.unknownbytes", FT_BYTES, BASE_HEX,
+		  { "unknown", "frsrpc.unknownbytes", FT_BYTES, BASE_NONE,
 		   NULL, 0x0, "unknown bytes", HFILL }},	
 
 		{ &hf_frsrpc_guid_size, 
 		  { "Guid Size", "frsrpc.guid.size", FT_UINT32, BASE_DEC,
-		   NULL, 0x0, "", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_ssrv_guid,
 		  { "SSRV GUID", "frsrpc.ssrv.guid", FT_GUID, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_frsrpc_dsrv_guid,
 		  { "DSRV GUID", "frsrpc.dsrv.guid", FT_GUID, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_frsrpc_str_size, 
 		  { "String Size", "frsrpc.str.size", FT_UINT32, BASE_DEC,
-		   NULL, 0x0, "", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 
 		{ &hf_frsrpc_ssrv,
 		  { "SSRV", "frsrpc.ssrv", FT_STRING, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_frsrpc_dsrv,
 		  { "DSRV", "frsrpc.dsrv", FT_STRING, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_frsrpc_timestamp,
 		  { "Timestamp", "frsrpc.timestamp", FT_ABSOLUTE_TIME, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-ftserver.c b/epan/dissectors/packet-dcerpc-ftserver.c
index 4e998ac138..aedcad63e0 100644
--- a/epan/dissectors/packet-dcerpc-ftserver.c
+++ b/epan/dissectors/packet-dcerpc-ftserver.c
@@ -85,7 +85,7 @@ proto_register_ftserver (void)
 	static hf_register_info hf[] = {
 	  { &hf_ftserver_opnum,
 	    { "Operation", "ftserver.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-icl_rpc.c b/epan/dissectors/packet-dcerpc-icl_rpc.c
index bdafcfc5a6..35af06f76d 100644
--- a/epan/dissectors/packet-dcerpc-icl_rpc.c
+++ b/epan/dissectors/packet-dcerpc-icl_rpc.c
@@ -67,7 +67,7 @@ proto_register_icl_rpc (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_icl_rpc_opnum,
-		{ "Operation", "icl_rpc.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "icl_rpc.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-initshutdown.c b/epan/dissectors/packet-dcerpc-initshutdown.c
index ccfc1c4396..5a54422ef3 100644
--- a/epan/dissectors/packet-dcerpc-initshutdown.c
+++ b/epan/dissectors/packet-dcerpc-initshutdown.c
@@ -463,43 +463,43 @@ void proto_register_dcerpc_initshutdown(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_initshutdown_initshutdown_String_name_len, 
-	  { "Name Len", "initshutdown.initshutdown_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Len", "initshutdown.initshutdown_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Abort_server, 
-	  { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server", "initshutdown.initshutdown_Abort.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_message, 
-	  { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Message", "initshutdown.initshutdown_Init.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_hostname, 
-	  { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hostname", "initshutdown.initshutdown_Init.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_reboot, 
-	  { "Reboot", "initshutdown.initshutdown_InitEx.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reboot", "initshutdown.initshutdown_InitEx.reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_reason, 
-	  { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reason", "initshutdown.initshutdown_InitEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_String_name_size, 
-	  { "Name Size", "initshutdown.initshutdown_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Size", "initshutdown.initshutdown_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_timeout, 
-	  { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "initshutdown.initshutdown_Init.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_hostname, 
-	  { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hostname", "initshutdown.initshutdown_InitEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_message, 
-	  { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Message", "initshutdown.initshutdown_InitEx.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_String_name, 
-	  { "Name", "initshutdown.initshutdown_String.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "initshutdown.initshutdown_String.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_reboot, 
-	  { "Reboot", "initshutdown.initshutdown_Init.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reboot", "initshutdown.initshutdown_Init.reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_opnum, 
-	  { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "initshutdown.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_Init_force_apps, 
-	  { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Apps", "initshutdown.initshutdown_Init.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_String_sub_name, 
-	  { "Name", "initshutdown.initshutdown_String_sub.name", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Name", "initshutdown.initshutdown_String_sub.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_werror, 
-	  { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "initshutdown.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_String_sub_name_size, 
-	  { "Name Size", "initshutdown.initshutdown_String_sub.name_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Size", "initshutdown.initshutdown_String_sub.name_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_force_apps, 
-	  { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Apps", "initshutdown.initshutdown_InitEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_initshutdown_initshutdown_InitEx_timeout, 
-	  { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "initshutdown.initshutdown_InitEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-krb5rpc.c b/epan/dissectors/packet-dcerpc-krb5rpc.c
index f14d96c2a2..51892ebc5e 100644
--- a/epan/dissectors/packet-dcerpc-krb5rpc.c
+++ b/epan/dissectors/packet-dcerpc-krb5rpc.c
@@ -161,34 +161,34 @@ proto_register_krb5rpc (void)
   static hf_register_info hf[] = {
     {&hf_krb5rpc_opnum,
      {"hf_krb5rpc_opnum", "hf_krb5rpc_opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_krb5rpc_sendto_kdc_rqst_keysize,
      {"hf_krb5rpc_sendto_kdc_rqst_keysize",
       "hf_krb5rpc_sendto_kdc_rqst_keysize", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_krb5rpc_sendto_kdc_rqst_spare1,
      {"hf_krb5rpc_sendto_kdc_rqst_spare1",
-      "hf_krb5rpc_sendto_kdc_rqst_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+      "hf_krb5rpc_sendto_kdc_rqst_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_krb5rpc_sendto_kdc_resp_len,
      {"hf_krb5rpc_sendto_kdc_resp_len", "hf_krb5rpc_sendto_kdc_resp_len",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_krb5rpc_sendto_kdc_resp_max,
      {"hf_krb5rpc_sendto_kdc_resp_max", "hf_krb5rpc_sendto_kdc_resp_max",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_krb5rpc_sendto_kdc_resp_spare1,
      {"hf_krb5rpc_sendto_kdc_resp_spare1",
-      "hf_krb5rpc_sendto_kdc_resp_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+      "hf_krb5rpc_sendto_kdc_resp_spare1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_krb5rpc_sendto_kdc_resp_keysize,
      {"hf_krb5rpc_sendto_kdc_resp_keysize",
       "hf_krb5rpc_sendto_kdc_resp_keysize", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_krb5rpc_sendto_kdc_resp_st,
      {"hf_krb5rpc_sendto_kdc_resp_st", "hf_krb5rpc_sendto_kdc_resp_st",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_krb5rpc_krb5,
-     {"hf_krb5rpc_krb5", "hf_krb5rpc_krb5", FT_BYTES, BASE_HEX, NULL, 0x0,
+     {"hf_krb5rpc_krb5", "hf_krb5rpc_krb5", FT_BYTES, BASE_NONE, NULL, 0x0,
       "krb5_blob", HFILL}},
 
   };
diff --git a/epan/dissectors/packet-dcerpc-llb.c b/epan/dissectors/packet-dcerpc-llb.c
index 434f7ae4a4..acfb818bfa 100644
--- a/epan/dissectors/packet-dcerpc-llb.c
+++ b/epan/dissectors/packet-dcerpc-llb.c
@@ -67,7 +67,7 @@ proto_register_llb (void)
 {
   static hf_register_info hf[] = {
     {&hf_llb_opnum,
-     {"Operation", "llb.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation",
+     {"Operation", "llb.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
   };
 
diff --git a/epan/dissectors/packet-dcerpc-lsa.c b/epan/dissectors/packet-dcerpc-lsa.c
index d92a5d9edc..ea08b2114b 100644
--- a/epan/dissectors/packet-dcerpc-lsa.c
+++ b/epan/dissectors/packet-dcerpc-lsa.c
@@ -11738,847 +11738,847 @@ void proto_register_dcerpc_lsarpc(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_lsarpc_lsa_AsciiStringLarge_size, 
-	  { "Size", "lsarpc.lsa_AsciiStringLarge.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_AsciiStringLarge.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivName_luid, 
-	  { "Luid", "lsarpc.lsa_LookupPrivName.luid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Luid", "lsarpc.lsa_LookupPrivName.luid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_count, 
-	  { "Outgoing Count", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Outgoing Count", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_CONTROLLERS, 
-	  { "Lsa Domain Set Controllers", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_CONTROLLERS", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_CONTROLLERS_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Lsa Domain Set Controllers", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_CONTROLLERS", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_CONTROLLERS_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_Delete_handle, 
-	  { "Handle", "lsarpc.lsa_Delete.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_Delete.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_account_domain, 
-	  { "Account Domain", "lsarpc.lsa_PolicyInformation.account_domain", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Domain", "lsarpc.lsa_PolicyInformation.account_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_clock_skew, 
-	  { "Clock Skew", "lsarpc.lsa_DomainInfoKerberos.clock_skew", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Clock Skew", "lsarpc.lsa_DomainInfoKerberos.clock_skew", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustData_domain_info, 
-	  { "Domain Info", "lsarpc.lsa_ForestTrustData.domain_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Info", "lsarpc.lsa_ForestTrustData.domain_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AddPrivilegesToAccount_handle, 
-	  { "Handle", "lsarpc.lsa_AddPrivilegesToAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_AddPrivilegesToAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_sec_qos, 
-	  { "Sec Qos", "lsarpc.lsa_ObjectAttribute.sec_qos", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Qos", "lsarpc.lsa_ObjectAttribute.sec_qos", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_handle, 
-	  { "Handle", "lsarpc.lsa_LookupNames3.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupNames3.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_level, 
-	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfoBySid.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfoBySid.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomain_sid, 
-	  { "Sid", "lsarpc.lsa_OpenTrustedDomain.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_OpenTrustedDomain.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccounts_handle, 
-	  { "Handle", "lsarpc.lsa_EnumAccounts.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumAccounts.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateAccount_sid, 
-	  { "Sid", "lsarpc.lsa_CreateAccount.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_CreateAccount.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ReplicaSourceInfo_account, 
-	  { "Account", "lsarpc.lsa_ReplicaSourceInfo.account", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "lsarpc.lsa_ReplicaSourceInfo.account", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryDomainInformationPolicy_handle, 
-	  { "Handle", "lsarpc.lsa_QueryDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QueryDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateTrustedDomain_info, 
-	  { "Info", "lsarpc.lsa_CreateTrustedDomain.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_CreateTrustedDomain.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS, 
-	  { "Lsa Policy Set Default Quota Limits", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Lsa Policy Set Default Quota Limits", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SET_DEFAULT_QUOTA_LIMITS_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivilegeSet_set, 
-	  { "Set", "lsarpc.lsa_PrivilegeSet.set", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Set", "lsarpc.lsa_PrivilegeSet.set", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecret_new_val, 
-	  { "New Val", "lsarpc.lsa_QuerySecret.new_val", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Val", "lsarpc.lsa_QuerySecret.new_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid2_unknown, 
-	  { "Unknown", "lsarpc.lsa_TranslatedSid2.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_TranslatedSid2.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_handle, 
-	  { "Handle", "lsarpc.lsa_LookupSids2.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupSids2.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainListEx_domains, 
-	  { "Domains", "lsarpc.lsa_DomainListEx.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_DomainListEx.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_num_names, 
-	  { "Num Names", "lsarpc.lsa_LookupNames3.num_names", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Names", "lsarpc.lsa_LookupNames3.num_names", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustedDomainsEx_max_size, 
-	  { "Max Size", "lsarpc.lsa_EnumTrustedDomainsEx.max_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Size", "lsarpc.lsa_EnumTrustedDomainsEx.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivName_handle, 
-	  { "Handle", "lsarpc.lsa_LookupPrivName.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupPrivName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenAccount_handle, 
-	  { "Handle", "lsarpc.lsa_OpenAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenSecret_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecurity_sdbuf, 
-	  { "Sdbuf", "lsarpc.lsa_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sdbuf", "lsarpc.lsa_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetTrustedDomainInfoByName_trusted_domain, 
-	  { "Trusted Domain", "lsarpc.lsa_SetTrustedDomainInfoByName.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trusted Domain", "lsarpc.lsa_SetTrustedDomainInfoByName.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateTrustedDomain_trustdom_handle, 
-	  { "Trustdom Handle", "lsarpc.lsa_CreateTrustedDomain.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trustdom Handle", "lsarpc.lsa_CreateTrustedDomain.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivs_handle, 
-	  { "Handle", "lsarpc.lsa_EnumPrivs.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumPrivs.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LUID_high, 
-	  { "High", "lsarpc.lsa_LUID.high", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "High", "lsarpc.lsa_LUID.high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy_handle, 
-	  { "Handle", "lsarpc.lsa_QueryInfoPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QueryInfoPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_audit_events, 
-	  { "Audit Events", "lsarpc.lsa_PolicyInformation.audit_events", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Audit Events", "lsarpc.lsa_PolicyInformation.audit_events", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_auth_info, 
-	  { "Auth Info", "lsarpc.lsa_TrustedDomainInfo.auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Auth Info", "lsarpc.lsa_TrustedDomainInfo.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE, 
-	  { "Lsa Policy Create Privilege", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_PRIVILEGE", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Lsa Policy Create Privilege", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_PRIVILEGE", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_PRIVILEGE_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_service_tkt_lifetime, 
-	  { "Service Tkt Lifetime", "lsarpc.lsa_DomainInfoKerberos.service_tkt_lifetime", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Service Tkt Lifetime", "lsarpc.lsa_DomainInfoKerberos.service_tkt_lifetime", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateSecret_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_CreateSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_CreateSecret.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_GetUserName_authority_name, 
-	  { "Authority Name", "lsarpc.lsa_GetUserName.authority_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Authority Name", "lsarpc.lsa_GetUserName.authority_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditFullSetInfo_shutdown_on_full, 
-	  { "Shutdown On Full", "lsarpc.lsa_AuditFullSetInfo.shutdown_on_full", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Shutdown On Full", "lsarpc.lsa_AuditFullSetInfo.shutdown_on_full", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemoveAccountRights_unknown, 
-	  { "Unknown", "lsarpc.lsa_RemoveAccountRights.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_RemoveAccountRights.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_unknown1, 
-	  { "Unknown1", "lsarpc.lsa_LookupNames4.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "lsarpc.lsa_LookupNames4.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_secret_access_mask, 
-	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DeleteTrustedDomain_dom_sid, 
-	  { "Dom Sid", "lsarpc.lsa_DeleteTrustedDomain.dom_sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Dom Sid", "lsarpc.lsa_DeleteTrustedDomain.dom_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_names, 
-	  { "Names", "lsarpc.lsa_LookupNames4.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupNames4.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustRecord_forest_trust_data, 
-	  { "Forest Trust Data", "lsarpc.lsa_ForestTrustRecord.forest_trust_data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Forest Trust Data", "lsarpc.lsa_ForestTrustRecord.forest_trust_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_role, 
-	  { "Role", "lsarpc.lsa_PolicyInformation.role", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Role", "lsarpc.lsa_PolicyInformation.role", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_audit_log, 
-	  { "Audit Log", "lsarpc.lsa_PolicyInformation.audit_log", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Audit Log", "lsarpc.lsa_PolicyInformation.audit_log", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME, 
-	  { "Lsa Domain Query Domain Name", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_DOMAIN_NAME", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Lsa Domain Query Domain Name", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_DOMAIN_NAME", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_DOMAIN_NAME_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_dns, 
-	  { "Dns", "lsarpc.lsa_PolicyInformation.dns", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Dns", "lsarpc.lsa_PolicyInformation.dns", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_trusted_domain_name, 
-	  { "Trusted Domain Name", "lsarpc.lsa_lsaRQueryForestTrustInformation.trusted_domain_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trusted Domain Name", "lsarpc.lsa_lsaRQueryForestTrustInformation.trusted_domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoByName_trusted_domain, 
-	  { "Trusted Domain", "lsarpc.lsa_QueryTrustedDomainInfoByName.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trusted Domain", "lsarpc.lsa_QueryTrustedDomainInfoByName.trusted_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy2_handle, 
-	  { "Handle", "lsarpc.lsa_OpenPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountsWithUserRight_handle, 
-	  { "Handle", "lsarpc.lsa_EnumAccountsWithUserRight.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumAccountsWithUserRight.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_count, 
-	  { "Incoming Count", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Incoming Count", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemoveAccountRights_rights, 
-	  { "Rights", "lsarpc.lsa_RemoveAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rights", "lsarpc.lsa_RemoveAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetSecret_sec_handle, 
-	  { "Sec Handle", "lsarpc.lsa_SetSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Handle", "lsarpc.lsa_SetSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_CREATE_SECRET, 
-	  { "Lsa Policy Create Secret", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_SECRET", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_SECRET_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Lsa Policy Create Secret", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_SECRET", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_SECRET_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomainByName_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenTrustedDomainByName.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenTrustedDomainByName.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RightAttribute_name, 
-	  { "Name", "lsarpc.lsa_RightAttribute.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_RightAttribute.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoPassword_old_password, 
-	  { "Old Password", "lsarpc.lsa_TrustDomainInfoPassword.old_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Password", "lsarpc.lsa_TrustDomainInfoPassword.old_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_user_tkt_renewaltime, 
-	  { "User Tkt Renewaltime", "lsarpc.lsa_DomainInfoKerberos.user_tkt_renewaltime", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User Tkt Renewaltime", "lsarpc.lsa_DomainInfoKerberos.user_tkt_renewaltime", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LUID_low, 
-	  { "Low", "lsarpc.lsa_LUID.low", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Low", "lsarpc.lsa_LUID.low", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_names, 
-	  { "Names", "lsarpc.lsa_LookupNames3.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupNames3.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_dom_sid, 
-	  { "Dom Sid", "lsarpc.lsa_QueryTrustedDomainInfoBySid.dom_sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Dom Sid", "lsarpc.lsa_QueryTrustedDomainInfoBySid.dom_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfo11_info_ex, 
-	  { "Info Ex", "lsarpc.lsa_TrustDomainInfo11.info_ex", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info Ex", "lsarpc.lsa_TrustDomainInfo11.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_names, 
-	  { "Names", "lsarpc.lsa_LookupSids.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupSids.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomain_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenTrustedDomain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenTrustedDomain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RefDomainList_max_size, 
-	  { "Max Size", "lsarpc.lsa_RefDomainList.max_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Size", "lsarpc.lsa_RefDomainList.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray_sids, 
-	  { "Sids", "lsarpc.lsa_TransSidArray.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_TransSidArray.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_trust_attributes, 
-	  { "Trust Attributes", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_attributes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Trust Attributes", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_attributes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateSecret_sec_handle, 
-	  { "Sec Handle", "lsarpc.lsa_CreateSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Handle", "lsarpc.lsa_CreateSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetSecret_old_val, 
-	  { "Old Val", "lsarpc.lsa_SetSecret.old_val", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Val", "lsarpc.lsa_SetSecret.old_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoBuffer_last_update_time, 
-	  { "Last Update Time", "lsarpc.lsa_TrustDomainInfoBuffer.last_update_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Update Time", "lsarpc.lsa_TrustDomainInfoBuffer.last_update_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DnsDomainInfo_dns_forest, 
-	  { "Dns Forest", "lsarpc.lsa_DnsDomainInfo.dns_forest", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Dns Forest", "lsarpc.lsa_DnsDomainInfo.dns_forest", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryDomainInformationPolicy_info, 
-	  { "Info", "lsarpc.lsa_QueryDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustDomainInfo_netbios_domain_name, 
-	  { "Netbios Domain Name", "lsarpc.lsa_ForestTrustDomainInfo.netbios_domain_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Netbios Domain Name", "lsarpc.lsa_ForestTrustDomainInfo.netbios_domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_trust_direction, 
-	  { "Trust Direction", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_direction", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Trust Direction", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_direction", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_sids, 
-	  { "Sids", "lsarpc.lsa_LookupNames3.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupNames3.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_unknown, 
-	  { "Unknown", "lsarpc.lsa_AuditLogInfo.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_AuditLogInfo.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_retention_time, 
-	  { "Retention Time", "lsarpc.lsa_AuditLogInfo.retention_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Retention Time", "lsarpc.lsa_AuditLogInfo.retention_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_sec_desc, 
-	  { "Sec Desc", "lsarpc.lsa_ObjectAttribute.sec_desc", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sec Desc", "lsarpc.lsa_ObjectAttribute.sec_desc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DnsDomainInfo_name, 
-	  { "Name", "lsarpc.lsa_DnsDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_DnsDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_efs_blob_len, 
-	  { "EFS blob size", "lsarpc.efs.blob_size", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "EFS blob size", "lsarpc.efs.blob_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid2_sid_index, 
-	  { "Sid Index", "lsarpc.lsa_TranslatedSid2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Index", "lsarpc.lsa_TranslatedSid2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecret_old_mtime, 
-	  { "Old Mtime", "lsarpc.lsa_QuerySecret.old_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Mtime", "lsarpc.lsa_QuerySecret.old_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomain_handle, 
-	  { "Handle", "lsarpc.lsa_OpenTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransNameArray_names, 
-	  { "Names", "lsarpc.lsa_TransNameArray.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_TransNameArray.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_CONTROLLERS, 
-	  { "Lsa Domain Query Controllers", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_CONTROLLERS", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_CONTROLLERS_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Lsa Domain Query Controllers", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_CONTROLLERS", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_CONTROLLERS_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RefDomainList_count, 
-	  { "Count", "lsarpc.lsa_RefDomainList.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_RefDomainList.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy2_info, 
-	  { "Info", "lsarpc.lsa_QueryInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInformationPolicy_kerberos_info, 
-	  { "Kerberos Info", "lsarpc.lsa_DomainInformationPolicy.kerberos_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Kerberos Info", "lsarpc.lsa_DomainInformationPolicy.kerberos_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy_info, 
-	  { "Info", "lsarpc.lsa_QueryInfoPolicy.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryInfoPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateAccount_acct_handle, 
-	  { "Acct Handle", "lsarpc.lsa_CreateAccount.acct_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Acct Handle", "lsarpc.lsa_CreateAccount.acct_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_shutdown_in_progress, 
-	  { "Shutdown In Progress", "lsarpc.lsa_AuditLogInfo.shutdown_in_progress", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Shutdown In Progress", "lsarpc.lsa_AuditLogInfo.shutdown_in_progress", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenSecret_handle, 
-	  { "Handle", "lsarpc.lsa_OpenSecret.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenSecret.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoBuffer_secret_type, 
-	  { "Secret Type", "lsarpc.lsa_TrustDomainInfoBuffer.secret_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Secret Type", "lsarpc.lsa_TrustDomainInfoBuffer.secret_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoName_netbios_name, 
-	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoName.netbios_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoName.netbios_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_handle, 
-	  { "Handle", "lsarpc.lsa_LookupNames.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupNames.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustDom_max_size, 
-	  { "Max Size", "lsarpc.lsa_EnumTrustDom.max_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Size", "lsarpc.lsa_EnumTrustDom.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoPassword_password, 
-	  { "Password", "lsarpc.lsa_TrustDomainInfoPassword.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "lsarpc.lsa_TrustDomainInfoPassword.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_object_name, 
-	  { "Object Name", "lsarpc.lsa_ObjectAttribute.object_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Object Name", "lsarpc.lsa_ObjectAttribute.object_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateTrustedDomain_handle, 
-	  { "Handle", "lsarpc.lsa_CreateTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_CreateTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustDom_resume_handle, 
-	  { "Resume Handle", "lsarpc.lsa_EnumTrustDom.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "lsarpc.lsa_EnumTrustDom.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_info11, 
-	  { "Info11", "lsarpc.lsa_TrustedDomainInfo.info11", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info11", "lsarpc.lsa_TrustedDomainInfo.info11", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QosInfo_impersonation_level, 
-	  { "Impersonation Level", "lsarpc.lsa_QosInfo.impersonation_level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SecurityImpersonationLevel_vals), 0, "", HFILL }},
+	  { "Impersonation Level", "lsarpc.lsa_QosInfo.impersonation_level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SecurityImpersonationLevel_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy2_level, 
-	  { "Level", "lsarpc.lsa_QueryInfoPolicy2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryInfoPolicy2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid3_sid, 
-	  { "Sid", "lsarpc.lsa_TranslatedSid3.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_TranslatedSid3.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoBasic_netbios_name, 
-	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoBasic.netbios_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoBasic.netbios_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_AUDIT_LOG_ADMIN, 
-	  { "Lsa Policy Audit Log Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_AUDIT_LOG_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_AUDIT_LOG_ADMIN_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Lsa Policy Audit Log Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_AUDIT_LOG_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_AUDIT_LOG_ADMIN_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustInformation_entries, 
-	  { "Entries", "lsarpc.lsa_ForestTrustInformation.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "lsarpc.lsa_ForestTrustInformation.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustData_top_level_name_ex, 
-	  { "Top Level Name Ex", "lsarpc.lsa_ForestTrustData.top_level_name_ex", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Top Level Name Ex", "lsarpc.lsa_ForestTrustData.top_level_name_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_non_paged_pool, 
-	  { "Non Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.non_paged_pool", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Non Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.non_paged_pool", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustBinaryData_length, 
-	  { "Length", "lsarpc.lsa_ForestTrustBinaryData.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_ForestTrustBinaryData.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_unknown, 
-	  { "Unknown", "lsarpc.lsa_DefaultQuotaInfo.unknown", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_DefaultQuotaInfo.unknown", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QosInfo_len, 
-	  { "Len", "lsarpc.lsa_QosInfo.len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Len", "lsarpc.lsa_QosInfo.len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditFullQueryInfo_unknown, 
-	  { "Unknown", "lsarpc.lsa_AuditFullQueryInfo.unknown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_AuditFullQueryInfo.unknown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_level, 
-	  { "Level", "lsarpc.lsa_LookupNames3.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupNames3.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivDisplayName_disp_name, 
-	  { "Disp Name", "lsarpc.lsa_LookupPrivDisplayName.disp_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Disp Name", "lsarpc.lsa_LookupPrivDisplayName.disp_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_level, 
-	  { "Level", "lsarpc.lsa_LookupNames.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupNames.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_count, 
-	  { "Count", "lsarpc.lsa_LookupNames4.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupNames4.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_names, 
-	  { "Names", "lsarpc.lsa_LookupNames.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupNames.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES, 
-	  { "Lsa Account Adjust Privileges", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_PRIVILEGES", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Lsa Account Adjust Privileges", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_PRIVILEGES", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_PRIVILEGES_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfo11_data1, 
-	  { "Data1", "lsarpc.lsa_TrustDomainInfo11.data1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Data1", "lsarpc.lsa_TrustDomainInfo11.data1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivEntry_luid, 
-	  { "Luid", "lsarpc.lsa_PrivEntry.luid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Luid", "lsarpc.lsa_PrivEntry.luid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccounts_resume_handle, 
-	  { "Resume Handle", "lsarpc.lsa_EnumAccounts.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "lsarpc.lsa_EnumAccounts.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_level, 
-	  { "Level", "lsarpc.lsa_LookupSids3.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupSids3.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF_data, 
-	  { "Data", "lsarpc.lsa_DATA_BUF.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "lsarpc.lsa_DATA_BUF.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomainByName_name, 
-	  { "Name", "lsarpc.lsa_OpenTrustedDomainByName.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_OpenTrustedDomainByName.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainListEx_count, 
-	  { "Count", "lsarpc.lsa_DomainListEx.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_DomainListEx.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_AUTH, 
-	  { "Lsa Domain Query Auth", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_AUTH", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_AUTH_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Lsa Domain Query Auth", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_AUTH", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_AUTH_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_pagefile, 
-	  { "Pagefile", "lsarpc.lsa_DefaultQuotaInfo.pagefile", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pagefile", "lsarpc.lsa_DefaultQuotaInfo.pagefile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_min_wss, 
-	  { "Min Wss", "lsarpc.lsa_DefaultQuotaInfo.min_wss", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Min Wss", "lsarpc.lsa_DefaultQuotaInfo.min_wss", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustData_top_level_name, 
-	  { "Top Level Name", "lsarpc.lsa_ForestTrustData.top_level_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Top Level Name", "lsarpc.lsa_ForestTrustData.top_level_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName2_sid_type, 
-	  { "Sid Type", "lsarpc.lsa_TranslatedName2.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Sid Type", "lsarpc.lsa_TranslatedName2.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomain_trustdom_handle, 
-	  { "Trustdom Handle", "lsarpc.lsa_OpenTrustedDomain.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trustdom Handle", "lsarpc.lsa_OpenTrustedDomain.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoFullInfo_info_ex, 
-	  { "Info Ex", "lsarpc.lsa_TrustDomainInfoFullInfo.info_ex", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info Ex", "lsarpc.lsa_TrustDomainInfoFullInfo.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF2_data, 
-	  { "Data", "lsarpc.lsa_DATA_BUF2.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "lsarpc.lsa_DATA_BUF2.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemoveAccountRights_handle, 
-	  { "Handle", "lsarpc.lsa_RemoveAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_RemoveAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_count, 
-	  { "Count", "lsarpc.lsa_LookupNames3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupNames3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_unknown2, 
-	  { "Unknown2", "lsarpc.lsa_LookupNames2.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "lsarpc.lsa_LookupNames2.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustedDomainsEx_resume_handle, 
-	  { "Resume Handle", "lsarpc.lsa_EnumTrustedDomainsEx.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "lsarpc.lsa_EnumTrustedDomainsEx.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransNameArray2_count, 
-	  { "Count", "lsarpc.lsa_TransNameArray2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_TransNameArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfo_sid, 
-	  { "Sid", "lsarpc.lsa_DomainInfo.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_DomainInfo.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoByName_level, 
-	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfoByName.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfoByName.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_sid, 
-	  { "Sid", "lsarpc.lsa_TrustDomainInfoInfoEx.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_TrustDomainInfoInfoEx.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_previous_auth_info, 
-	  { "Incoming Previous Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_previous_auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Incoming Previous Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_previous_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_domains, 
-	  { "Domains", "lsarpc.lsa_LookupNames3.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupNames3.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetSecret_new_val, 
-	  { "New Val", "lsarpc.lsa_SetSecret.new_val", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Val", "lsarpc.lsa_SetSecret.new_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_String_string, 
-	  { "String", "lsarpc.lsa_String.string", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "String", "lsarpc.lsa_String.string", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivArray_count, 
-	  { "Count", "lsarpc.lsa_PrivArray.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_PrivArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfo_level, 
-	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfo.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryTrustedDomainInfo.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF_size, 
-	  { "Size", "lsarpc.lsa_DATA_BUF.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_DATA_BUF.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryDomainInformationPolicy_level, 
-	  { "Level", "lsarpc.lsa_QueryDomainInformationPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_DomainInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryDomainInformationPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_DomainInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_AUTH, 
-	  { "Lsa Domain Set Auth", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_AUTH", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_AUTH_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Lsa Domain Set Auth", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_AUTH", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_AUTH_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_StringLarge_string, 
-	  { "String", "lsarpc.lsa_StringLarge.string", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "String", "lsarpc.lsa_StringLarge.string", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfo_name, 
-	  { "Name", "lsarpc.lsa_DomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_DomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AsciiString_size, 
-	  { "Size", "lsarpc.lsa_AsciiString.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_AsciiString.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_sids, 
-	  { "Sids", "lsarpc.lsa_LookupNames2.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupNames2.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_SET_POSIX, 
-	  { "Lsa Domain Set Posix", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_POSIX", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_POSIX_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Lsa Domain Set Posix", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_SET_POSIX", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_SET_POSIX_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetDomainInformationPolicy_level, 
-	  { "Level", "lsarpc.lsa_SetDomainInformationPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_DomainInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_SetDomainInformationPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_DomainInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_account_access_mask, 
-	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy2_info, 
-	  { "Info", "lsarpc.lsa_SetInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_SetInfoPolicy2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AsciiStringLarge_string, 
-	  { "String", "lsarpc.lsa_AsciiStringLarge.string", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "String", "lsarpc.lsa_AsciiStringLarge.string", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_level, 
-	  { "Level", "lsarpc.lsa_LookupSids2.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupSids2.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenSecret_sec_handle, 
-	  { "Sec Handle", "lsarpc.lsa_OpenSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Handle", "lsarpc.lsa_OpenSecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_incoming_current_auth_info, 
-	  { "Incoming Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Incoming Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.incoming_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInformationPolicy_efs_info, 
-	  { "Efs Info", "lsarpc.lsa_DomainInformationPolicy.efs_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Efs Info", "lsarpc.lsa_DomainInformationPolicy.efs_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccounts_sids, 
-	  { "Sids", "lsarpc.lsa_EnumAccounts.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_EnumAccounts.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ReplicaSourceInfo_source, 
-	  { "Source", "lsarpc.lsa_ReplicaSourceInfo.source", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Source", "lsarpc.lsa_ReplicaSourceInfo.source", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_unknown1, 
-	  { "Unknown1", "lsarpc.lsa_LookupNames3.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "lsarpc.lsa_LookupNames3.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecurity_sec_info, 
-	  { "Sec Info", "lsarpc.lsa_QuerySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sec Info", "lsarpc.lsa_QuerySecurity.sec_info", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_enforce_restrictions, 
-	  { "Enforce Restrictions", "lsarpc.lsa_DomainInfoKerberos.enforce_restrictions", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enforce Restrictions", "lsarpc.lsa_DomainInfoKerberos.enforce_restrictions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_domains, 
-	  { "Domains", "lsarpc.lsa_LookupSids2.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupSids2.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_policy_access_mask, 
-	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustedDomainsEx_domains, 
-	  { "Domains", "lsarpc.lsa_EnumTrustedDomainsEx.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_EnumTrustedDomainsEx.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccounts_num_entries, 
-	  { "Num Entries", "lsarpc.lsa_EnumAccounts.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Entries", "lsarpc.lsa_EnumAccounts.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_domain_access_mask, 
-	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "lsarpc.policy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_info_all, 
-	  { "Info All", "lsarpc.lsa_TrustedDomainInfo.info_all", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info All", "lsarpc.lsa_TrustedDomainInfo.info_all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoFullInfo_posix_offset, 
-	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoFullInfo.posix_offset", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoFullInfo.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_trust_type, 
-	  { "Trust Type", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Trust Type", "lsarpc.lsa_TrustDomainInfoInfoEx.trust_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DnsDomainInfo_sid, 
-	  { "Sid", "lsarpc.lsa_DnsDomainInfo.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_DnsDomainInfo.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_num_names, 
-	  { "Num Names", "lsarpc.lsa_LookupNames.num_names", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Names", "lsarpc.lsa_LookupNames.num_names", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustDomainInfo_domain_sid, 
-	  { "Domain Sid", "lsarpc.lsa_ForestTrustDomainInfo.domain_sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Domain Sid", "lsarpc.lsa_ForestTrustDomainInfo.domain_sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_handle, 
-	  { "Handle", "lsarpc.lsa_LookupSids.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupSids.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AsciiString_string, 
-	  { "String", "lsarpc.lsa_AsciiString.string", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "String", "lsarpc.lsa_AsciiString.string", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_info_ex, 
-	  { "Info Ex", "lsarpc.lsa_TrustedDomainInfo.info_ex", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info Ex", "lsarpc.lsa_TrustedDomainInfo.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemovePrivilegesFromAccount_handle, 
-	  { "Handle", "lsarpc.lsa_RemovePrivilegesFromAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_RemovePrivilegesFromAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateAccount_handle, 
-	  { "Handle", "lsarpc.lsa_CreateAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_CreateAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_name, 
-	  { "Name", "lsarpc.lsa_TrustedDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_TrustedDomainInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_unknown2, 
-	  { "Unknown2", "lsarpc.lsa_LookupNames4.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "lsarpc.lsa_LookupNames4.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountRights_rights, 
-	  { "Rights", "lsarpc.lsa_EnumAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rights", "lsarpc.lsa_EnumAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainAccessMask_LSA_DOMAIN_QUERY_POSIX, 
-	  { "Lsa Domain Query Posix", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_POSIX", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_POSIX_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Lsa Domain Query Posix", "lsarpc.lsa_DomainAccessMask.LSA_DOMAIN_QUERY_POSIX", FT_BOOLEAN, 32, TFS(&lsa_DomainAccessMask_LSA_DOMAIN_QUERY_POSIX_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivDisplayName_name, 
-	  { "Name", "lsarpc.lsa_LookupPrivDisplayName.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_LookupPrivDisplayName.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_GET_PRIVATE_INFORMATION, 
-	  { "Lsa Policy Get Private Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_GET_PRIVATE_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_GET_PRIVATE_INFORMATION_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Lsa Policy Get Private Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_GET_PRIVATE_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_GET_PRIVATE_INFORMATION_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy2_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenPolicy2.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenPolicy2.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy2_handle, 
-	  { "Handle", "lsarpc.lsa_SetInfoPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_SetInfoPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_sec_desc_buf_len, 
-	  { "Sec Desc Buf Len", "lsarpc.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Sec Desc Buf Len", "lsarpc.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_num_names, 
-	  { "Num Names", "lsarpc.lsa_LookupNames2.num_names", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Names", "lsarpc.lsa_LookupNames2.num_names", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy2_level, 
-	  { "Level", "lsarpc.lsa_SetInfoPolicy2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_SetInfoPolicy2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivsAccount_privs, 
-	  { "Privs", "lsarpc.lsa_EnumPrivsAccount.privs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Privs", "lsarpc.lsa_EnumPrivsAccount.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenAccount_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivs_privs, 
-	  { "Privs", "lsarpc.lsa_EnumPrivs.privs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Privs", "lsarpc.lsa_EnumPrivs.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN, 
-	  { "Lsa Policy Trust Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_TRUST_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Lsa Policy Trust Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_TRUST_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_TRUST_ADMIN_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_percent_full, 
-	  { "Percent Full", "lsarpc.lsa_AuditLogInfo.percent_full", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Percent Full", "lsarpc.lsa_AuditLogInfo.percent_full", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_quota, 
-	  { "Quota", "lsarpc.lsa_PolicyInformation.quota", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Quota", "lsarpc.lsa_PolicyInformation.quota", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemovePrivilegesFromAccount_privs, 
-	  { "Privs", "lsarpc.lsa_RemovePrivilegesFromAccount.privs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Privs", "lsarpc.lsa_RemovePrivilegesFromAccount.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid3_unknown, 
-	  { "Unknown", "lsarpc.lsa_TranslatedSid3.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_TranslatedSid3.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName_sid_type, 
-	  { "Sid Type", "lsarpc.lsa_TranslatedName.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Sid Type", "lsarpc.lsa_TranslatedName.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_names, 
-	  { "Names", "lsarpc.lsa_LookupSids2.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupSids2.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivsAccount_handle, 
-	  { "Handle", "lsarpc.lsa_EnumPrivsAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumPrivsAccount.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SidArray_sids, 
-	  { "Sids", "lsarpc.lsa_SidArray.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_SidArray.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemoveAccountRights_sid, 
-	  { "Sid", "lsarpc.lsa_RemoveAccountRights.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_RemoveAccountRights.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfo_info, 
-	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_String_length, 
-	  { "Length", "lsarpc.lsa_String.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_String.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_opnum, 
-	  { "Operation", "lsarpc.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "lsarpc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivilegeSet_count, 
-	  { "Count", "lsarpc.lsa_PrivilegeSet.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_PrivilegeSet.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetTrustedDomainInfoByName_level, 
-	  { "Level", "lsarpc.lsa_SetTrustedDomainInfoByName.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_SetTrustedDomainInfoByName.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_TrustDomInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivDisplayName_language_id, 
-	  { "Language Id", "lsarpc.lsa_LookupPrivDisplayName.language_id", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Language Id", "lsarpc.lsa_LookupPrivDisplayName.language_id", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray3_sids, 
-	  { "Sids", "lsarpc.lsa_TransSidArray3.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_TransSidArray3.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_status, 
-	  { "NT Error", "lsarpc.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, "", HFILL }},
+	  { "NT Error", "lsarpc.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_count, 
-	  { "Count", "lsarpc.lsa_LookupNames.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupNames.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_previous_auth_info, 
-	  { "Outgoing Previous Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_previous_auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Outgoing Previous Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_previous_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivValue_name, 
-	  { "Name", "lsarpc.lsa_LookupPrivValue.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_LookupPrivValue.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustBinaryData_data, 
-	  { "Data", "lsarpc.lsa_ForestTrustBinaryData.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "lsarpc.lsa_ForestTrustBinaryData.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS, 
-	  { "Lsa Account Adjust System Access", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Lsa Account Adjust System Access", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_SYSTEM_ACCESS_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid_sid_index, 
-	  { "Sid Index", "lsarpc.lsa_TranslatedSid.sid_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Index", "lsarpc.lsa_TranslatedSid.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_CREATE_ACCOUNT, 
-	  { "Lsa Policy Create Account", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_ACCOUNT", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_ACCOUNT_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Lsa Policy Create Account", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_CREATE_ACCOUNT", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_CREATE_ACCOUNT_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AsciiStringLarge_length, 
-	  { "Length", "lsarpc.lsa_AsciiStringLarge.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_AsciiStringLarge.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomainByName_trustdom_handle, 
-	  { "Trustdom Handle", "lsarpc.lsa_OpenTrustedDomainByName.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trustdom Handle", "lsarpc.lsa_OpenTrustedDomainByName.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransNameArray2_names, 
-	  { "Names", "lsarpc.lsa_TransNameArray2.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_TransNameArray2.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustDom_handle, 
-	  { "Handle", "lsarpc.lsa_EnumTrustDom.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumTrustDom.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateAccount_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_CreateAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_CreateAccount.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy2_attr, 
-	  { "Attr", "lsarpc.lsa_OpenPolicy2.attr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Attr", "lsarpc.lsa_OpenPolicy2.attr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_netbios_name, 
-	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoInfoEx.netbios_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Netbios Name", "lsarpc.lsa_TrustDomainInfoInfoEx.netbios_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustRecord_flags, 
-	  { "Flags", "lsarpc.lsa_ForestTrustRecord.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "lsarpc.lsa_ForestTrustRecord.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy_system_name, 
-	  { "System Name", "lsarpc.lsa_OpenPolicy.system_name", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "lsarpc.lsa_OpenPolicy.system_name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_sids, 
-	  { "Sids", "lsarpc.lsa_LookupSids2.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupSids2.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName_sid_index, 
-	  { "Sid Index", "lsarpc.lsa_TranslatedName.sid_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Index", "lsarpc.lsa_TranslatedName.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_password, 
-	  { "Password", "lsarpc.lsa_TrustedDomainInfo.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "lsarpc.lsa_TrustedDomainInfo.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ModificationInfo_db_create_time, 
-	  { "Db Create Time", "lsarpc.lsa_ModificationInfo.db_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Db Create Time", "lsarpc.lsa_ModificationInfo.db_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION, 
-	  { "Lsa Policy Notification", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_NOTIFICATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION_tfs), ( 0x00001000 ), "", HFILL }},
+	  { "Lsa Policy Notification", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_NOTIFICATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_NOTIFICATION_tfs), ( 0x00001000 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_domain, 
-	  { "Domain", "lsarpc.lsa_PolicyInformation.domain", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain", "lsarpc.lsa_PolicyInformation.domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF2_size, 
-	  { "Size", "lsarpc.lsa_DATA_BUF2.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_DATA_BUF2.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoByName_handle, 
-	  { "Handle", "lsarpc.lsa_QueryTrustedDomainInfoByName.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QueryTrustedDomainInfoByName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SET_AUDIT_REQUIREMENTS, 
-	  { "Lsa Policy Set Audit Requirements", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SET_AUDIT_REQUIREMENTS", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SET_AUDIT_REQUIREMENTS_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Lsa Policy Set Audit Requirements", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SET_AUDIT_REQUIREMENTS", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SET_AUDIT_REQUIREMENTS_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_unknown1, 
-	  { "Unknown1", "lsarpc.lsa_LookupNames2.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "lsarpc.lsa_LookupNames2.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_domains, 
-	  { "Domains", "lsarpc.lsa_LookupNames4.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupNames4.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_unknown2, 
-	  { "Unknown2", "lsarpc.lsa_LookupSids3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "lsarpc.lsa_LookupSids3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid_sid_type, 
-	  { "Sid Type", "lsarpc.lsa_TranslatedSid.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Sid Type", "lsarpc.lsa_TranslatedSid.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_count, 
-	  { "Count", "lsarpc.lsa_LookupNames2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupNames2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustDomainInfo_dns_domain_name, 
-	  { "Dns Domain Name", "lsarpc.lsa_ForestTrustDomainInfo.dns_domain_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Dns Domain Name", "lsarpc.lsa_ForestTrustDomainInfo.dns_domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_next_audit_record, 
-	  { "Next Audit Record", "lsarpc.lsa_AuditLogInfo.next_audit_record", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Next Audit Record", "lsarpc.lsa_AuditLogInfo.next_audit_record", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivArray_privs, 
-	  { "Privs", "lsarpc.lsa_PrivArray.privs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Privs", "lsarpc.lsa_PrivArray.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray2_sids, 
-	  { "Sids", "lsarpc.lsa_TransSidArray2.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_TransSidArray2.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray3_count, 
-	  { "Count", "lsarpc.lsa_TransSidArray3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_TransSidArray3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_handle, 
-	  { "Handle", "lsarpc.lsa_lsaRQueryForestTrustInformation.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_lsaRQueryForestTrustInformation.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainList_count, 
-	  { "Count", "lsarpc.lsa_DomainList.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_DomainList.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecret_sec_handle, 
-	  { "Sec Handle", "lsarpc.lsa_QuerySecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Handle", "lsarpc.lsa_QuerySecret.sec_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditFullQueryInfo_shutdown_on_full, 
-	  { "Shutdown On Full", "lsarpc.lsa_AuditFullQueryInfo.shutdown_on_full", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Shutdown On Full", "lsarpc.lsa_AuditFullQueryInfo.shutdown_on_full", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_GetUserName_system_name, 
-	  { "System Name", "lsarpc.lsa_GetUserName.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "lsarpc.lsa_GetUserName.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SidArray_num_sids, 
-	  { "Num Sids", "lsarpc.lsa_SidArray.num_sids", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Sids", "lsarpc.lsa_SidArray.num_sids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_level, 
-	  { "Level", "lsarpc.lsa_LookupNames4.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupNames4.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_handle, 
-	  { "Handle", "lsarpc.lsa_QueryTrustedDomainInfoBySid.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QueryTrustedDomainInfoBySid.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RightSet_names, 
-	  { "Names", "lsarpc.lsa_RightSet.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_RightSet.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_domains, 
-	  { "Domains", "lsarpc.lsa_LookupNames.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupNames.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_unknown2, 
-	  { "Unknown2", "lsarpc.lsa_LookupSids2.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "lsarpc.lsa_LookupSids2.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames_sids, 
-	  { "Sids", "lsarpc.lsa_LookupNames.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupNames.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountsWithUserRight_name, 
-	  { "Name", "lsarpc.lsa_EnumAccountsWithUserRight.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_EnumAccountsWithUserRight.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivName_name, 
-	  { "Name", "lsarpc.lsa_LookupPrivName.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_LookupPrivName.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION, 
-	  { "Lsa Policy View Local Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_VIEW_LOCAL_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Lsa Policy View Local Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_VIEW_LOCAL_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_VIEW_LOCAL_INFORMATION_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_sids, 
-	  { "Sids", "lsarpc.lsa_LookupNames4.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupNames4.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RefDomainList_domains, 
-	  { "Domains", "lsarpc.lsa_RefDomainList.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_RefDomainList.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetDomainInformationPolicy_info, 
-	  { "Info", "lsarpc.lsa_SetDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_SetDomainInformationPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetDomainInformationPolicy_handle, 
-	  { "Handle", "lsarpc.lsa_SetDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_SetDomainInformationPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_replica, 
-	  { "Replica", "lsarpc.lsa_PolicyInformation.replica", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Replica", "lsarpc.lsa_PolicyInformation.replica", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoAll_info_ex, 
-	  { "Info Ex", "lsarpc.lsa_TrustDomainInfoInfoAll.info_ex", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info Ex", "lsarpc.lsa_TrustDomainInfoInfoAll.info_ex", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray_count, 
-	  { "Count", "lsarpc.lsa_TransSidArray.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_TransSidArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoFullInfo_auth_info, 
-	  { "Auth Info", "lsarpc.lsa_TrustDomainInfoFullInfo.auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Auth Info", "lsarpc.lsa_TrustDomainInfoFullInfo.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountRights_handle, 
-	  { "Handle", "lsarpc.lsa_EnumAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_time_to_shutdown, 
-	  { "Time To Shutdown", "lsarpc.lsa_AuditLogInfo.time_to_shutdown", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Time To Shutdown", "lsarpc.lsa_AuditLogInfo.time_to_shutdown", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_VIEW, 
-	  { "Lsa Account View", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_VIEW", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_VIEW_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Lsa Account View", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_VIEW", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_VIEW_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoEx_domain_name, 
-	  { "Domain Name", "lsarpc.lsa_TrustDomainInfoInfoEx.domain_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Name", "lsarpc.lsa_TrustDomainInfoInfoEx.domain_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_unknown1, 
-	  { "Unknown1", "lsarpc.lsa_LookupSids3.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "lsarpc.lsa_LookupSids3.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_count, 
-	  { "Count", "lsarpc.lsa_LookupSids2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupSids2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_info_basic, 
-	  { "Info Basic", "lsarpc.lsa_TrustedDomainInfo.info_basic", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info Basic", "lsarpc.lsa_TrustedDomainInfo.info_basic", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoPosixOffset_posix_offset, 
-	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoPosixOffset.posix_offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoPosixOffset.posix_offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenSecret_name, 
-	  { "Name", "lsarpc.lsa_OpenSecret.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_OpenSecret.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_db, 
-	  { "Db", "lsarpc.lsa_PolicyInformation.db", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Db", "lsarpc.lsa_PolicyInformation.db", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_String_name, 
-	  { "String", "lsarpc.lsa.string", FT_STRING, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "String", "lsarpc.lsa.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_GetUserName_account_name, 
-	  { "Account Name", "lsarpc.lsa_GetUserName.account_name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "lsarpc.lsa_GetUserName.account_name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LUIDAttribute_attribute, 
-	  { "Attribute", "lsarpc.lsa_LUIDAttribute.attribute", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Attribute", "lsarpc.lsa_LUIDAttribute.attribute", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF_PTR_buf, 
-	  { "Buf", "lsarpc.lsa_DATA_BUF_PTR.buf", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Buf", "lsarpc.lsa_DATA_BUF_PTR.buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_OpenPolicy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_OpenPolicy.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_sids, 
-	  { "Sids", "lsarpc.lsa_LookupSids3.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupSids3.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_String_size, 
-	  { "Size", "lsarpc.lsa_String.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_String.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoAuthInfo_outgoing_current_auth_info, 
-	  { "Outgoing Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Outgoing Current Auth Info", "lsarpc.lsa_TrustDomainInfoAuthInfo.outgoing_current_auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_posix_offset, 
-	  { "Posix Offset", "lsarpc.lsa_TrustedDomainInfo.posix_offset", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Posix Offset", "lsarpc.lsa_TrustedDomainInfo.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_unknown6, 
-	  { "Unknown6", "lsarpc.lsa_DomainInfoKerberos.unknown6", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown6", "lsarpc.lsa_DomainInfoKerberos.unknown6", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids2_unknown1, 
-	  { "Unknown1", "lsarpc.lsa_LookupSids2.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "lsarpc.lsa_LookupSids2.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenAccount_sid, 
-	  { "Sid", "lsarpc.lsa_OpenAccount.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_OpenAccount.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetTrustedDomainInfoByName_handle, 
-	  { "Handle", "lsarpc.lsa_SetTrustedDomainInfoByName.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_SetTrustedDomainInfoByName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DnsDomainInfo_domain_guid, 
-	  { "Domain Guid", "lsarpc.lsa_DnsDomainInfo.domain_guid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Guid", "lsarpc.lsa_DnsDomainInfo.domain_guid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LUIDAttribute_luid, 
-	  { "Luid", "lsarpc.lsa_LUIDAttribute.luid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Luid", "lsarpc.lsa_LUIDAttribute.luid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoKerberos_user_tkt_lifetime, 
-	  { "User Tkt Lifetime", "lsarpc.lsa_DomainInfoKerberos.user_tkt_lifetime", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User Tkt Lifetime", "lsarpc.lsa_DomainInfoKerberos.user_tkt_lifetime", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AddAccountRights_rights, 
-	  { "Rights", "lsarpc.lsa_AddAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rights", "lsarpc.lsa_AddAccountRights.rights", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoAll_data1, 
-	  { "Data1", "lsarpc.lsa_TrustDomainInfoInfoAll.data1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Data1", "lsarpc.lsa_TrustDomainInfoInfoAll.data1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivilegeSet_unknown, 
-	  { "Unknown", "lsarpc.lsa_PrivilegeSet.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_PrivilegeSet.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_root_dir, 
-	  { "Root Dir", "lsarpc.lsa_ObjectAttribute.root_dir", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Root Dir", "lsarpc.lsa_ObjectAttribute.root_dir", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_names, 
-	  { "Names", "lsarpc.lsa_LookupSids3.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupSids3.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateSecret_handle, 
-	  { "Handle", "lsarpc.lsa_CreateSecret.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_CreateSecret.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_StringLarge_length, 
-	  { "Length", "lsarpc.lsa_StringLarge.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_StringLarge.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS, 
-	  { "Lsa Account Adjust Quotas", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_QUOTAS", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Lsa Account Adjust Quotas", "lsarpc.lsa_AccountAccessMask.LSA_ACCOUNT_ADJUST_QUOTAS", FT_BOOLEAN, 32, TFS(&lsa_AccountAccessMask_LSA_ACCOUNT_ADJUST_QUOTAS_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_names, 
-	  { "Names", "lsarpc.lsa_LookupNames2.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_LookupNames2.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenAccount_acct_handle, 
-	  { "Acct Handle", "lsarpc.lsa_OpenAccount.acct_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Acct Handle", "lsarpc.lsa_OpenAccount.acct_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_StringPointer_string, 
-	  { "String", "lsarpc.lsa_StringPointer.string", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "String", "lsarpc.lsa_StringPointer.string", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_SERVER_ADMIN, 
-	  { "Lsa Policy Server Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SERVER_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SERVER_ADMIN_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Lsa Policy Server Admin", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_SERVER_ADMIN", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_SERVER_ADMIN_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecret_old_val, 
-	  { "Old Val", "lsarpc.lsa_QuerySecret.old_val", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Val", "lsarpc.lsa_QuerySecret.old_val", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DeleteTrustedDomain_handle, 
-	  { "Handle", "lsarpc.lsa_DeleteTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_DeleteTrustedDomain.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivDisplayName_handle, 
-	  { "Handle", "lsarpc.lsa_LookupPrivDisplayName.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupPrivDisplayName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_domains, 
-	  { "Domains", "lsarpc.lsa_LookupNames2.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupNames2.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivs_resume_handle, 
-	  { "Resume Handle", "lsarpc.lsa_EnumPrivs.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "lsarpc.lsa_EnumPrivs.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_handle, 
-	  { "Handle", "lsarpc.lsa_LookupNames2.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupNames2.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetTrustedDomainInfoByName_info, 
-	  { "Info", "lsarpc.lsa_SetTrustedDomainInfoByName.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_SetTrustedDomainInfoByName.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AddPrivilegesToAccount_privs, 
-	  { "Privs", "lsarpc.lsa_AddPrivilegesToAccount.privs", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Privs", "lsarpc.lsa_AddPrivilegesToAccount.privs", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_Close_handle, 
-	  { "Handle", "lsarpc.lsa_Close.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_Close.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName2_name, 
-	  { "Name", "lsarpc.lsa_TranslatedName2.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_TranslatedName2.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AddAccountRights_sid, 
-	  { "Sid", "lsarpc.lsa_AddAccountRights.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_AddAccountRights.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivValue_luid, 
-	  { "Luid", "lsarpc.lsa_LookupPrivValue.luid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Luid", "lsarpc.lsa_LookupPrivValue.luid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_LOOKUP_NAMES, 
-	  { "Lsa Policy Lookup Names", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_LOOKUP_NAMES", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_LOOKUP_NAMES_tfs), ( 0x00000800 ), "", HFILL }},
+	  { "Lsa Policy Lookup Names", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_LOOKUP_NAMES", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_LOOKUP_NAMES_tfs), ( 0x00000800 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName2_unknown, 
-	  { "Unknown", "lsarpc.lsa_TranslatedName2.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_TranslatedName2.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustRecord_unknown, 
-	  { "Unknown", "lsarpc.lsa_ForestTrustRecord.unknown", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_ForestTrustRecord.unknown", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateTrustedDomain_access_mask, 
-	  { "Access Mask", "lsarpc.lsa_CreateTrustedDomain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "lsarpc.lsa_CreateTrustedDomain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainList_domains, 
-	  { "Domains", "lsarpc.lsa_DomainList.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_DomainList.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CreateSecret_name, 
-	  { "Name", "lsarpc.lsa_CreateSecret.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_CreateSecret.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditEventsInfo_auditing_mode, 
-	  { "Auditing Mode", "lsarpc.lsa_AuditEventsInfo.auditing_mode", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Auditing Mode", "lsarpc.lsa_AuditEventsInfo.auditing_mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoBySid_info, 
-	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfoBySid.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfoBySid.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountsWithUserRight_sids, 
-	  { "Sids", "lsarpc.lsa_EnumAccountsWithUserRight.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_EnumAccountsWithUserRight.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy_info, 
-	  { "Info", "lsarpc.lsa_SetInfoPolicy.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_SetInfoPolicy.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SidPtr_sid, 
-	  { "Sid", "lsarpc.lsa_SidPtr.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_SidPtr.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfoByName_info, 
-	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfoByName.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "lsarpc.lsa_QueryTrustedDomainInfoByName.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_names, 
-	  { "Names", "lsarpc.lookup.names", FT_NONE, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Names", "lsarpc.lookup.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PDAccountInfo_name, 
-	  { "Name", "lsarpc.lsa_PDAccountInfo.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_PDAccountInfo.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecurity_handle, 
-	  { "Handle", "lsarpc.lsa_QuerySecurity.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QuerySecurity.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustInformation_count, 
-	  { "Count", "lsarpc.lsa_ForestTrustInformation.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_ForestTrustInformation.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_unknown, 
-	  { "Unknown", "lsarpc.lsa_lsaRQueryForestTrustInformation.unknown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_lsaRQueryForestTrustInformation.unknown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_domains, 
-	  { "Domains", "lsarpc.lsa_LookupSids3.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupSids3.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_Strings_count, 
-	  { "Count", "lsarpc.lsa_Strings.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_Strings.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy2_handle, 
-	  { "Handle", "lsarpc.lsa_QueryInfoPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_QueryInfoPolicy2.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryTrustedDomainInfo_trustdom_handle, 
-	  { "Trustdom Handle", "lsarpc.lsa_QueryTrustedDomainInfo.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Trustdom Handle", "lsarpc.lsa_QueryTrustedDomainInfo.trustdom_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoBuffer_data, 
-	  { "Data", "lsarpc.lsa_TrustDomainInfoBuffer.data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Data", "lsarpc.lsa_TrustDomainInfoBuffer.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_attributes, 
-	  { "Attributes", "lsarpc.lsa_ObjectAttribute.attributes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Attributes", "lsarpc.lsa_ObjectAttribute.attributes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_StringLarge_size, 
-	  { "Size", "lsarpc.lsa_StringLarge.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "lsarpc.lsa_StringLarge.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QosInfo_effective_only, 
-	  { "Effective Only", "lsarpc.lsa_QosInfo.effective_only", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Effective Only", "lsarpc.lsa_QosInfo.effective_only", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ObjectAttribute_len, 
-	  { "Len", "lsarpc.lsa_ObjectAttribute.len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Len", "lsarpc.lsa_ObjectAttribute.len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy_attr, 
-	  { "Attr", "lsarpc.lsa_OpenPolicy.attr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Attr", "lsarpc.lsa_OpenPolicy.attr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoBasic_sid, 
-	  { "Sid", "lsarpc.lsa_TrustDomainInfoBasic.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_TrustDomainInfoBasic.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PrivEntry_name, 
-	  { "Name", "lsarpc.lsa_PrivEntry.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_PrivEntry.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ServerRole_role, 
-	  { "Role", "lsarpc.lsa_ServerRole.role", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyServerRole_vals), 0, "", HFILL }},
+	  { "Role", "lsarpc.lsa_ServerRole.role", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyServerRole_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid3_sid_type, 
-	  { "Sid Type", "lsarpc.lsa_TranslatedSid3.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Sid Type", "lsarpc.lsa_TranslatedSid3.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames4_num_names, 
-	  { "Num Names", "lsarpc.lsa_LookupNames4.num_names", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Names", "lsarpc.lsa_LookupNames4.num_names", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustRecord_level, 
-	  { "Level", "lsarpc.lsa_ForestTrustRecord.level", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_ForestTrustRecordType_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_ForestTrustRecord.level", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_ForestTrustRecordType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumPrivs_max_count, 
-	  { "Max Count", "lsarpc.lsa_EnumPrivs.max_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Count", "lsarpc.lsa_EnumPrivs.max_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames2_level, 
-	  { "Level", "lsarpc.lsa_LookupNames2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupNames2.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_LookupNamesLevel_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupNames3_unknown2, 
-	  { "Unknown2", "lsarpc.lsa_LookupNames3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "lsarpc.lsa_LookupNames3.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DATA_BUF_length, 
-	  { "Length", "lsarpc.lsa_DATA_BUF.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_DATA_BUF.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_Strings_names, 
-	  { "Names", "lsarpc.lsa_Strings.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "lsarpc.lsa_Strings.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivDisplayName_unknown, 
-	  { "Unknown", "lsarpc.lsa_LookupPrivDisplayName.unknown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "lsarpc.lsa_LookupPrivDisplayName.unknown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_auditfullset, 
-	  { "Auditfullset", "lsarpc.lsa_PolicyInformation.auditfullset", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Auditfullset", "lsarpc.lsa_PolicyInformation.auditfullset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ForestTrustData_data, 
-	  { "Data", "lsarpc.lsa_ForestTrustData.data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Data", "lsarpc.lsa_ForestTrustData.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy_handle, 
-	  { "Handle", "lsarpc.lsa_OpenPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_count, 
-	  { "Count", "lsarpc.lsa_LookupSids.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupSids.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DnsDomainInfo_dns_domain, 
-	  { "Dns Domain", "lsarpc.lsa_DnsDomainInfo.dns_domain", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Dns Domain", "lsarpc.lsa_DnsDomainInfo.dns_domain", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName_name, 
-	  { "Name", "lsarpc.lsa_TranslatedName.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "lsarpc.lsa_TranslatedName.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QueryInfoPolicy_level, 
-	  { "Level", "lsarpc.lsa_QueryInfoPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_QueryInfoPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_domains, 
-	  { "Domains", "lsarpc.lsa_LookupSids.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_LookupSids.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid_rid, 
-	  { "Rid", "lsarpc.lsa_TranslatedSid.rid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rid", "lsarpc.lsa_TranslatedSid.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoEfs_efs_blob, 
-	  { "Efs Blob", "lsarpc.lsa_DomainInfoEfs.efs_blob", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Efs Blob", "lsarpc.lsa_DomainInfoEfs.efs_blob", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RemovePrivilegesFromAccount_remove_all, 
-	  { "Remove All", "lsarpc.lsa_RemovePrivilegesFromAccount.remove_all", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Remove All", "lsarpc.lsa_RemovePrivilegesFromAccount.remove_all", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE, 
-	  { "Lsa Secret Query Value", "lsarpc.lsa_SecretAccessMask.LSA_SECRET_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Lsa Secret Query Value", "lsarpc.lsa_SecretAccessMask.LSA_SECRET_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&lsa_SecretAccessMask_LSA_SECRET_QUERY_VALUE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AddAccountRights_handle, 
-	  { "Handle", "lsarpc.lsa_AddAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_AddAccountRights.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DomainInfoEfs_blob_size, 
-	  { "Blob Size", "lsarpc.lsa_DomainInfoEfs.blob_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Blob Size", "lsarpc.lsa_DomainInfoEfs.blob_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenPolicy2_system_name, 
-	  { "System Name", "lsarpc.lsa_OpenPolicy2.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "lsarpc.lsa_OpenPolicy2.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_lsaRQueryForestTrustInformation_forest_trust_info, 
-	  { "Forest Trust Info", "lsarpc.lsa_lsaRQueryForestTrustInformation.forest_trust_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Forest Trust Info", "lsarpc.lsa_lsaRQueryForestTrustInformation.forest_trust_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_max_wss, 
-	  { "Max Wss", "lsarpc.lsa_DefaultQuotaInfo.max_wss", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Wss", "lsarpc.lsa_DefaultQuotaInfo.max_wss", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_DefaultQuotaInfo_paged_pool, 
-	  { "Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.paged_pool", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Paged Pool", "lsarpc.lsa_DefaultQuotaInfo.paged_pool", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_level, 
-	  { "Level", "lsarpc.lsa_LookupSids.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_LookupSids.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditFullQueryInfo_log_is_full, 
-	  { "Log Is Full", "lsarpc.lsa_AuditFullQueryInfo.log_is_full", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Log Is Full", "lsarpc.lsa_AuditFullQueryInfo.log_is_full", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_RightSet_count, 
-	  { "Count", "lsarpc.lsa_RightSet.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_RightSet.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditLogInfo_log_size, 
-	  { "Log Size", "lsarpc.lsa_AuditLogInfo.log_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Log Size", "lsarpc.lsa_AuditLogInfo.log_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditEventsInfo_settings, 
-	  { "Settings", "lsarpc.lsa_AuditEventsInfo.settings", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_PolicyAuditPolicy_vals), 0, "", HFILL }},
+	  { "Settings", "lsarpc.lsa_AuditEventsInfo.settings", FT_UINT32, BASE_DEC, VALS(lsarpc_lsa_PolicyAuditPolicy_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid2_rid, 
-	  { "Rid", "lsarpc.lsa_TranslatedSid2.rid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rid", "lsarpc.lsa_TranslatedSid2.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid2_sid_type, 
-	  { "Sid Type", "lsarpc.lsa_TranslatedSid2.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Sid Type", "lsarpc.lsa_TranslatedSid2.sid_type", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_OpenTrustedDomainByName_handle, 
-	  { "Handle", "lsarpc.lsa_OpenTrustedDomainByName.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_OpenTrustedDomainByName.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustedDomainsEx_handle, 
-	  { "Handle", "lsarpc.lsa_EnumTrustedDomainsEx.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_EnumTrustedDomainsEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AsciiString_length, 
-	  { "Length", "lsarpc.lsa_AsciiString.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "lsarpc.lsa_AsciiString.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoAll_posix_offset, 
-	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoInfoAll.posix_offset", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Posix Offset", "lsarpc.lsa_TrustDomainInfoInfoAll.posix_offset", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumAccountRights_sid, 
-	  { "Sid", "lsarpc.lsa_EnumAccountRights.sid", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sid", "lsarpc.lsa_EnumAccountRights.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids_sids, 
-	  { "Sids", "lsarpc.lsa_LookupSids.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "lsarpc.lsa_LookupSids.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustDomainInfoInfoAll_auth_info, 
-	  { "Auth Info", "lsarpc.lsa_TrustDomainInfoInfoAll.auth_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Auth Info", "lsarpc.lsa_TrustDomainInfoInfoAll.auth_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_CloseTrustedDomainEx_handle, 
-	  { "Handle", "lsarpc.lsa_CloseTrustedDomainEx.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_CloseTrustedDomainEx.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QosInfo_context_mode, 
-	  { "Context Mode", "lsarpc.lsa_QosInfo.context_mode", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Context Mode", "lsarpc.lsa_QosInfo.context_mode", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyAccessMask_LSA_POLICY_VIEW_AUDIT_INFORMATION, 
-	  { "Lsa Policy View Audit Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_VIEW_AUDIT_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_VIEW_AUDIT_INFORMATION_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Lsa Policy View Audit Information", "lsarpc.lsa_PolicyAccessMask.LSA_POLICY_VIEW_AUDIT_INFORMATION", FT_BOOLEAN, 32, TFS(&lsa_PolicyAccessMask_LSA_POLICY_VIEW_AUDIT_INFORMATION_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SecretAccessMask_LSA_SECRET_SET_VALUE, 
-	  { "Lsa Secret Set Value", "lsarpc.lsa_SecretAccessMask.LSA_SECRET_SET_VALUE", FT_BOOLEAN, 32, TFS(&lsa_SecretAccessMask_LSA_SECRET_SET_VALUE_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Lsa Secret Set Value", "lsarpc.lsa_SecretAccessMask.LSA_SECRET_SET_VALUE", FT_BOOLEAN, 32, TFS(&lsa_SecretAccessMask_LSA_SECRET_SET_VALUE_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_lsarpc_lsa_EnumTrustDom_domains, 
-	  { "Domains", "lsarpc.lsa_EnumTrustDom.domains", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domains", "lsarpc.lsa_EnumTrustDom.domains", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransNameArray_count, 
-	  { "Count", "lsarpc.lsa_TransNameArray.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_TransNameArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_pd, 
-	  { "Pd", "lsarpc.lsa_PolicyInformation.pd", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pd", "lsarpc.lsa_PolicyInformation.pd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedName2_sid_index, 
-	  { "Sid Index", "lsarpc.lsa_TranslatedName2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Index", "lsarpc.lsa_TranslatedName2.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_PolicyInformation_auditfullquery, 
-	  { "Auditfullquery", "lsarpc.lsa_PolicyInformation.auditfullquery", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Auditfullquery", "lsarpc.lsa_PolicyInformation.auditfullquery", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_ModificationInfo_modified_id, 
-	  { "Modified Id", "lsarpc.lsa_ModificationInfo.modified_id", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Modified Id", "lsarpc.lsa_ModificationInfo.modified_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_QuerySecret_new_mtime, 
-	  { "New Mtime", "lsarpc.lsa_QuerySecret.new_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Mtime", "lsarpc.lsa_QuerySecret.new_mtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupPrivValue_handle, 
-	  { "Handle", "lsarpc.lsa_LookupPrivValue.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_LookupPrivValue.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TransSidArray2_count, 
-	  { "Count", "lsarpc.lsa_TransSidArray2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_TransSidArray2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_AuditEventsInfo_count, 
-	  { "Count", "lsarpc.lsa_AuditEventsInfo.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_AuditEventsInfo.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TrustedDomainInfo_full_info, 
-	  { "Full Info", "lsarpc.lsa_TrustedDomainInfo.full_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Info", "lsarpc.lsa_TrustedDomainInfo.full_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy_level, 
-	  { "Level", "lsarpc.lsa_SetInfoPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, "", HFILL }},
+	  { "Level", "lsarpc.lsa_SetInfoPolicy.level", FT_UINT16, BASE_DEC, VALS(lsarpc_lsa_PolicyInfo_vals), 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_LookupSids3_count, 
-	  { "Count", "lsarpc.lsa_LookupSids3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "lsarpc.lsa_LookupSids3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_TranslatedSid3_sid_index, 
-	  { "Sid Index", "lsarpc.lsa_TranslatedSid3.sid_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sid Index", "lsarpc.lsa_TranslatedSid3.sid_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_lsarpc_lsa_SetInfoPolicy_handle, 
-	  { "Handle", "lsarpc.lsa_SetInfoPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "lsarpc.lsa_SetInfoPolicy.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-mapi.c b/epan/dissectors/packet-dcerpc-mapi.c
index 84b5dc8076..6d7a315ab8 100644
--- a/epan/dissectors/packet-dcerpc-mapi.c
+++ b/epan/dissectors/packet-dcerpc-mapi.c
@@ -10168,191 +10168,191 @@ void proto_register_dcerpc_mapi(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_mapi_EcDoConnect_unknown1, 
-	  { "Unknown1", "mapi.EcDoConnect.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "mapi.EcDoConnect.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_i, 
-	  { "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "I", "mapi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_emsmdb_client_version, 
-	  { "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Emsmdb Client Version", "mapi.EcDoConnect.emsmdb_client_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_name, 
-	  { "Name", "mapi.EcDoConnect.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "mapi.EcDoConnect.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_lpszW, 
-	  { "Lpszw", "mapi.SPropValue_CTR.lpszW", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lpszw", "mapi.SPropValue_CTR.lpszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_offset, 
-	  { "Offset", "mapi.EcDoRpc.offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Offset", "mapi.EcDoRpc.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_alloc_space, 
-	  { "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alloc Space", "mapi.EcDoConnect.alloc_space", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevCriticalError, 
-	  { "Fnevcriticalerror", "mapi.ulEventType.fnevCriticalError", FT_BOOLEAN, 16, TFS(&ulEventType_fnevCriticalError_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Fnevcriticalerror", "mapi.ulEventType.fnevCriticalError", FT_BOOLEAN, 16, TFS(&ulEventType_fnevCriticalError_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenFolder, 
-	  { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SRow_ulRowFlags, 
-	  { "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, "", HFILL }},
+	  { "Ulrowflags", "mapi.SRow.ulRowFlags", FT_UINT8, BASE_DEC, VALS(mapi_ulRowFlags_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_notifkey, 
-	  { "Notifkey", "mapi.EcRRegisterPushNotification.notifkey", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Notifkey", "mapi.EcRRegisterPushNotification.notifkey", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRUnregisterPushNotification_unknown, 
-	  { "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "mapi.EcRUnregisterPushNotification.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_recipients_headers_username, 
-	  { "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Username", "mapi.recipients_headers.username", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_mapi_request_mapi_req, 
-	  { "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_HEX, NULL, 0, "HFILL", HFILL }},
+	  { "Mapi Req", "mapi.mapi_request.mapi_req", FT_NONE, BASE_NONE, NULL, 0, "HFILL", HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_retval, 
-	  { "Retval", "mapi.EcRRegisterPushNotification.retval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Retval", "mapi.EcRRegisterPushNotification.retval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectDeleted, 
-	  { "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Fnevobjectdeleted", "mapi.ulEventType.fnevObjectDeleted", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectDeleted_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_lpszA, 
-	  { "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lpsza", "mapi.SPropValue_CTR.lpszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_DATA_BLOB_data, 
-	  { "Data", "mapi.DATA_BLOB.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "mapi.DATA_BLOB.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_GetProps, 
-	  { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_recipient_type_SMTP, 
-	  { "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Smtp", "mapi.recipient_type.SMTP", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_sockaddr, 
-	  { "Sockaddr", "mapi.EcRRegisterPushNotification.sockaddr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sockaddr", "mapi.EcRRegisterPushNotification.sockaddr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_LPSTR_lppszA, 
-	  { "Lppsza", "mapi.LPSTR.lppszA", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lppsza", "mapi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_max_data, 
-	  { "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Data", "mapi.EcDoRpc.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_recipients_codepage, 
-	  { "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, "", HFILL }},
+	  { "Codepage", "mapi.OpenMessage_recipients.codepage", FT_UINT32, BASE_DEC, VALS(mapi_CODEPAGEID_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectCopied, 
-	  { "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Fnevobjectcopied", "mapi.ulEventType.fnevObjectCopied", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCopied_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_unknown2, 
-	  { "Unknown2", "mapi.EcRRegisterPushNotification.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "mapi.EcRRegisterPushNotification.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_recipients_headers_prop_count, 
-	  { "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Prop Count", "mapi.recipients_headers.prop_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_recipients_headers_bitmask, 
-	  { "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bitmask", "mapi.recipients_headers.bitmask", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_FILETIME_dwLowDateTime, 
-	  { "Dwlowdatetime", "mapi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwlowdatetime", "mapi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_MAPISTATUS_status, 
-	  { "MAPISTATUS", "mapi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(mapi_MAPISTATUS_vals), 0, "", HFILL }},
+	  { "MAPISTATUS", "mapi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(mapi_MAPISTATUS_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_recipient_type_EXCHANGE, 
-	  { "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Exchange", "mapi.recipient_type.EXCHANGE", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_lpguid, 
-	  { "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpguid", "mapi.SPropValue_CTR.lpguid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_unknown2, 
-	  { "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "mapi.EcDoConnect.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevSearchComplete, 
-	  { "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Fnevsearchcomplete", "mapi.ulEventType.fnevSearchComplete", FT_BOOLEAN, 16, TFS(&ulEventType_fnevSearchComplete_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevStatusObjectModified, 
-	  { "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Fnevstatusobjectmodified", "mapi.ulEventType.fnevStatusObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevStatusObjectModified_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectCreated, 
-	  { "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Fnevobjectcreated", "mapi.ulEventType.fnevObjectCreated", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectCreated_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_max_data, 
-	  { "Max Data", "mapi.OpenMessage_req.max_data", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Data", "mapi.OpenMessage_req.max_data", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_DATA_BLOB_length, 
-	  { "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "mapi.DATA_BLOB.length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_input_locale, 
-	  { "Input Locale", "mapi.EcDoConnect.input_locale", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Input Locale", "mapi.EcDoConnect.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_RecipExchange_addr_type, 
-	  { "Addr Type", "mapi.RecipExchange.addr_type", FT_UINT8, BASE_DEC, VALS(mapi_addr_type_vals), 0, "", HFILL }},
+	  { "Addr Type", "mapi.RecipExchange.addr_type", FT_UINT8, BASE_DEC, VALS(mapi_addr_type_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_mapi_request, 
-	  { "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Request", "mapi.EcDoRpc.mapi_request", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_Release, 
-	  { "Mapi Release", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mapi Release", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_decrypted_data, 
-	  { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_HEX, NULL, 0x0, "Decrypted data", HFILL }},
+	  { "Decrypted data", "mapi.decrypted.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevNewMail, 
-	  { "Fnevnewmail", "mapi.ulEventType.fnevNewMail", FT_BOOLEAN, 16, TFS(&ulEventType_fnevNewMail_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Fnevnewmail", "mapi.ulEventType.fnevNewMail", FT_BOOLEAN, 16, TFS(&ulEventType_fnevNewMail_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_b, 
-	  { "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "B", "mapi.SPropValue_CTR.b", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_mapi_response_mapi_repl, 
-	  { "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_HEX, NULL, 0, "HFILL", HFILL }},
+	  { "Mapi Repl", "mapi.mapi_response.mapi_repl", FT_NONE, BASE_NONE, NULL, 0, "HFILL", HFILL }},
 	{ &hf_mapi_recipients_headers_layout, 
-	  { "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Layout", "mapi.recipients_headers.layout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_length, 
-	  { "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "mapi.EcDoRpc.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_RecipExchange_organization_length, 
-	  { "Organization Length", "mapi.RecipExchange.organization_length", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Organization Length", "mapi.RecipExchange.organization_length", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_recipients_recipients_headers, 
-	  { "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Recipients Headers", "mapi.OpenMessage_recipients.recipients_headers", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_GetProps, 
-	  { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Getprops", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_GetProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_dbl, 
-	  { "Dbl", "mapi.SPropValue_CTR.dbl", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dbl", "mapi.SPropValue_CTR.dbl", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_message_id, 
-	  { "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Id", "mapi.OpenMessage_req.message_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_size, 
-	  { "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "mapi.EcDoRpc.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_session_nb, 
-	  { "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Session Nb", "mapi.EcDoConnect.session_nb", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_pdu_len, 
 	  { "Length", "mapi.pdu.len", FT_UINT16, BASE_HEX, NULL, 0x0, "Size of the command PDU", HFILL }},
 	{ &hf_mapi_SPropValue_CTR_ft, 
-	  { "Ft", "mapi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ft", "mapi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_ulPropTag, 
-	  { "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, "", HFILL }},
+	  { "Ulproptag", "mapi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(mapi_MAPITAGS_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_recipients_RecipClass, 
-	  { "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, "", HFILL }},
+	  { "Recipclass", "mapi.OpenMessage_recipients.RecipClass", FT_UINT8, BASE_DEC, VALS(mapi_ulRecipClass_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_ulEventMask, 
-	  { "Uleventmask", "mapi.EcRRegisterPushNotification.ulEventMask", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Uleventmask", "mapi.EcRRegisterPushNotification.ulEventMask", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_FILETIME_dwHighDateTime, 
-	  { "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwhighdatetime", "mapi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_OpenFolder, 
-	  { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Openfolder", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_OpenFolder", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_message_permissions, 
-	  { "Message Permissions", "mapi.OpenMessage_req.message_permissions", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Permissions", "mapi.OpenMessage_req.message_permissions", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_l, 
-	  { "L", "mapi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "L", "mapi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevReservedForMapi, 
-	  { "Fnevreservedformapi", "mapi.ulEventType.fnevReservedForMapi", FT_BOOLEAN, 16, TFS(&ulEventType_fnevReservedForMapi_tfs), ( 0x40000000 ), "", HFILL }},
+	  { "Fnevreservedformapi", "mapi.ulEventType.fnevReservedForMapi", FT_BOOLEAN, 16, TFS(&ulEventType_fnevReservedForMapi_tfs), ( 0x40000000 ), NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_user, 
-	  { "User", "mapi.EcDoConnect.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "mapi.EcDoConnect.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_unknown4, 
-	  { "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown4", "mapi.EcDoConnect.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_MAPI_OPNUM, 
-	  { "Opnum", "mapi.EcDoRpc_MAPI_REQ.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, " ", HFILL }},
+	  { "Opnum", "mapi.EcDoRpc_MAPI_REQ.opnum", FT_UINT8, BASE_HEX, VALS(mapi_MAPI_OPNUM_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_code_page, 
-	  { "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Code Page", "mapi.EcDoConnect.code_page", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_handle, 
-	  { "Handle", "mapi.handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Handle", "mapi.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_input_locale_method, 
-	  { "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Method", "mapi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_input_locale_language, 
-	  { "Language", "mapi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Language", "mapi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_mapi_response, 
-	  { "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Response", "mapi.EcDoRpc.mapi_response", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_store_version, 
-	  { "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Store Version", "mapi.EcDoConnect.store_version", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectMoved, 
-	  { "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Fnevobjectmoved", "mapi.ulEventType.fnevObjectMoved", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectMoved_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_err, 
-	  { "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Err", "mapi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevTableModified, 
-	  { "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Fnevtablemodified", "mapi.ulEventType.fnevTableModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevTableModified_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_mapi_recipient_type, 
-	  { "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, " ", HFILL }},
+	  { "Recipient Type", "mapi.recipients_headers.type", FT_UINT16, BASE_HEX, VALS(mapi_OM_recipient_type_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_recipients_headers_prop_values, 
-	  { "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Prop Values", "mapi.recipients_headers.prop_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevExtended, 
-	  { "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), "", HFILL }},
+	  { "Fnevextended", "mapi.ulEventType.fnevExtended", FT_BOOLEAN, 16, TFS(&ulEventType_fnevExtended_tfs), ( 0x80000000 ), NULL, HFILL }},
 	{ &hf_mapi_opnum, 
-	  { "Operation", "mapi.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "mapi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_property_types, 
-	  { "Value", "mapi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(mapi_property_types_vals), 0, " ", HFILL }},
+	  { "Value", "mapi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(mapi_property_types_vals), 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REPL_UNION_mapi_Release, 
-	  { "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mapi Release", "mapi.EcDoRpc_MAPI_REPL_UNION.mapi_Release", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_recipient_displayname_7bit_lpszA, 
-	  { "Lpsza", "mapi.recipient_displayname_7bit.lpszA", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lpsza", "mapi.recipient_displayname_7bit.lpszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_sockaddr_len, 
-	  { "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sockaddr Len", "mapi.EcRRegisterPushNotification.sockaddr_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcRRegisterPushNotification_notif_len, 
-	  { "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Notif Len", "mapi.EcRRegisterPushNotification.notif_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_unknown3, 
-	  { "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "mapi.EcDoConnect.unknown3", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_folder_handle_idx, 
-	  { "Folder Handle Idx", "mapi.OpenMessage_req.folder_handle_idx", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Folder Handle Idx", "mapi.OpenMessage_req.folder_handle_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_SPropValue_CTR_d, 
-	  { "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "D", "mapi.SPropValue_CTR.d", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoRpc_MAPI_REQ_UNION_mapi_OpenMsgStore, 
-	  { "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Mapi Openmsgstore", "mapi.EcDoRpc_MAPI_REQ_UNION.mapi_OpenMsgStore", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_EcDoConnect_org_group, 
-	  { "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Org Group", "mapi.EcDoConnect.org_group", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_OpenMessage_req_folder_id, 
-	  { "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Folder Id", "mapi.OpenMessage_req.folder_id", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_mapi_ulEventType_fnevObjectModified, 
-	  { "Fnevobjectmodified", "mapi.ulEventType.fnevObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectModified_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Fnevobjectmodified", "mapi.ulEventType.fnevObjectModified", FT_BOOLEAN, 16, TFS(&ulEventType_fnevObjectModified_tfs), ( 0x00000010 ), NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-messenger.c b/epan/dissectors/packet-dcerpc-messenger.c
index 083a21d7d3..6b1bd93825 100644
--- a/epan/dissectors/packet-dcerpc-messenger.c
+++ b/epan/dissectors/packet-dcerpc-messenger.c
@@ -105,10 +105,10 @@ proto_register_dcerpc_messenger(void)
 
 		{ &hf_messenger_opnum,
 		  { "Operation", "messenger.opnum", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "Operation", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_messenger_rc,
-                  { "Return code", "messenger.rc", FT_UINT32, BASE_HEX, VALS (NT_errors), 0x0, "", HFILL }},
+                  { "Return code", "messenger.rc", FT_UINT32, BASE_HEX, VALS (NT_errors), 0x0, NULL, HFILL }},
 
 		{ &hf_messenger_server, {
 		"Server", "messenger.server", 
diff --git a/epan/dissectors/packet-dcerpc-mgmt.c b/epan/dissectors/packet-dcerpc-mgmt.c
index a7449f2c76..ca12d46b4f 100644
--- a/epan/dissectors/packet-dcerpc-mgmt.c
+++ b/epan/dissectors/packet-dcerpc-mgmt.c
@@ -61,7 +61,7 @@ proto_register_mgmt (void)
 	static hf_register_info hf[] = {
 		{ &hf_opnum,
 		  { "Operation", "mgmt.opnum", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 105d07efa8..6049a41a42 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -6762,7 +6762,7 @@ proto_register_dcerpc_netlogon(void)
 static hf_register_info hf[] = {
 	{ &hf_netlogon_opnum,
 	  { "Operation", "netlogon.opnum", FT_UINT16, BASE_DEC,
-	    NULL, 0x0, "Operation", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_rc, {
 		"Return code", "netlogon.rc", FT_UINT32, BASE_HEX,
@@ -6782,7 +6782,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_logon_id, {
 		"Logon ID", "netlogon.logon_id", FT_UINT64, BASE_DEC,
-		NULL, 0x0, "Logon ID", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_modify_count, {
 		"Modify Count", "netlogon.modify_count", FT_UINT64, BASE_DEC,
@@ -6790,43 +6790,43 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_security_information, {
 		"Security Information", "netlogon.security_information", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "Security Information", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_count, {
 		"Count", "netlogon.count", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_entries, {
 		"Entries", "netlogon.entries", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_credential, {
-		"Credential", "netlogon.credential", FT_BYTES, BASE_HEX,
+		"Credential", "netlogon.credential", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Netlogon Credential", HFILL }},
 
 	{ &hf_netlogon_challenge, {
-		"Challenge", "netlogon.challenge", FT_BYTES, BASE_HEX,
+		"Challenge", "netlogon.challenge", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Netlogon challenge", HFILL }},
 
 	{ &hf_netlogon_lm_owf_password, {
-		"LM Pwd", "netlogon.lm_owf_pwd", FT_BYTES, BASE_HEX,
+		"LM Pwd", "netlogon.lm_owf_pwd", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "LanManager OWF Password", HFILL }},
 
 	{ &hf_netlogon_user_session_key, {
-		"User Session Key", "netlogon.user_session_key", FT_BYTES, BASE_HEX,
-		NULL, 0x0, "User Session Key", HFILL }},
+		"User Session Key", "netlogon.user_session_key", FT_BYTES, BASE_NONE,
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_encrypted_lm_owf_password, {
-		"Encrypted LM Pwd", "netlogon.lm_owf_pwd.encrypted", FT_BYTES, BASE_HEX,
+		"Encrypted LM Pwd", "netlogon.lm_owf_pwd.encrypted", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Encrypted LanManager OWF Password", HFILL }},
 
 	{ &hf_netlogon_nt_owf_password, {
-		"NT Pwd", "netlogon.nt_owf_pwd", FT_BYTES, BASE_HEX,
+		"NT Pwd", "netlogon.nt_owf_pwd", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "NT OWF Password", HFILL }},
 
 	{ &hf_netlogon_blob, {
-		"BLOB", "netlogon.blob", FT_BYTES, BASE_HEX,
-		NULL, 0x0, "BLOB", HFILL }},
+		"BLOB", "netlogon.blob", FT_BYTES, BASE_NONE,
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_len, {
 		"Len", "netlogon.len", FT_UINT32, BASE_DEC,
@@ -6834,31 +6834,31 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_priv, {
 		"Priv", "netlogon.priv", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_privilege_entries, {
 		"Privilege Entries", "netlogon.privilege_entries", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_privilege_control, {
 		"Privilege Control", "netlogon.privilege_control", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_privilege_name, {
-		"Privilege Name", "netlogon.privilege_name", FT_STRING, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		"Privilege Name", "netlogon.privilege_name", FT_STRING, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_pdc_connection_status, {
 		"PDC Connection Status", "netlogon.pdc_connection_status", FT_UINT32, BASE_DEC,
-		NULL, 0, "PDC Connection Status", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_tc_connection_status, {
 		"TC Connection Status", "netlogon.tc_connection_status", FT_UINT32, BASE_DEC,
-		NULL, 0, "TC Connection Status", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_attrs, {
 		"Attributes", "netlogon.attrs", FT_UINT32, BASE_HEX,
-		NULL, 0, "Attributes", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_unknown_string,
 		{ "Unknown string", "netlogon.unknown_string", FT_STRING, BASE_NONE,
@@ -6868,7 +6868,7 @@ static hf_register_info hf[] = {
 		NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
 	{ &hf_netlogon_reserved,
 		{ "Reserved", "netlogon.reserved", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Reserved", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_netlogon_unknown_short,
 		{ "Unknown short", "netlogon.unknown.short", FT_UINT16, BASE_HEX,
 		NULL, 0x0, "Unknown short. If you know what this is, contact wireshark developers.", HFILL }},
@@ -6895,7 +6895,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_authoritative,
 		{ "Authoritative", "netlogon.authoritative", FT_UINT8, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_sensitive_data_flag,
 		{ "Sensitive Data", "netlogon.sensitive_data_flag", FT_UINT8, BASE_DEC,
@@ -6903,7 +6903,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_auditing_mode,
 		{ "Auditing Mode", "netlogon.auditing_mode", FT_UINT8, BASE_DEC,
-		NULL, 0x0, "Auditing Mode", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_max_audit_event_count,
 		{ "Max Audit Event Count", "netlogon.max_audit_event_count", FT_UINT32, BASE_DEC,
@@ -6918,40 +6918,40 @@ static hf_register_info hf[] = {
 		NULL, 0x0, "Length of sensitive data", HFILL }},
 
 	{ &hf_netlogon_nt_chal_resp,
-		{ "NT Chal resp", "netlogon.nt_chal_resp", FT_BYTES, BASE_HEX,
+		{ "NT Chal resp", "netlogon.nt_chal_resp", FT_BYTES, BASE_NONE,
 		NULL, 0, "Challenge response for NT authentication", HFILL }},
 
 	{ &hf_netlogon_lm_chal_resp,
-		{ "LM Chal resp", "netlogon.lm_chal_resp", FT_BYTES, BASE_HEX,
+		{ "LM Chal resp", "netlogon.lm_chal_resp", FT_BYTES, BASE_NONE,
 		NULL, 0, "Challenge response for LM authentication", HFILL }},
 
 	{ &hf_netlogon_cipher_len,
 		{ "Cipher Len", "netlogon.cipher_len", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_cipher_maxlen,
 		{ "Cipher Max Len", "netlogon.cipher_maxlen", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_pac_data,
-		{ "Pac Data", "netlogon.pac.data", FT_BYTES, BASE_HEX,
-		NULL, 0, "Pac Data", HFILL }},
+		{ "Pac Data", "netlogon.pac.data", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_sensitive_data,
-		{ "Data", "netlogon.sensitive_data", FT_BYTES, BASE_HEX,
+		{ "Data", "netlogon.sensitive_data", FT_BYTES, BASE_NONE,
 		NULL, 0, "Sensitive Data", HFILL }},
 
 	{ &hf_netlogon_auth_data,
-		{ "Auth Data", "netlogon.auth.data", FT_BYTES, BASE_HEX,
-		NULL, 0, "Auth Data", HFILL }},
+		{ "Auth Data", "netlogon.auth.data", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_cipher_current_data,
-		{ "Cipher Current Data", "netlogon.cipher_current_data", FT_BYTES, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		{ "Cipher Current Data", "netlogon.cipher_current_data", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_cipher_old_data,
-		{ "Cipher Old Data", "netlogon.cipher_old_data", FT_BYTES, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		{ "Cipher Old Data", "netlogon.cipher_old_data", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_acct_name,
 		{ "Acct Name", "netlogon.acct_name", FT_STRING, BASE_NONE,
@@ -6967,23 +6967,23 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_full_name,
 		{ "Full Name", "netlogon.full_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Full Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_comment,
 		{ "Comment", "netlogon.comment", FT_STRING, BASE_NONE,
-		NULL, 0, "Comment", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_parameters,
 		{ "Parameters", "netlogon.parameters", FT_STRING, BASE_NONE,
-		NULL, 0, "Parameters", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_logon_script,
 		{ "Logon Script", "netlogon.logon_script", FT_STRING, BASE_NONE,
-		NULL, 0, "Logon Script", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_profile_path,
 		{ "Profile Path", "netlogon.profile_path", FT_STRING, BASE_NONE,
-		NULL, 0, "Profile Path", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_home_dir,
 		{ "Home Dir", "netlogon.home_dir", FT_STRING, BASE_NONE,
@@ -6995,15 +6995,15 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_logon_srv,
 		{ "Server", "netlogon.server", FT_STRING, BASE_NONE,
-		NULL, 0, "Server", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_principal,
 		{ "Principal", "netlogon.principal", FT_STRING, BASE_NONE,
-		NULL, 0, "Principal", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_logon_dom,
 		{ "Domain", "netlogon.domain", FT_STRING, BASE_NONE,
-		NULL, 0, "Domain", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_resourcegroupcount,
 		{ "ResourceGroup count", "netlogon.resourcegroupcount", FT_UINT32, BASE_DEC,
@@ -7011,35 +7011,35 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_computer_name,
 		{ "Computer Name", "netlogon.computer_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Computer Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_site_name,
 		{ "Site Name", "netlogon.site_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Site Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dc_name,
 		{ "DC Name", "netlogon.dc.name", FT_STRING, BASE_NONE,
-		NULL, 0, "DC Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dc_site_name,
 		{ "DC Site Name", "netlogon.dc.site_name", FT_STRING, BASE_NONE,
-		NULL, 0, "DC Site Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dns_forest_name,
 		{ "DNS Forest Name", "netlogon.dns.forest_name", FT_STRING, BASE_NONE,
-		NULL, 0, "DNS Forest Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dc_address,
 		{ "DC Address", "netlogon.dc.address", FT_STRING, BASE_NONE,
-		NULL, 0, "DC Address", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dc_address_type,
 		{ "DC Address Type", "netlogon.dc.address_type", FT_UINT32, BASE_DEC,
-		VALS(dc_address_types), 0, "DC Address Type", HFILL }},
+		VALS(dc_address_types), 0, NULL, HFILL }},
 
 	{ &hf_netlogon_client_site_name,
 		{ "Client Site Name", "netlogon.client.site_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Client Site Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_workstation_site_name,
 		{ "Wkst Site Name", "netlogon.wkst.site_name", FT_STRING, BASE_NONE,
@@ -7055,7 +7055,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_workstations,
 		{ "Workstations", "netlogon.wksts", FT_STRING, BASE_NONE,
-		NULL, 0, "Workstations", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_workstation_fqdn,
 		{ "Wkst FQDN", "netlogon.wkst.fqdn", FT_STRING, BASE_NONE,
@@ -7063,15 +7063,15 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_group_name,
 		{ "Group Name", "netlogon.group_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Group Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_alias_name,
 		{ "Alias Name", "netlogon.alias_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Alias Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_dns_host,
 		{ "DNS Host", "netlogon.dns_host", FT_STRING, BASE_NONE,
-		NULL, 0, "DNS Host", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_downlevel_domain_name,
 		{ "Downlevel Domain", "netlogon.downlevel_domain", FT_STRING, BASE_NONE,
@@ -7087,11 +7087,11 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_oem_info,
 		{ "OEM Info", "netlogon.oem_info", FT_STRING, BASE_NONE,
-		NULL, 0, "OEM Info", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_trusted_dc_name,
 		{ "Trusted DC", "netlogon.trusted_dc", FT_STRING, BASE_NONE,
-		NULL, 0, "Trusted DC", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_logonsrv_handle,
 		{ "Handle", "netlogon.handle", FT_STRING, BASE_NONE,
@@ -7147,11 +7147,11 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_restart_state,
 		{ "Restart State", "netlogon.restart_state", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Restart State", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_delta_type,
 		{ "Delta Type", "netlogon.delta_type", FT_UINT16, BASE_DEC,
-		VALS(delta_type_vals), 0x0, "Delta Type", HFILL }},
+		VALS(delta_type_vals), 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_blob_size,
 		{ "Size", "netlogon.blob.size", FT_UINT32, BASE_DEC,
@@ -7159,7 +7159,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_code,
 		{ "Code", "netlogon.code", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Code", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_level,
 		{ "Level", "netlogon.level", FT_UINT32, BASE_DEC,
@@ -7167,27 +7167,27 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_reference,
 		{ "Reference", "netlogon.reference", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_next_reference,
 		{ "Next Reference", "netlogon.next_reference", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_timestamp,
 		{ "Timestamp", "netlogon.timestamp", FT_ABSOLUTE_TIME, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_user_rid,
 		{ "User RID", "netlogon.rid", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_alias_rid,
 		{ "Alias RID", "netlogon.alias_rid", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_group_rid,
 		{ "Group RID", "netlogon.group_rid", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_num_rids,
 		{ "Num RIDs", "netlogon.num_rids", FT_UINT32, BASE_DEC,
@@ -7199,11 +7199,11 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_num_other_groups,
 		{ "Num Other Groups", "netlogon.num_other_groups", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_flags,
 		{ "Flags", "netlogon.flags", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_user_account_control,
 		{ "User Account Control", "netlogon.user_account_control", FT_UINT32, BASE_HEX,
@@ -7215,19 +7215,19 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_auth_flags,
 		{ "Auth Flags", "netlogon.auth_flags", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_systemflags,
 		{ "System Flags", "netlogon.system_flags", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_database_id,
 		{ "Database Id", "netlogon.database_id", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "Database Id", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_sync_context,
 		{ "Sync Context", "netlogon.sync_context", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "Sync Context", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_max_size,
 		{ "Max Size", "netlogon.max_size", FT_UINT32, BASE_DEC,
@@ -7251,7 +7251,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_num_trusts,
 		{ "Num Trusts", "netlogon.num_trusts", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_logon_attempts,
 		{ "Logon Attempts", "netlogon.logon_attempts", FT_UINT32, BASE_DEC,
@@ -7259,27 +7259,27 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_pagefilelimit,
 		{ "Page File Limit", "netlogon.page_file_limit", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_pagedpoollimit,
 		{ "Paged Pool Limit", "netlogon.paged_pool_limit", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_nonpagedpoollimit,
 		{ "Non-Paged Pool Limit", "netlogon.nonpaged_pool_limit", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_minworkingsetsize,
 		{ "Min Working Set Size", "netlogon.min_working_set_size", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_maxworkingsetsize,
 		{ "Max Working Set Size", "netlogon.max_working_set_size", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_serial_number,
 		{ "Serial Number", "netlogon.serial_number", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_neg_flags,
 		{ "Neg Flags", "netlogon.neg_flags", FT_UINT32, BASE_HEX,
@@ -7287,7 +7287,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_dc_flags,
 		{ "Domain Controller Flags", "netlogon.dc.flags", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Domain Controller Flags", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_dc_flags_pdc_flag,
 	        { "PDC", "netlogon.dc.flags.pdc",
@@ -7347,12 +7347,12 @@ static hf_register_info hf[] = {
 	{ &hf_netlogon_dc_flags_dns_domain_flag,
 	        { "DNS Domain", "netlogon.dc.flags.dns_domain",
 		  FT_BOOLEAN, 32, TFS(&dc_flags_dns_domain_flag), DS_DNS_DOMAIN_FLAG,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 	{ &hf_netlogon_dc_flags_dns_forest_flag,
 	        { "DNS Forest", "netlogon.dc.flags.dns_forest",
 		  FT_BOOLEAN, 32, TFS(&dc_flags_dns_forest_flag), DS_DNS_FOREST_FLAG,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 	{ &hf_netlogon_get_dcname_request_flags,
 		{ "Flags", "netlogon.get_dcname.request.flags", FT_UINT32, BASE_HEX,
@@ -7445,43 +7445,43 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_trust_attribs,
 		{ "Trust Attributes", "netlogon.trust_attribs", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Trust Attributes", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_non_transitive,
 	        { "Non Transitive", "netlogon.trust.attribs.non_transitive", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_non_transitive), 0x00000001, "", HFILL }},
+		TFS(&trust_attribs_non_transitive), 0x00000001, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_uplevel_only,
 	        { "Uplevel Only", "netlogon.trust.attribs.uplevel_only", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_uplevel_only), 0x00000002, "", HFILL }},
+		TFS(&trust_attribs_uplevel_only), 0x00000002, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_quarantined_domain,
 	        { "Quarantined Domain", "netlogon.trust.attribs.quarantined_domain", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_quarantined_domain), 0x00000004, "", HFILL }},
+		TFS(&trust_attribs_quarantined_domain), 0x00000004, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_forest_transitive,
 	        { "Forest Transitive", "netlogon.trust.attribs.forest_transitive", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_forest_transitive), 0x00000008, "", HFILL }},
+		TFS(&trust_attribs_forest_transitive), 0x00000008, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_cross_organization,
 	        { "Cross Organization", "netlogon.trust.attribs.cross_organization", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_cross_organization), 0x00000010, "", HFILL }},
+		TFS(&trust_attribs_cross_organization), 0x00000010, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_within_forest,
 	        { "Within Forest", "netlogon.trust.attribs.within_forest", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_within_forest), 0x00000020, "", HFILL }},
+		TFS(&trust_attribs_within_forest), 0x00000020, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_attribs_treat_as_external,
 	        { "Treat As External", "netlogon.trust.attribs.treat_as_external", FT_BOOLEAN, 32, 
-		TFS(&trust_attribs_treat_as_external), 0x00000040, "", HFILL }},
+		TFS(&trust_attribs_treat_as_external), 0x00000040, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_type,
 		{ "Trust Type", "netlogon.trust_type", FT_UINT32, BASE_DEC,
-		VALS(trust_type_vals), 0x0, "Trust Type", HFILL }},
+		VALS(trust_type_vals), 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_flags,
 		{ "Trust Flags", "netlogon.trust_flags", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Trust Flags", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_trust_flags_inbound,
 	        { "Inbound Trust", "netlogon.trust.flags.inbound",
@@ -7515,7 +7515,7 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_trust_parent_index,
 		{ "Parent Index", "netlogon.parent_index", FT_UINT32, BASE_HEX,
-		NULL, 0x0, "Parent Index", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_logon_time,
 		{ "Logon Time", "netlogon.logon_time", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -7579,57 +7579,57 @@ static hf_register_info hf[] = {
 
 	{ &hf_netlogon_timelimit,
 		{ "Time Limit", "netlogon.time_limit", FT_RELATIVE_TIME, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	/* Secure channel dissection */
 
 	{ &hf_netlogon_secchan_bind_unknown1,
 	  { "Unknown1", "netlogon.secchan.bind.unknown1", FT_UINT32, BASE_HEX,
-	    NULL, 0x0, "", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_bind_unknown2,
 	  { "Unknown2", "netlogon.secchan.bind.unknown2", FT_UINT32, BASE_HEX,
-	    NULL, 0x0, "", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_domain,
 	  { "Domain", "netlogon.secchan.domain", FT_STRING, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_host,
 	  { "Host", "netlogon.secchan.host", FT_STRING, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_bind_ack_unknown1,
 	  { "Unknown1", "netlogon.secchan.bind_ack.unknown1", FT_UINT32, 
-	    BASE_HEX, NULL, 0x0, "", HFILL }},
+	    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_bind_ack_unknown2,
 	  { "Unknown2", "netlogon.secchan.bind_ack.unknown2", FT_UINT32, 
-	    BASE_HEX, NULL, 0x0, "", HFILL }},
+	    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_netlogon_secchan_bind_ack_unknown3,
 	  { "Unknown3", "netlogon.secchan.bind_ack.unknown3", FT_UINT32, 
-	    BASE_HEX, NULL, 0x0, "", HFILL }},
+	    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
         { &hf_netlogon_secchan_verf,
           { "Secure Channel Verifier", "netlogon.secchan.verifier", FT_NONE, BASE_NONE, 
 	    NULL, 0x0, "Verifier", HFILL }},
 
         { &hf_netlogon_secchan_verf_sig,
-          { "Signature", "netlogon.secchan.sig", FT_BYTES, BASE_HEX, NULL, 
-	    0x0, "Signature", HFILL }}, 
+          { "Signature", "netlogon.secchan.sig", FT_BYTES, BASE_NONE, NULL, 
+	    0x0, NULL, HFILL }}, 
 
         { &hf_netlogon_secchan_verf_digest,
-          { "Packet Digest", "netlogon.secchan.digest", FT_BYTES, BASE_HEX, NULL, 
-          0x0, "Packet Digest", HFILL }}, 
+          { "Packet Digest", "netlogon.secchan.digest", FT_BYTES, BASE_NONE, NULL, 
+          0x0, NULL, HFILL }}, 
 
         { &hf_netlogon_secchan_verf_seq,
-          { "Sequence No", "netlogon.secchan.seq", FT_BYTES, BASE_HEX, NULL, 
-          0x0, "Sequence No", HFILL }}, 
+          { "Sequence No", "netlogon.secchan.seq", FT_BYTES, BASE_NONE, NULL, 
+          0x0, NULL, HFILL }}, 
 
         { &hf_netlogon_secchan_verf_nonce,
-          { "Nonce", "netlogon.secchan.nonce", FT_BYTES, BASE_HEX, NULL, 
-          0x0, "Nonce", HFILL }}, 
+          { "Nonce", "netlogon.secchan.nonce", FT_BYTES, BASE_NONE, NULL, 
+          0x0, NULL, HFILL }}, 
 
 	{ &hf_netlogon_group_attrs_mandatory,
 	        { "Mandatory", "netlogon.groups.attrs.mandatory",
@@ -7659,91 +7659,91 @@ static hf_register_info hf[] = {
 	{ &hf_netlogon_user_account_control_dont_require_preauth,
 	        { "Don't Require PreAuth", "netlogon.user.account_control.dont_require_preauth",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_dont_require_preauth), 0x00010000,
-		  "The user account control DONT_REQUIRE_PREAUTH flag ", HFILL }},
+		  "The user account control DONT_REQUIRE_PREAUTH flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_use_des_key_only,
 	        { "Use DES Key Only", "netlogon.user.account_control.use_des_key_only",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_use_des_key_only), 0x00008000,
-		  "The user account control use_des_key_only flag ", HFILL }},
+		  "The user account control use_des_key_only flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_not_delegated,
 	        { "Not Delegated", "netlogon.user.account_control.not_delegated",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_not_delegated), 0x00004000,
-		  "The user account control not_delegated flag ", HFILL }},
+		  "The user account control not_delegated flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_trusted_for_delegation,
 	        { "Trusted For Delegation", "netlogon.user.account_control.trusted_for_delegation",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_trusted_for_delegation), 0x00002000,
-		  "The user account control trusted_for_delegation flag ", HFILL }},
+		  "The user account control trusted_for_delegation flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_smartcard_required,
 	        { "SmartCard Required", "netlogon.user.account_control.smartcard_required",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_smartcard_required), 0x00001000,
-		  "The user account control smartcard_required flag ", HFILL }},
+		  "The user account control smartcard_required flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_encrypted_text_password_allowed,
 	        { "Encrypted Text Password Allowed", "netlogon.user.account_control.encrypted_text_password_allowed",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_encrypted_text_password_allowed), 0x00000800,
-		  "The user account control encrypted_text_password_allowed flag ", HFILL }},
+		  "The user account control encrypted_text_password_allowed flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_account_auto_locked,
 	        { "Account Auto Locked", "netlogon.user.account_control.account_auto_locked",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_account_auto_locked), 0x00000400,
-		  "The user account control account_auto_locked flag ", HFILL }},
+		  "The user account control account_auto_locked flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_dont_expire_password,
 	        { "Don't Expire Password", "netlogon.user.account_control.dont_expire_password",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_dont_expire_password), 0x00000200,
-		  "The user account control dont_expire_password flag ", HFILL }},
+		  "The user account control dont_expire_password flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_server_trust_account,
 	        { "Server Trust Account", "netlogon.user.account_control.server_trust_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_server_trust_account), 0x00000100,
-		  "The user account control server_trust_account flag ", HFILL }},
+		  "The user account control server_trust_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_workstation_trust_account,
 	        { "Workstation Trust Account", "netlogon.user.account_control.workstation_trust_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_workstation_trust_account), 0x00000080,
-		  "The user account control workstation_trust_account flag ", HFILL }},
+		  "The user account control workstation_trust_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_interdomain_trust_account,
 	        { "Interdomain trust Account", "netlogon.user.account_control.interdomain_trust_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_interdomain_trust_account), 0x00000040,
-		  "The user account control interdomain_trust_account flag ", HFILL }},
+		  "The user account control interdomain_trust_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_mns_logon_account,
 	        { "MNS Logon Account", "netlogon.user.account_control.mns_logon_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_mns_logon_account), 0x00000020,
-		  "The user account control mns_logon_account flag ", HFILL }},
+		  "The user account control mns_logon_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_normal_account,
 	        { "Normal Account", "netlogon.user.account_control.normal_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_normal_account), 0x00000010,
-		  "The user account control normal_account flag ", HFILL }},
+		  "The user account control normal_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_temp_duplicate_account,
 	        { "Temp Duplicate Account", "netlogon.user.account_control.temp_duplicate_account",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_temp_duplicate_account), 0x00000008,
-		  "The user account control temp_duplicate_account flag ", HFILL }},
+		  "The user account control temp_duplicate_account flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_password_not_required,
 	        { "Password Not Required", "netlogon.user.account_control.password_not_required",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_password_not_required), 0x00000004,
-		  "The user account control password_not_required flag ", HFILL }},
+		  "The user account control password_not_required flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_home_directory_required,
 	        { "Home Directory Required", "netlogon.user.account_control.home_directory_required",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_home_directory_required), 0x00000002,
-		  "The user account control home_directory_required flag ", HFILL }},
+		  "The user account control home_directory_required flag", HFILL }},
 
 	{ &hf_netlogon_user_account_control_account_disabled,
 	        { "Account Disabled", "netlogon.user.account_control.account_disabled",
 		  FT_BOOLEAN, 32, TFS(&user_account_control_account_disabled), 0x00000001,
-		  "The user account control account_disabled flag ", HFILL }},
+		  "The user account control account_disabled flag", HFILL }},
 
         { &hf_netlogon_dnsdomaininfo,
           { "DnsDomainInfo", "netlogon.dnsdomaininfo", FT_NONE, BASE_NONE, 
-	    NULL, 0x0, "", HFILL }},
+	    NULL, 0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-nspi.c b/epan/dissectors/packet-dcerpc-nspi.c
index eaf0022938..69eee56e63 100644
--- a/epan/dissectors/packet-dcerpc-nspi.c
+++ b/epan/dissectors/packet-dcerpc-nspi.c
@@ -10476,225 +10476,225 @@ void proto_register_dcerpc_nspi(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_nspi_NspiGetHierarchyInfo_unknown1, 
-	  { "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "nspi.NspiGetHierarchyInfo.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_ft, 
-	  { "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ft", "nspi.SPropValue_CTR.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_object, 
-	  { "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Object", "nspi.SPropValue_CTR.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_input_locale_language, 
-	  { "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Language", "nspi.input_locale.language", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVft, 
-	  { "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvft", "nspi.SPropValue_CTR.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SDateTimeArray_lpft, 
-	  { "Lpft", "nspi.SDateTimeArray.lpft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpft", "nspi.SDateTimeArray.lpft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrderSet_aSort, 
-	  { "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Asort", "nspi.SSortOrderSet.aSort", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SGuidArray_lpguid, 
-	  { "Lpguid", "nspi.SGuidArray.lpguid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpguid", "nspi.SGuidArray.lpguid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_dwAlignPad, 
-	  { "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwalignpad", "nspi.SPropValue.dwAlignPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_instance_key, 
-	  { "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Instance Key", "nspi.NspiQueryRows.instance_key", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrderSet_cCategories, 
-	  { "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ccategories", "nspi.SSortOrderSet.cCategories", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPINAMEID_ulKind, 
-	  { "Ulkind", "nspi.MAPINAMEID.ulKind", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulkind", "nspi.MAPINAMEID.ulKind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiDNToEph_server_dn, 
-	  { "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Server Dn", "nspi.NspiDNToEph.server_dn", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPIUID_ab, 
-	  { "Ab", "nspi.MAPIUID.ab", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ab", "nspi.MAPIUID.ab", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_b, 
-	  { "B", "nspi.SPropValue_CTR.b", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "B", "nspi.SPropValue_CTR.b", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRow_ulAdrEntryPad, 
-	  { "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Uladrentrypad", "nspi.SRow.ulAdrEntryPad", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_null, 
-	  { "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Null", "nspi.SPropValue_CTR.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SBinary_cb, 
-	  { "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cb", "nspi.SBinary.cb", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SBinaryArray_lpbin, 
-	  { "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpbin", "nspi.SBinaryArray.lpbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SShortArray_cValues, 
-	  { "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SShortArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRowSet_aRow, 
-	  { "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Arow", "nspi.SRowSet.aRow", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiBind_mapiuid, 
-	  { "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mapiuid", "nspi.NspiBind.mapiuid", FT_GUID, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SGuidArray_cValues, 
-	  { "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SGuidArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_instance_key_cValues, 
-	  { "Cvalues", "nspi.instance_key.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.instance_key.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRestriction_CTR_resProperty, 
-	  { "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Resproperty", "nspi.SRestriction_CTR.resProperty", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_lRows, 
-	  { "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lrows", "nspi.NspiQueryRows.lRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MV_UNICODE_STRUCT_cValues, 
-	  { "Cvalues", "nspi.MV_UNICODE_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.MV_UNICODE_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrder_ulOrder, 
-	  { "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulorder", "nspi.SSortOrder.ulOrder", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetHierarchyInfo_RowSet, 
-	  { "Rowset", "nspi.NspiGetHierarchyInfo.RowSet", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rowset", "nspi.NspiGetHierarchyInfo.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPINAMEID_lID, 
-	  { "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lid", "nspi.MAPINAMEID.lID", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_settings, 
-	  { "Settings", "nspi.NspiQueryRows.settings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Settings", "nspi.NspiQueryRows.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SBinaryArray_cValues, 
-	  { "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SBinaryArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_unknown2, 
-	  { "Unknown2", "nspi.NspiGetMatches.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "nspi.NspiGetMatches.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SLPSTRArray_strings, 
-	  { "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Strings", "nspi.SLPSTRArray.strings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_FILETIME_dwHighDateTime, 
-	  { "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwhighdatetime", "nspi.FILETIME.dwHighDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_REPL_values, 
-	  { "Repl Values", "nspi.NspiGetProps.REPL_values", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Repl Values", "nspi.NspiGetProps.REPL_values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRow_cValues, 
-	  { "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SRow.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_ulPropTag, 
-	  { "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, "", HFILL }},
+	  { "Ulproptag", "nspi.SPropValue.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_settings, 
-	  { "Settings", "nspi.NspiGetProps.settings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Settings", "nspi.NspiGetProps.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiDNToEph_instance_key, 
-	  { "Instance Key", "nspi.NspiDNToEph.instance_key", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Instance Key", "nspi.NspiDNToEph.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRestriction_CTR_resAnd, 
-	  { "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Resand", "nspi.SRestriction_CTR.resAnd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_RowSet, 
-	  { "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rowset", "nspi.NspiGetMatches.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MV_UNICODE_STRUCT_lpi, 
-	  { "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpi", "nspi.MV_UNICODE_STRUCT.lpi", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrderSet_cSorts, 
-	  { "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Csorts", "nspi.SSortOrderSet.cSorts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrder_ulPropTag, 
-	  { "Ulproptag", "nspi.SSortOrder.ulPropTag", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulproptag", "nspi.SSortOrder.ulPropTag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVbin, 
-	  { "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvbin", "nspi.SPropValue_CTR.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_opnum, 
-	  { "Operation", "nspi.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "nspi.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiUnbind_status, 
-	  { "Status", "nspi.NspiUnbind.status", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Status", "nspi.NspiUnbind.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SAndRestriction_lpRes, 
-	  { "Lpres", "nspi.SAndRestriction.lpRes", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lpres", "nspi.SAndRestriction.lpRes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiDNToEph_size, 
-	  { "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "nspi.NspiDNToEph.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVi, 
-	  { "Mvi", "nspi.SPropValue_CTR.MVi", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvi", "nspi.SPropValue_CTR.MVi", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropertyRestriction_lpProp, 
-	  { "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lpprop", "nspi.SPropertyRestriction.lpProp", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_unknown3, 
-	  { "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "nspi.NspiGetMatches.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPI_SETTINGS_flag, 
-	  { "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flag", "nspi.MAPI_SETTINGS.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_instance_key_value, 
-	  { "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Value", "nspi.instance_key.value", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_settings, 
-	  { "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Settings", "nspi.NspiGetMatches.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MV_LONG_STRUCT_cValues, 
-	  { "Cvalues", "nspi.MV_LONG_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.MV_LONG_STRUCT.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRowSet_cRows, 
-	  { "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Crows", "nspi.SRowSet.cRows", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPI_SETTINGS_service_provider, 
-	  { "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Service Provider", "nspi.MAPI_SETTINGS.service_provider", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_l, 
-	  { "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "L", "nspi.SPropValue_CTR.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SAndRestriction_cRes, 
-	  { "Cres", "nspi.SAndRestriction.cRes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cres", "nspi.SAndRestriction.cRes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_flag, 
-	  { "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flag", "nspi.NspiQueryRows.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_REQ_properties, 
-	  { "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req Properties", "nspi.NspiQueryRows.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVl, 
-	  { "Mvl", "nspi.SPropValue_CTR.MVl", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvl", "nspi.SPropValue_CTR.MVl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_flag, 
-	  { "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flag", "nspi.NspiGetProps.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPISTATUS_status, 
-	  { "MAPISTATUS", "nspi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(nspi_MAPISTATUS_vals), 0, "", HFILL }},
+	  { "MAPISTATUS", "nspi.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVszW, 
-	  { "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvszw", "nspi.SPropValue_CTR.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_LPSTR_lppszA, 
-	  { "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Lppsza", "nspi.LPSTR.lppszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVszA, 
-	  { "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvsza", "nspi.SPropValue_CTR.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_property_type, 
-	  { "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, " ", HFILL }},
+	  { "Value", "nspi.SPropValue.value", FT_UINT32, BASE_HEX, VALS(nspi_property_types_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_handle, 
-	  { "Handle", "nspi.handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Handle", "nspi.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_restrictions, 
-	  { "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Restrictions", "nspi.NspiGetMatches.restrictions", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_RowSet, 
-	  { "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rowset", "nspi.NspiQueryRows.RowSet", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SRow_lpProps, 
-	  { "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpprops", "nspi.SRow.lpProps", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPI_SETTINGS_input_locale, 
-	  { "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Input Locale", "nspi.MAPI_SETTINGS.input_locale", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropertyRestriction_ulPropTag, 
-	  { "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, "", HFILL }},
+	  { "Ulproptag", "nspi.SPropertyRestriction.ulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_SPropTagArray_aulPropTag, 
-	  { "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, "", HFILL }},
+	  { "Aulproptag", "nspi.SPropTagArray.aulPropTag", FT_UINT32, BASE_DEC, VALS(nspi_MAPITAGS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetHierarchyInfo_unknown2, 
-	  { "Unknown2", "nspi.NspiGetHierarchyInfo.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "nspi.NspiGetHierarchyInfo.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SBinary_lpb, 
-	  { "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpb", "nspi.SBinary.lpb", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetHierarchyInfo_settings, 
-	  { "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Settings", "nspi.NspiGetHierarchyInfo.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SSortOrderSet_cExpanded, 
-	  { "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cexpanded", "nspi.SSortOrderSet.cExpanded", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiQueryRows_unknown, 
-	  { "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "nspi.NspiQueryRows.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_input_locale_method, 
-	  { "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Method", "nspi.input_locale.method", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_instance_key, 
-	  { "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Instance Key", "nspi.NspiGetMatches.instance_key", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_lpszA, 
-	  { "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpsza", "nspi.SPropValue_CTR.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_bin, 
-	  { "Bin", "nspi.SPropValue_CTR.bin", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Bin", "nspi.SPropValue_CTR.bin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SShortArray_lpi, 
-	  { "Lpi", "nspi.SShortArray.lpi", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpi", "nspi.SShortArray.lpi", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_lpszW, 
-	  { "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpszw", "nspi.SPropValue_CTR.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_PropTagArray, 
-	  { "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Proptagarray", "nspi.NspiGetMatches.PropTagArray", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SLPSTRArray_cValues, 
-	  { "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SLPSTRArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_err, 
-	  { "Err", "nspi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, "", HFILL }},
+	  { "Err", "nspi.SPropValue_CTR.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_SRestriction_PTTYPE, 
-	  { "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, " ", HFILL }},
+	  { "Restriction Type", "nspi.property_type", FT_UINT32, BASE_HEX, VALS(nspi_nspi_RestrictionType_vals), 0, NULL, HFILL }},
 	{ &hf_nspi_NAME_STRING_str, 
-	  { "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Str", "nspi.NAME_STRING.str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropertyRestriction_relop, 
-	  { "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Relop", "nspi.SPropertyRestriction.relop", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_MVguid, 
-	  { "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Mvguid", "nspi.SPropValue_CTR.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPINAMEID_lpguid, 
-	  { "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpguid", "nspi.MAPINAMEID.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_FILETIME_dwLowDateTime, 
-	  { "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dwlowdatetime", "nspi.FILETIME.dwLowDateTime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_REQ_properties, 
-	  { "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req Properties", "nspi.NspiGetMatches.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropTagArray_cValues, 
-	  { "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SPropTagArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_lpguid, 
-	  { "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lpguid", "nspi.SPropValue_CTR.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SPropValue_CTR_i, 
-	  { "I", "nspi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "I", "nspi.SPropValue_CTR.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPI_SETTINGS_codepage, 
-	  { "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Codepage", "nspi.MAPI_SETTINGS.codepage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiDNToEph_flag, 
-	  { "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flag", "nspi.NspiDNToEph.flag", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiBind_unknown, 
-	  { "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "nspi.NspiBind.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MAPI_SETTINGS_handle, 
-	  { "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Handle", "nspi.MAPI_SETTINGS.handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetProps_REQ_properties, 
-	  { "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req Properties", "nspi.NspiGetProps.REQ_properties", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_MV_LONG_STRUCT_lpl, 
-	  { "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lpl", "nspi.MV_LONG_STRUCT.lpl", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiGetMatches_unknown1, 
-	  { "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "nspi.NspiGetMatches.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_SDateTimeArray_cValues, 
-	  { "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cvalues", "nspi.SDateTimeArray.cValues", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_nspi_NspiBind_settings, 
-	  { "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Settings", "nspi.NspiBind.settings", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c
index c9135c11d7..1de4013472 100644
--- a/epan/dissectors/packet-dcerpc-nt.c
+++ b/epan/dissectors/packet-dcerpc-nt.c
@@ -1664,12 +1664,12 @@ void dcerpc_smb_init(int proto_dcerpc)
 		{ &hf_nt_policy_open_frame,
 		  { "Frame handle opened", "dcerpc.nt.open_frame",
 		    FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-		    "Frame handle opened", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_nt_policy_close_frame,
 		  { "Frame handle closed", "dcerpc.nt.close_frame",
 		    FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-		    "Frame handle closed", HFILL }},
+		    NULL, HFILL }},
 
 		/* ACBs */
 
@@ -1705,22 +1705,22 @@ void dcerpc_smb_init(int proto_dcerpc)
 		{ &hf_nt_acb_mns,
 		  { "MNS logon user account", "dcerpc.nt.acb.mns", FT_BOOLEAN, 32,
 		    TFS(&tfs_nt_acb_mns), 0x0020,
-		    "MNS logon user account", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_nt_acb_domtrust,
 		  { "Interdomain trust account", "dcerpc.nt.acb.domtrust", FT_BOOLEAN, 32,
 		    TFS(&tfs_nt_acb_domtrust), 0x0040,
-		    "Interdomain trust account", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_nt_acb_wstrust,
 		  { "Workstation trust account", "dcerpc.nt.acb.wstrust", FT_BOOLEAN, 32,
 		    TFS(&tfs_nt_acb_wstrust), 0x0080,
-		    "Workstation trust account", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_nt_acb_svrtrust,
 		  { "Server trust account", "dcerpc.nt.acb.svrtrust", FT_BOOLEAN, 32,
 		    TFS(&tfs_nt_acb_svrtrust), 0x0100,
-		    "Server trust account", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_nt_acb_pwnoexp,
 		  { "Password expires", "dcerpc.nt.acb.pwnoexp", FT_BOOLEAN, 32,
@@ -1754,14 +1754,13 @@ void dcerpc_smb_init(int proto_dcerpc)
 		{ &hf_logonhours_unknown_char,
 		  { "Unknown char", "dcerpc.nt.unknown.char",
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "Unknown char. If you know what this is, contact "
-		    "wireshark developers.", HFILL }},
+		    "Unknown char. If you know what this is, contact wireshark developers.", HFILL }},
 
 		/* Misc */
 
                 { &hf_nt_attrib,
 		  { "Attributes", "dcerpc.nt.attr",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-pnp.c b/epan/dissectors/packet-dcerpc-pnp.c
index 5de5147421..28a27e95c2 100644
--- a/epan/dissectors/packet-dcerpc-pnp.c
+++ b/epan/dissectors/packet-dcerpc-pnp.c
@@ -199,7 +199,7 @@ proto_register_dcerpc_pnp(void)
 
 		{ &hf_pnp_opnum, 
 		  { "Operation", "pnp.opnum", FT_UINT16, BASE_DEC,
-		   NULL, 0x0, "Operation", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-rdaclif.c b/epan/dissectors/packet-dcerpc-rdaclif.c
index 4a0a44e5f0..d0e9037c54 100644
--- a/epan/dissectors/packet-dcerpc-rdaclif.c
+++ b/epan/dissectors/packet-dcerpc-rdaclif.c
@@ -72,7 +72,7 @@ proto_register_rdaclif (void)
   static hf_register_info hf[] = {
     {&hf_rdaclif_opnum,
      {"Operation", "rdaclif.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rep_proc.c b/epan/dissectors/packet-dcerpc-rep_proc.c
index 39935be9aa..092c6c2748 100644
--- a/epan/dissectors/packet-dcerpc-rep_proc.c
+++ b/epan/dissectors/packet-dcerpc-rep_proc.c
@@ -74,7 +74,7 @@ proto_register_rep_proc (void)
 	static hf_register_info hf[] = {
 	  { &hf_rep_proc_opnum,
 	    { "Operation", "rep_proc.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rfr.c b/epan/dissectors/packet-dcerpc-rfr.c
index a48045c819..41d3a0198d 100644
--- a/epan/dissectors/packet-dcerpc-rfr.c
+++ b/epan/dissectors/packet-dcerpc-rfr.c
@@ -468,25 +468,25 @@ void proto_register_dcerpc_rfr(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rfr_MAPISTATUS_status, 
-	  { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, "", HFILL }},
+	  { "MAPISTATUS", "rfr.MAPISTATUS_status", FT_UINT32, BASE_HEX, VALS(rfr_MAPISTATUS_vals), 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ulFlags, 
-	  { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulflags", "rfr.RfrGetFQDNFromLegacyDN.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetFQDNFromLegacyDN_szMailboxServerDN, 
-	  { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Szmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.szMailboxServerDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_opnum, 
-	  { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "rfr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetNewDSA_ulFlags, 
-	  { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulflags", "rfr.RfrGetNewDSA.ulFlags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetFQDNFromLegacyDN_cbMailboxServerDN, 
-	  { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cbmailboxserverdn", "rfr.RfrGetFQDNFromLegacyDN.cbMailboxServerDN", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetNewDSA_pUserDN, 
-	  { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Puserdn", "rfr.RfrGetNewDSA.pUserDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetNewDSA_ppszUnused, 
-	  { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ppszunused", "rfr.RfrGetNewDSA.ppszUnused", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetNewDSA_ppszServer, 
-	  { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ppszserver", "rfr.RfrGetNewDSA.ppszServer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_rfr_RfrGetFQDNFromLegacyDN_ppszServerFQDN, 
-	  { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ppszserverfqdn", "rfr.RfrGetFQDNFromLegacyDN.ppszServerFQDN", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-roverride.c b/epan/dissectors/packet-dcerpc-roverride.c
index 6f2a8a354a..a924450017 100644
--- a/epan/dissectors/packet-dcerpc-roverride.c
+++ b/epan/dissectors/packet-dcerpc-roverride.c
@@ -69,7 +69,7 @@ proto_register_roverride (void)
 {
 	static hf_register_info hf[] = {
       { &hf_roverride_opnum,
-         { "Operation", "roverride.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+         { "Operation", "roverride.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rpriv.c b/epan/dissectors/packet-dcerpc-rpriv.c
index 68421dcd64..aff2a72e5b 100644
--- a/epan/dissectors/packet-dcerpc-rpriv.c
+++ b/epan/dissectors/packet-dcerpc-rpriv.c
@@ -118,21 +118,21 @@ proto_register_rpriv (void)
 {
 	static hf_register_info hf[] = {
       { &hf_rpriv_opnum,
-         { "Operation", "rpriv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+         { "Operation", "rpriv.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_authn_svc,
-         { "Authn_Svc", "rpriv.get_eptgt_rqst_authn_svc", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+         { "Authn_Svc", "rpriv.get_eptgt_rqst_authn_svc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_authz_svc,
-         { "Authz_Svc", "rpriv.get_eptgt_rqst_authz_svc", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+         { "Authz_Svc", "rpriv.get_eptgt_rqst_authz_svc", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_size,
-         { "Key_Size", "rpriv.get_eptgt_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+         { "Key_Size", "rpriv.get_eptgt_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_var1,
-         { "Var1", "rpriv.get_eptgt_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+         { "Var1", "rpriv.get_eptgt_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_size2,
-         { "Key_Size", "rpriv.get_eptgt_rqst_key_size2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+         { "Key_Size", "rpriv.get_eptgt_rqst_key_size2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_t,
-         { "Key_t", "rpriv.get_eptgt_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+         { "Key_t", "rpriv.get_eptgt_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
       { &hf_rpriv_get_eptgt_rqst_key_t2,
-         { "Key_t2", "rpriv.get_eptgt_rqst_key_t2", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+         { "Key_t2", "rpriv.get_eptgt_rqst_key_t2", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 					 
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-rras.c b/epan/dissectors/packet-dcerpc-rras.c
index e05ea1b5df..d69ab0a582 100644
--- a/epan/dissectors/packet-dcerpc-rras.c
+++ b/epan/dissectors/packet-dcerpc-rras.c
@@ -137,7 +137,7 @@ proto_register_dcerpc_rras(void)
 
 		{ &hf_rras_opnum, 
 		  { "Operation", "rras.opnum", FT_UINT16, BASE_DEC,
-		   NULL, 0x0, "Operation", HFILL }},	
+		   NULL, 0x0, NULL, HFILL }},	
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-rs_acct.c b/epan/dissectors/packet-dcerpc-rs_acct.c
index 1e11b8649e..f5c0a737a4 100644
--- a/epan/dissectors/packet-dcerpc-rs_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_acct.c
@@ -135,19 +135,19 @@ proto_register_rs_acct (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rs_acct_opnum,
-		{ "Operation", "rs_acct.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "rs_acct.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_lookup_rqst_var,
-		{ "Var", "rs_acct.lookup_rqst_var", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Var", "rs_acct.lookup_rqst_var", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_lookup_rqst_key_size,
-		{ "Key Size", "rs_acct.lookup_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Key Size", "rs_acct.lookup_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_lookup_rqst_key_t,
-		{ "Key", "rs_lookup.get_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "Key", "rs_lookup.get_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_get_projlist_rqst_var1,
-		{ "Var1", "rs_acct.get_projlist_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Var1", "rs_acct.get_projlist_rqst_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_get_projlist_rqst_key_size,
-		{ "Var1", "rs_acct.get_projlist_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Var1", "rs_acct.get_projlist_rqst_key_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_acct_get_projlist_rqst_key_t,
-		{ "Var1", "rs_acct.get_projlist_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}
+		{ "Var1", "rs_acct.get_projlist_rqst_key_t", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_attr.c b/epan/dissectors/packet-dcerpc-rs_attr.c
index 9833671b4d..165cf79b2b 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr.c
@@ -71,7 +71,7 @@ proto_register_rs_attr (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rs_attr_opnum,
-		{ "Operation", "rs_attr.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "rs_attr.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_attr_schema.c b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
index 0a5e32f78a..9d8ddf379a 100644
--- a/epan/dissectors/packet-dcerpc-rs_attr_schema.c
+++ b/epan/dissectors/packet-dcerpc-rs_attr_schema.c
@@ -72,7 +72,7 @@ proto_register_rs_attr_schema (void)
   static hf_register_info hf[] = {
     {&hf_rs_attr_schema_opnum,
      {"Operation", "rs_attr_schema.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_bind.c b/epan/dissectors/packet-dcerpc-rs_bind.c
index e549647894..bdd0a07b6e 100644
--- a/epan/dissectors/packet-dcerpc-rs_bind.c
+++ b/epan/dissectors/packet-dcerpc-rs_bind.c
@@ -68,7 +68,7 @@ proto_register_rs_bind (void)
 {
   static hf_register_info hf[] = {
         { &hf_rs_bind_opnum,
-                { "Operation", "rs_bind.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+                { "Operation", "rs_bind.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_misc.c b/epan/dissectors/packet-dcerpc-rs_misc.c
index 56c506a5b2..bcf5b9911e 100644
--- a/epan/dissectors/packet-dcerpc-rs_misc.c
+++ b/epan/dissectors/packet-dcerpc-rs_misc.c
@@ -103,16 +103,16 @@ proto_register_rs_misc (void)
 	static hf_register_info hf[] = {
 	{ &hf_rs_misc_opnum,
 		{ "Operation", "rs_misc.opnum", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Operation", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_misc_login_get_info_rqst_var,
 		{ "Var", "rs_misc.login_get_info_rqst_var", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_misc_login_get_info_rqst_key_size,
 		{ "Key Size", "rs_misc.login_get_info_rqst_key_size", FT_UINT32, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_rs_misc_login_get_info_rqst_key_t,
 		{ "Key", "rs.misc_login_get_info_rqst_key_t", FT_STRING, BASE_NONE,
-		NULL, 0x0, "", HFILL }}
+		NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index 4aaad9e52c..3865f454a5 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -1698,164 +1698,164 @@ proto_register_rs_pgo (void)
   static hf_register_info hf[] = {
     {&hf_rs_pgo_opnum,
      {"Operation", "rs_pgo.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
     {&hf_error_status_t,
      {"hf_error_status_t", "hf_error_status_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rgy_acct_user_flags_t,
      {"hf_rgy_acct_user_flags_t", "hf_rgy_acct_user_flags_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_key_size,
      {"hf_rgy_get_rqst_key_size", "hf_rgy_get_rqst_key_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_key_t,
      {"hf_rgy_get_rqst_key_t", "hf_rgy_get_rqst_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_name_domain,
      {"hf_rgy_get_rqst_name_domain", "hf_rgy_get_rqst_name_domain",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_var,
      {"hf_rgy_get_rqst_var", "hf_rgy_get_rqst_var", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_get_rqst_var2,
      {"hf_rgy_get_rqst_var2", "hf_rgy_get_rqst_var2", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key1,
      {"hf_rgy_is_member_rqst_key1", "hf_rgy_is_member_rqst_key1", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key1_size,
      {"hf_rgy_is_member_rqst_key1_size", "hf_rgy_is_member_rqst_key1_size",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key2,
      {"hf_rgy_is_member_rqst_key2", "hf_rgy_is_member_rqst_key2", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_key2_size,
      {"hf_rgy_is_member_rqst_key2_size", "hf_rgy_is_member_rqst_key2_size",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var1,
      {"hf_rgy_is_member_rqst_var1", "hf_rgy_is_member_rqst_var1", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var2,
      {"hf_rgy_is_member_rqst_var2", "hf_rgy_is_member_rqst_var2", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var3,
      {"hf_rgy_is_member_rqst_var3", "hf_rgy_is_member_rqst_var3", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_is_member_rqst_var4,
      {"hf_rgy_is_member_rqst_var4", "hf_rgy_is_member_rqst_var4", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var1,
      {"hf_rgy_key_transfer_rqst_var1", "hf_rgy_key_transfer_rqst_var1",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var2,
      {"hf_rgy_key_transfer_rqst_var2", "hf_rgy_key_transfer_rqst_var2",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_key_transfer_rqst_var3,
      {"hf_rgy_key_transfer_rqst_var3", "hf_rgy_key_transfer_rqst_var3",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_name_domain,
      {"hf_rgy_name_domain", "hf_rgy_name_domain", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_max_len,
      {"hf_rgy_sec_rgy_name_max_len", "hf_rgy_sec_rgy_name_max_len",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_t,
      {"hf_rgy_sec_rgy_name_t", "hf_rgy_sec_rgy_name_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rgy_sec_rgy_name_t_size,
      {"hf_rgy_sec_rgy_name_t_size", "hf_rgy_sec_rgy_name_t_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_id_key_t,
      {"hf_rs_pgo_id_key_t", "hf_rs_pgo_id_key_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_key_t,
      {"hf_rs_pgo_query_key_t", "hf_rs_pgo_query_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_result_t,
      {"hf_rs_pgo_query_result_t", "hf_rs_pgo_query_result_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_query_t,
      {"hf_rs_pgo_query_t", "hf_rs_pgo_query_t", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_rs_sec_rgy_pgo_item_t_quota,
      {"hf_rs_sec_rgy_pgo_item_t_quota", "hf_rs_sec_rgy_pgo_item_t_quota",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_rs_sec_rgy_pgo_item_t_unix_num,
      {"hf_rs_sec_rgy_pgo_item_t_unix_num",
-      "hf_rs_sec_rgy_pgo_item_t_unix_num", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+      "hf_rs_sec_rgy_pgo_item_t_unix_num", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_rs_timeval,
-     {"hf_rs_timeval", "hf_rs_timeval", FT_RELATIVE_TIME, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+     {"hf_rs_timeval", "hf_rs_timeval", FT_RELATIVE_TIME, BASE_NONE, NULL,
+      0x0, NULL, HFILL}},
     {&hf_rs_uuid1,
      {"hf_rs_uuid1", "hf_rs_uuid1", FT_GUID, BASE_NONE, NULL, 0x0, "UUID",
       HFILL}},
     {&hf_rs_var1,
-     {"hf_rs_var1", "hf_rs_var1", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+     {"hf_rs_var1", "hf_rs_var1", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
       HFILL}},
     {&hf_sec_attr_component_name_t_handle,
      {"hf_sec_attr_component_name_t_handle",
       "hf_sec_attr_component_name_t_handle", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_sec_attr_component_name_t_valid,
      {"hf_sec_attr_component_name_t_valid",
       "hf_sec_attr_component_name_t_valid", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     {&hf_sec_passwd_type_t,
      {"hf_sec_passwd_type_t", "hf_sec_passwd_type_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_passwd_version_t,
      {"hf_sec_passwd_version_t", "hf_sec_passwd_version_t", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_admin_flags,
      {"hf_sec_rgy_acct_admin_flags", "hf_sec_rgy_acct_admin_flags",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_auth_flags_t,
      {"hf_sec_rgy_acct_auth_flags_t", "hf_sec_rgy_acct_auth_flags_t",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_acct_key_t,
      {"hf_sec_rgy_acct_key_t", "hf_sec_rgy_acct_key_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_domain_t,
      {"hf_sec_rgy_domain_t", "hf_sec_rgy_domain_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_name_t_principalName_string,
      {"hf_sec_rgy_name_t_principalName_string",
       "hf_sec_rgy_name_t_principalName_string", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_name_t_size,
      {"hf_sec_rgy_name_t_size", "hf_sec_rgy_name_t_size", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pgo_flags_t,
      {"hf_sec_rgy_pgo_flags_t", "hf_sec_rgy_pgo_flags_t", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pgo_item_t,
      {"hf_sec_rgy_pgo_item_t", "hf_sec_rgy_pgo_item_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_pname_t_size,
      {"hf_sec_rgy_pname_t_size",
       "hf_sec_rgy_pname_t_size", FT_UINT32, BASE_DEC, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_pname_t_principalName_string,
      {"hf_sec_rgy_pname_t_principalName_string",
       "hf_sec_rgy_pname_t_principalName_string", FT_STRING, BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_group,
      {"hf_sec_rgy_unix_sid_t_group", "hf_sec_rgy_unix_sid_t_group",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_org,
      {"hf_sec_rgy_unix_sid_t_org", "hf_sec_rgy_unix_sid_t_org", FT_UINT32,
-      BASE_DEC, NULL, 0x0, "", HFILL}},
+      BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_rgy_unix_sid_t_person,
      {"hf_sec_rgy_unix_sid_t_person", "hf_sec_rgy_unix_sid_t_person",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sec_timeval_sec_t,
      {"hf_sec_timeval_sec_t", "hf_sec_timeval_sec_t", FT_UINT32, BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
     {&hf_rs_pgo_unix_num_key_t,
      {"hf_rs_pgo_unix_num_key_t", "hf_rs_pgo_unix_num_key_t", FT_UINT32,
       BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
   };
 
diff --git a/epan/dissectors/packet-dcerpc-rs_plcy.c b/epan/dissectors/packet-dcerpc-rs_plcy.c
index c40badbeca..e5605ce648 100644
--- a/epan/dissectors/packet-dcerpc-rs_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_plcy.c
@@ -71,7 +71,7 @@ proto_register_dcerpc_rs_plcy(void)
 
 		{ &hf_rs_plcy_opnum,
 		  { "Operation", "rs_plcy.opnum", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "Operation", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acct.c b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
index d8ca51cfd5..578584a964 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acct.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acct.c
@@ -64,7 +64,7 @@ proto_register_rs_prop_acct (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rs_prop_acct_opnum,
-		{ "Operation", "rs_prop_acct.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "rs_prop_acct.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_acl.c b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
index 4105f69380..51a2d17c91 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_acl.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_acl.c
@@ -64,7 +64,7 @@ proto_register_rs_prop_acl (void)
   static hf_register_info hf[] = {
     {&hf_rs_prop_acl_opnum,
      {"Operation", "rs_prop_acl.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_attr.c b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
index a6213f19b3..01f730ef24 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_attr.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_attr.c
@@ -65,7 +65,7 @@ proto_register_rs_prop_attr (void)
   static hf_register_info hf[] = {
     {&hf_rs_prop_attr_opnum,
      {"Operation", "rs_prop_attr.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
index 14c787db4a..74c380259d 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_pgo.c
@@ -69,7 +69,7 @@ proto_register_rs_prop_pgo (void)
   static hf_register_info hf[] = {
     {&hf_rs_prop_pgo_opnum,
      {"Operation", "rs_prop_pgo.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
index f4c3b67c17..a36018e365 100644
--- a/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
+++ b/epan/dissectors/packet-dcerpc-rs_prop_plcy.c
@@ -67,7 +67,7 @@ proto_register_rs_prop_plcy (void)
   static hf_register_info hf[] = {
     {&hf_rs_prop_plcy_opnum,
      {"Operation", "rs_prop_plcy.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
index a8771eaa64..0211360054 100644
--- a/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
+++ b/epan/dissectors/packet-dcerpc-rs_pwd_mgmt.c
@@ -72,7 +72,7 @@ proto_register_rs_pwd_mgmt (void)
   static hf_register_info hf[] = {
     {&hf_rs_pwd_mgmt_opnum,
      {"Operation", "rs_pwd_mgmt.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_repadm.c b/epan/dissectors/packet-dcerpc-rs_repadm.c
index 66f36e871b..3f0457e081 100644
--- a/epan/dissectors/packet-dcerpc-rs_repadm.c
+++ b/epan/dissectors/packet-dcerpc-rs_repadm.c
@@ -77,7 +77,7 @@ proto_register_rs_repadm (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rs_repadm_opnum,
-		{ "Operation", "rs_repadmin.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}
+		{ "Operation", "rs_repadmin.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_replist.c b/epan/dissectors/packet-dcerpc-rs_replist.c
index c4bc742b6f..fda6677310 100644
--- a/epan/dissectors/packet-dcerpc-rs_replist.c
+++ b/epan/dissectors/packet-dcerpc-rs_replist.c
@@ -72,7 +72,7 @@ proto_register_rs_replist (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rs_replist_opnum,
-		{ "Operation", "rs_replist.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+		{ "Operation", "rs_replist.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_repmgr.c b/epan/dissectors/packet-dcerpc-rs_repmgr.c
index 502ab34451..95f58599e0 100644
--- a/epan/dissectors/packet-dcerpc-rs_repmgr.c
+++ b/epan/dissectors/packet-dcerpc-rs_repmgr.c
@@ -72,7 +72,7 @@ proto_register_rs_repmgr (void)
   static hf_register_info hf[] = {
     {&hf_rs_repmgr_opnum,
      {"Operation", "rs_repmgr.opnum", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "Operation", HFILL}},
+      NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rs_unix.c b/epan/dissectors/packet-dcerpc-rs_unix.c
index b066a81c12..449d0ba683 100644
--- a/epan/dissectors/packet-dcerpc-rs_unix.c
+++ b/epan/dissectors/packet-dcerpc-rs_unix.c
@@ -63,7 +63,7 @@ proto_register_rs_unix (void)
 	static hf_register_info hf[] = {
 	  { &hf_rs_unix_opnum,
 	    { "Operation", "rs_unix.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-rsec_login.c b/epan/dissectors/packet-dcerpc-rsec_login.c
index 9c14c6b1f1..6368e7c8f7 100644
--- a/epan/dissectors/packet-dcerpc-rsec_login.c
+++ b/epan/dissectors/packet-dcerpc-rsec_login.c
@@ -62,7 +62,7 @@ proto_register_rsec_login (void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_rsec_login_opnum,
-		{ "Operation", "rsec_login.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }}
+		{ "Operation", "rsec_login.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-samr.c b/epan/dissectors/packet-dcerpc-samr.c
index f0b5971790..000fc4ddfe 100644
--- a/epan/dissectors/packet-dcerpc-samr.c
+++ b/epan/dissectors/packet-dcerpc-samr.c
@@ -14747,1115 +14747,1115 @@ void proto_register_dcerpc_samr(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_samr_samr_QueryDisplayInfo2_level, 
-	  { "Level", "samr.samr_QueryDisplayInfo2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryDisplayInfo2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, NULL, HFILL }},
 	{ &hf_samr_rid, 
-	  { "RID", "samr.rid", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "RID", "samr.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect2_system_name, 
-	  { "System Name", "samr.samr_Connect2.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "samr.samr_Connect2.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH, 
-	  { "Acb Dont Require Preauth", "samr.samr_AcctFlags.ACB_DONT_REQUIRE_PREAUTH", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH_tfs), ( 0x00010000 ), "", HFILL }},
+	  { "Acb Dont Require Preauth", "samr.samr_AcctFlags.ACB_DONT_REQUIRE_PREAUTH", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DONT_REQUIRE_PREAUTH_tfs), ( 0x00010000 ), NULL, HFILL }},
 	{ &hf_samr_group_access_mask, 
-	  { "Access Mask", "samr.group.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "samr.group.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_oem, 
-	  { "Oem", "samr.samr_DomainInfo.oem", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Oem", "samr.samr_DomainInfo.oem", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoAscii_entries, 
-	  { "Entries", "samr.samr_DispInfoAscii.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "samr.samr_DispInfoAscii.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryAliasInfo_level, 
-	  { "Level", "samr.samr_QueryAliasInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_AliasInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryAliasInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_AliasInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFullGroup_idx, 
-	  { "Idx", "samr.samr_DispEntryFullGroup.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_DispEntryFullGroup.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ConnectInfo1_revision, 
-	  { "Revision", "samr.samr_ConnectInfo1.revision", FT_UINT32, BASE_DEC, VALS(samr_samr_ConnectRevision_vals), 0, "", HFILL }},
+	  { "Revision", "samr.samr_ConnectInfo1.revision", FT_UINT32, BASE_DEC, VALS(samr_samr_ConnectRevision_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryGroupInfo_info, 
-	  { "Info", "samr.samr_QueryGroupInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryGroupInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_LOGON_SCRIPT, 
-	  { "Samr Field Logon Script", "samr.samr_FieldsPresent.SAMR_FIELD_LOGON_SCRIPT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LOGON_SCRIPT_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Samr Field Logon Script", "samr.samr_FieldsPresent.SAMR_FIELD_LOGON_SCRIPT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LOGON_SCRIPT_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_primary_gid, 
-	  { "Primary Gid", "samr.samr_UserInfo21.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Gid", "samr.samr_UserInfo21.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation2_lockout_duration, 
-	  { "Lockout Duration", "samr.samr_DomGeneralInformation2.lockout_duration", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Duration", "samr.samr_DomGeneralInformation2.lockout_duration", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_ACCT_EXPIRY, 
-	  { "Samr Field Acct Expiry", "samr.samr_FieldsPresent.SAMR_FIELD_ACCT_EXPIRY", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCT_EXPIRY_tfs), ( 0x00080000 ), "", HFILL }},
+	  { "Samr Field Acct Expiry", "samr.samr_FieldsPresent.SAMR_FIELD_ACCT_EXPIRY", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCT_EXPIRY_tfs), ( 0x00080000 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoGeneral_count, 
-	  { "Count", "samr.samr_DispInfoGeneral.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_DispInfoGeneral.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_total_size, 
-	  { "Total Size", "samr.samr_QueryDisplayInfo3.total_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total Size", "samr.samr_QueryDisplayInfo3.total_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetDomPwInfo_info, 
-	  { "Info", "samr.samr_GetDomPwInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_GetDomPwInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QuerySecurity_sdbuf, 
-	  { "Sdbuf", "samr.samr_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sdbuf", "samr.samr_QuerySecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_workstations, 
-	  { "Workstations", "samr.samr_UserInfo3.workstations", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Workstations", "samr.samr_UserInfo3.workstations", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryUserInfo2_info, 
-	  { "Info", "samr.samr_QueryUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_start_idx, 
-	  { "Start Idx", "samr.samr_QueryDisplayInfo3.start_idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Start Idx", "samr.samr_QueryDisplayInfo3.start_idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PARAMETERS, 
-	  { "Samr Field Parameters", "samr.samr_FieldsPresent.SAMR_FIELD_PARAMETERS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PARAMETERS_tfs), ( 0x00200000 ), "", HFILL }},
+	  { "Samr Field Parameters", "samr.samr_FieldsPresent.SAMR_FIELD_PARAMETERS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PARAMETERS_tfs), ( 0x00200000 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_num_users, 
-	  { "Num Users", "samr.samr_DomGeneralInformation.num_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Users", "samr.samr_DomGeneralInformation.num_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS, 
-	  { "Samr Domain Access Lookup Alias", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Samr Domain Access Lookup Alias", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_ALIAS_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_acct_flags, 
-	  { "Acct Flags", "samr.samr_UserInfo21.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_UserInfo21.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_profile_path, 
-	  { "Profile Path", "samr.samr_UserInfo5.profile_path", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Profile Path", "samr.samr_UserInfo5.profile_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_PW_EXPIRED, 
-	  { "Acb Pw Expired", "samr.samr_AcctFlags.ACB_PW_EXPIRED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PW_EXPIRED_tfs), ( 0x00020000 ), "", HFILL }},
+	  { "Acb Pw Expired", "samr.samr_AcctFlags.ACB_PW_EXPIRED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PW_EXPIRED_tfs), ( 0x00020000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_hash, 
-	  { "Hash", "samr.samr_ValidatePasswordReq3.hash", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hash", "samr.samr_ValidatePasswordReq3.hash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDomainInfo_info, 
-	  { "Info", "samr.samr_QueryDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info16, 
-	  { "Info16", "samr.samr_UserInfo.info16", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info16", "samr.samr_UserInfo.info16", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetBootKeyInformation_unknown1, 
-	  { "Unknown1", "samr.samr_SetBootKeyInformation.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "samr.samr_SetBootKeyInformation.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfo_attributes, 
-	  { "Attributes", "samr.samr_GroupInfo.attributes", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_GroupInfo.attributes", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo3_force_logoff_time, 
-	  { "Force Logoff Time", "samr.samr_DomInfo3.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Force Logoff Time", "samr.samr_DomInfo3.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_new_nt_crypted, 
-	  { "New Nt Crypted", "samr.samr_ChangePasswordUser.new_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Nt Crypted", "samr.samr_ChangePasswordUser.new_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_reject, 
-	  { "Reject", "samr.samr_ChangePasswordUser3.reject", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Reject", "samr.samr_ChangePasswordUser3.reject", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDomainInfo2_info, 
-	  { "Info", "samr.samr_QueryDomainInfo2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryDomainInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo1_description, 
-	  { "Description", "samr.samr_UserInfo1.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_UserInfo1.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetAliasInfo_info, 
-	  { "Info", "samr.samr_SetAliasInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_SetAliasInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_cross1_present, 
-	  { "Cross1 Present", "samr.samr_ChangePasswordUser.cross1_present", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cross1 Present", "samr.samr_ChangePasswordUser.cross1_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_primary_gid, 
-	  { "Primary Gid", "samr.samr_UserInfo5.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Gid", "samr.samr_UserInfo5.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_CLEAR_CHANGE, 
-	  { "Domain Password No Clear Change", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_NO_CLEAR_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_NO_CLEAR_CHANGE_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Domain Password No Clear Change", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_NO_CLEAR_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_NO_CLEAR_CHANGE_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT, 
-	  { "Samr Domain Access Open Account", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Samr Domain Access Open Account", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_samr_samr_Connect4_system_name, 
-	  { "System Name", "samr.samr_Connect4.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "samr.samr_Connect4.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_buf_size, 
-	  { "Buf Size", "samr.samr_QueryDisplayInfo3.buf_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Size", "samr.samr_QueryDisplayInfo3.buf_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_NUM_LOGONS, 
-	  { "Samr Field Num Logons", "samr.samr_FieldsPresent.SAMR_FIELD_NUM_LOGONS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_NUM_LOGONS_tfs), ( 0x00008000 ), "", HFILL }},
+	  { "Samr Field Num Logons", "samr.samr_FieldsPresent.SAMR_FIELD_NUM_LOGONS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_NUM_LOGONS_tfs), ( 0x00008000 ), NULL, HFILL }},
 	{ &hf_samr_samr_Connect5_info, 
-	  { "Info", "samr.samr_Connect5.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_Connect5.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT, 
-	  { "Samr Validate Field Bad Password Count", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Validate Field Bad Password Count", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_COUNT_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE, 
-	  { "Samr Field Last Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE_tfs), ( 0x00040000 ), "", HFILL }},
+	  { "Samr Field Last Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_PWD_CHANGE_tfs), ( 0x00040000 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo20_parameters, 
-	  { "Parameters", "samr.samr_UserInfo20.parameters", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Parameters", "samr.samr_UserInfo20.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo1_account_name, 
-	  { "Account Name", "samr.samr_UserInfo1.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo1.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_lm_change, 
-	  { "Lm Change", "samr.samr_ChangePasswordUser2.lm_change", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lm Change", "samr.samr_ChangePasswordUser2.lm_change", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_description, 
-	  { "Description", "samr.samr_UserInfo21.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_UserInfo21.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_profile_path, 
-	  { "Profile Path", "samr.samr_UserInfo21.profile_path", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Profile Path", "samr.samr_UserInfo21.profile_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePassword_req, 
-	  { "Req", "samr.samr_ValidatePassword.req", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req", "samr.samr_ValidatePassword.req", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_DISABLED, 
-	  { "Acb Disabled", "samr.samr_AcctFlags.ACB_DISABLED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DISABLED_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Acb Disabled", "samr.samr_AcctFlags.ACB_DISABLED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DISABLED_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_nt_cross, 
-	  { "Nt Cross", "samr.samr_ChangePasswordUser.nt_cross", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Cross", "samr.samr_ChangePasswordUser.nt_cross", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangeReject_unknown2, 
-	  { "Unknown2", "samr.samr_ChangeReject.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "samr.samr_ChangeReject.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME, 
-	  { "Samr Field Account Name", "samr.samr_FieldsPresent.SAMR_FIELD_ACCOUNT_NAME", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Field Account Name", "samr.samr_FieldsPresent.SAMR_FIELD_ACCOUNT_NAME", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCOUNT_NAME_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo2_unknown, 
-	  { "Unknown", "samr.samr_UserInfo2.unknown", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Unknown", "samr.samr_UserInfo2.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_password, 
-	  { "Password", "samr.samr_ValidatePasswordReq3.password", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_ValidatePasswordReq3.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_logon_script, 
-	  { "Logon Script", "samr.samr_UserInfo5.logon_script", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Script", "samr.samr_UserInfo5.logon_script", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_RidWithAttributeArray_count, 
-	  { "Count", "samr.samr_RidWithAttributeArray.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_RidWithAttributeArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SeGroupAttributes_SE_GROUP_ENABLED_BY_DEFAULT, 
-	  { "Se Group Enabled By Default", "samr.samr_SeGroupAttributes.SE_GROUP_ENABLED_BY_DEFAULT", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_ENABLED_BY_DEFAULT_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Se Group Enabled By Default", "samr.samr_SeGroupAttributes.SE_GROUP_ENABLED_BY_DEFAULT", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_ENABLED_BY_DEFAULT_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_pwd_history_len, 
-	  { "Pwd History Len", "samr.samr_ValidatePasswordInfo.pwd_history_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pwd History Len", "samr.samr_ValidatePasswordInfo.pwd_history_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoFullGroups_entries, 
-	  { "Entries", "samr.samr_DispInfoFullGroups.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "samr.samr_DispInfoFullGroups.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_bad_password_count, 
-	  { "Bad Password Count", "samr.samr_UserInfo5.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bad Password Count", "samr.samr_UserInfo5.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info5, 
-	  { "Info5", "samr.samr_DomainInfo.info5", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info5", "samr.samr_DomainInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER, 
-	  { "Samr Alias Access Add Member", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_ADD_MEMBER", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Alias Access Add Member", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_ADD_MEMBER", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_ADD_MEMBER_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info6, 
-	  { "Info6", "samr.samr_UserInfo.info6", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info6", "samr.samr_UserInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_logon_script, 
-	  { "Logon Script", "samr.samr_UserInfo3.logon_script", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Script", "samr.samr_UserInfo3.logon_script", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetUserInfo_level, 
-	  { "Level", "samr.samr_SetUserInfo.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "samr.samr_SetUserInfo.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_last_logon, 
-	  { "Last Logon", "samr.samr_UserInfo21.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logon", "samr.samr_UserInfo21.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetBootKeyInformation_domain_handle, 
-	  { "Domain Handle", "samr.samr_GetBootKeyInformation.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Handle", "samr.samr_GetBootKeyInformation.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_lm_password, 
-	  { "Lm Password", "samr.samr_UserInfo21.lm_password", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Password", "samr.samr_UserInfo21.lm_password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_returned_size, 
-	  { "Returned Size", "samr.samr_QueryDisplayInfo3.returned_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Returned Size", "samr.samr_QueryDisplayInfo3.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_account, 
-	  { "Account", "samr.samr_ValidatePasswordReq3.account", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "samr.samr_ValidatePasswordReq3.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo7_account_name, 
-	  { "Account Name", "samr.samr_UserInfo7.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo7.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo23_info, 
-	  { "Info", "samr.samr_UserInfo23.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_UserInfo23.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1, 
-	  { "Samr Domain Access Set Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Domain Access Set Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_1_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_last_logon, 
-	  { "Last Logon", "samr.samr_UserInfo3.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logon", "samr.samr_UserInfo3.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info10, 
-	  { "Info10", "samr.samr_UserInfo.info10", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info10", "samr.samr_UserInfo.info10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainGroups_max_size, 
-	  { "Max Size", "samr.samr_EnumDomainGroups.max_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Size", "samr.samr_EnumDomainGroups.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE, 
-	  { "Domain Password No Anon Change", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_NO_ANON_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Domain Password No Anon Change", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_NO_ANON_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_NO_ANON_CHANGE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PASSWORD2, 
-	  { "Samr Field Password2", "samr.samr_FieldsPresent.SAMR_FIELD_PASSWORD2", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PASSWORD2_tfs), ( 0x02000000 ), "", HFILL }},
+	  { "Samr Field Password2", "samr.samr_FieldsPresent.SAMR_FIELD_PASSWORD2", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PASSWORD2_tfs), ( 0x02000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_full_name, 
-	  { "Full Name", "samr.samr_UserInfo3.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo3.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryAscii_account_name, 
-	  { "Account Name", "samr.samr_DispEntryAscii.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_DispEntryAscii.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo11_logon_script, 
-	  { "Logon Script", "samr.samr_UserInfo11.logon_script", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Script", "samr.samr_UserInfo11.logon_script", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Types_types, 
-	  { "Types", "samr.samr_Types.types", FT_UINT32, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, "", HFILL }},
+	  { "Types", "samr.samr_Types.types", FT_UINT32, BASE_DEC, VALS(samr_lsa_SidType_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_TRUST_AUTH_DELEGAT, 
-	  { "Acb Trust Auth Delegat", "samr.samr_AcctFlags.ACB_TRUST_AUTH_DELEGAT", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUST_AUTH_DELEGAT_tfs), ( 0x00040000 ), "", HFILL }},
+	  { "Acb Trust Auth Delegat", "samr.samr_AcctFlags.ACB_TRUST_AUTH_DELEGAT", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUST_AUTH_DELEGAT_tfs), ( 0x00040000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_lm_present, 
-	  { "Lm Present", "samr.samr_ChangePasswordUser.lm_present", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lm Present", "samr.samr_ChangePasswordUser.lm_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AddMultipleMembersToAlias_sids, 
-	  { "Sids", "samr.samr_AddMultipleMembersToAlias.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "samr.samr_AddMultipleMembersToAlias.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo13_sequence_num, 
-	  { "Sequence Num", "samr.samr_DomInfo13.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sequence Num", "samr.samr_DomInfo13.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info21, 
-	  { "Info21", "samr.samr_UserInfo.info21", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info21", "samr.samr_UserInfo.info21", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq_req1, 
-	  { "Req1", "samr.samr_ValidatePasswordReq.req1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req1", "samr.samr_ValidatePasswordReq.req1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_MNS, 
-	  { "Acb Mns", "samr.samr_AcctFlags.ACB_MNS", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_MNS_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Acb Mns", "samr.samr_AcctFlags.ACB_MNS", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_MNS_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFullGroup_description, 
-	  { "Description", "samr.samr_DispEntryFullGroup.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_DispEntryFullGroup.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetSecurity_sdbuf, 
-	  { "Sdbuf", "samr.samr_SetSecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sdbuf", "samr.samr_SetSecurity.sdbuf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq2_account, 
-	  { "Account", "samr.samr_ValidatePasswordReq2.account", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "samr.samr_ValidatePasswordReq2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupNames_names, 
-	  { "Names", "samr.samr_LookupNames.names", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "samr.samr_LookupNames.names", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_REFUSE_PASSWORD_CHANGE, 
-	  { "Domain Refuse Password Change", "samr.samr_PasswordProperties.DOMAIN_REFUSE_PASSWORD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_REFUSE_PASSWORD_CHANGE_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Domain Refuse Password Change", "samr.samr_PasswordProperties.DOMAIN_REFUSE_PASSWORD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_REFUSE_PASSWORD_CHANGE_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP, 
-	  { "Samr User Access Change Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Samr User Access Change Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_GROUP_MEMBERSHIP_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_samr_samr_PwInfo_password_properties, 
-	  { "Password Properties", "samr.samr_PwInfo.password_properties", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Password Properties", "samr.samr_PwInfo.password_properties", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq_req2, 
-	  { "Req2", "samr.samr_ValidatePasswordReq.req2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req2", "samr.samr_ValidatePasswordReq.req2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation2_lockout_window, 
-	  { "Lockout Window", "samr.samr_DomGeneralInformation2.lockout_window", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Window", "samr.samr_DomGeneralInformation2.lockout_window", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_returned_size, 
-	  { "Returned Size", "samr.samr_QueryDisplayInfo2.returned_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Returned Size", "samr.samr_QueryDisplayInfo2.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetBootKeyInformation_unknown2, 
-	  { "Unknown2", "samr.samr_SetBootKeyInformation.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "samr.samr_SetBootKeyInformation.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_LOGON, 
-	  { "Samr Field Last Logon", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGON", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGON_tfs), ( 0x00000800 ), "", HFILL }},
+	  { "Samr Field Last Logon", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGON", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGON_tfs), ( 0x00000800 ), NULL, HFILL }},
 	{ &hf_samr_samr_Ids_count, 
-	  { "Count", "samr.samr_Ids.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_Ids.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM, 
-	  { "Samr User Access Set Loc Com", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_LOC_COM", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr User Access Set Loc Com", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_LOC_COM", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_LOC_COM_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_SMARTCARD_REQUIRED, 
-	  { "Acb Smartcard Required", "samr.samr_AcctFlags.ACB_SMARTCARD_REQUIRED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_SMARTCARD_REQUIRED_tfs), ( 0x00001000 ), "", HFILL }},
+	  { "Acb Smartcard Required", "samr.samr_AcctFlags.ACB_SMARTCARD_REQUIRED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_SMARTCARD_REQUIRED_tfs), ( 0x00001000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_nt_verifier, 
-	  { "Nt Verifier", "samr.samr_ChangePasswordUser3.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Verifier", "samr.samr_ChangePasswordUser3.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info17, 
-	  { "Info17", "samr.samr_UserInfo.info17", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info17", "samr.samr_UserInfo.info17", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupRids_types, 
-	  { "Types", "samr.samr_LookupRids.types", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Types", "samr.samr_LookupRids.types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PROFILE_PATH, 
-	  { "Samr Field Profile Path", "samr.samr_FieldsPresent.SAMR_FIELD_PROFILE_PATH", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PROFILE_PATH_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Samr Field Profile Path", "samr.samr_FieldsPresent.SAMR_FIELD_PROFILE_PATH", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PROFILE_PATH_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_lm_change, 
-	  { "Lm Change", "samr.samr_ChangePasswordUser3.lm_change", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lm Change", "samr.samr_ChangePasswordUser3.lm_change", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo1_primary_gid, 
-	  { "Primary Gid", "samr.samr_UserInfo1.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Gid", "samr.samr_UserInfo1.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq1_info, 
-	  { "Info", "samr.samr_ValidatePasswordReq1.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_ValidatePasswordReq1.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_home_drive, 
-	  { "Home Drive", "samr.samr_UserInfo21.home_drive", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Drive", "samr.samr_UserInfo21.home_drive", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_PWNOEXP, 
-	  { "Acb Pwnoexp", "samr.samr_AcctFlags.ACB_PWNOEXP", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PWNOEXP_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Acb Pwnoexp", "samr.samr_AcctFlags.ACB_PWNOEXP", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PWNOEXP_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomOEMInformation_oem_information, 
-	  { "Oem Information", "samr.samr_DomOEMInformation.oem_information", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Oem Information", "samr.samr_DomOEMInformation.oem_information", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_group_handle, 
-	  { "Group Handle", "samr.group_handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Group Handle", "samr.group_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainAliases_num_entries, 
-	  { "Num Entries", "samr.samr_EnumDomainAliases.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Entries", "samr.samr_EnumDomainAliases.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_SVRTRUST, 
-	  { "Acb Svrtrust", "samr.samr_AcctFlags.ACB_SVRTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_SVRTRUST_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Acb Svrtrust", "samr.samr_AcctFlags.ACB_SVRTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_SVRTRUST_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_oem_information, 
-	  { "Oem Information", "samr.samr_DomGeneralInformation.oem_information", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Oem Information", "samr.samr_DomGeneralInformation.oem_information", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetMemberAttributesOfGroup_attributes, 
-	  { "Attributes", "samr.samr_SetMemberAttributesOfGroup.attributes", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_SetMemberAttributesOfGroup.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info8, 
-	  { "Info8", "samr.samr_UserInfo.info8", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info8", "samr.samr_UserInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo25_info, 
-	  { "Info", "samr.samr_UserInfo25.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_UserInfo25.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP, 
-	  { "Samr User Access Get Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Samr User Access Get Group Membership", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUP_MEMBERSHIP_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_samr_samr_CreateDomainGroup_name, 
-	  { "Name", "samr.samr_CreateDomainGroup.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_CreateDomainGroup.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_privatedatasensitive, 
-	  { "Privatedatasensitive", "samr.samr_UserInfo21.privatedatasensitive", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Privatedatasensitive", "samr.samr_UserInfo21.privatedatasensitive", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_num_groups, 
-	  { "Num Groups", "samr.samr_DomGeneralInformation.num_groups", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Groups", "samr.samr_DomGeneralInformation.num_groups", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetGroupInfo_info, 
-	  { "Info", "samr.samr_SetGroupInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_SetGroupInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_lsa_Strings_names, 
-	  { "Names", "samr.lsa_Strings.names", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "samr.lsa_Strings.names", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainAliases_resume_handle, 
-	  { "Resume Handle", "samr.samr_EnumDomainAliases.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "samr.samr_EnumDomainAliases.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_num_aliases, 
-	  { "Num Aliases", "samr.samr_DomGeneralInformation.num_aliases", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Aliases", "samr.samr_DomGeneralInformation.num_aliases", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_full_name, 
-	  { "Full Name", "samr.samr_UserInfo21.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo21.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetDomPwInfo_domain_name, 
-	  { "Domain Name", "samr.samr_GetDomPwInfo.domain_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Name", "samr.samr_GetDomPwInfo.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetMembersBuffer_attributes, 
-	  { "Attributes", "samr.samr_GetMembersBuffer.attributes", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_GetMembersBuffer.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_primary_gid, 
-	  { "Primary Gid", "samr.samr_UserInfo3.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Gid", "samr.samr_UserInfo3.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO, 
-	  { "Samr Alias Access Lookup Info", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_LOOKUP_INFO", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Alias Access Lookup Info", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_LOOKUP_INFO", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_LOOKUP_INFO_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info5, 
-	  { "Info5", "samr.samr_UserInfo.info5", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info5", "samr.samr_UserInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_home_directory, 
-	  { "Home Directory", "samr.samr_UserInfo3.home_directory", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Directory", "samr.samr_UserInfo3.home_directory", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_cross2_present, 
-	  { "Cross2 Present", "samr.samr_ChangePasswordUser.cross2_present", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cross2 Present", "samr.samr_ChangePasswordUser.cross2_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DeleteAliasMember_sid, 
-	  { "Sid", "samr.samr_DeleteAliasMember.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_DeleteAliasMember.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePassword_rep, 
-	  { "Rep", "samr.samr_ValidatePassword.rep", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rep", "samr.samr_ValidatePassword.rep", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_fields_present, 
-	  { "Fields Present", "samr.samr_ValidatePasswordInfo.fields_present", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Fields Present", "samr.samr_ValidatePasswordInfo.fields_present", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER, 
-	  { "Samr Group Access Remove Member", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_REMOVE_MEMBER", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Group Access Remove Member", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_REMOVE_MEMBER", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_REMOVE_MEMBER_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex2_level, 
-	  { "Level", "samr.samr_GetDisplayEnumerationIndex2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_GetDisplayEnumerationIndex2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED, 
-	  { "Acb Enc Txt Pwd Allowed", "samr.samr_AcctFlags.ACB_ENC_TXT_PWD_ALLOWED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED_tfs), ( 0x00000800 ), "", HFILL }},
+	  { "Acb Enc Txt Pwd Allowed", "samr.samr_AcctFlags.ACB_ENC_TXT_PWD_ALLOWED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_ENC_TXT_PWD_ALLOWED_tfs), ( 0x00000800 ), NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfo_description, 
-	  { "Description", "samr.samr_AliasInfo.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_AliasInfo.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_info, 
-	  { "Info", "samr.samr_QueryDisplayInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryDisplayInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoAll_num_members, 
-	  { "Num Members", "samr.samr_GroupInfoAll.num_members", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Members", "samr.samr_GroupInfoAll.num_members", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_status, 
-	  { "NT Error", "samr.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, "", HFILL }},
+	  { "NT Error", "samr.status", FT_UINT32, BASE_HEX, VALS(NT_errors), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo12_profile_path, 
-	  { "Profile Path", "samr.samr_UserInfo12.profile_path", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Profile Path", "samr.samr_UserInfo12.profile_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_comment, 
-	  { "Comment", "samr.samr_UserInfo21.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Comment", "samr.samr_UserInfo21.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2, 
-	  { "Samr Domain Access Set Info 2", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_2", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Domain Access Set Info 2", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_2", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_2_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info14, 
-	  { "Info14", "samr.samr_UserInfo.info14", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info14", "samr.samr_UserInfo.info14", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_CreateUser2_access_granted, 
-	  { "Access Granted", "samr.samr_CreateUser2.access_granted", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Access Granted", "samr.samr_CreateUser2.access_granted", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_acct_flags, 
-	  { "Acct Flags", "samr.samr_UserInfo5.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_UserInfo5.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_NOT_DELEGATED, 
-	  { "Acb Not Delegated", "samr.samr_AcctFlags.ACB_NOT_DELEGATED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NOT_DELEGATED_tfs), ( 0x00004000 ), "", HFILL }},
+	  { "Acb Not Delegated", "samr.samr_AcctFlags.ACB_NOT_DELEGATED", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NOT_DELEGATED_tfs), ( 0x00004000 ), NULL, HFILL }},
 	{ &hf_samr_samr_SupportedFeatures_SAMR_FEATURES_DONT_CONCAT_RIDS, 
-	  { "Samr Features Dont Concat Rids", "samr.samr_SupportedFeatures.SAMR_FEATURES_DONT_CONCAT_RIDS", FT_BOOLEAN, 32, TFS(&samr_SupportedFeatures_SAMR_FEATURES_DONT_CONCAT_RIDS_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Features Dont Concat Rids", "samr.samr_SupportedFeatures.SAMR_FEATURES_DONT_CONCAT_RIDS", FT_BOOLEAN, 32, TFS(&samr_SupportedFeatures_SAMR_FEATURES_DONT_CONCAT_RIDS_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_SetDsrmPassword_name, 
-	  { "Name", "samr.samr_SetDsrmPassword.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_SetDsrmPassword.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect_system_name, 
-	  { "System Name", "samr.samr_Connect.system_name", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "samr.samr_Connect.system_name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo1_min_password_age, 
-	  { "Min Password Age", "samr.samr_DomInfo1.min_password_age", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Min Password Age", "samr.samr_DomInfo1.min_password_age", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupRids_num_rids, 
-	  { "Num Rids", "samr.samr_LookupRids.num_rids", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Rids", "samr.samr_LookupRids.num_rids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoDescription_description, 
-	  { "Description", "samr.samr_GroupInfoDescription.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_GroupInfoDescription.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryUserInfo_level, 
-	  { "Level", "samr.samr_QueryUserInfo.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryUserInfo.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_LOGON_ID, 
-	  { "Se Group Logon Id", "samr.samr_GroupAttrs.SE_GROUP_LOGON_ID", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_LOGON_ID_tfs), ( 0xC0000000 ), "", HFILL }},
+	  { "Se Group Logon Id", "samr.samr_GroupAttrs.SE_GROUP_LOGON_ID", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_LOGON_ID_tfs), ( 0xC0000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_ENUM_DOMAINS, 
-	  { "Samr Server Access Enum Domains", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_ENUM_DOMAINS", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_ENUM_DOMAINS_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Server Access Enum Domains", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_ENUM_DOMAINS", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_ENUM_DOMAINS_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryGeneral_account_name, 
-	  { "Account Name", "samr.samr_DispEntryGeneral.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_DispEntryGeneral.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_HOMDIRREQ, 
-	  { "Acb Homdirreq", "samr.samr_AcctFlags.ACB_HOMDIRREQ", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_HOMDIRREQ_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Acb Homdirreq", "samr.samr_AcctFlags.ACB_HOMDIRREQ", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_HOMDIRREQ_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_CryptPasswordEx_data, 
-	  { "Data", "samr.samr_CryptPasswordEx.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "samr.samr_CryptPasswordEx.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_bad_password_time, 
-	  { "Bad Password Time", "samr.samr_ValidatePasswordInfo.bad_password_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Bad Password Time", "samr.samr_ValidatePasswordInfo.bad_password_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_USE_DES_KEY_ONLY, 
-	  { "Acb Use Des Key Only", "samr.samr_AcctFlags.ACB_USE_DES_KEY_ONLY", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_USE_DES_KEY_ONLY_tfs), ( 0x00008000 ), "", HFILL }},
+	  { "Acb Use Des Key Only", "samr.samr_AcctFlags.ACB_USE_DES_KEY_ONLY", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_USE_DES_KEY_ONLY_tfs), ( 0x00008000 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispInfo_info1, 
-	  { "Info1", "samr.samr_DispInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "samr.samr_DispInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetDomainInfo_level, 
-	  { "Level", "samr.samr_SetDomainInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_SetDomainInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfo_info4, 
-	  { "Info4", "samr.samr_DispInfo.info4", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info4", "samr.samr_DispInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo8_domain_create_time, 
-	  { "Domain Create Time", "samr.samr_DomInfo8.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Create Time", "samr.samr_DomInfo8.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_private, 
-	  { "Private", "samr.samr_UserInfo21.private", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Private", "samr.samr_UserInfo21.private", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_old_nt_crypted, 
-	  { "Old Nt Crypted", "samr.samr_ChangePasswordUser.old_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Nt Crypted", "samr.samr_ChangePasswordUser.old_nt_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_force_logoff_time, 
-	  { "Force Logoff Time", "samr.samr_DomGeneralInformation.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Force Logoff Time", "samr.samr_DomGeneralInformation.force_logoff_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo12_lockout_threshold, 
-	  { "Lockout Threshold", "samr.samr_DomInfo12.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Threshold", "samr.samr_DomInfo12.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoAttributes_attributes, 
-	  { "Attributes", "samr.samr_GroupInfoAttributes.attributes", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_GroupInfoAttributes.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SamArray_entries, 
-	  { "Entries", "samr.samr_SamArray.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "samr.samr_SamArray.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info9, 
-	  { "Info9", "samr.samr_UserInfo.info9", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info9", "samr.samr_UserInfo.info9", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_lm_password, 
-	  { "Lm Password", "samr.samr_ChangePasswordUser2.lm_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Password", "samr.samr_ChangePasswordUser2.lm_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryGeneral_full_name, 
-	  { "Full Name", "samr.samr_DispEntryGeneral.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_DispEntryGeneral.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_domain_handle, 
-	  { "Domain Handle", "samr.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Domain Handle", "samr.domain_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation2_general, 
-	  { "General", "samr.samr_DomGeneralInformation2.general", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "General", "samr.samr_DomGeneralInformation2.general", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfoAll_num_members, 
-	  { "Num Members", "samr.samr_AliasInfoAll.num_members", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Members", "samr.samr_AliasInfoAll.num_members", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO, 
-	  { "Samr Group Access Set Info", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_SET_INFO", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Group Access Set Info", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_SET_INFO", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_SET_INFO_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFull_description, 
-	  { "Description", "samr.samr_DispEntryFull.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_DispEntryFull.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupDomain_domain_name, 
-	  { "Domain Name", "samr.samr_LookupDomain.domain_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Name", "samr.samr_LookupDomain.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordRep_ctr3, 
-	  { "Ctr3", "samr.samr_ValidatePasswordRep.ctr3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr3", "samr.samr_ValidatePasswordRep.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_user_handle, 
-	  { "User Handle", "samr.user_handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "User Handle", "samr.user_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_max_entries, 
-	  { "Max Entries", "samr.samr_QueryDisplayInfo3.max_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Entries", "samr.samr_QueryDisplayInfo3.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo6_primary, 
-	  { "Primary", "samr.samr_DomInfo6.primary", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Primary", "samr.samr_DomInfo6.primary", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX, 
-	  { "Domain Password Complex", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_COMPLEX", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Domain Password Complex", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_COMPLEX", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_COMPLEX_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_domain_access_mask, 
-	  { "Access Mask", "samr.domain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "samr.domain.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect5_system_name, 
-	  { "System Name", "samr.samr_Connect5.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "samr.samr_Connect5.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_bad_password_count, 
-	  { "Bad Password Count", "samr.samr_UserInfo21.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bad Password Count", "samr.samr_UserInfo21.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_acct_expiry, 
-	  { "Acct Expiry", "samr.samr_UserInfo21.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Acct Expiry", "samr.samr_UserInfo21.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainUsers_max_size, 
-	  { "Max Size", "samr.samr_EnumDomainUsers.max_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Size", "samr.samr_EnumDomainUsers.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_ALLOW_PWD_CHANGE, 
-	  { "Samr Field Allow Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_ALLOW_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ALLOW_PWD_CHANGE_tfs), ( 0x00010000 ), "", HFILL }},
+	  { "Samr Field Allow Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_ALLOW_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ALLOW_PWD_CHANGE_tfs), ( 0x00010000 ), NULL, HFILL }},
 	{ &hf_samr_samr_LookupNames_rids, 
-	  { "Rids", "samr.samr_LookupNames.rids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rids", "samr.samr_LookupNames.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo1_min_password_length, 
-	  { "Min Password Length", "samr.samr_DomInfo1.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Min Password Length", "samr.samr_DomInfo1.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_pwd_must_change_at_next_logon, 
-	  { "Pwd Must Change At Next Logon", "samr.samr_ValidatePasswordReq3.pwd_must_change_at_next_logon", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pwd Must Change At Next Logon", "samr.samr_ValidatePasswordReq3.pwd_must_change_at_next_logon", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_WORKSTATIONS, 
-	  { "Samr Field Workstations", "samr.samr_FieldsPresent.SAMR_FIELD_WORKSTATIONS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_WORKSTATIONS_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Samr Field Workstations", "samr.samr_FieldsPresent.SAMR_FIELD_WORKSTATIONS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_WORKSTATIONS_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex_idx, 
-	  { "Idx", "samr.samr_GetDisplayEnumerationIndex.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_GetDisplayEnumerationIndex.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_last_logon, 
-	  { "Last Logon", "samr.samr_UserInfo5.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logon", "samr.samr_UserInfo5.last_logon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_CREATE_DOMAIN, 
-	  { "Samr Server Access Create Domain", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_CREATE_DOMAIN", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_CREATE_DOMAIN_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Server Access Create Domain", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_CREATE_DOMAIN", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_CREATE_DOMAIN_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_server, 
-	  { "Server", "samr.samr_ChangePasswordUser2.server", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Server", "samr.samr_ChangePasswordUser2.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetDomainInfo_info, 
-	  { "Info", "samr.samr_SetDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_SetDomainInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SamArray_count, 
-	  { "Count", "samr.samr_SamArray.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_SamArray.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo24_password, 
-	  { "Password", "samr.samr_UserInfo24.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_UserInfo24.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFull_idx, 
-	  { "Idx", "samr.samr_DispEntryFull.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_DispEntryFull.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFull_acct_flags, 
-	  { "Acct Flags", "samr.samr_DispEntryFull.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_DispEntryFull.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetAliasMembership_sids, 
-	  { "Sids", "samr.samr_GetAliasMembership.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "samr.samr_GetAliasMembership.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info1, 
-	  { "Info1", "samr.samr_UserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "samr.samr_UserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_RESOURCE, 
-	  { "Se Group Resource", "samr.samr_GroupAttrs.SE_GROUP_RESOURCE", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_RESOURCE_tfs), ( 0x20000000 ), "", HFILL }},
+	  { "Se Group Resource", "samr.samr_GroupAttrs.SE_GROUP_RESOURCE", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_RESOURCE_tfs), ( 0x20000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_DESCRIPTION, 
-	  { "Samr Field Description", "samr.samr_FieldsPresent.SAMR_FIELD_DESCRIPTION", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_DESCRIPTION_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Field Description", "samr.samr_FieldsPresent.SAMR_FIELD_DESCRIPTION", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_DESCRIPTION_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo23_password, 
-	  { "Password", "samr.samr_UserInfo23.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_UserInfo23.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_last_logoff, 
-	  { "Last Logoff", "samr.samr_UserInfo21.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logoff", "samr.samr_UserInfo21.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfo_info2, 
-	  { "Info2", "samr.samr_DispInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "samr.samr_DispInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainUsers_resume_handle, 
-	  { "Resume Handle", "samr.samr_EnumDomainUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "samr.samr_EnumDomainUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordRepCtr_status, 
-	  { "Status", "samr.samr_ValidatePasswordRepCtr.status", FT_UINT16, BASE_DEC, VALS(samr_samr_ValidationStatus_vals), 0, "", HFILL }},
+	  { "Status", "samr.samr_ValidatePasswordRepCtr.status", FT_UINT16, BASE_DEC, VALS(samr_samr_ValidationStatus_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_general2, 
-	  { "General2", "samr.samr_DomainInfo.general2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "General2", "samr.samr_DomainInfo.general2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoFull_count, 
-	  { "Count", "samr.samr_DispInfoFull.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_DispInfoFull.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS, 
-	  { "Samr Group Access Get Members", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Group Access Get Members", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_GET_MEMBERS_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_COUNTRY_CODE, 
-	  { "Samr Field Country Code", "samr.samr_FieldsPresent.SAMR_FIELD_COUNTRY_CODE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_COUNTRY_CODE_tfs), ( 0x00400000 ), "", HFILL }},
+	  { "Samr Field Country Code", "samr.samr_FieldsPresent.SAMR_FIELD_COUNTRY_CODE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_COUNTRY_CODE_tfs), ( 0x00400000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq2_password, 
-	  { "Password", "samr.samr_ValidatePasswordReq2.password", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_ValidatePasswordReq2.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_logon_hours, 
-	  { "Logon Hours", "samr.samr_UserInfo5.logon_hours", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Hours", "samr.samr_UserInfo5.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_HOME_DIRECTORY, 
-	  { "Samr Field Home Directory", "samr.samr_FieldsPresent.SAMR_FIELD_HOME_DIRECTORY", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_HOME_DIRECTORY_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Samr Field Home Directory", "samr.samr_FieldsPresent.SAMR_FIELD_HOME_DIRECTORY", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_HOME_DIRECTORY_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_NO_AUTH_DATA_REQD, 
-	  { "Acb No Auth Data Reqd", "samr.samr_AcctFlags.ACB_NO_AUTH_DATA_REQD", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NO_AUTH_DATA_REQD_tfs), ( 0x00080000 ), "", HFILL }},
+	  { "Acb No Auth Data Reqd", "samr.samr_AcctFlags.ACB_NO_AUTH_DATA_REQD", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NO_AUTH_DATA_REQD_tfs), ( 0x00080000 ), NULL, HFILL }},
 	{ &hf_samr_samr_QueryDomainInfo_level, 
-	  { "Level", "samr.samr_QueryDomainInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryDomainInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo26_password, 
-	  { "Password", "samr.samr_UserInfo26.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_UserInfo26.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq1_password_matched, 
-	  { "Password Matched", "samr.samr_ValidatePasswordReq1.password_matched", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password Matched", "samr.samr_ValidatePasswordReq1.password_matched", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_account_name, 
-	  { "Account Name", "samr.samr_UserInfo21.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo21.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_ATTRIBUTES, 
-	  { "Samr User Access Get Attributes", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_ATTRIBUTES", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_ATTRIBUTES_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr User Access Get Attributes", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_ATTRIBUTES", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_ATTRIBUTES_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO, 
-	  { "Samr Alias Access Set Info", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_SET_INFO", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Alias Access Set Info", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_SET_INFO", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_SET_INFO_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo2_comment, 
-	  { "Comment", "samr.samr_UserInfo2.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Comment", "samr.samr_UserInfo2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_RID, 
-	  { "Samr Field Rid", "samr.samr_FieldsPresent.SAMR_FIELD_RID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_RID_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Field Rid", "samr.samr_FieldsPresent.SAMR_FIELD_RID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_RID_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info23, 
-	  { "Info23", "samr.samr_UserInfo.info23", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info23", "samr.samr_UserInfo.info23", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_total_size, 
-	  { "Total Size", "samr.samr_QueryDisplayInfo2.total_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total Size", "samr.samr_QueryDisplayInfo2.total_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo25_password, 
-	  { "Password", "samr.samr_UserInfo25.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_UserInfo25.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_lm_verifier, 
-	  { "Lm Verifier", "samr.samr_ChangePasswordUser2.lm_verifier", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Verifier", "samr.samr_ChangePasswordUser2.lm_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo4_logon_hours, 
-	  { "Logon Hours", "samr.samr_UserInfo4.logon_hours", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Hours", "samr.samr_UserInfo4.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_home_directory, 
-	  { "Home Directory", "samr.samr_UserInfo5.home_directory", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Directory", "samr.samr_UserInfo5.home_directory", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo12_lockout_duration, 
-	  { "Lockout Duration", "samr.samr_DomInfo12.lockout_duration", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Duration", "samr.samr_DomInfo12.lockout_duration", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_CreateUser_account_name, 
-	  { "Account Name", "samr.samr_CreateUser.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_CreateUser.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo9_primary_gid, 
-	  { "Primary Gid", "samr.samr_UserInfo9.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Gid", "samr.samr_UserInfo9.primary_gid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOGONINFO, 
-	  { "Samr User Access Get Logoninfo", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_LOGONINFO", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOGONINFO_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr User Access Get Logoninfo", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_LOGONINFO", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOGONINFO_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET, 
-	  { "Samr Validate Field Password Last Set", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Validate Field Password Last Set", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_LAST_SET_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_domain_name, 
-	  { "Domain Name", "samr.samr_DomGeneralInformation.domain_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Name", "samr.samr_DomGeneralInformation.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_CreateUser2_account_name, 
-	  { "Account Name", "samr.samr_CreateUser2.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_CreateUser2.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupDomain_sid, 
-	  { "Sid", "samr.samr_LookupDomain.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_LookupDomain.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AddAliasMember_sid, 
-	  { "Sid", "samr.samr_AddAliasMember.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_AddAliasMember.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryAliasInfo_info, 
-	  { "Info", "samr.samr_QueryAliasInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryAliasInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq2_hash, 
-	  { "Hash", "samr.samr_ValidatePasswordReq2.hash", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hash", "samr.samr_ValidatePasswordReq2.hash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_fields_present, 
-	  { "Fields Present", "samr.samr_UserInfo21.fields_present", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Fields Present", "samr.samr_UserInfo21.fields_present", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_EXPIRED_FLAG, 
-	  { "Samr Field Expired Flag", "samr.samr_FieldsPresent.SAMR_FIELD_EXPIRED_FLAG", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_EXPIRED_FLAG_tfs), ( 0x08000000 ), "", HFILL }},
+	  { "Samr Field Expired Flag", "samr.samr_FieldsPresent.SAMR_FIELD_EXPIRED_FLAG", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_EXPIRED_FLAG_tfs), ( 0x08000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq2_password_matched, 
-	  { "Password Matched", "samr.samr_ValidatePasswordReq2.password_matched", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password Matched", "samr.samr_ValidatePasswordReq2.password_matched", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QuerySecurity_sec_info, 
-	  { "Sec Info", "samr.samr_QuerySecurity.sec_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Info", "samr.samr_QuerySecurity.sec_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info12, 
-	  { "Info12", "samr.samr_DomainInfo.info12", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info12", "samr.samr_DomainInfo.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_max_entries, 
-	  { "Max Entries", "samr.samr_QueryDisplayInfo.max_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Entries", "samr.samr_QueryDisplayInfo.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomains_resume_handle, 
-	  { "Resume Handle", "samr.samr_EnumDomains.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "samr.samr_EnumDomains.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info7, 
-	  { "Info7", "samr.samr_UserInfo.info7", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info7", "samr.samr_UserInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfo_all2, 
-	  { "All2", "samr.samr_GroupInfo.all2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "All2", "samr.samr_GroupInfo.all2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo1_full_name, 
-	  { "Full Name", "samr.samr_UserInfo1.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo1.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainGroups_resume_handle, 
-	  { "Resume Handle", "samr.samr_EnumDomainGroups.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "samr.samr_EnumDomainGroups.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetUserInfo2_info, 
-	  { "Info", "samr.samr_SetUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_SetUserInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_nt_password, 
-	  { "Nt Password", "samr.samr_ChangePasswordUser3.nt_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Password", "samr.samr_ChangePasswordUser3.nt_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_buf_count, 
-	  { "Buf Count", "samr.samr_UserInfo21.buf_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Count", "samr.samr_UserInfo21.buf_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PwInfo_min_password_length, 
-	  { "Min Password Length", "samr.samr_PwInfo.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Min Password Length", "samr.samr_PwInfo.min_password_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_user_access_mask, 
-	  { "Access Mask", "samr.user.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "samr.user.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_sequence_num, 
-	  { "Sequence Num", "samr.samr_DomGeneralInformation.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sequence Num", "samr.samr_DomGeneralInformation.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_old_lm_crypted, 
-	  { "Old Lm Crypted", "samr.samr_ChangePasswordUser.old_lm_crypted", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Old Lm Crypted", "samr.samr_ChangePasswordUser.old_lm_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS, 
-	  { "Samr Alias Access Get Members", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Alias Access Get Members", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_GET_MEMBERS", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_GET_MEMBERS_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_NORMAL, 
-	  { "Acb Normal", "samr.samr_AcctFlags.ACB_NORMAL", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NORMAL_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Acb Normal", "samr.samr_AcctFlags.ACB_NORMAL", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_NORMAL_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfo_all, 
-	  { "All", "samr.samr_GroupInfo.all", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "All", "samr.samr_GroupInfo.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo16_acct_flags, 
-	  { "Acct Flags", "samr.samr_UserInfo16.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_UserInfo16.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo2_country_code, 
-	  { "Country Code", "samr.samr_UserInfo2.country_code", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Country Code", "samr.samr_UserInfo2.country_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AddGroupMember_flags, 
-	  { "Flags", "samr.samr_AddGroupMember.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "samr.samr_AddGroupMember.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo10_home_directory, 
-	  { "Home Directory", "samr.samr_UserInfo10.home_directory", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Directory", "samr.samr_UserInfo10.home_directory", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_OemChangePasswordUser2_server, 
-	  { "Server", "samr.samr_OemChangePasswordUser2.server", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Server", "samr.samr_OemChangePasswordUser2.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD, 
-	  { "Samr User Access Change Password", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Samr User Access Change Password", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_CHANGE_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_CHANGE_PASSWORD_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfo_all, 
-	  { "All", "samr.samr_AliasInfo.all", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "All", "samr.samr_AliasInfo.all", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME, 
-	  { "Samr Validate Field Bad Password Time", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Validate Field Bad Password Time", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_BAD_PASSWORD_TIME_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangeReject_reason, 
-	  { "Reason", "samr.samr_ChangeReject.reason", FT_UINT32, BASE_DEC, VALS(samr_samr_ExtendedFailureReason_vals), 0, "", HFILL }},
+	  { "Reason", "samr.samr_ChangeReject.reason", FT_UINT32, BASE_DEC, VALS(samr_samr_ExtendedFailureReason_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC, 
-	  { "Samr User Access Get Name Etc", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_NAME_ETC", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr User Access Get Name Etc", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_NAME_ETC", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_NAME_ETC_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_password3, 
-	  { "Password3", "samr.samr_ChangePasswordUser3.password3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password3", "samr.samr_ChangePasswordUser3.password3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo13_description, 
-	  { "Description", "samr.samr_UserInfo13.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_UserInfo13.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_lm_password_set, 
-	  { "Lm Password Set", "samr.samr_UserInfo21.lm_password_set", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lm Password Set", "samr.samr_UserInfo21.lm_password_set", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info2, 
-	  { "Info2", "samr.samr_UserInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "samr.samr_UserInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LogonHours_bits, 
-	  { "Bits", "samr.samr_LogonHours.bits", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bits", "samr.samr_LogonHours.bits", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_handle, 
-	  { "Handle", "samr.handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Handle", "samr.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_ENABLED_BY_DEFAULT, 
-	  { "Se Group Enabled By Default", "samr.samr_GroupAttrs.SE_GROUP_ENABLED_BY_DEFAULT", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_ENABLED_BY_DEFAULT_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Se Group Enabled By Default", "samr.samr_GroupAttrs.SE_GROUP_ENABLED_BY_DEFAULT", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_ENABLED_BY_DEFAULT_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainGroups_sam, 
-	  { "Sam", "samr.samr_EnumDomainGroups.sam", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sam", "samr.samr_EnumDomainGroups.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoAll_name, 
-	  { "Name", "samr.samr_GroupInfoAll.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_GroupInfoAll.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordRep_ctr2, 
-	  { "Ctr2", "samr.samr_ValidatePasswordRep.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "samr.samr_ValidatePasswordRep.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info24, 
-	  { "Info24", "samr.samr_UserInfo.info24", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info24", "samr.samr_UserInfo.info24", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SeGroupAttributes_SE_GROUP_MANDATORY, 
-	  { "Se Group Mandatory", "samr.samr_SeGroupAttributes.SE_GROUP_MANDATORY", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_MANDATORY_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Se Group Mandatory", "samr.samr_SeGroupAttributes.SE_GROUP_MANDATORY", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_MANDATORY_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info3, 
-	  { "Info3", "samr.samr_DomainInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "samr.samr_DomainInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainGroups_num_entries, 
-	  { "Num Entries", "samr.samr_EnumDomainGroups.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Entries", "samr.samr_EnumDomainGroups.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_PWNOTREQ, 
-	  { "Acb Pwnotreq", "samr.samr_AcctFlags.ACB_PWNOTREQ", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PWNOTREQ_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Acb Pwnotreq", "samr.samr_AcctFlags.ACB_PWNOTREQ", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_PWNOTREQ_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_bad_password_count, 
-	  { "Bad Password Count", "samr.samr_UserInfo3.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bad Password Count", "samr.samr_UserInfo3.bad_password_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_CODE_PAGE, 
-	  { "Samr Field Code Page", "samr.samr_FieldsPresent.SAMR_FIELD_CODE_PAGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_CODE_PAGE_tfs), ( 0x00800000 ), "", HFILL }},
+	  { "Samr Field Code Page", "samr.samr_FieldsPresent.SAMR_FIELD_CODE_PAGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_CODE_PAGE_tfs), ( 0x00800000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_new_lm_crypted, 
-	  { "New Lm Crypted", "samr.samr_ChangePasswordUser.new_lm_crypted", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Lm Crypted", "samr.samr_ChangePasswordUser.new_lm_crypted", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupNames_types, 
-	  { "Types", "samr.samr_LookupNames.types", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Types", "samr.samr_LookupNames.types", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SamEntry_idx, 
-	  { "Idx", "samr.samr_SamEntry.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_SamEntry.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_logon_hours, 
-	  { "Logon Hours", "samr.samr_UserInfo3.logon_hours", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Hours", "samr.samr_UserInfo3.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangeReject_unknown1, 
-	  { "Unknown1", "samr.samr_ChangeReject.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "samr.samr_ChangeReject.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_account, 
-	  { "Account", "samr.samr_ChangePasswordUser3.account", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "samr.samr_ChangePasswordUser3.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo8_sequence_num, 
-	  { "Sequence Num", "samr.samr_DomInfo8.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sequence Num", "samr.samr_DomInfo8.sequence_num", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_pwd_history, 
-	  { "Pwd History", "samr.samr_ValidatePasswordInfo.pwd_history", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Pwd History", "samr.samr_ValidatePasswordInfo.pwd_history", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect3_unknown, 
-	  { "Unknown", "samr.samr_Connect3.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "samr.samr_Connect3.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex2_idx, 
-	  { "Idx", "samr.samr_GetDisplayEnumerationIndex2.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_GetDisplayEnumerationIndex2.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_lsa_String_name, 
-	  { "Name", "samr.lsa_String.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "samr.lsa_String.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfoAll_name, 
-	  { "Name", "samr.samr_AliasInfoAll.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_AliasInfoAll.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfo_description, 
-	  { "Description", "samr.samr_GroupInfo.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_GroupInfo.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_OWNER, 
-	  { "Se Group Owner", "samr.samr_GroupAttrs.SE_GROUP_OWNER", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_OWNER_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Se Group Owner", "samr.samr_GroupAttrs.SE_GROUP_OWNER", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_OWNER_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainAliases_sam, 
-	  { "Sam", "samr.samr_EnumDomainAliases.sam", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sam", "samr.samr_EnumDomainAliases.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LogonHours_units_per_week, 
-	  { "Units Per Week", "samr.samr_LogonHours.units_per_week", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Units Per Week", "samr.samr_LogonHours.units_per_week", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_role, 
-	  { "Role", "samr.samr_DomGeneralInformation.role", FT_UINT32, BASE_DEC, VALS(samr_samr_Role_vals), 0, "", HFILL }},
+	  { "Role", "samr.samr_DomGeneralInformation.role", FT_UINT32, BASE_DEC, VALS(samr_samr_Role_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info13, 
-	  { "Info13", "samr.samr_DomainInfo.info13", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info13", "samr.samr_DomainInfo.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetSecurity_sec_info, 
-	  { "Sec Info", "samr.samr_SetSecurity.sec_info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Info", "samr.samr_SetSecurity.sec_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_buf_size, 
-	  { "Buf Size", "samr.samr_QueryDisplayInfo2.buf_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Size", "samr.samr_QueryDisplayInfo2.buf_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT, 
-	  { "Domain Password Store Cleartext", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_STORE_CLEARTEXT", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Domain Password Store Cleartext", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_STORE_CLEARTEXT", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_STORE_CLEARTEXT_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation2_lockout_threshold, 
-	  { "Lockout Threshold", "samr.samr_DomGeneralInformation2.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Threshold", "samr.samr_DomGeneralInformation2.lockout_threshold", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_last_password_change, 
-	  { "Last Password Change", "samr.samr_UserInfo21.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Password Change", "samr.samr_UserInfo21.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetMembersBuffer_rids, 
-	  { "Rids", "samr.samr_GetMembersBuffer.rids", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rids", "samr.samr_GetMembersBuffer.rids", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_account, 
-	  { "Account", "samr.samr_ChangePasswordUser2.account", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "samr.samr_ChangePasswordUser2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_lm_password, 
-	  { "Lm Password", "samr.samr_ChangePasswordUser3.lm_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Password", "samr.samr_ChangePasswordUser3.lm_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_account_name, 
-	  { "Account Name", "samr.samr_UserInfo3.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo3.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect3_system_name, 
-	  { "System Name", "samr.samr_Connect3.system_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "System Name", "samr.samr_Connect3.system_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_lsa_String_name_size, 
-	  { "Name Size", "samr.lsa_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Size", "samr.lsa_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info11, 
-	  { "Info11", "samr.samr_UserInfo.info11", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info11", "samr.samr_UserInfo.info11", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SamEntry_name, 
-	  { "Name", "samr.samr_SamEntry.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_SamEntry.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_lsa_Strings_count, 
-	  { "Count", "samr.lsa_Strings.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.lsa_Strings.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_acct_flags, 
-	  { "Acct Flags", "samr.samr_UserInfo3.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_UserInfo3.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_allow_password_change, 
-	  { "Allow Password Change", "samr.samr_UserInfo3.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Allow Password Change", "samr.samr_UserInfo3.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDomainInfo2_level, 
-	  { "Level", "samr.samr_QueryDomainInfo2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryDomainInfo2.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainInformationClass_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PASSWORD, 
-	  { "Samr Field Password", "samr.samr_FieldsPresent.SAMR_FIELD_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PASSWORD_tfs), ( 0x01000000 ), "", HFILL }},
+	  { "Samr Field Password", "samr.samr_FieldsPresent.SAMR_FIELD_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PASSWORD_tfs), ( 0x01000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex_name, 
-	  { "Name", "samr.samr_GetDisplayEnumerationIndex.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_GetDisplayEnumerationIndex.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_info, 
-	  { "Info", "samr.samr_ValidatePasswordReq3.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_ValidatePasswordReq3.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_lockout_time, 
-	  { "Lockout Time", "samr.samr_ValidatePasswordInfo.lockout_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lockout Time", "samr.samr_ValidatePasswordInfo.lockout_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo17_acct_expiry, 
-	  { "Acct Expiry", "samr.samr_UserInfo17.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Acct Expiry", "samr.samr_UserInfo17.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo1_password_history_length, 
-	  { "Password History Length", "samr.samr_DomInfo1.password_history_length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password History Length", "samr.samr_DomInfo1.password_history_length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryUserInfo_info, 
-	  { "Info", "samr.samr_QueryUserInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryUserInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_primary, 
-	  { "Primary", "samr.samr_DomGeneralInformation.primary", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Primary", "samr.samr_DomGeneralInformation.primary", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_home_drive, 
-	  { "Home Drive", "samr.samr_UserInfo5.home_drive", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Drive", "samr.samr_UserInfo5.home_drive", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_RemoveMemberFromForeignDomain_sid, 
-	  { "Sid", "samr.samr_RemoveMemberFromForeignDomain.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_RemoveMemberFromForeignDomain.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE, 
-	  { "Samr Field Force Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_FORCE_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE_tfs), ( 0x00020000 ), "", HFILL }},
+	  { "Samr Field Force Pwd Change", "samr.samr_FieldsPresent.SAMR_FIELD_FORCE_PWD_CHANGE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_FORCE_PWD_CHANGE_tfs), ( 0x00020000 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF, 
-	  { "Samr Field Last Logoff", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGOFF", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF_tfs), ( 0x00001000 ), "", HFILL }},
+	  { "Samr Field Last Logoff", "samr.samr_FieldsPresent.SAMR_FIELD_LAST_LOGOFF", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LAST_LOGOFF_tfs), ( 0x00001000 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_OWF_PWD, 
-	  { "Samr Field Owf Pwd", "samr.samr_FieldsPresent.SAMR_FIELD_OWF_PWD", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_OWF_PWD_tfs), ( 0x20000000 ), "", HFILL }},
+	  { "Samr Field Owf Pwd", "samr.samr_FieldsPresent.SAMR_FIELD_OWF_PWD", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_OWF_PWD_tfs), ( 0x20000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info25, 
-	  { "Info25", "samr.samr_UserInfo.info25", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info25", "samr.samr_UserInfo.info25", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Password_hash, 
-	  { "Hash", "samr.samr_Password.hash", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hash", "samr.samr_Password.hash", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_home_drive, 
-	  { "Home Drive", "samr.samr_UserInfo3.home_drive", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Drive", "samr.samr_UserInfo3.home_drive", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_start_idx, 
-	  { "Start Idx", "samr.samr_QueryDisplayInfo.start_idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Start Idx", "samr.samr_QueryDisplayInfo.start_idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info13, 
-	  { "Info13", "samr.samr_UserInfo.info13", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info13", "samr.samr_UserInfo.info13", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainStateInformation_state, 
-	  { "State", "samr.samr_DomainStateInformation.state", FT_UINT32, BASE_DEC, VALS(samr_samr_DomainServerEnableState_vals), 0, "", HFILL }},
+	  { "State", "samr.samr_DomainStateInformation.state", FT_UINT32, BASE_DEC, VALS(samr_samr_DomainServerEnableState_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_nt_password, 
-	  { "Nt Password", "samr.samr_ChangePasswordUser2.nt_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Password", "samr.samr_ChangePasswordUser2.nt_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_bad_pwd_count, 
-	  { "Bad Pwd Count", "samr.samr_ValidatePasswordInfo.bad_pwd_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bad Pwd Count", "samr.samr_ValidatePasswordInfo.bad_pwd_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryGroupMember_rids, 
-	  { "Rids", "samr.samr_QueryGroupMember.rids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rids", "samr.samr_QueryGroupMember.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_password_expired, 
-	  { "Password Expired", "samr.samr_UserInfo21.password_expired", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password Expired", "samr.samr_UserInfo21.password_expired", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomains_buf_size, 
-	  { "Buf Size", "samr.samr_EnumDomains.buf_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Size", "samr.samr_EnumDomains.buf_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo1_max_password_age, 
-	  { "Max Password Age", "samr.samr_DomInfo1.max_password_age", FT_INT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Password Age", "samr.samr_DomInfo1.max_password_age", FT_INT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER, 
-	  { "Samr Group Access Add Member", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_ADD_MEMBER", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Group Access Add Member", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_ADD_MEMBER", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_ADD_MEMBER_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoAll_description, 
-	  { "Description", "samr.samr_GroupInfoAll.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_GroupInfoAll.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_logon_count, 
-	  { "Logon Count", "samr.samr_UserInfo3.logon_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logon Count", "samr.samr_UserInfo3.logon_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY, 
-	  { "Samr Validate Field Password History", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Samr Validate Field Password History", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfo_name, 
-	  { "Name", "samr.samr_GroupInfo.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_GroupInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_SHUTDOWN_SERVER, 
-	  { "Samr Server Access Shutdown Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_SHUTDOWN_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_SHUTDOWN_SERVER_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Server Access Shutdown Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_SHUTDOWN_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_SHUTDOWN_SERVER_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_force_password_change, 
-	  { "Force Password Change", "samr.samr_UserInfo3.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Force Password Change", "samr.samr_UserInfo3.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_nt_present, 
-	  { "Nt Present", "samr.samr_ChangePasswordUser.nt_present", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Nt Present", "samr.samr_ChangePasswordUser.nt_present", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_home_directory, 
-	  { "Home Directory", "samr.samr_UserInfo21.home_directory", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Directory", "samr.samr_UserInfo21.home_directory", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info12, 
-	  { "Info12", "samr.samr_UserInfo.info12", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info12", "samr.samr_UserInfo.info12", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_OemChangePasswordUser2_password, 
-	  { "Password", "samr.samr_OemChangePasswordUser2.password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Password", "samr.samr_OemChangePasswordUser2.password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_ALIAS, 
-	  { "Samr Domain Access Create Alias", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_ALIAS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_ALIAS_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Samr Domain Access Create Alias", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_ALIAS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_ALIAS_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_samr_opnum, 
-	  { "Operation", "samr.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "samr.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_server, 
-	  { "Server", "samr.samr_ChangePasswordUser3.server", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Server", "samr.samr_ChangePasswordUser3.server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo24_pw_len, 
-	  { "Pw Len", "samr.samr_UserInfo24.pw_len", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pw Len", "samr.samr_UserInfo24.pw_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex2_name, 
-	  { "Name", "samr.samr_GetDisplayEnumerationIndex2.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_GetDisplayEnumerationIndex2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO, 
-	  { "Samr Group Access Lookup Info", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_LOOKUP_INFO", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Group Access Lookup Info", "samr.samr_GroupAccessMask.SAMR_GROUP_ACCESS_LOOKUP_INFO", FT_BOOLEAN, 32, TFS(&samr_GroupAccessMask_SAMR_GROUP_ACCESS_LOOKUP_INFO_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo14_workstations, 
-	  { "Workstations", "samr.samr_UserInfo14.workstations", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Workstations", "samr.samr_UserInfo14.workstations", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo13_unknown1, 
-	  { "Unknown1", "samr.samr_DomInfo13.unknown1", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "samr.samr_DomInfo13.unknown1", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfo_info3, 
-	  { "Info3", "samr.samr_DispInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "samr.samr_DispInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info8, 
-	  { "Info8", "samr.samr_DomainInfo.info8", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info8", "samr.samr_DomainInfo.info8", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoGeneral_entries, 
-	  { "Entries", "samr.samr_DispInfoGeneral.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "samr.samr_DispInfoGeneral.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo8_full_name, 
-	  { "Full Name", "samr.samr_UserInfo8.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo8.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SeGroupAttributes_SE_GROUP_ENABLED, 
-	  { "Se Group Enabled", "samr.samr_SeGroupAttributes.SE_GROUP_ENABLED", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_ENABLED_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Se Group Enabled", "samr.samr_SeGroupAttributes.SE_GROUP_ENABLED", FT_BOOLEAN, 32, TFS(&samr_SeGroupAttributes_SE_GROUP_ENABLED_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_logon_count, 
-	  { "Logon Count", "samr.samr_UserInfo21.logon_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logon Count", "samr.samr_UserInfo21.logon_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_code_page, 
-	  { "Code Page", "samr.samr_UserInfo21.code_page", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Code Page", "samr.samr_UserInfo21.code_page", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFullGroup_acct_flags, 
-	  { "Acct Flags", "samr.samr_DispEntryFullGroup.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_DispEntryFullGroup.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetUserInfo_info, 
-	  { "Info", "samr.samr_SetUserInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_SetUserInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_OpenDomain_sid, 
-	  { "Sid", "samr.samr_OpenDomain.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_OpenDomain.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFull_account_name, 
-	  { "Account Name", "samr.samr_DispEntryFull.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_DispEntryFull.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH, 
-	  { "Samr Validate Field Password History Length", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Validate Field Password History Length", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_PASSWORD_HISTORY_LENGTH_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_CreateUser2_acct_flags, 
-	  { "Acct Flags", "samr.samr_CreateUser2.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_CreateUser2.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_lsa_String_name_len, 
-	  { "Name Len", "samr.lsa_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Len", "samr.lsa_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_CONNECT_TO_SERVER, 
-	  { "Samr Server Access Connect To Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_CONNECT_TO_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_CONNECT_TO_SERVER_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Server Access Connect To Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_CONNECT_TO_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_CONNECT_TO_SERVER_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainAliases_acct_flags, 
-	  { "Acct Flags", "samr.samr_EnumDomainAliases.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_EnumDomainAliases.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE, 
-	  { "Samr Field Home Drive", "samr.samr_FieldsPresent.SAMR_FIELD_HOME_DRIVE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Samr Field Home Drive", "samr.samr_FieldsPresent.SAMR_FIELD_HOME_DRIVE", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_HOME_DRIVE_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info1, 
-	  { "Info1", "samr.samr_DomainInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "samr.samr_DomainInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordRep_ctr1, 
-	  { "Ctr1", "samr.samr_ValidatePasswordRep.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "samr.samr_ValidatePasswordRep.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_DOMTRUST, 
-	  { "Acb Domtrust", "samr.samr_AcctFlags.ACB_DOMTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DOMTRUST_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Acb Domtrust", "samr.samr_AcctFlags.ACB_DOMTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_DOMTRUST_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser_lm_cross, 
-	  { "Lm Cross", "samr.samr_ChangePasswordUser.lm_cross", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Cross", "samr.samr_ChangePasswordUser.lm_cross", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_profile_path, 
-	  { "Profile Path", "samr.samr_UserInfo3.profile_path", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Profile Path", "samr.samr_UserInfo3.profile_path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo13_domain_create_time, 
-	  { "Domain Create Time", "samr.samr_DomInfo13.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Create Time", "samr.samr_DomInfo13.domain_create_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_WSTRUST, 
-	  { "Acb Wstrust", "samr.samr_AcctFlags.ACB_WSTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_WSTRUST_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Acb Wstrust", "samr.samr_AcctFlags.ACB_WSTRUST", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_WSTRUST_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryAscii_idx, 
-	  { "Idx", "samr.samr_DispEntryAscii.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_DispEntryAscii.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo5_domain_name, 
-	  { "Domain Name", "samr.samr_DomInfo5.domain_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Domain Name", "samr.samr_DomInfo5.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_logon_count, 
-	  { "Logon Count", "samr.samr_UserInfo5.logon_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logon Count", "samr.samr_UserInfo5.logon_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_last_logoff, 
-	  { "Last Logoff", "samr.samr_UserInfo5.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logoff", "samr.samr_UserInfo5.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePassword_level, 
-	  { "Level", "samr.samr_ValidatePassword.level", FT_UINT16, BASE_DEC, VALS(samr_samr_ValidatePasswordLevel_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_ValidatePassword.level", FT_UINT16, BASE_DEC, VALS(samr_samr_ValidatePasswordLevel_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo6_full_name, 
-	  { "Full Name", "samr.samr_UserInfo6.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo6.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupRids_names, 
-	  { "Names", "samr.samr_LookupRids.names", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Names", "samr.samr_LookupRids.names", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo10_home_drive, 
-	  { "Home Drive", "samr.samr_UserInfo10.home_drive", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Home Drive", "samr.samr_UserInfo10.home_drive", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_ACCT_FLAGS, 
-	  { "Samr Field Acct Flags", "samr.samr_FieldsPresent.SAMR_FIELD_ACCT_FLAGS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCT_FLAGS_tfs), ( 0x00100000 ), "", HFILL }},
+	  { "Samr Field Acct Flags", "samr.samr_FieldsPresent.SAMR_FIELD_ACCT_FLAGS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_ACCT_FLAGS_tfs), ( 0x00100000 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUPS, 
-	  { "Samr User Access Get Groups", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_GROUPS", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUPS_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Samr User Access Get Groups", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_GROUPS", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_GROUPS_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_samr_samr_RemoveMultipleMembersFromAlias_sids, 
-	  { "Sids", "samr.samr_RemoveMultipleMembersFromAlias.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "samr.samr_RemoveMultipleMembersFromAlias.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_OemChangePasswordUser2_account, 
-	  { "Account", "samr.samr_OemChangePasswordUser2.account", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account", "samr.samr_OemChangePasswordUser2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info4, 
-	  { "Info4", "samr.samr_UserInfo.info4", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info4", "samr.samr_UserInfo.info4", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_info, 
-	  { "Info", "samr.samr_QueryDisplayInfo2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryDisplayInfo2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo1_password_properties, 
-	  { "Password Properties", "samr.samr_DomInfo1.password_properties", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Password Properties", "samr.samr_DomInfo1.password_properties", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_logon_script, 
-	  { "Logon Script", "samr.samr_UserInfo21.logon_script", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Script", "samr.samr_UserInfo21.logon_script", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_AUTOLOCK, 
-	  { "Acb Autolock", "samr.samr_AcctFlags.ACB_AUTOLOCK", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_AUTOLOCK_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Acb Autolock", "samr.samr_AcctFlags.ACB_AUTOLOCK", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_AUTOLOCK_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetBootKeyInformation_unknown, 
-	  { "Unknown", "samr.samr_GetBootKeyInformation.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "samr.samr_GetBootKeyInformation.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_RidWithAttribute_attributes, 
-	  { "Attributes", "samr.samr_RidWithAttribute.attributes", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_RidWithAttribute.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_OPEN_DOMAIN, 
-	  { "Samr Server Access Open Domain", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_OPEN_DOMAIN", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_OPEN_DOMAIN_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Samr Server Access Open Domain", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_OPEN_DOMAIN", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_OPEN_DOMAIN_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_CryptPassword_data, 
-	  { "Data", "samr.samr_CryptPassword.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "samr.samr_CryptPassword.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfo_name, 
-	  { "Name", "samr.samr_AliasInfo.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "samr.samr_AliasInfo.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER, 
-	  { "Samr Domain Access Create User", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_USER", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Samr Domain Access Create User", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_USER", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_USER_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_COMMENT, 
-	  { "Samr Field Comment", "samr.samr_FieldsPresent.SAMR_FIELD_COMMENT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_COMMENT_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Samr Field Comment", "samr.samr_FieldsPresent.SAMR_FIELD_COMMENT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_COMMENT_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_last_password_change, 
-	  { "Last Password Change", "samr.samr_UserInfo3.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Password Change", "samr.samr_UserInfo3.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Shutdown_connect_handle, 
-	  { "Connect Handle", "samr.samr_Shutdown.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Connect Handle", "samr.samr_Shutdown.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_sec_desc_buf_len, 
-	  { "Sec Desc Buf Len", "samr.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Sec Desc Buf Len", "samr.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_ENABLED, 
-	  { "Se Group Enabled", "samr.samr_GroupAttrs.SE_GROUP_ENABLED", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_ENABLED_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Se Group Enabled", "samr.samr_GroupAttrs.SE_GROUP_ENABLED", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_ENABLED_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2, 
-	  { "Samr Domain Access Lookup Info 2", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Domain Access Lookup Info 2", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_2_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidationBlob_length, 
-	  { "Length", "samr.samr_ValidationBlob.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "samr.samr_ValidationBlob.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryGeneral_idx, 
-	  { "Idx", "samr.samr_DispEntryGeneral.idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idx", "samr.samr_DispEntryGeneral.idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_start_idx, 
-	  { "Start Idx", "samr.samr_QueryDisplayInfo2.start_idx", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Start Idx", "samr.samr_QueryDisplayInfo2.start_idx", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_logon_hours, 
-	  { "Logon Hours", "samr.samr_UserInfo21.logon_hours", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Logon Hours", "samr.samr_UserInfo21.logon_hours", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_country_code, 
-	  { "Country Code", "samr.samr_UserInfo21.country_code", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Country Code", "samr.samr_UserInfo21.country_code", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo13_unknown2, 
-	  { "Unknown2", "samr.samr_DomInfo13.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "samr.samr_DomInfo13.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetDsrmPassword_hash, 
-	  { "Hash", "samr.samr_SetDsrmPassword.hash", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hash", "samr.samr_SetDsrmPassword.hash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_general, 
-	  { "General", "samr.samr_DomainInfo.general", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "General", "samr.samr_DomainInfo.general", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_MANDATORY, 
-	  { "Se Group Mandatory", "samr.samr_GroupAttrs.SE_GROUP_MANDATORY", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_MANDATORY_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Se Group Mandatory", "samr.samr_GroupAttrs.SE_GROUP_MANDATORY", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_MANDATORY_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_description, 
-	  { "Description", "samr.samr_UserInfo5.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_UserInfo5.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo7_role, 
-	  { "Role", "samr.samr_DomInfo7.role", FT_UINT32, BASE_DEC, VALS(samr_samr_Role_vals), 0, "", HFILL }},
+	  { "Role", "samr.samr_DomInfo7.role", FT_UINT32, BASE_DEC, VALS(samr_samr_Role_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_workstations, 
-	  { "Workstations", "samr.samr_UserInfo21.workstations", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Workstations", "samr.samr_UserInfo21.workstations", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryGeneral_description, 
-	  { "Description", "samr.samr_DispEntryGeneral.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_DispEntryGeneral.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA, 
-	  { "Samr Field Private Data", "samr.samr_FieldsPresent.SAMR_FIELD_PRIVATE_DATA", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA_tfs), ( 0x04000000 ), "", HFILL }},
+	  { "Samr Field Private Data", "samr.samr_FieldsPresent.SAMR_FIELD_PRIVATE_DATA", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIVATE_DATA_tfs), ( 0x04000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS, 
-	  { "Samr Domain Access Enum Accounts", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Samr Domain Access Enum Accounts", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_ENUM_ACCOUNTS_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq_req3, 
-	  { "Req3", "samr.samr_ValidatePasswordReq.req3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Req3", "samr.samr_ValidatePasswordReq.req3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_alias_access_mask, 
-	  { "Access Mask", "samr.alias.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "samr.alias.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser2_nt_verifier, 
-	  { "Nt Verifier", "samr.samr_ChangePasswordUser2.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Verifier", "samr.samr_ChangePasswordUser2.nt_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION, 
-	  { "Acb Trusted For Delegation", "samr.samr_AcctFlags.ACB_TRUSTED_FOR_DELEGATION", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION_tfs), ( 0x00002000 ), "", HFILL }},
+	  { "Acb Trusted For Delegation", "samr.samr_AcctFlags.ACB_TRUSTED_FOR_DELEGATION", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TRUSTED_FOR_DELEGATION_tfs), ( 0x00002000 ), NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomains_connect_handle, 
-	  { "Connect Handle", "samr.samr_EnumDomains.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Connect Handle", "samr.samr_EnumDomains.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_force_password_change, 
-	  { "Force Password Change", "samr.samr_UserInfo21.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Force Password Change", "samr.samr_UserInfo21.force_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_nt_password, 
-	  { "Nt Password", "samr.samr_UserInfo21.nt_password", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Nt Password", "samr.samr_UserInfo21.nt_password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetBootKeyInformation_unknown3, 
-	  { "Unknown3", "samr.samr_SetBootKeyInformation.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "samr.samr_SetBootKeyInformation.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainUsers_num_entries, 
-	  { "Num Entries", "samr.samr_EnumDomainUsers.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Entries", "samr.samr_EnumDomainUsers.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq2_info, 
-	  { "Info", "samr.samr_ValidatePasswordReq2.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_ValidatePasswordReq2.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_LookupNames_num_names, 
-	  { "Num Names", "samr.samr_LookupNames.num_names", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Names", "samr.samr_LookupNames.num_names", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_level, 
-	  { "Level", "samr.samr_QueryDisplayInfo3.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryDisplayInfo3.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo2_max_entries, 
-	  { "Max Entries", "samr.samr_QueryDisplayInfo2.max_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Entries", "samr.samr_QueryDisplayInfo2.max_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordInfo_last_password_change, 
-	  { "Last Password Change", "samr.samr_ValidatePasswordInfo.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Password Change", "samr.samr_ValidatePasswordInfo.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE, 
-	  { "Samr User Access Get Locale", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_LOCALE", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr User Access Get Locale", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_GET_LOCALE", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_GET_LOCALE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS, 
-	  { "Samr Field Logon Hours", "samr.samr_FieldsPresent.SAMR_FIELD_LOGON_HOURS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS_tfs), ( 0x00002000 ), "", HFILL }},
+	  { "Samr Field Logon Hours", "samr.samr_FieldsPresent.SAMR_FIELD_LOGON_HOURS", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_LOGON_HOURS_tfs), ( 0x00002000 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo26_pw_len, 
-	  { "Pw Len", "samr.samr_UserInfo26.pw_len", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pw Len", "samr.samr_UserInfo26.pw_len", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_dominfo, 
-	  { "Dominfo", "samr.samr_ChangePasswordUser3.dominfo", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Dominfo", "samr.samr_ChangePasswordUser3.dominfo", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidationBlob_data, 
-	  { "Data", "samr.samr_ValidationBlob.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "samr.samr_ValidationBlob.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info26, 
-	  { "Info26", "samr.samr_UserInfo.info26", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info26", "samr.samr_UserInfo.info26", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GroupInfoAll_attributes, 
-	  { "Attributes", "samr.samr_GroupInfoAll.attributes", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Attributes", "samr.samr_GroupInfoAll.attributes", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Types_count, 
-	  { "Count", "samr.samr_Types.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_Types.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetMembersBuffer_count, 
-	  { "Count", "samr.samr_GetMembersBuffer.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_GetMembersBuffer.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info7, 
-	  { "Info7", "samr.samr_DomainInfo.info7", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info7", "samr.samr_DomainInfo.info7", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomains_num_entries, 
-	  { "Num Entries", "samr.samr_EnumDomains.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Entries", "samr.samr_EnumDomains.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_state, 
-	  { "State", "samr.samr_DomainInfo.state", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "State", "samr.samr_DomainInfo.state", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_parameters, 
-	  { "Parameters", "samr.samr_UserInfo21.parameters", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Parameters", "samr.samr_UserInfo21.parameters", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_state, 
-	  { "State", "samr.samr_DomGeneralInformation.state", FT_UINT32, BASE_DEC, VALS(samr_samr_DomainServerEnableState_vals), 0, "", HFILL }},
+	  { "State", "samr.samr_DomGeneralInformation.state", FT_UINT32, BASE_DEC, VALS(samr_samr_DomainServerEnableState_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryGeneral_acct_flags, 
-	  { "Acct Flags", "samr.samr_DispEntryGeneral.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_DispEntryGeneral.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_connect_handle, 
-	  { "Connect Handle", "samr.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Connect Handle", "samr.connect_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AcctFlags_ACB_TEMPDUP, 
-	  { "Acb Tempdup", "samr.samr_AcctFlags.ACB_TEMPDUP", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TEMPDUP_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Acb Tempdup", "samr.samr_AcctFlags.ACB_TEMPDUP", FT_BOOLEAN, 32, TFS(&samr_AcctFlags_ACB_TEMPDUP_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoFullGroups_count, 
-	  { "Count", "samr.samr_DispInfoFullGroups.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_DispInfoFullGroups.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1, 
-	  { "Samr Domain Access Lookup Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Samr Domain Access Lookup Info 1", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetAliasMembership_rids, 
-	  { "Rids", "samr.samr_GetAliasMembership.rids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rids", "samr.samr_GetAliasMembership.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo6_account_name, 
-	  { "Account Name", "samr.samr_UserInfo6.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo6.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_connect_access_mask, 
-	  { "Access Mask", "samr.connect.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "samr.connect.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info3, 
-	  { "Info3", "samr.samr_UserInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "samr.samr_UserInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomInfo12_lockout_window, 
-	  { "Lockout Window", "samr.samr_DomInfo12.lockout_window", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lockout Window", "samr.samr_DomInfo12.lockout_window", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_RidToSid_sid, 
-	  { "Sid", "samr.samr_RidToSid.sid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sid", "samr.samr_RidToSid.sid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_SEC_DESC, 
-	  { "Samr Field Sec Desc", "samr.samr_FieldsPresent.SAMR_FIELD_SEC_DESC", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_SEC_DESC_tfs), ( 0x10000000 ), "", HFILL }},
+	  { "Samr Field Sec Desc", "samr.samr_FieldsPresent.SAMR_FIELD_SEC_DESC", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_SEC_DESC_tfs), ( 0x10000000 ), NULL, HFILL }},
 	{ &hf_samr_samr_GetUserPwInfo_info, 
-	  { "Info", "samr.samr_GetUserPwInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_GetUserPwInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainUsers_acct_flags, 
-	  { "Acct Flags", "samr.samr_EnumDomainUsers.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Acct Flags", "samr.samr_EnumDomainUsers.acct_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainInfo_info6, 
-	  { "Info6", "samr.samr_DomainInfo.info6", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info6", "samr.samr_DomainInfo.info6", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect5_level, 
-	  { "Level", "samr.samr_Connect5.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "samr.samr_Connect5.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_CreateDomAlias_alias_name, 
-	  { "Alias Name", "samr.samr_CreateDomAlias.alias_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Alias Name", "samr.samr_CreateDomAlias.alias_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomainUsers_sam, 
-	  { "Sam", "samr.samr_EnumDomainUsers.sam", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sam", "samr.samr_EnumDomainUsers.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfo_info5, 
-	  { "Info5", "samr.samr_DispInfo.info5", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info5", "samr.samr_DispInfo.info5", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetGroupsForUser_rids, 
-	  { "Rids", "samr.samr_GetGroupsForUser.rids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Rids", "samr.samr_GetGroupsForUser.rids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo3_last_logoff, 
-	  { "Last Logoff", "samr.samr_UserInfo3.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Logoff", "samr.samr_UserInfo3.last_logoff", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ServerAccessMask_SAMR_SERVER_ACCESS_INITIALIZE_SERVER, 
-	  { "Samr Server Access Initialize Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_INITIALIZE_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_INITIALIZE_SERVER_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Server Access Initialize Server", "samr.samr_ServerAccessMask.SAMR_SERVER_ACCESS_INITIALIZE_SERVER", FT_BOOLEAN, 32, TFS(&samr_ServerAccessMask_SAMR_SERVER_ACCESS_INITIALIZE_SERVER_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordRepCtr_info, 
-	  { "Info", "samr.samr_ValidatePasswordRepCtr.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_ValidatePasswordRepCtr.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetGroupInfo_level, 
-	  { "Level", "samr.samr_SetGroupInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_GroupInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_SetGroupInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_GroupInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_PASSWORD, 
-	  { "Samr User Access Set Password", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_PASSWORD_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Samr User Access Set Password", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_PASSWORD", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_PASSWORD_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_samr_samr_SetUserInfo2_level, 
-	  { "Level", "samr.samr_SetUserInfo2.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "samr.samr_SetUserInfo2.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_acct_expiry, 
-	  { "Acct Expiry", "samr.samr_UserInfo5.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Acct Expiry", "samr.samr_UserInfo5.acct_expiry", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_nt_password_set, 
-	  { "Nt Password Set", "samr.samr_UserInfo21.nt_password_set", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Nt Password Set", "samr.samr_UserInfo21.nt_password_set", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo_info20, 
-	  { "Info20", "samr.samr_UserInfo.info20", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info20", "samr.samr_UserInfo.info20", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ConnectInfo1_features, 
-	  { "Features", "samr.samr_ConnectInfo1.features", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Features", "samr.samr_ConnectInfo1.features", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_alias_handle, 
-	  { "Alias Handle", "samr.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Alias Handle", "samr.alias_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_account_name, 
-	  { "Account Name", "samr.samr_UserInfo5.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_UserInfo5.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoFull_entries, 
-	  { "Entries", "samr.samr_DispInfoFull.entries", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Entries", "samr.samr_DispInfoFull.entries", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_full_name, 
-	  { "Full Name", "samr.samr_UserInfo5.full_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Full Name", "samr.samr_UserInfo5.full_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ChangePasswordUser3_lm_verifier, 
-	  { "Lm Verifier", "samr.samr_ChangePasswordUser3.lm_verifier", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Lm Verifier", "samr.samr_ChangePasswordUser3.lm_verifier", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_PRIMARY_GID, 
-	  { "Samr Field Primary Gid", "samr.samr_FieldsPresent.SAMR_FIELD_PRIMARY_GID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIMARY_GID_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Samr Field Primary Gid", "samr.samr_FieldsPresent.SAMR_FIELD_PRIMARY_GID", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_PRIMARY_GID_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3, 
-	  { "Samr Domain Access Set Info 3", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_3", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Samr Domain Access Set Info 3", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_SET_INFO_3", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_SET_INFO_3_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_samr_samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY, 
-	  { "Se Group Use For Deny Only", "samr.samr_GroupAttrs.SE_GROUP_USE_FOR_DENY_ONLY", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Se Group Use For Deny Only", "samr.samr_GroupAttrs.SE_GROUP_USE_FOR_DENY_ONLY", FT_BOOLEAN, 32, TFS(&samr_GroupAttrs_SE_GROUP_USE_FOR_DENY_ONLY_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_samr_samr_DispInfoAscii_count, 
-	  { "Count", "samr.samr_DispInfoAscii.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "samr.samr_DispInfoAscii.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetMembersInAlias_sids, 
-	  { "Sids", "samr.samr_GetMembersInAlias.sids", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sids", "samr.samr_GetMembersInAlias.sids", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo3_info, 
-	  { "Info", "samr.samr_QueryDisplayInfo3.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "samr.samr_QueryDisplayInfo3.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_OemChangePasswordUser2_hash, 
-	  { "Hash", "samr.samr_OemChangePasswordUser2.hash", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hash", "samr.samr_OemChangePasswordUser2.hash", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_Connect4_revision, 
-	  { "Revision", "samr.samr_Connect4.revision", FT_UINT32, BASE_DEC, VALS(samr_samr_ConnectRevision_vals), 0, "", HFILL }},
+	  { "Revision", "samr.samr_Connect4.revision", FT_UINT32, BASE_DEC, VALS(samr_samr_ConnectRevision_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryUserInfo2_level, 
-	  { "Level", "samr.samr_QueryUserInfo2.level", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryUserInfo2.level", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT, 
-	  { "Samr Field Bad Pwd Count", "samr.samr_FieldsPresent.SAMR_FIELD_BAD_PWD_COUNT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT_tfs), ( 0x00004000 ), "", HFILL }},
+	  { "Samr Field Bad Pwd Count", "samr.samr_FieldsPresent.SAMR_FIELD_BAD_PWD_COUNT", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_BAD_PWD_COUNT_tfs), ( 0x00004000 ), NULL, HFILL }},
 	{ &hf_samr_samr_ValidatePasswordReq3_clear_lockout, 
-	  { "Clear Lockout", "samr.samr_ValidatePasswordReq3.clear_lockout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Clear Lockout", "samr.samr_ValidatePasswordReq3.clear_lockout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_GetDisplayEnumerationIndex_level, 
-	  { "Level", "samr.samr_GetDisplayEnumerationIndex.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_GetDisplayEnumerationIndex.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_workstations, 
-	  { "Workstations", "samr.samr_UserInfo5.workstations", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Workstations", "samr.samr_UserInfo5.workstations", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DispEntryFullGroup_account_name, 
-	  { "Account Name", "samr.samr_DispEntryFullGroup.account_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Account Name", "samr.samr_DispEntryFullGroup.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_LOCKOUT_TIME, 
-	  { "Samr Validate Field Lockout Time", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_LOCKOUT_TIME", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_LOCKOUT_TIME_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Samr Validate Field Lockout Time", "samr.samr_ValidateFieldsPresent.SAMR_VALIDATE_FIELD_LOCKOUT_TIME", FT_BOOLEAN, 32, TFS(&samr_ValidateFieldsPresent_SAMR_VALIDATE_FIELD_LOCKOUT_TIME_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo1_comment, 
-	  { "Comment", "samr.samr_UserInfo1.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Comment", "samr.samr_UserInfo1.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_total_size, 
-	  { "Total Size", "samr.samr_QueryDisplayInfo.total_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total Size", "samr.samr_QueryDisplayInfo.total_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_EnumDomains_sam, 
-	  { "Sam", "samr.samr_EnumDomains.sam", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sam", "samr.samr_EnumDomains.sam", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo2_code_page, 
-	  { "Code Page", "samr.samr_UserInfo2.code_page", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Code Page", "samr.samr_UserInfo2.code_page", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_PasswordProperties_DOMAIN_PASSWORD_LOCKOUT_ADMINS, 
-	  { "Domain Password Lockout Admins", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_LOCKOUT_ADMINS", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_LOCKOUT_ADMINS_tfs), ( 0x00000008 ), "", HFILL }},
+	  { "Domain Password Lockout Admins", "samr.samr_PasswordProperties.DOMAIN_PASSWORD_LOCKOUT_ADMINS", FT_BOOLEAN, 32, TFS(&samr_PasswordProperties_DOMAIN_PASSWORD_LOCKOUT_ADMINS_tfs), ( 0x00000008 ), NULL, HFILL }},
 	{ &hf_samr_samr_DomGeneralInformation_unknown3, 
-	  { "Unknown3", "samr.samr_DomGeneralInformation.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "samr.samr_DomGeneralInformation.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserAccessMask_SAMR_USER_ACCESS_SET_ATTRIBUTES, 
-	  { "Samr User Access Set Attributes", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_ATTRIBUTES", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_ATTRIBUTES_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Samr User Access Set Attributes", "samr.samr_UserAccessMask.SAMR_USER_ACCESS_SET_ATTRIBUTES", FT_BOOLEAN, 32, TFS(&samr_UserAccessMask_SAMR_USER_ACCESS_SET_ATTRIBUTES_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_buf_size, 
-	  { "Buf Size", "samr.samr_QueryDisplayInfo.buf_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Size", "samr.samr_QueryDisplayInfo.buf_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER, 
-	  { "Samr Alias Access Remove Member", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_REMOVE_MEMBER", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Alias Access Remove Member", "samr.samr_AliasAccessMask.SAMR_ALIAS_ACCESS_REMOVE_MEMBER", FT_BOOLEAN, 32, TFS(&samr_AliasAccessMask_SAMR_ALIAS_ACCESS_REMOVE_MEMBER_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_QueryGroupInfo_level, 
-	  { "Level", "samr.samr_QueryGroupInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_GroupInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryGroupInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_GroupInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetAliasInfo_level, 
-	  { "Level", "samr.samr_SetAliasInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_AliasInfoEnum_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_SetAliasInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_AliasInfoEnum_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_buffer, 
-	  { "Buffer", "samr.samr_UserInfo21.buffer", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buffer", "samr.samr_UserInfo21.buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_level, 
-	  { "Level", "samr.samr_QueryDisplayInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, "", HFILL }},
+	  { "Level", "samr.samr_QueryDisplayInfo.level", FT_UINT16, BASE_DEC, VALS(samr_samr_DomainDisplayInformation_vals), 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetDsrmPassword_unknown, 
-	  { "Unknown", "samr.samr_SetDsrmPassword.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "samr.samr_SetDsrmPassword.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo5_last_password_change, 
-	  { "Last Password Change", "samr.samr_UserInfo5.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Password Change", "samr.samr_UserInfo5.last_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP, 
-	  { "Samr Domain Access Create Group", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_GROUP", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Samr Domain Access Create Group", "samr.samr_DomainAccessMask.SAMR_DOMAIN_ACCESS_CREATE_GROUP", FT_BOOLEAN, 32, TFS(&samr_DomainAccessMask_SAMR_DOMAIN_ACCESS_CREATE_GROUP_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_samr_samr_QueryDisplayInfo_returned_size, 
-	  { "Returned Size", "samr.samr_QueryDisplayInfo.returned_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Returned Size", "samr.samr_QueryDisplayInfo.returned_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_UserInfo21_allow_password_change, 
-	  { "Allow Password Change", "samr.samr_UserInfo21.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Allow Password Change", "samr.samr_UserInfo21.allow_password_change", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_ConnectInfo_info1, 
-	  { "Info1", "samr.samr_ConnectInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "samr.samr_ConnectInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_SetMemberAttributesOfGroup_rid, 
-	  { "Rid", "samr.samr_SetMemberAttributesOfGroup.rid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rid", "samr.samr_SetMemberAttributesOfGroup.rid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_samr_samr_FieldsPresent_SAMR_FIELD_FULL_NAME, 
-	  { "Samr Field Full Name", "samr.samr_FieldsPresent.SAMR_FIELD_FULL_NAME", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_FULL_NAME_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Samr Field Full Name", "samr.samr_FieldsPresent.SAMR_FIELD_FULL_NAME", FT_BOOLEAN, 32, TFS(&samr_FieldsPresent_SAMR_FIELD_FULL_NAME_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_samr_samr_AliasInfoAll_description, 
-	  { "Description", "samr.samr_AliasInfoAll.description", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Description", "samr.samr_AliasInfoAll.description", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-secidmap.c b/epan/dissectors/packet-dcerpc-secidmap.c
index b6506c8830..d2fb1aa548 100644
--- a/epan/dissectors/packet-dcerpc-secidmap.c
+++ b/epan/dissectors/packet-dcerpc-secidmap.c
@@ -68,7 +68,7 @@ proto_register_secidmap (void)
 	static hf_register_info hf[] = {
 	  { &hf_secidmap_opnum,
 	    { "Operation", "secidmap.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index ee7f11e183..064150bcaf 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -6986,36 +6986,36 @@ proto_register_dcerpc_spoolss(void)
 		    NULL, 0x0, "Server printer driver minor version", HFILL }},
 		{ &hf_driverpath,
 		  { "Driver path", "spoolss.driverpath", FT_STRING, BASE_NONE,
-		    NULL, 0, "Driver path", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_datafile,
 		  { "Data file", "spoolss.datafile", FT_STRING, BASE_NONE,
-		    NULL, 0, "Data file", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_configfile,
 		  { "Config file", "spoolss.configfile", FT_STRING, BASE_NONE,
 		    NULL, 0, "Printer name", HFILL }},
 		{ &hf_helpfile,
 		  { "Help file", "spoolss.helpfile", FT_STRING, BASE_NONE,
-		    NULL, 0, "Help file", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_monitorname,
 		  { "Monitor name", "spoolss.monitorname", FT_STRING, BASE_NONE,
-		    NULL, 0, "Monitor name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_defaultdatatype,
 		  { "Default data type", "spoolss.defaultdatatype", FT_STRING, BASE_NONE,
-		    NULL, 0, "Default data type", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 		{ &hf_driverinfo_cversion,
 		  { "Driver version", "spoolss.driverversion", FT_UINT32, BASE_DEC,
 		    VALS(driverinfo_cversion_vals), 0, "Printer name", HFILL }},
 		{ &hf_dependentfiles,
 		  { "Dependent files", "spoolss.dependentfiles", FT_STRING, BASE_NONE,
-		    NULL, 0, "Dependent files", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_status,
 		  { "Status", "spoolss.printer_status", FT_UINT32, BASE_DEC,
-		    VALS(printer_status_vals), 0, "Status", HFILL }},
+		    VALS(printer_status_vals), 0, NULL, HFILL }},
 
 		{ &hf_previousdrivernames,
 		  { "Previous Driver Names", "spoolss.previousdrivernames", FT_STRING, BASE_NONE,
-		    NULL, 0, "Previous Driver Names", HFILL }},		   
+		    NULL, 0, NULL, HFILL }},		   
 
 		{ &hf_driverdate,
 		  { "Driver Date", "spoolss.driverdate", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -7053,62 +7053,62 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_setprinter_cmd,
 		  { "Command", "spoolss.setprinter_cmd", FT_UINT32, BASE_DEC,
-		   VALS(setprinter_cmd_vals), 0, "Command", HFILL }},
+		   VALS(setprinter_cmd_vals), 0, NULL, HFILL }},
 
 		/* Enumprinters */
 
 		{ &hf_enumprinters_flags,
 		  { "Flags", "spoolss.enumprinters.flags",
-		    FT_UINT32, BASE_HEX, NULL, 0, "Flags", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_local,
 		  { "Enum local", "spoolss.enumprinters.flags.enum_local",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_LOCAL, "Enum local", HFILL }},
+		    PRINTER_ENUM_LOCAL, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_name,
 		  { "Enum name", "spoolss.enumprinters.flags.enum_name",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_NAME, "Enum name", HFILL }},
+		    PRINTER_ENUM_NAME, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_shared,
 		  { "Enum shared", "spoolss.enumprinters.flags.enum_shared",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_SHARED, "Enum shared", HFILL }},
+		    PRINTER_ENUM_SHARED, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_default,
 		  { "Enum default", "spoolss.enumprinters.flags.enum_default",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_DEFAULT, "Enum default", HFILL }},
+		    PRINTER_ENUM_DEFAULT, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_connections,
 		  { "Enum connections", "spoolss.enumprinters.flags.enum_connections",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_CONNECTIONS, "Enum connections", HFILL }},
+		    PRINTER_ENUM_CONNECTIONS, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_network,
 		  { "Enum network", "spoolss.enumprinters.flags.enum_network",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_NETWORK, "Enum network", HFILL }},
+		    PRINTER_ENUM_NETWORK, NULL, HFILL }},
 
 		{ &hf_enumprinters_flags_remote,
 		  { "Enum remote", "spoolss.enumprinters.flags.enum_remote",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ENUM_REMOTE, "Enum remote", HFILL }},
+		    PRINTER_ENUM_REMOTE, NULL, HFILL }},
 
 		/* GetPrinter */
 
 		{ &hf_start_time,
 		  { "Start time", "spoolss.start_time",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Start time", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_end_time,
 		  { "End time", "spoolss.end_time",
-		    FT_UINT32, BASE_DEC, NULL, 0, "End time", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_elapsed_time,
 		  { "Elapsed time", "spoolss.elapsed_time",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Elapsed time", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* 
                  * New hf index values 
@@ -7116,7 +7116,7 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_opnum,
 		  { "Operation", "spoolss.opnum", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "Operation", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_hnd,
 		  { "Context handle", "spoolss.hnd", FT_BYTES, BASE_NONE,
@@ -7144,7 +7144,7 @@ proto_register_dcerpc_spoolss(void)
 		    NULL, 0x0, "Size of buffer", HFILL }},
 
 		{ &hf_buffer_data,
-		  { "Buffer data", "spoolss.buffer.data", FT_BYTES, BASE_HEX,
+		  { "Buffer data", "spoolss.buffer.data", FT_BYTES, BASE_NONE,
 		    NULL, 0x0, "Contents of buffer", HFILL }},
 
 		{ &hf_offset,
@@ -7153,60 +7153,60 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_level,
 		  { "Info level", "spoolss.enumjobs.level", FT_UINT32, 
-		    BASE_DEC, NULL, 0x0, "Info level", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 
 		{ &hf_printername,
 		  { "Printer name", "spoolss.printername", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Printer name", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_machinename,
 		  { "Machine name", "spoolss.machinename", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Machine name", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notifyname,
 		  { "Notify name", "spoolss.notifyname", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Notify name", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printerdesc,
 		  { "Printer description", "spoolss.printerdesc", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Printer description", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printercomment,
 		  { "Printer comment", "spoolss.printercomment", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Printer comment", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_servername,
 		  { "Server name", "spoolss.servername", FT_STRING, BASE_NONE,
-		    NULL, 0, "Server name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_sharename,
 		  { "Share name", "spoolss.sharename", FT_STRING, BASE_NONE,
-		    NULL, 0, "Share name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_portname,
 		  { "Port name", "spoolss.portname", FT_STRING, BASE_NONE,
-		    NULL, 0, "Port name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_printerlocation,
 		  { "Printer location", "spoolss.printerlocation", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Printer location", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_architecture,
 		  { "Architecture name", "spoolss.architecture", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Architecture name", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_drivername,
 		  { "Driver name", "spoolss.drivername", FT_STRING, BASE_NONE,
-		    NULL, 0, "Driver name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_username,
 		  { "User name", "spoolss.username", FT_STRING, BASE_NONE,
-		    NULL, 0, "User name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_documentname,
 		  { "Document name", "spoolss.document", FT_STRING, BASE_NONE,
-		    NULL, 0, "Document name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_outputfile,
 		  { "Output file", "spoolss.outputfile", FT_STRING, BASE_NONE,
@@ -7214,29 +7214,29 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_datatype,
 		  { "Datatype", "spoolss.Datatype", FT_STRING, BASE_NONE,
-		    NULL, 0, "Datatype", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_textstatus,
 		  { "Text status", "spoolss.textstatus", FT_STRING, BASE_NONE,
-		    NULL, 0, "Text status", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
  		{ &hf_sepfile,
 		  { "Separator file", "spoolss.setpfile", FT_STRING, BASE_NONE,
-		    NULL, 0, "Separator file", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
  		{ &hf_parameters,
 		  { "Parameters", "spoolss.parameters", FT_STRING, BASE_NONE,
-		    NULL, 0, "Parameters", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_printprocessor,
 		  { "Print processor", "spoolss.printprocessor", FT_STRING, 
-		    BASE_NONE, NULL, 0, "Print processor", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* Printer data */
 
 		{ &hf_printerdata,
 		  { "Data", "spoolss.printerdata", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Data", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printerdata_key,
 		  { "Key", "spoolss.printerdata.key", FT_STRING, 
@@ -7258,324 +7258,324 @@ proto_register_dcerpc_spoolss(void)
 		    HFILL }},
 
 		{ &hf_printerdata_data,
-		  { "Data", "spoolss.printerdata.data", FT_BYTES, BASE_HEX,
+		  { "Data", "spoolss.printerdata.data", FT_BYTES, BASE_NONE,
 		    NULL, 0x0, "Printer data", HFILL }},
 
 		{ &hf_printerdata_data_dword,
 		  { "DWORD data", "spoolss.printerdata.data.dword", 
-		    FT_UINT32, BASE_HEX, NULL, 0, "DWORD data", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printerdata_data_sz,
 		  { "String data", "spoolss.printerdata.data.sz", 
-		    FT_STRING, BASE_NONE, NULL, 0, "String data", 
+		    FT_STRING, BASE_NONE, NULL, 0, NULL, 
 		    HFILL }},
 
 		/* Devicemode */
 
 		{ &hf_devmodectr_size,
 		  { "Devicemode ctr size", "spoolss.devicemodectr.size",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Devicemode ctr size", 
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, 
 		    HFILL }},
 
 		{ &hf_devmode,
 		  { "Devicemode", "spoolss.devmode", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Devicemode", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_size,
 		  { "Size", "spoolss.devmode.size",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Size", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_spec_version,
 		  { "Spec version", "spoolss.devmode.spec_version",
 		    FT_UINT16, BASE_DEC, VALS(devmode_specversion_vals), 
-		    0, "Spec version", HFILL }},
+		    0, NULL, HFILL }},
 
 		{ &hf_devmode_driver_version,
 		  { "Driver version", "spoolss.devmode.driver_version",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Driver version", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_size2,
 		  { "Size2", "spoolss.devmode.size2",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Size2", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_fields,
 		  { "Fields", "spoolss.devmode.fields",
-		    FT_UINT32, BASE_HEX, NULL, 0, "Fields", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_orientation,
 		  { "Orientation", "spoolss.devmode.orientation",
 		    FT_UINT16, BASE_DEC, VALS(devmode_orientation_vals), 
-		    0, "Orientation", HFILL }},
+		    0, NULL, HFILL }},
 
 		{ &hf_devmode_paper_size,
 		  { "Paper size", "spoolss.devmode.paper_size",
 		    FT_UINT16, BASE_DEC, VALS(devmode_papersize_vals), 
-		    0, "Paper size", HFILL }},
+		    0, NULL, HFILL }},
 
 		{ &hf_devmode_paper_width,
 		  { "Paper width", "spoolss.devmode.paper_width",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Paper width", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_paper_length,
 		  { "Paper length", "spoolss.devmode.paper_length",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Paper length", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_scale,
 		  { "Scale", "spoolss.devmode.scale",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Scale", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_copies,
 		  { "Copies", "spoolss.devmode.copies",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Copies", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_default_source,
 		  { "Default source", "spoolss.devmode.default_source",
 		    FT_UINT16, BASE_DEC, VALS(devmode_papersource_vals), 
-		    0, "Default source", HFILL }},
+		    0, NULL, HFILL }},
 
 		{ &hf_devmode_print_quality,
 		  { "Print quality", "spoolss.devmode.print_quality",
 		    FT_UINT16, BASE_DEC, VALS(devmode_printquality_vals), 
-		    0, "Print quality", HFILL }},
+		    0, NULL, HFILL }},
 
 		{ &hf_devmode_color,
 		  { "Color", "spoolss.devmode.color",
 		    FT_UINT16, BASE_DEC, VALS(devmode_colour_vals), 0, 
-		    "Color", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_duplex,
 		  { "Duplex", "spoolss.devmode.duplex",
 		    FT_UINT16, BASE_DEC, VALS(devmode_duplex_vals), 0, 
-		    "Duplex", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_y_resolution,
 		  { "Y resolution", "spoolss.devmode.y_resolution",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Y resolution", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_tt_option,
 		  { "TT option", "spoolss.devmode.tt_option",
 		    FT_UINT16, BASE_DEC, VALS(devmode_ttoption_vals), 0, 
-		    "TT option", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_collate,
 		  { "Collate", "spoolss.devmode.collate",
 		    FT_UINT16, BASE_DEC, VALS(devmode_collate_vals), 0, 
-		    "Collate", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_log_pixels,
 		  { "Log pixels", "spoolss.devmode.log_pixels",
-		    FT_UINT16, BASE_DEC, NULL, 0, "Log pixels", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_bits_per_pel,
 		  { "Bits per pel", "spoolss.devmode.bits_per_pel",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Bits per pel", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_pels_width,
 		  { "Pels width", "spoolss.devmode.pels_width",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Pels width", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_pels_height,
 		  { "Pels height", "spoolss.devmode.pels_height",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Pels height", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_display_flags,
 		  { "Display flags", "spoolss.devmode.display_flags",
 		    FT_UINT32, BASE_DEC, VALS(devmode_displayflags_vals), 0, 
-		    "Display flags", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_display_freq,
 		  { "Display frequency", "spoolss.devmode.display_freq",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Display frequency", 
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, 
 		    HFILL }},
 
 		{ &hf_devmode_icm_method,
 		  { "ICM method", "spoolss.devmode.icm_method",
 		    FT_UINT32, BASE_DEC, VALS(devmode_icmmethod_vals), 0, 
-		    "ICM method", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_icm_intent,
 		  { "ICM intent", "spoolss.devmode.icm_intent",
 		    FT_UINT32, BASE_DEC, VALS(devmode_icmintent_vals), 0, 
-		    "ICM intent", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_media_type,
 		  { "Media type", "spoolss.devmode.media_type",
 		    FT_UINT32, BASE_DEC, VALS(devmode_mediatype_vals), 0, 
-		    "Media type", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_dither_type,
 		  { "Dither type", "spoolss.devmode.dither_type",
 		    FT_UINT32, BASE_DEC, VALS(devmode_dithertype_vals), 0, 
-		    "Dither type", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_devmode_reserved1,
 		  { "Reserved1", "spoolss.devmode.reserved1",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Reserved1", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_reserved2,
 		  { "Reserved2", "spoolss.devmode.reserved2",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Reserved2", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_panning_width,
 		  { "Panning width", "spoolss.devmode.panning_width",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Panning width", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_panning_height,
 		  { "Panning height", "spoolss.devmode.panning_height",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Panning height", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_devmode_driver_extra_len,
 		  { "Driver extra length", 
 		    "spoolss.devmode.driver_extra_len",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Driver extra length", 
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, 
 		    HFILL }},
 
 		{ &hf_devmode_driver_extra,
 		  { "Driver extra", "spoolss.devmode.driver_extra",
-		    FT_BYTES, BASE_NONE, NULL, 0, "Driver extra", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* Devicemode fields */
 
 		{ &hf_devmode_fields_orientation,
 		  { "Orientation", "spoolss.devmode.fields.orientation",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_ORIENTATION, "Orientation", HFILL }},
+		    DEVMODE_ORIENTATION, NULL, HFILL }},
 
 		{ &hf_devmode_fields_papersize,
 		  { "Paper size", "spoolss.devmode.fields.paper_size",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PAPERSIZE, "Paper size", HFILL }},
+		    DEVMODE_PAPERSIZE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_paperlength,
 		  { "Paper length", "spoolss.devmode.fields.paper_length",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PAPERLENGTH, "Paper length", HFILL }},
+		    DEVMODE_PAPERLENGTH, NULL, HFILL }},
 
 		{ &hf_devmode_fields_paperwidth,
 		  { "Paper width", "spoolss.devmode.fields.paper_width",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PAPERWIDTH, "Paper width", HFILL }},
+		    DEVMODE_PAPERWIDTH, NULL, HFILL }},
 
 		{ &hf_devmode_fields_scale,
 		  { "Scale", "spoolss.devmode.fields.scale",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_SCALE, "Scale", HFILL }},
+		    DEVMODE_SCALE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_position,
 		  { "Position", "spoolss.devmode.fields.position",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_POSITION, "Position", HFILL }},
+		    DEVMODE_POSITION, NULL, HFILL }},
 
 		{ &hf_devmode_fields_nup,
 		  { "N-up", "spoolss.devmode.fields.nup",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_NUP, "N-up", HFILL }},
+		    DEVMODE_NUP, NULL, HFILL }},
 
 		{ &hf_devmode_fields_copies,
 		  { "Copies", "spoolss.devmode.fields.copies",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_COPIES, "Copies", HFILL }},
+		    DEVMODE_COPIES, NULL, HFILL }},
 
 		{ &hf_devmode_fields_defaultsource,
 		  { "Default source", "spoolss.devmode.fields.default_source",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_DEFAULTSOURCE, "Default source", HFILL }},
+		    DEVMODE_DEFAULTSOURCE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_printquality,
 		  { "Print quality", "spoolss.devmode.fields.print_quality",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PRINTQUALITY, "Print quality", HFILL }},
+		    DEVMODE_PRINTQUALITY, NULL, HFILL }},
 
 		{ &hf_devmode_fields_color,
 		  { "Color", "spoolss.devmode.fields.color",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_COLOR, "Color", HFILL }},
+		    DEVMODE_COLOR, NULL, HFILL }},
 
 		{ &hf_devmode_fields_duplex,
 		  { "Duplex", "spoolss.devmode.fields.duplex",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_DUPLEX, "Duplex", HFILL }},
+		    DEVMODE_DUPLEX, NULL, HFILL }},
 
 		{ &hf_devmode_fields_yresolution,
 		  { "Y resolution", "spoolss.devmode.fields.y_resolution",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_YRESOLUTION, "Y resolution", HFILL }},
+		    DEVMODE_YRESOLUTION, NULL, HFILL }},
 
 		{ &hf_devmode_fields_ttoption,
 		  { "TT option", "spoolss.devmode.fields.tt_option",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_TTOPTION, "TT option", HFILL }},
+		    DEVMODE_TTOPTION, NULL, HFILL }},
 
 		{ &hf_devmode_fields_collate,
 		  { "Collate", "spoolss.devmode.fields.collate",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_COLLATE, "Collate", HFILL }},
+		    DEVMODE_COLLATE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_formname,
 		  { "Form name", "spoolss.devmode.fields.form_name",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_FORMNAME, "Form name", HFILL }},
+		    DEVMODE_FORMNAME, NULL, HFILL }},
 
 		{ &hf_devmode_fields_logpixels,
 		  { "Log pixels", "spoolss.devmode.fields.log_pixels",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_LOGPIXELS, "Log pixels", HFILL }},
+		    DEVMODE_LOGPIXELS, NULL, HFILL }},
 
 		{ &hf_devmode_fields_bitsperpel,
 		  { "Bits per pel", "spoolss.devmode.fields.bits_per_pel",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_BITSPERPEL, "Bits per pel", HFILL }},
+		    DEVMODE_BITSPERPEL, NULL, HFILL }},
 
 		{ &hf_devmode_fields_pelswidth,
 		  { "Pels width", "spoolss.devmode.fields.pels_width",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PELSWIDTH, "Pels width", HFILL }},
+		    DEVMODE_PELSWIDTH, NULL, HFILL }},
 
 		{ &hf_devmode_fields_pelsheight,
 		  { "Pels height", "spoolss.devmode.fields.pels_height",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PELSHEIGHT, "Pels height", HFILL }},
+		    DEVMODE_PELSHEIGHT, NULL, HFILL }},
 
 		{ &hf_devmode_fields_displayflags,
 		  { "Display flags", "spoolss.devmode.fields.display_flags",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_DISPLAYFLAGS, "Display flags", HFILL }},
+		    DEVMODE_DISPLAYFLAGS, NULL, HFILL }},
 
 		{ &hf_devmode_fields_displayfrequency,
 		  { "Display frequency", 
 		    "spoolss.devmode.fields.display_frequency",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_DISPLAYFREQUENCY, "Display frequency", HFILL }},
+		    DEVMODE_DISPLAYFREQUENCY, NULL, HFILL }},
 
 		{ &hf_devmode_fields_icmmethod,
 		  { "ICM method", "spoolss.devmode.fields.icm_method",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_ICMMETHOD, "ICM method", HFILL }},
+		    DEVMODE_ICMMETHOD, NULL, HFILL }},
 
 		{ &hf_devmode_fields_icmintent,
 		  { "ICM intent", "spoolss.devmode.fields.icm_intent",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_ICMINTENT, "ICM intent", HFILL }},
+		    DEVMODE_ICMINTENT, NULL, HFILL }},
 
 		{ &hf_devmode_fields_mediatype,
 		  { "Media type", "spoolss.devmode.fields.media_type",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_MEDIATYPE, "Media type", HFILL }},
+		    DEVMODE_MEDIATYPE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_dithertype,
 		  { "Dither type", "spoolss.devmode.fields.dither_type",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_DITHERTYPE, "Dither type", HFILL }},
+		    DEVMODE_DITHERTYPE, NULL, HFILL }},
 
 		{ &hf_devmode_fields_panningwidth,
 		  { "Panning width", "spoolss.devmode.fields.panning_width",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PANNINGWIDTH, "Panning width", HFILL }},
+		    DEVMODE_PANNINGWIDTH, NULL, HFILL }},
 
 		{ &hf_devmode_fields_panningheight,
 		  { "Panning height", "spoolss.devmode.fields.panning_height",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DEVMODE_PANNINGHEIGHT, "Panning height", HFILL }},
+		    DEVMODE_PANNINGHEIGHT, NULL, HFILL }},
 
 		/* EnumPrinterData RPC */
 
@@ -7622,124 +7622,124 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_job_status,
 		  { "Job status", "spoolss.job.status", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Job status", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_job_status_paused,
 		  { "Paused", "spoolss.job.status.paused", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_paused), JOB_STATUS_PAUSED,
-		    "Paused", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_error,
 		  { "Error", "spoolss.job.status.error", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_error), JOB_STATUS_ERROR,
-		    "Error", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_deleting,
 		  { "Deleting", "spoolss.job.status.deleting", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_deleting), JOB_STATUS_DELETING,
-		    "Deleting", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_spooling,
 		  { "Spooling", "spoolss.job.status.spooling", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_spooling), JOB_STATUS_SPOOLING,
-		    "Spooling", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_printing,
 		  { "Printing", "spoolss.job.status.printing", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_printing), JOB_STATUS_PRINTING,
-		    "Printing", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_offline,
 		  { "Offline", "spoolss.job.status.offline", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_offline), JOB_STATUS_OFFLINE,
-		    "Offline", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_paperout,
 		  { "Paperout", "spoolss.job.status.paperout", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_paperout), JOB_STATUS_PAPEROUT,
-		    "Paperout", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_printed,
 		  { "Printed", "spoolss.job.status.printed", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_printed), JOB_STATUS_PRINTED,
-		    "Printed", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_deleted,
 		  { "Deleted", "spoolss.job.status.deleted", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_deleted), JOB_STATUS_DELETED,
-		    "Deleted", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_blocked,
 		  { "Blocked", "spoolss.job.status.blocked", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_blocked), JOB_STATUS_BLOCKED,
-		    "Blocked", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_job_status_user_intervention,
 		  { "User intervention", 
 		    "spoolss.job.status.user_intervention", FT_BOOLEAN, 32,
 		    TFS(&tfs_job_status_user_intervention), 
-		    JOB_STATUS_USER_INTERVENTION, "User intervention", 
+		    JOB_STATUS_USER_INTERVENTION, NULL, 
 		    HFILL }},
 
 		{ &hf_job_priority,
 		  { "Job priority", "spoolss.job.priority", FT_UINT32, 
-		    BASE_DEC, NULL, 0x0, "Job priority", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_job_position,
 		  { "Job position", "spoolss.job.position", FT_UINT32, 
-		    BASE_DEC, NULL, 0x0, "Job position", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_job_totalpages,
 		  { "Job total pages", "spoolss.job.totalpages", FT_UINT32, 
-		    BASE_DEC, NULL, 0x0, "Job total pages", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_job_totalbytes,
 		  { "Job total bytes", "spoolss.job.totalbytes", FT_UINT32, 
-		    BASE_DEC, NULL, 0x0, "Job total bytes", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_job_bytesprinted,
 		  { "Job bytes printed", "spoolss.job.bytesprinted", 
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "Job bytes printed", 
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, 
 		    HFILL }},
 
 		{ &hf_job_pagesprinted,
 		  { "Job pages printed", "spoolss.job.pagesprinted", 
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "Job pages printed", 
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, 
 		    HFILL }},
 
 		{ &hf_job_size,
 		  { "Job size", "spoolss.job.size", FT_UINT32, BASE_DEC, 
-		    NULL, 0x0, "Job size", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		/* Forms */
 
 		{ &hf_form,
 		  { "Data", "spoolss.form", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Data", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_level,
 		  { "Level", "spoolss.form.level", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Level", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_name,
 		  { "Name", "spoolss.form.name", FT_STRING, BASE_NONE,
-		    NULL, 0, "Name", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_flags,
 		  { "Flags", "spoolss.form.flags", FT_UINT32,
-		    BASE_DEC, VALS(form_type_vals), 0, "Flags", HFILL }},
+		    BASE_DEC, VALS(form_type_vals), 0, NULL, HFILL }},
 
 		{ &hf_form_unknown,
 		  { "Unknown", "spoolss.form.unknown", FT_UINT32,
-		    BASE_HEX, NULL, 0, "Unknown", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_width,
 		  { "Width", "spoolss.form.width", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Width", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_height,
 		  { "Height", "spoolss.form.height", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Height", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_left_margin,
 		  { "Left margin", "spoolss.form.left", FT_UINT32,
@@ -7747,114 +7747,114 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_form_top_margin,
 		  { "Top", "spoolss.form.top", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Top", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_horiz_len,
 		  { "Horizontal", "spoolss.form.horiz", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Horizontal", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_form_vert_len,
 		  { "Vertical", "spoolss.form.vert", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Vertical", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_enumforms_num,
 		  { "Num", "spoolss.enumforms.num", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Num", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* Print notify */
 
 		{ &hf_notify_options_version,
 		  { "Version", "spoolss.notify_options.version", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Version", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_options_flags,
 		  { "Flags", "spoolss.notify_options.flags", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Flags", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_options_count,
 		  { "Count", "spoolss.notify_options.count", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Count", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_option_type,
 		  { "Type", "spoolss.notify_option.type", FT_UINT16, BASE_DEC,
-		    VALS(printer_notify_types), 0, "Type", HFILL }},
+		    VALS(printer_notify_types), 0, NULL, HFILL }},
 
 		{ &hf_notify_option_reserved1,
 		  { "Reserved1", "spoolss.notify_option.reserved1", FT_UINT16, 
-		    BASE_DEC, NULL, 0, "Reserved1", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_option_reserved2,
 		  { "Reserved2", "spoolss.notify_option.reserved2", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Reserved2", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_option_reserved3,
 		  { "Reserved3", "spoolss.notify_option.reserved3", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Reserved3", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_option_count,
 		  { "Count", "spoolss.notify_option.count", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Count", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_option_data_count,
 		  { "Count", "spoolss.notify_option_data.count", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Count", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_options_flags_refresh,
 		  { "Refresh", "spoolss.notify_options.flags", FT_BOOLEAN, 32,
 		    TFS(&tfs_notify_options_flags_refresh), 
-		    PRINTER_NOTIFY_OPTIONS_REFRESH, "Refresh", HFILL }},
+		    PRINTER_NOTIFY_OPTIONS_REFRESH, NULL, HFILL }},
 
 		{ &hf_notify_info_count,
 		  { "Count", "spoolss.notify_info.count", FT_UINT32, BASE_DEC,
-		    NULL, 0, "Count", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_version,
 		  { "Version", "spoolss.notify_info.version", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Version", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_flags,
 		  { "Flags", "spoolss.notify_info.flags", FT_UINT32, BASE_HEX,
-		    NULL, 0, "Flags", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_type,
 		  { "Type", "spoolss.notify_info_data.type", FT_UINT16, 
-		    BASE_DEC, VALS(printer_notify_types), 0, "Type", HFILL }},
+		    BASE_DEC, VALS(printer_notify_types), 0, NULL, HFILL }},
 
 		{ &hf_notify_field,
 		  { "Field", "spoolss.notify_field", FT_UINT16, BASE_DEC,
-		    NULL, 0, "Field", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_count,
 		  { "Count", "spoolss.notify_info_data.count", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Count", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_id,
 		  { "Job Id", "spoolss.notify_info_data.jobid", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Job Id", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_value1,
 		  { "Value1", "spoolss.notify_info_data.value1", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Value1", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_value2,
 		  { "Value2", "spoolss.notify_info_data.value2", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Value2", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_bufsize,
 		  { "Buffer size", "spoolss.notify_info_data.bufsize", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Buffer size", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_buffer,
 		  { "Buffer", "spoolss.notify_info_data.buffer", FT_UINT32, 
-		    BASE_HEX, NULL, 0, "Buffer", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_buffer_len,
 		  { "Buffer length", "spoolss.notify_info_data.buffer.len", 
-		    FT_UINT32, BASE_HEX, NULL, 0, "Buffer length", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_notify_info_data_buffer_data,
 		  { "Buffer data", "spoolss.notify_info_data.buffer.data", 
-		    FT_BYTES, BASE_HEX, NULL, 0, "Buffer data", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* RffpCNex RPC */
 
@@ -7864,81 +7864,81 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_printerlocal, /* XXX: move me */
 		  { "Printer local", "spoolss.printer_local", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Printer local", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags,
 		  { "RFFPCNEX flags", "spoolss.rffpcnex.flags", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "RFFPCNEX flags", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_add_printer,
 		  { "Add printer", "spoolss.rffpcnex.flags.add_printer",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_printer),
-		    SPOOLSS_PRINTER_CHANGE_ADD_PRINTER, "Add printer", 
+		    SPOOLSS_PRINTER_CHANGE_ADD_PRINTER, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_set_printer,
 		  { "Set printer", "spoolss.rffpcnex.flags.set_printer",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_printer),
-		    SPOOLSS_PRINTER_CHANGE_SET_PRINTER, "Set printer", 
+		    SPOOLSS_PRINTER_CHANGE_SET_PRINTER, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_printer,
 		  { "Delete printer", "spoolss.rffpcnex.flags.delete_printer",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_printer),
-		    SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER, "Delete printer", 
+		    SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_add_job,
 		  { "Add job", "spoolss.rffpcnex.flags.add_job",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_job),
-		    SPOOLSS_PRINTER_CHANGE_ADD_JOB, "Add job", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_ADD_JOB, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_set_job,
 		  { "Set job", "spoolss.rffpcnex.flags.set_job",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_job),
-		    SPOOLSS_PRINTER_CHANGE_SET_JOB, "Set job", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_SET_JOB, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_job,
 		  { "Delete job", "spoolss.rffpcnex.flags.delete_job",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_job),
-		    SPOOLSS_PRINTER_CHANGE_DELETE_JOB, "Delete job", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_DELETE_JOB, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_write_job,
 		  { "Write job", "spoolss.rffpcnex.flags.write_job",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_write_job),
-		    SPOOLSS_PRINTER_CHANGE_WRITE_JOB, "Write job", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_WRITE_JOB, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_add_form,
 		  { "Add form", "spoolss.rffpcnex.flags.add_form",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_form),
-		    SPOOLSS_PRINTER_CHANGE_ADD_FORM, "Add form", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_ADD_FORM, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_set_form,
 		  { "Set form", "spoolss.rffpcnex.flags.set_form",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_form),
-		    SPOOLSS_PRINTER_CHANGE_SET_FORM, "Set form", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_SET_FORM, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_form,
 		  { "Delete form", "spoolss.rffpcnex.flags.delete_form",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_form),
-		    SPOOLSS_PRINTER_CHANGE_DELETE_FORM, "Delete form", 
+		    SPOOLSS_PRINTER_CHANGE_DELETE_FORM, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_add_port,
 		  { "Add port", "spoolss.rffpcnex.flags.add_port",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_port),
-		    SPOOLSS_PRINTER_CHANGE_ADD_PORT, "Add port", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_ADD_PORT, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_configure_port,
 		  { "Configure port", "spoolss.rffpcnex.flags.configure_port",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_configure_port),
-		    SPOOLSS_PRINTER_CHANGE_CONFIGURE_PORT, "Configure port", 
+		    SPOOLSS_PRINTER_CHANGE_CONFIGURE_PORT, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_port,
 		  { "Delete port", "spoolss.rffpcnex.flags.delete_port",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_port),
-		    SPOOLSS_PRINTER_CHANGE_DELETE_PORT, "Delete port", 
+		    SPOOLSS_PRINTER_CHANGE_DELETE_PORT, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_add_print_processor,
@@ -7946,37 +7946,37 @@ proto_register_dcerpc_spoolss(void)
 		    FT_BOOLEAN, 32, 
 		    TFS(&tfs_rffpcnex_flags_add_print_processor),
 		    SPOOLSS_PRINTER_CHANGE_ADD_PRINT_PROCESSOR, 
-		    "Add processor", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_print_processor,
 		  { "Delete processor", 
 		    "spoolss.rffpcnex.flags.delete_processor", FT_BOOLEAN, 32, 
 		    TFS(&tfs_rffpcnex_flags_delete_print_processor),
 		    SPOOLSS_PRINTER_CHANGE_DELETE_PRINT_PROCESSOR, 
-		    "Delete processor", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_add_driver,
 		  { "Add driver", "spoolss.rffpcnex.flags.add_driver",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_add_driver),
-		    SPOOLSS_PRINTER_CHANGE_ADD_PRINTER_DRIVER, "Add driver", 
+		    SPOOLSS_PRINTER_CHANGE_ADD_PRINTER_DRIVER, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_set_driver,
 		  { "Set driver", "spoolss.rffpcnex.flags.set_driver",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_set_driver),
-		    SPOOLSS_PRINTER_CHANGE_SET_PRINTER_DRIVER, "Set driver", 
+		    SPOOLSS_PRINTER_CHANGE_SET_PRINTER_DRIVER, NULL, 
 		    HFILL }},
 
 		{ &hf_rffpcnex_flags_delete_driver,
 		  { "Delete driver", "spoolss.rffpcnex.flags.delete_driver",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_delete_driver),
 		    SPOOLSS_PRINTER_CHANGE_DELETE_PRINTER_DRIVER, 
-		    "Delete driver", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_timeout,
 		  { "Timeout", "spoolss.rffpcnex.flags.timeout",
 		    FT_BOOLEAN, 32, TFS(&tfs_rffpcnex_flags_timeout),
-		    SPOOLSS_PRINTER_CHANGE_TIMEOUT, "Timeout", HFILL }},
+		    SPOOLSS_PRINTER_CHANGE_TIMEOUT, NULL, HFILL }},
 
 		{ &hf_rffpcnex_flags_failed_printer_connection,
 		  { "Failed printer connection", 
@@ -7984,51 +7984,51 @@ proto_register_dcerpc_spoolss(void)
 		    FT_BOOLEAN, 32, 
 		    TFS(&tfs_rffpcnex_flags_failed_connection_printer),
 		    SPOOLSS_PRINTER_CHANGE_FAILED_CONNECTION_PRINTER, 
-		    "Failed printer connection", HFILL }},
+		    NULL, HFILL }},
 
 		/* RRPCN RPC */
 
 		{ &hf_rrpcn_changelow,
 		  { "Change low", "spoolss.rrpcn.changelow", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Change low", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_rrpcn_changehigh,
 		  { "Change high", "spoolss.rrpcn.changehigh", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Change high", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_rrpcn_unk0,
 		  { "Unknown 0", "spoolss.rrpcn.unk0", FT_UINT32, BASE_DEC,
-		    NULL, 0, "Unknown 0", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_rrpcn_unk1,
 		  { "Unknown 1", "spoolss.rrpcn.unk1", FT_UINT32, BASE_DEC,
-		    NULL, 0, "Unknown 1", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		/* ReplyOpenPrinter RPC */
 
 		{ &hf_replyopenprinter_unk0,
 		  { "Unknown 0", "spoolss.replyopenprinter.unk0", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Unknown 0", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_replyopenprinter_unk1,
 		  { "Unknown 1", "spoolss.replyopenprinter.unk1", FT_UINT32, 
-		    BASE_DEC, NULL, 0, "Unknown 1", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* Printer attributes */
 
 		{ &hf_printer_attributes,
 		  { "Attributes", "spoolss.printer_attributes", FT_UINT32,
-		    BASE_HEX, NULL, 0, "Attributes", HFILL }},
+		    BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_attributes_queued,
 		  { "Queued", "spoolss.printer_attributes.queued", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_queued),
-		    PRINTER_ATTRIBUTE_QUEUED, "Queued", HFILL }},
+		    PRINTER_ATTRIBUTE_QUEUED, NULL, HFILL }},
 
 		{ &hf_printer_attributes_direct,
 		  { "Direct", "spoolss.printer_attributes.direct", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_direct),
-		    PRINTER_ATTRIBUTE_DIRECT, "Direct", HFILL }},
+		    PRINTER_ATTRIBUTE_DIRECT, NULL, HFILL }},
 
 		{ &hf_printer_attributes_default,
 		  { "Default (9x/ME only)", 
@@ -8039,22 +8039,22 @@ proto_register_dcerpc_spoolss(void)
 		{ &hf_printer_attributes_shared,
 		  { "Shared", "spoolss.printer_attributes.shared", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_shared),
-		    PRINTER_ATTRIBUTE_SHARED, "Shared", HFILL }},
+		    PRINTER_ATTRIBUTE_SHARED, NULL, HFILL }},
 
 		{ &hf_printer_attributes_network,
 		  { "Network", "spoolss.printer_attributes.network", 
 		    FT_BOOLEAN, 32, TFS(&tfs_printer_attributes_network),
-		    PRINTER_ATTRIBUTE_NETWORK, "Network", HFILL }},
+		    PRINTER_ATTRIBUTE_NETWORK, NULL, HFILL }},
 
 		{ &hf_printer_attributes_hidden,
 		  { "Hidden", "spoolss.printer_attributes.hidden", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_hidden),
-		    PRINTER_ATTRIBUTE_HIDDEN, "Hidden", HFILL }},
+		    PRINTER_ATTRIBUTE_HIDDEN, NULL, HFILL }},
 
 		{ &hf_printer_attributes_local,
 		  { "Local", "spoolss.printer_attributes.local", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_local),
-		    PRINTER_ATTRIBUTE_LOCAL, "Local", HFILL }},
+		    PRINTER_ATTRIBUTE_LOCAL, NULL, HFILL }},
 
 		{ &hf_printer_attributes_enable_devq,
 		  { "Enable devq", "spoolss.printer_attributes.enable_devq", 
@@ -8065,14 +8065,14 @@ proto_register_dcerpc_spoolss(void)
 		  { "Keep printed jobs", 
 		    "spoolss.printer_attributes.keep_printed_jobs", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_keep_printed_jobs),
-		    PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS, "Keep printed jobs", 
+		    PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS, NULL, 
 		    HFILL }},
 
 		{ &hf_printer_attributes_do_complete_first,
 		  { "Do complete first", 
 		    "spoolss.printer_attributes.do_complete_first", FT_BOOLEAN,
 		    32, TFS(&tfs_printer_attributes_do_complete_first),
-		    PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST, "Do complete first", 
+		    PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST, NULL, 
 		    HFILL }},
 
 		{ &hf_printer_attributes_work_offline,
@@ -8090,76 +8090,76 @@ proto_register_dcerpc_spoolss(void)
 		{ &hf_printer_attributes_raw_only,
 		  { "Raw only", "spoolss.printer_attributes.raw_only", 
 		    FT_BOOLEAN, 32, TFS(&tfs_printer_attributes_raw_only),
-		    PRINTER_ATTRIBUTE_RAW_ONLY, "Raw only", HFILL }},
+		    PRINTER_ATTRIBUTE_RAW_ONLY, NULL, HFILL }},
 
 		{ &hf_printer_attributes_published,
 		  { "Published", "spoolss.printer_attributes.published", 
 		    FT_BOOLEAN, 32, TFS(&tfs_printer_attributes_published),
-		    PRINTER_ATTRIBUTE_PUBLISHED, "Published", HFILL }},
+		    PRINTER_ATTRIBUTE_PUBLISHED, NULL, HFILL }},
 
 		/* Timestamps */
 
 		{ &hf_time_year,
 		  { "Year", "spoolss.time.year", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Year", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_month,
 		  { "Month", "spoolss.time.month", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Month", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_dow,
 		  { "Day of week", "spoolss.time.dow", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Day of week", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_day,
 		  { "Day", "spoolss.time.day", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Day", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_hour,
 		  { "Hour", "spoolss.time.hour", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Hour", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_minute,
 		  { "Minute", "spoolss.time.minute", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Minute", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_second,
 		  { "Second", "spoolss.time.second", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Second", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_time_msec,
 		  { "Millisecond", "spoolss.time.msec", FT_UINT32, BASE_DEC,
-		    NULL, 0x0, "Millisecond", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 /* Userlevel */
 
                 { &hf_userlevel_size,
                   { "Size", "spoolss.userlevel.size",
-                    FT_UINT32, BASE_DEC, NULL, 0, "Size", HFILL }},
+                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_client,
                   { "Client", "spoolss.userlevel.client", FT_STRING, 
-                    BASE_NONE, NULL, 0, "Client", HFILL }},
+                    BASE_NONE, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_user,
                   { "User", "spoolss.userlevel.user", FT_STRING, 
-                    BASE_NONE, NULL, 0, "User", HFILL }},
+                    BASE_NONE, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_build,
                   { "Build", "spoolss.userlevel.build",
-                    FT_UINT32, BASE_DEC, NULL, 0, "Build", HFILL }},
+                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_major,
                   { "Major", "spoolss.userlevel.major",
-                    FT_UINT32, BASE_DEC, NULL, 0, "Major", HFILL }},
+                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_minor,
                   { "Minor", "spoolss.userlevel.minor",
-                    FT_UINT32, BASE_DEC, NULL, 0, "Minor", HFILL }},
+                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                 { &hf_userlevel_processor,
                   { "Processor", "spoolss.userlevel.processor",
-                    FT_UINT32, BASE_DEC, NULL, 0, "Processor", HFILL }},
+                    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* EnumprinterdataEx RPC */
 
@@ -8171,61 +8171,61 @@ proto_register_dcerpc_spoolss(void)
 		{ &hf_enumprinterdataex_name_offset,
 		  { "Name offset", "spoolss.enumprinterdataex.name_offset",
 		    FT_UINT32, BASE_DEC, NULL, 0x0, 
-		    "Name offset", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_name_len,
 		  { "Name len", "spoolss.enumprinterdataex.name_len",
 		    FT_UINT32, BASE_DEC, NULL, 0x0, 
-		    "Name len", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_name,
 		  { "Name", "spoolss.enumprinterdataex.name", 
-		    FT_STRING, BASE_NONE, NULL, 0, "Name", HFILL }},
+		    FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_type,
 		  { "Value type", "spoolss.enumprinterdataex.value_type",
 		    FT_UINT32, BASE_DEC, NULL, 0x0, 
-		    "Value type", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_offset,
 		  { "Value offset", "spoolss.enumprinterdataex.value_offset",
 		    FT_UINT32, BASE_DEC, NULL, 0x0, 
-		    "Value offset", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_len,
 		  { "Value len", "spoolss.enumprinterdataex.value_len",
 		    FT_UINT32, BASE_DEC, NULL, 0x0, 
-		    "Value len", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_dword_high,
 		  { "DWORD value (high)", 
 		    "spoolss.enumprinterdataex.val_dword.high",
 		    FT_UINT16, BASE_DEC, NULL, 0x0, 
-		    "DWORD value (high)", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_dword_low,
 		  { "DWORD value (low)", 
 		    "spoolss.enumprinterdataex.val_dword.low",
 		    FT_UINT16, BASE_DEC, NULL, 0x0, 
-		    "DWORD value (low)", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_enumprinterdataex_val_sz,
 		  { "SZ value", "spoolss.printerdata.val_sz", 
-		    FT_STRING, BASE_NONE, NULL, 0, "SZ value", HFILL }},
+		    FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* RouterReplyPrinter RPC */
 
 		{ &hf_routerreplyprinter_condition,
 		  { "Condition", "spoolss.routerreplyprinter.condition", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Condition", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_routerreplyprinter_unknown1,
 		  { "Unknown1", "spoolss.routerreplyprinter.unknown1", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Unknown1", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_routerreplyprinter_changeid,
 		  { "Change id", "spoolss.routerreplyprinter.changeid", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Change id", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* EnumPrinterKey RPC */
 
@@ -8235,7 +8235,7 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_keybuffer_data,
 		  { "Key Buffer data", "spoolss.keybuffer.data", FT_BYTES, 
-		    BASE_HEX, NULL, 0x0, "Contents of buffer", HFILL }},
+		    BASE_NONE, NULL, 0x0, "Contents of buffer", HFILL }},
 
 		/* SetJob RPC */
 
@@ -8259,25 +8259,25 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_secdescbuf_maxlen,
 		  { "Max len", "secdescbuf.max_len",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Max len", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_secdescbuf_undoc,
 		  { "Undocumented", "secdescbuf.undoc",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Undocumented", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_secdescbuf_len,
 		  { "Length", "secdescbuf.len",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Length", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		/* Spool printer info */
 
 		{ &hf_spool_printer_info_devmode_ptr,
 		  { "Devmode pointer", "spoolprinterinfo.devmode_ptr",
-		    FT_UINT32, BASE_HEX, NULL, 0, "Devmode pointer", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_spool_printer_info_secdesc_ptr,
 		  { "Secdesc pointer", "spoolprinterinfo.secdesc_ptr",
-		    FT_UINT32, BASE_HEX, NULL, 0, "Secdesc pointer", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		/* WritePrinter RPC */
 
@@ -8290,89 +8290,89 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_setprinterdataex_max_len,
 		  { "Max len", "setprinterdataex.max_len",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Max len", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_setprinterdataex_real_len,
 		  { "Real len", "setprinterdataex.real_len",
-		    FT_UINT32, BASE_DEC, NULL, 0, "Real len", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_setprinterdataex_data,
 		  { "Data", "setprinterdataex.data",
-		    FT_BYTES, BASE_HEX, NULL, 0, "Data", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		/* Specific access rights */
 
 		{ &hf_access_required,
 		  { "Access required", "spoolss.access_required",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "Access required",
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
 		    HFILL }},
 
 		{ &hf_server_access_admin,
 		  { "Server admin", "spoolss.access_mask.server_admin",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    SERVER_ACCESS_ADMINISTER, "Server admin", HFILL }},
+		    SERVER_ACCESS_ADMINISTER, NULL, HFILL }},
 
 		{ &hf_server_access_enum,
 		  { "Server enum", "spoolss.access_mask.server_enum",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    SERVER_ACCESS_ENUMERATE, "Server enum", HFILL }},
+		    SERVER_ACCESS_ENUMERATE, NULL, HFILL }},
 
 		{ &hf_printer_access_admin,
 		  { "Printer admin", "spoolss.access_mask.printer_admin",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ACCESS_ADMINISTER, "Printer admin", HFILL }},
+		    PRINTER_ACCESS_ADMINISTER, NULL, HFILL }},
 
 		{ &hf_printer_access_use,
 		  { "Printer use", "spoolss.access_mask.printer_use",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    PRINTER_ACCESS_USE, "Printer use", HFILL }},
+		    PRINTER_ACCESS_USE, NULL, HFILL }},
 
 		{ &hf_job_access_admin,
 		  { "Job admin", "spoolss.access_mask.job_admin",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    JOB_ACCESS_ADMINISTER, "Job admin", HFILL }},
+		    JOB_ACCESS_ADMINISTER, NULL, HFILL }},
 
 		/* Printer information */
 
 		{ &hf_printer_cjobs,
 		  { "CJobs", "spoolss.printer.cjobs", FT_UINT32,
-		    BASE_DEC, NULL, 0, "CJobs", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_total_jobs,
 		  { "Total jobs", "spoolss.printer.total_jobs", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Total jobs", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_total_bytes,
 		  { "Total bytes", "spoolss.printer.total_bytes", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Total bytes", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_global_counter,
 		  { "Global counter", "spoolss.printer.global_counter", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Global counter", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_total_pages,
 		  { "Total pages", "spoolss.printer.total_pages", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Total pages", HFILL }},
+		    BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_major_version,
 		  { "Major version", "spoolss.printer.major_version", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Major version", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_build_version,
 		  { "Build version", "spoolss.printer.build_version", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Build version", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk7,
 		  { "Unknown 7", "spoolss.printer.unknown7", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 7", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk8,
 		  { "Unknown 8", "spoolss.printer.unknown8", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 8", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk9,
 		  { "Unknown 9", "spoolss.printer.unknown9", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 9", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_session_ctr,
 		  { "Session counter", "spoolss.printer.session_ctr", 
@@ -8380,103 +8380,103 @@ proto_register_dcerpc_spoolss(void)
 
 		{ &hf_printer_unk11,
 		  { "Unknown 11", "spoolss.printer.unknown11", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 11", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_printer_errors,
 		  { "Printer errors", "spoolss.printer.printer_errors", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Printer errors", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk13,
 		  { "Unknown 13", "spoolss.printer.unknown13", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 13", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk14,
 		  { "Unknown 14", "spoolss.printer.unknown14", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 14", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk15,
 		  { "Unknown 15", "spoolss.printer.unknown15", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 15", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk16,
 		  { "Unknown 16", "spoolss.printer.unknown16", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 16", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_changeid,
 		  { "Change id", "spoolss.printer.changeid", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Change id", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk18,
 		  { "Unknown 18", "spoolss.printer.unknown18", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 18", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_unk20,
 		  { "Unknown 20", "spoolss.printer.unknown20", FT_UINT32,
-		    BASE_DEC, NULL, 0, "Unknown 20", HFILL }},		
+		    BASE_DEC, NULL, 0, NULL, HFILL }},		
 
 		{ &hf_printer_c_setprinter,
 		  { "Csetprinter", "spoolss.printer.c_setprinter", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Csetprinter", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk22,
 		  { "Unknown 22", "spoolss.printer.unknown22", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 22", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk23,
 		  { "Unknown 23", "spoolss.printer.unknown23", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 23", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk24,
 		  { "Unknown 24", "spoolss.printer.unknown24", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 24", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk25,
 		  { "Unknown 25", "spoolss.printer.unknown25", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 25", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk26,
 		  { "Unknown 26", "spoolss.printer.unknown26", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 26", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk27,
 		  { "Unknown 27", "spoolss.printer.unknown27", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 27", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk28,
 		  { "Unknown 28", "spoolss.printer.unknown28", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 28", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_unk29,
 		  { "Unknown 29", "spoolss.printer.unknown29", 
-		    FT_UINT16, BASE_DEC, NULL, 0, "Unknown 29", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_flags,
 		  { "Flags", "spoolss.printer.flags", 
-		    FT_UINT32, BASE_HEX, NULL, 0, "Flags", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_priority,
 		  { "Priority", "spoolss.printer.priority", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Priority", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_default_priority,
 		  { "Default Priority", "spoolss.printer.default_priority", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Default Priority", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_averageppm,
 		  { "Average PPM", "spoolss.printer.averageppm", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Average PPM", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_jobs,
 		  { "Jobs", "spoolss.printer.jobs", 
-		    FT_UINT32, BASE_DEC, NULL, 0, "Jobs", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
                 { &hf_printer_guid,
                   { "GUID", "spoolss.printer.guid", FT_STRING, 
-                    BASE_NONE, NULL, 0, "GUID", HFILL }},
+                    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_printer_action,
 		  { "Action", "spoolss.printer.action", FT_UINT32, BASE_DEC,
-		   VALS(getprinter_action_vals), 0, "Action", HFILL }},
+		   VALS(getprinter_action_vals), 0, NULL, HFILL }},
 	};
 
         static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-srvsvc.c b/epan/dissectors/packet-dcerpc-srvsvc.c
index 14e6eedb1f..fa7e755134 100644
--- a/epan/dissectors/packet-dcerpc-srvsvc.c
+++ b/epan/dissectors/packet-dcerpc-srvsvc.c
@@ -18320,1507 +18320,1507 @@ void proto_register_dcerpc_srvsvc(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_srvsvc_srvsvc_NetDiskInfo0_disk,
-	  { "Disk", "srvsvc.srvsvc_NetDiskInfo0.disk", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Disk", "srvsvc.srvsvc_NetDiskInfo0.disk", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_user,
-	  { "User", "srvsvc.srvsvc_NetConnInfo1.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetConnInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_SHARE_1005_FLAGS_DFS_ROOT,
-	  { "Share 1005 Flags Dfs Root", "srvsvc.srvsvc_DFSFlags.SHARE_1005_FLAGS_DFS_ROOT", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_SHARE_1005_FLAGS_DFS_ROOT_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Share 1005 Flags Dfs Root", "srvsvc.srvsvc_DFSFlags.SHARE_1005_FLAGS_DFS_ROOT", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_SHARE_1005_FLAGS_DFS_ROOT_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetTransportCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetTransportCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1536,
-	  { "Info1536", "srvsvc.srvsvc_NetSrvInfo.info1536", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1536", "srvsvc.srvsvc_NetSrvInfo.info1536", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info502,
-	  { "Info502", "srvsvc.srvsvc_NetShareInfo.info502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info502", "srvsvc.srvsvc_NetShareInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetFileEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetFileEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_threadcountadd,
-	  { "Threadcountadd", "srvsvc.srvsvc_NetSrvInfo599.threadcountadd", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Threadcountadd", "srvsvc.srvsvc_NetSrvInfo599.threadcountadd", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_hunds,
-	  { "Hunds", "srvsvc.srvsvc_NetRemoteTODInfo.hunds", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hunds", "srvsvc.srvsvc_NetRemoteTODInfo.hunds", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareAdd_level,
-	  { "Level", "srvsvc.srvsvc_NetShareAdd.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetShareAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelCommit_hnd,
-	  { "Hnd", "srvsvc.srvsvc_NetShareDelCommit.hnd", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hnd", "srvsvc.srvsvc_NetShareDelCommit.hnd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_networkerrortreshold,
-	  { "Networkerrortreshold", "srvsvc.srvsvc_NetSrvInfo599.networkerrortreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Networkerrortreshold", "srvsvc.srvsvc_NetSrvInfo599.networkerrortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerTransportAddEx_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetServerTransportAddEx.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetServerTransportAddEx.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepcomplsearch,
-	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo503.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo503.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_maxlen,
-	  { "Maxlen", "srvsvc.srvsvc_NetDiskEnum.maxlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxlen", "srvsvc.srvsvc_NetDiskEnum.maxlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_mins,
-	  { "Mins", "srvsvc.srvsvc_NetRemoteTODInfo.mins", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Mins", "srvsvc.srvsvc_NetRemoteTODInfo.mins", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_accessalert,
-	  { "Accessalert", "srvsvc.srvsvc_NetSrvInfo403.accessalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Accessalert", "srvsvc.srvsvc_NetSrvInfo403.accessalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo_info0,
-	  { "Info0", "srvsvc.srvsvc_NetTransportInfo.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "srvsvc.srvsvc_NetTransportInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_initsesstable,
-	  { "Initsesstable", "srvsvc.srvsvc_NetSrvInfo599.initsesstable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initsesstable", "srvsvc.srvsvc_NetSrvInfo599.initsesstable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_num_open,
-	  { "Num Open", "srvsvc.srvsvc_NetSessInfo1.num_open", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Open", "srvsvc.srvsvc_NetSessInfo1.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1509_maxrawbuflen,
-	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo1509.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo1509.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_sesssvc,
-	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo599.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo599.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetSessEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetSessEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1007,
-	  { "Ctr1007", "srvsvc.srvsvc_NetShareCtr.ctr1007", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1007", "srvsvc.srvsvc_NetShareCtr.ctr1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetCharDevQCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetCharDevQCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareSetInfo_share_name,
-	  { "Share Name", "srvsvc.srvsvc_NetShareSetInfo.share_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share Name", "srvsvc.srvsvc_NetShareSetInfo.share_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1501_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1501.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1501.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_vcs,
-	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo3.vcs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo3.vcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minfreeconnections,
-	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPRNameCompare_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetPRNameCompare.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetPRNameCompare.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxfreeconnections,
-	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo599.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_bytessent_low,
-	  { "Bytessent Low", "srvsvc.srvsvc_Statistics.bytessent_low", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bytessent Low", "srvsvc.srvsvc_Statistics.bytessent_low", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1529,
-	  { "Info1529", "srvsvc.srvsvc_NetSrvInfo.info1529", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1529", "srvsvc.srvsvc_NetSrvInfo.info1529", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_alertsched,
-	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo403.alertsched", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo403.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_numfiletasks,
-	  { "Numfiletasks", "srvsvc.srvsvc_NetSrvInfo402.numfiletasks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numfiletasks", "srvsvc.srvsvc_NetSrvInfo402.numfiletasks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_diskspacetreshold,
-	  { "Diskspacetreshold", "srvsvc.srvsvc_NetSrvInfo599.diskspacetreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Diskspacetreshold", "srvsvc.srvsvc_NetSrvInfo599.diskspacetreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_announce,
-	  { "Announce", "srvsvc.srvsvc_NetSrvInfo102.announce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Announce", "srvsvc.srvsvc_NetSrvInfo102.announce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_accessalert,
-	  { "Accessalert", "srvsvc.srvsvc_NetSrvInfo402.accessalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Accessalert", "srvsvc.srvsvc_NetSrvInfo402.accessalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_transport,
-	  { "Transport", "srvsvc.srvsvc_NetSessInfo502.transport", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Transport", "srvsvc.srvsvc_NetSessInfo502.transport", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetTransportCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetTransportCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1501,
-	  { "Info1501", "srvsvc.srvsvc_NetShareInfo.info1501", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Info1501", "srvsvc.srvsvc_NetShareInfo.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_name,
-	  { "Name", "srvsvc.srvsvc_NetTransportInfo3.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetTransportInfo3.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileClose_fid,
-	  { "Fid", "srvsvc.srvsvc_NetFileClose.fid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Fid", "srvsvc.srvsvc_NetFileClose.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_auditedevents,
-	  { "Auditedevents", "srvsvc.srvsvc_NetSrvInfo403.auditedevents", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Auditedevents", "srvsvc.srvsvc_NetSrvInfo403.auditedevents", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1554_linkinfovalidtime,
-	  { "Linkinfovalidtime", "srvsvc.srvsvc_NetSrvInfo1554.linkinfovalidtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Linkinfovalidtime", "srvsvc.srvsvc_NetSrvInfo1554.linkinfovalidtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_user_flags,
-	  { "User Flags", "srvsvc.srvsvc_NetSessInfo2.user_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "User Flags", "srvsvc.srvsvc_NetSessInfo2.user_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxlinkdelay,
-	  { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo599.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo599.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_eroralert,
-	  { "Eroralert", "srvsvc.srvsvc_NetSrvInfo403.eroralert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Eroralert", "srvsvc.srvsvc_NetSrvInfo403.eroralert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr2_count,
-	  { "Count", "srvsvc.srvsvc_NetSessCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetSessCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1540_enablesharednetdrives,
-	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo1540.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo1540.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo_info3,
-	  { "Info3", "srvsvc.srvsvc_NetFileInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "srvsvc.srvsvc_NetFileInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_comment,
-	  { "Comment", "srvsvc.srvsvc_NetShareInfo2.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetShareInfo2.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_start,
-	  { "Start", "srvsvc.srvsvc_Statistics.start", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Start", "srvsvc.srvsvc_Statistics.start", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetShareEnumAll.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetShareEnumAll.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_user,
-	  { "User", "srvsvc.srvsvc_NetSessInfo502.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessInfo502.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetTransportEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetTransportEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_numfiletasks,
-	  { "Numfiletasks", "srvsvc.srvsvc_NetSrvInfo403.numfiletasks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numfiletasks", "srvsvc.srvsvc_NetSrvInfo403.numfiletasks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQGetInfo_queue_name,
-	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQGetInfo.queue_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQGetInfo.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_sessconns,
-	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo599.sessconns", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo599.sessconns", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_sesssvc,
-	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo503.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo503.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo_info1,
-	  { "Info1", "srvsvc.srvsvc_NetCharDevInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "srvsvc.srvsvc_NetCharDevInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetGetFileSecurity_sd_buf,
-	  { "Sd Buf", "srvsvc.srvsvc_NetGetFileSecurity.sd_buf", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sd Buf", "srvsvc.srvsvc_NetGetFileSecurity.sd_buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo0_conn_id,
-	  { "Conn Id", "srvsvc.srvsvc_NetConnInfo0.conn_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Conn Id", "srvsvc.srvsvc_NetConnInfo0.conn_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxmpxct,
-	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo599.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo599.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetFileEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetFileEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_sessconns,
-	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo502.sessconns", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo502.sessconns", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_rawworkitems,
-	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo599.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo599.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetShareEnumAll.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetShareEnumAll.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_minrcvqueue,
-	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo503.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo503.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo_info1,
-	  { "Info1", "srvsvc.srvsvc_NetTransportInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "srvsvc.srvsvc_NetTransportInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_threadcountadd,
-	  { "Threadcountadd", "srvsvc.srvsvc_NetSrvInfo503.threadcountadd", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Threadcountadd", "srvsvc.srvsvc_NetSrvInfo503.threadcountadd", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo3_user,
-	  { "User", "srvsvc.srvsvc_NetFileInfo3.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetFileInfo3.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_weekday,
-	  { "Weekday", "srvsvc.srvsvc_NetRemoteTODInfo.weekday", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Weekday", "srvsvc.srvsvc_NetRemoteTODInfo.weekday", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_addr_len,
-	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo3.addr_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo3.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_bytesrcvd_low,
-	  { "Bytesrcvd Low", "srvsvc.srvsvc_Statistics.bytesrcvd_low", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bytesrcvd Low", "srvsvc.srvsvc_Statistics.bytesrcvd_low", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1549_networkerrortreshold,
-	  { "Networkerrortreshold", "srvsvc.srvsvc_NetSrvInfo1549.networkerrortreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Networkerrortreshold", "srvsvc.srvsvc_NetSrvInfo1549.networkerrortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebitsofinterest,
-	  { "Servicebitsofinterest", "srvsvc.srvsvc_NetServerSetServiceBitsEx.servicebitsofinterest", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servicebitsofinterest", "srvsvc.srvsvc_NetServerSetServiceBitsEx.servicebitsofinterest", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetTransportEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetTransportEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1542_maxfreeconnections,
-	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo1542.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo1542.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enableoplockforceclose,
-	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo599.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo599.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvGetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetSrvGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetSrvGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetNameValidate_name,
-	  { "Name", "srvsvc.srvsvc_NetNameValidate.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetNameValidate.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1511,
-	  { "Info1511", "srvsvc.srvsvc_NetSrvInfo.info1511", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1511", "srvsvc.srvsvc_NetSrvInfo.info1511", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr501,
-	  { "Ctr501", "srvsvc.srvsvc_NetShareCtr.ctr501", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr501", "srvsvc.srvsvc_NetShareCtr.ctr501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo0_addr,
-	  { "Addr", "srvsvc.srvsvc_NetTransportInfo0.addr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr", "srvsvc.srvsvc_NetTransportInfo0.addr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo599.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo599.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr3_array,
-	  { "Array", "srvsvc.srvsvc_NetFileCtr3.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetFileCtr3.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetSessCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetSessCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1552_maxlinkdelay,
-	  { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo1552.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxlinkdelay", "srvsvc.srvsvc_NetSrvInfo1552.maxlinkdelay", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxkeepcomplsearch,
-	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enablefcbopens,
-	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo503.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo503.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_version_minor,
-	  { "Version Minor", "srvsvc.srvsvc_NetSrvInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Minor", "srvsvc.srvsvc_NetSrvInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1501,
-	  { "Info1501", "srvsvc.srvsvc_NetSrvInfo.info1501", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1501", "srvsvc.srvsvc_NetSrvInfo.info1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetDiskEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetDiskEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1107,
-	  { "Info1107", "srvsvc.srvsvc_NetSrvInfo.info1107", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1107", "srvsvc.srvsvc_NetSrvInfo.info1107", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1520,
-	  { "Info1520", "srvsvc.srvsvc_NetSrvInfo.info1520", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1520", "srvsvc.srvsvc_NetSrvInfo.info1520", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo_info0,
-	  { "Info0", "srvsvc.srvsvc_NetCharDevInfo.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "srvsvc.srvsvc_NetCharDevInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1006_max_users,
-	  { "Max Users", "srvsvc.srvsvc_NetShareInfo1006.max_users", FT_INT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Users", "srvsvc.srvsvc_NetShareInfo1006.max_users", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_openfiles,
-	  { "Openfiles", "srvsvc.srvsvc_NetSrvInfo402.openfiles", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Openfiles", "srvsvc.srvsvc_NetSrvInfo402.openfiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetCharDevQEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetCharDevQEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_rawworkitems,
-	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo502.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo502.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakresponsewait,
-	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo599.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo599.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetCharDevQEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetCharDevQEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_password,
-	  { "Password", "srvsvc.srvsvc_NetTransportInfo3.password", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "srvsvc.srvsvc_NetTransportInfo3.password", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info502,
-	  { "Info502", "srvsvc.srvsvc_NetSrvInfo.info502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info502", "srvsvc.srvsvc_NetSrvInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_initworkitems,
-	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo503.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo503.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportAdd_level,
-	  { "Level", "srvsvc.srvsvc_NetTransportAdd.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetTransportAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_timesource,
-	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo502.timesource", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo502.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetFileEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetFileEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetServiceBits_updateimmediately,
-	  { "Updateimmediately", "srvsvc.srvsvc_NetSetServiceBits.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Updateimmediately", "srvsvc.srvsvc_NetSetServiceBits.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1537,
-	  { "Info1537", "srvsvc.srvsvc_NetSrvInfo.info1537", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1537", "srvsvc.srvsvc_NetSrvInfo.info1537", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1534,
-	  { "Info1534", "srvsvc.srvsvc_NetSrvInfo.info1534", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1534", "srvsvc.srvsvc_NetSrvInfo.info1534", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1525_maxkeepcomplsearch,
-	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo1525.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo1525.maxkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr3_count,
-	  { "Count", "srvsvc.srvsvc_NetFileCtr3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetFileCtr3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCheck_device_name,
-	  { "Device Name", "srvsvc.srvsvc_NetShareCheck.device_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device Name", "srvsvc.srvsvc_NetShareCheck.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetFileEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetFileEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1528,
-	  { "Info1528", "srvsvc.srvsvc_NetSrvInfo.info1528", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1528", "srvsvc.srvsvc_NetSrvInfo.info1528", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_scavtimeout,
-	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo503.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo503.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_guestaccount,
-	  { "Guestaccount", "srvsvc.srvsvc_NetSrvInfo402.guestaccount", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Guestaccount", "srvsvc.srvsvc_NetSrvInfo402.guestaccount", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetShareEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetShareEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1538_enablefcbopens,
-	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo1538.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo1538.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_alist_mtime,
-	  { "Alist Mtime", "srvsvc.srvsvc_NetSrvInfo402.alist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alist Mtime", "srvsvc.srvsvc_NetSrvInfo402.alist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetTransportCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetTransportCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_alertsched,
-	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo402.alertsched", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo402.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetFileEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetFileEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1529_minrcvqueue,
-	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo1529.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo1529.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_transport_flags,
-	  { "Transport Flags", "srvsvc.srvsvc_NetTransportInfo3.transport_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Transport Flags", "srvsvc.srvsvc_NetTransportInfo3.transport_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_erroralert,
-	  { "Erroralert", "srvsvc.srvsvc_NetSrvInfo402.erroralert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Erroralert", "srvsvc.srvsvc_NetSrvInfo402.erroralert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_share,
-	  { "Share", "srvsvc.srvsvc_NetConnInfo1.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "srvsvc.srvsvc_NetConnInfo1.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info599,
-	  { "Info599", "srvsvc.srvsvc_NetSrvInfo.info599", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info599", "srvsvc.srvsvc_NetSrvInfo.info599", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxcopywritelen,
-	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo503.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo503.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareSetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetShareSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetShareSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_num_open,
-	  { "Num Open", "srvsvc.srvsvc_NetSessInfo502.num_open", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Open", "srvsvc.srvsvc_NetSessInfo502.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetGetFileSecurity_share,
-	  { "Share", "srvsvc.srvsvc_NetGetFileSecurity.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "srvsvc.srvsvc_NetGetFileSecurity.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enablesharednetdrives,
-	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo503.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo503.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxcopyreadlen,
-	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo503.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo503.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1509,
-	  { "Info1509", "srvsvc.srvsvc_NetSrvInfo.info1509", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1509", "srvsvc.srvsvc_NetSrvInfo.info1509", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_client,
-	  { "Client", "srvsvc.srvsvc_NetSessInfo1.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessInfo1.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1540,
-	  { "Info1540", "srvsvc.srvsvc_NetSrvInfo.info1540", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1540", "srvsvc.srvsvc_NetSrvInfo.info1540", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1005_dfs_flags,
-	  { "Dfs Flags", "srvsvc.srvsvc_NetShareInfo1005.dfs_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Dfs Flags", "srvsvc.srvsvc_NetShareInfo1005.dfs_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_sessusers,
-	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo599.sessusers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo599.sessusers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo0_device,
-	  { "Device", "srvsvc.srvsvc_NetCharDevInfo0.device", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device", "srvsvc.srvsvc_NetCharDevInfo0.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_sd,
-	  { "Sd", "srvsvc.srvsvc_NetShareInfo502.sd", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sd", "srvsvc.srvsvc_NetShareInfo502.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_domain,
-	  { "Domain", "srvsvc.srvsvc_NetTransportInfo3.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "srvsvc.srvsvc_NetTransportInfo3.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_chdevjobs,
-	  { "Chdevjobs", "srvsvc.srvsvc_NetSrvInfo403.chdevjobs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevjobs", "srvsvc.srvsvc_NetSrvInfo403.chdevjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_threadpriority,
-	  { "Threadpriority", "srvsvc.srvsvc_NetSrvInfo599.threadpriority", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Threadpriority", "srvsvc.srvsvc_NetSrvInfo599.threadpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetCharDevCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetCharDevCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1017_announce,
-	  { "Announce", "srvsvc.srvsvc_NetSrvInfo1017.announce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Announce", "srvsvc.srvsvc_NetSrvInfo1017.announce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxpagedmemoryusage,
-	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo599.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo599.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_guestaccount,
-	  { "Guestaccount", "srvsvc.srvsvc_NetSrvInfo403.guestaccount", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Guestaccount", "srvsvc.srvsvc_NetSrvInfo403.guestaccount", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_client,
-	  { "Client", "srvsvc.srvsvc_NetSessInfo502.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessInfo502.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDel_share_name,
-	  { "Share Name", "srvsvc.srvsvc_NetShareDel.share_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share Name", "srvsvc.srvsvc_NetShareDel.share_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxmpxct,
-	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo503.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo503.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetCharDevCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetCharDevCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_alerts,
-	  { "Alerts", "srvsvc.srvsvc_NetSrvInfo402.alerts", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alerts", "srvsvc.srvsvc_NetSrvInfo402.alerts", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxpagedmemoryusage,
-	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo503.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo503.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_comment,
-	  { "Comment", "srvsvc.srvsvc_NetSrvInfo101.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetSrvInfo101.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1556_maxworkitemidletime,
-	  { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo1556.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo1556.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelStart_hnd,
-	  { "Hnd", "srvsvc.srvsvc_NetShareDelStart.hnd", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Hnd", "srvsvc.srvsvc_NetShareDelStart.hnd", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info403,
-	  { "Info403", "srvsvc.srvsvc_NetSrvInfo.info403", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info403", "srvsvc.srvsvc_NetSrvInfo.info403", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo501_csc_policy,
-	  { "Csc Policy", "srvsvc.srvsvc_NetShareInfo501.csc_policy", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Csc Policy", "srvsvc.srvsvc_NetShareInfo501.csc_policy", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_addr_len,
-	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo1.addr_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo1.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetServiceBits_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSetServiceBits.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSetServiceBits.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_srvheuristics,
-	  { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo402.srvheuristics", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo402.srvheuristics", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_version_major,
-	  { "Version Major", "srvsvc.srvsvc_NetSrvInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Major", "srvsvc.srvsvc_NetSrvInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1004,
-	  { "Ctr1004", "srvsvc.srvsvc_NetShareCtr.ctr1004", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1004", "srvsvc.srvsvc_NetShareCtr.ctr1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1510,
-	  { "Info1510", "srvsvc.srvsvc_NetSrvInfo.info1510", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1510", "srvsvc.srvsvc_NetSrvInfo.info1510", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo_info2,
-	  { "Info2", "srvsvc.srvsvc_NetFileInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "srvsvc.srvsvc_NetFileInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvGetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetSrvGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetSrvGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelSticky_share_name,
-	  { "Share Name", "srvsvc.srvsvc_NetShareDelSticky.share_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share Name", "srvsvc.srvsvc_NetShareDelSticky.share_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetConnEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetConnEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_TransportFlags_SVTI2_REMAP_PIPE_NAMES,
-	  { "Svti2 Remap Pipe Names", "srvsvc.srvsvc_TransportFlags.SVTI2_REMAP_PIPE_NAMES", FT_BOOLEAN, 32, TFS(&srvsvc_TransportFlags_SVTI2_REMAP_PIPE_NAMES_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Svti2 Remap Pipe Names", "srvsvc.srvsvc_TransportFlags.SVTI2_REMAP_PIPE_NAMES", FT_BOOLEAN, 32, TFS(&srvsvc_TransportFlags_SVTI2_REMAP_PIPE_NAMES_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr501_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr501.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr501.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enableoplockforceclose,
-	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo503.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo503.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_vcs,
-	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo2.vcs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo2.vcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_lmannounce,
-	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo502.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo502.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_irpstacksize,
-	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo502.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo502.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1018_anndelta,
-	  { "Anndelta", "srvsvc.srvsvc_NetSrvInfo1018.anndelta", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Anndelta", "srvsvc.srvsvc_NetSrvInfo1018.anndelta", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_diskalert,
-	  { "Diskalert", "srvsvc.srvsvc_NetSrvInfo402.diskalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Diskalert", "srvsvc.srvsvc_NetSrvInfo402.diskalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileGetInfo_fid,
-	  { "Fid", "srvsvc.srvsvc_NetFileGetInfo.fid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Fid", "srvsvc.srvsvc_NetFileGetInfo.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1544_initconntable,
-	  { "Initconntable", "srvsvc.srvsvc_NetSrvInfo1544.initconntable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initconntable", "srvsvc.srvsvc_NetSrvInfo1544.initconntable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportAdd_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetTransportAdd.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetTransportAdd.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelStart_reserved,
-	  { "Reserved", "srvsvc.srvsvc_NetShareDelStart.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "srvsvc.srvsvc_NetShareDelStart.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetNameValidate_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetNameValidate.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetNameValidate.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetCharDevQCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetCharDevQCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo501_type,
-	  { "Type", "srvsvc.srvsvc_NetShareInfo501.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, "", HFILL }},
+	  { "Type", "srvsvc.srvsvc_NetShareInfo501.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetConnEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetConnEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minfreeworkitems,
-	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo599.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo599.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_initworkitems,
-	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo502.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo502.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetGetFileSecurity_securityinformation,
-	  { "Securityinformation", "srvsvc.srvsvc_NetGetFileSecurity.securityinformation", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Securityinformation", "srvsvc.srvsvc_NetGetFileSecurity.securityinformation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetConnEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetConnEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_permissions,
-	  { "Permissions", "srvsvc.srvsvc_NetShareInfo2.permissions", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Permissions", "srvsvc.srvsvc_NetShareInfo2.permissions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1555_scavqosinfoupdatetime,
-	  { "Scavqosinfoupdatetime", "srvsvc.srvsvc_NetSrvInfo1555.scavqosinfoupdatetime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavqosinfoupdatetime", "srvsvc.srvsvc_NetSrvInfo1555.scavqosinfoupdatetime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_minfreeconnections,
-	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo503.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo503.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_elapsed,
-	  { "Elapsed", "srvsvc.srvsvc_NetRemoteTODInfo.elapsed", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Elapsed", "srvsvc.srvsvc_NetRemoteTODInfo.elapsed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_maxaudits,
-	  { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo402.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo402.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_timesource,
-	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo503.timesource", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo503.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessDel_client,
-	  { "Client", "srvsvc.srvsvc_NetSessDel.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessDel.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_chdevjobs,
-	  { "Chdevjobs", "srvsvc.srvsvc_NetSrvInfo402.chdevjobs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevjobs", "srvsvc.srvsvc_NetSrvInfo402.chdevjobs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo0_name,
-	  { "Name", "srvsvc.srvsvc_NetTransportInfo0.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetTransportInfo0.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQSetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQSetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQSetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1534_oplockbreakwait,
-	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo1534.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo1534.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info0,
-	  { "Info0", "srvsvc.srvsvc_NetShareInfo.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "srvsvc.srvsvc_NetShareInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_secs,
-	  { "Secs", "srvsvc.srvsvc_NetRemoteTODInfo.secs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Secs", "srvsvc.srvsvc_NetRemoteTODInfo.secs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1007_flags,
-	  { "Flags", "srvsvc.srvsvc_NetShareInfo1007.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "srvsvc.srvsvc_NetShareInfo1007.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_minkeepcomplsearch,
-	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo503.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo503.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_user,
-	  { "User", "srvsvc.srvsvc_NetCharDevQEnum.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetCharDevQEnum.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo1_priority,
-	  { "Priority", "srvsvc.srvsvc_NetCharDevQInfo1.priority", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Priority", "srvsvc.srvsvc_NetCharDevQInfo1.priority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo0_name,
-	  { "Name", "srvsvc.srvsvc_NetShareInfo0.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetShareInfo0.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr2_count,
-	  { "Count", "srvsvc.srvsvc_NetTransportCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetTransportCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTOD_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetRemoteTOD.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetRemoteTOD.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo0_addr_len,
-	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo0.addr_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo0.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxcopyreadlen,
-	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo599.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo599.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo0_device,
-	  { "Device", "srvsvc.srvsvc_NetCharDevQInfo0.device", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device", "srvsvc.srvsvc_NetCharDevQInfo0.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_sesssvc,
-	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo502.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo502.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_CSC_CACHE_VDO,
-	  { "Csc Cache Vdo", "srvsvc.srvsvc_DFSFlags.CSC_CACHE_VDO", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_CSC_CACHE_VDO_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Csc Cache Vdo", "srvsvc.srvsvc_DFSFlags.CSC_CACHE_VDO", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_CSC_CACHE_VDO_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1501_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1501.array", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1501.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareSetInfo_parm_error,
-	  { "Parm Error", "srvsvc.srvsvc_NetShareSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Error", "srvsvc.srvsvc_NetShareSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetShareEnumAll.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetShareEnumAll.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_platform_id,
-	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo102.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, "", HFILL }},
+	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo102.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr_ctr10,
-	  { "Ctr10", "srvsvc.srvsvc_NetSessCtr.ctr10", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr10", "srvsvc.srvsvc_NetSessCtr.ctr10", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_version_minor,
-	  { "Version Minor", "srvsvc.srvsvc_NetSrvInfo101.version_minor", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Minor", "srvsvc.srvsvc_NetSrvInfo101.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQSetInfo_parm_error,
-	  { "Parm Error", "srvsvc.srvsvc_NetCharDevQSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Error", "srvsvc.srvsvc_NetCharDevQSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1550_diskspacetreshold,
-	  { "Diskspacetreshold", "srvsvc.srvsvc_NetSrvInfo1550.diskspacetreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Diskspacetreshold", "srvsvc.srvsvc_NetSrvInfo1550.diskspacetreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enableoplocks,
-	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo599.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo599.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr501_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr501.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr501.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDel_reserved,
-	  { "Reserved", "srvsvc.srvsvc_NetShareDel.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "srvsvc.srvsvc_NetShareDel.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_acceptdownlevelapis,
-	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo599.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo599.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_security,
-	  { "Security", "srvsvc.srvsvc_NetSrvInfo402.security", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Security", "srvsvc.srvsvc_NetSrvInfo402.security", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_conn_id,
-	  { "Conn Id", "srvsvc.srvsvc_NetConnInfo1.conn_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Conn Id", "srvsvc.srvsvc_NetConnInfo1.conn_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_user_flags,
-	  { "User Flags", "srvsvc.srvsvc_NetSessInfo502.user_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "User Flags", "srvsvc.srvsvc_NetSessInfo502.user_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1502,
-	  { "Info1502", "srvsvc.srvsvc_NetSrvInfo.info1502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1502", "srvsvc.srvsvc_NetSrvInfo.info1502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1541_minfreeconnections,
-	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo1541.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeconnections", "srvsvc.srvsvc_NetSrvInfo1541.minfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_linkinfovalidtime,
-	  { "Linkinfovalidtime", "srvsvc.srvsvc_NetSrvInfo599.linkinfovalidtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Linkinfovalidtime", "srvsvc.srvsvc_NetSrvInfo599.linkinfovalidtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_sessreqs,
-	  { "Sessreqs", "srvsvc.srvsvc_NetSrvInfo403.sessreqs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessreqs", "srvsvc.srvsvc_NetSrvInfo403.sessreqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareAdd_parm_error,
-	  { "Parm Error", "srvsvc.srvsvc_NetShareAdd.parm_error", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Error", "srvsvc.srvsvc_NetShareAdd.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info100,
-	  { "Info100", "srvsvc.srvsvc_NetSrvInfo.info100", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info100", "srvsvc.srvsvc_NetSrvInfo.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr502_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr502.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr502.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1514_enablesoftcompat,
-	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo1514.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo1514.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minlinkthroughput,
-	  { "Minlinkthroughput", "srvsvc.srvsvc_NetSrvInfo599.minlinkthroughput", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minlinkthroughput", "srvsvc.srvsvc_NetSrvInfo599.minlinkthroughput", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_SessionUserFlags_SESS_NOENCRYPTION,
-	  { "Sess Noencryption", "srvsvc.srvsvc_SessionUserFlags.SESS_NOENCRYPTION", FT_BOOLEAN, 32, TFS(&srvsvc_SessionUserFlags_SESS_NOENCRYPTION_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Sess Noencryption", "srvsvc.srvsvc_SessionUserFlags.SESS_NOENCRYPTION", FT_BOOLEAN, 32, TFS(&srvsvc_SessionUserFlags_SESS_NOENCRYPTION_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_updateimmediately,
-	  { "Updateimmediately", "srvsvc.srvsvc_NetServerSetServiceBitsEx.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Updateimmediately", "srvsvc.srvsvc_NetServerSetServiceBitsEx.updateimmediately", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_conn_time,
-	  { "Conn Time", "srvsvc.srvsvc_NetConnInfo1.conn_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Conn Time", "srvsvc.srvsvc_NetConnInfo1.conn_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1543_initsesstable,
-	  { "Initsesstable", "srvsvc.srvsvc_NetSrvInfo1543.initsesstable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initsesstable", "srvsvc.srvsvc_NetSrvInfo1543.initsesstable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_xactmemsize,
-	  { "Xactmemsize", "srvsvc.srvsvc_NetSrvInfo503.xactmemsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Xactmemsize", "srvsvc.srvsvc_NetSrvInfo503.xactmemsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevGetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetCharDevGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetCharDevGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_FLAGS_FORCE_SHARED_DELETE,
-	  { "Flags Force Shared Delete", "srvsvc.srvsvc_DFSFlags.FLAGS_FORCE_SHARED_DELETE", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_FORCE_SHARED_DELETE_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Flags Force Shared Delete", "srvsvc.srvsvc_DFSFlags.FLAGS_FORCE_SHARED_DELETE", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_FORCE_SHARED_DELETE_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_stimeouts,
-	  { "Stimeouts", "srvsvc.srvsvc_Statistics.stimeouts", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Stimeouts", "srvsvc.srvsvc_Statistics.stimeouts", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_sessopen,
-	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo599.sessopen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo599.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_bytessent_high,
-	  { "Bytessent High", "srvsvc.srvsvc_Statistics.bytessent_high", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bytessent High", "srvsvc.srvsvc_Statistics.bytessent_high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_domain,
-	  { "Domain", "srvsvc.srvsvc_NetTransportInfo1.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "srvsvc.srvsvc_NetTransportInfo1.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1007_alternate_directory_name,
-	  { "Alternate Directory Name", "srvsvc.srvsvc_NetShareInfo1007.alternate_directory_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alternate Directory Name", "srvsvc.srvsvc_NetShareInfo1007.alternate_directory_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetConnCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetConnCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_minkeepsearch,
-	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo503.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo503.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_acceptdownlevelapis,
-	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo503.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo503.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr2_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr2.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetGetFileSecurity_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetGetFileSecurity.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetGetFileSecurity.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_maxpagedmemoryusage,
-	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo10_client,
-	  { "Client", "srvsvc.srvsvc_NetSessInfo10.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessInfo10.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQPurge_queue_name,
-	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQPurge.queue_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQPurge.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_jobsqueued,
-	  { "Jobsqueued", "srvsvc.srvsvc_Statistics.jobsqueued", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Jobsqueued", "srvsvc.srvsvc_Statistics.jobsqueued", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1550,
-	  { "Info1550", "srvsvc.srvsvc_NetSrvInfo.info1550", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1550", "srvsvc.srvsvc_NetSrvInfo.info1550", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1007,
-	  { "Info1007", "srvsvc.srvsvc_NetShareInfo.info1007", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1007", "srvsvc.srvsvc_NetShareInfo.info1007", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQGetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQGetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1513,
-	  { "Info1513", "srvsvc.srvsvc_NetSrvInfo.info1513", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1513", "srvsvc.srvsvc_NetSrvInfo.info1513", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetFileSecurity_file,
-	  { "File", "srvsvc.srvsvc_NetSetFileSecurity.file", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "File", "srvsvc.srvsvc_NetSetFileSecurity.file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_activelocks,
-	  { "Activelocks", "srvsvc.srvsvc_NetSrvInfo402.activelocks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Activelocks", "srvsvc.srvsvc_NetSrvInfo402.activelocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_addr,
-	  { "Addr", "srvsvc.srvsvc_NetTransportInfo2.addr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr", "srvsvc.srvsvc_NetTransportInfo2.addr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_anndelta,
-	  { "Anndelta", "srvsvc.srvsvc_NetSrvInfo102.anndelta", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Anndelta", "srvsvc.srvsvc_NetSrvInfo102.anndelta", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileGetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetFileGetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetFileGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_threadpriority,
-	  { "Threadpriority", "srvsvc.srvsvc_NetSrvInfo503.threadpriority", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Threadpriority", "srvsvc.srvsvc_NetSrvInfo503.threadpriority", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_idle_time,
-	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo502.idle_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo502.idle_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1537_enableoplockforceclose,
-	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo1537.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplockforceclose", "srvsvc.srvsvc_NetSrvInfo1537.enableoplockforceclose", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxnonpagedmemoryusage,
-	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo503.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo503.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo503.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo503.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enableforcedlogoff,
-	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo599.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo599.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvSetInfo_parm_error,
-	  { "Parm Error", "srvsvc.srvsvc_NetSrvSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Error", "srvsvc.srvsvc_NetSrvSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareEnumAll.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareEnumAll.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_glist_mtime,
-	  { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo403.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo403.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_comment,
-	  { "Comment", "srvsvc.srvsvc_NetShareInfo502.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetShareInfo502.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1552,
-	  { "Info1552", "srvsvc.srvsvc_NetSrvInfo.info1552", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1552", "srvsvc.srvsvc_NetSrvInfo.info1552", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1004_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1004.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1004.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minkeepcomplsearch,
-	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_conn_type,
-	  { "Conn Type", "srvsvc.srvsvc_NetConnInfo1.conn_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Conn Type", "srvsvc.srvsvc_NetConnInfo1.conn_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_year,
-	  { "Year", "srvsvc.srvsvc_NetRemoteTODInfo.year", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Year", "srvsvc.srvsvc_NetRemoteTODInfo.year", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetTransportCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetTransportCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo2_fid,
-	  { "Fid", "srvsvc.srvsvc_NetFileInfo2.fid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Fid", "srvsvc.srvsvc_NetFileInfo2.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo1_time,
-	  { "Time", "srvsvc.srvsvc_NetCharDevInfo1.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time", "srvsvc.srvsvc_NetCharDevInfo1.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetShareEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetShareEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_prefix,
-	  { "Prefix", "srvsvc.srvsvc_NetPathCanonicalize.prefix", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Prefix", "srvsvc.srvsvc_NetPathCanonicalize.prefix", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_syserrors,
-	  { "Syserrors", "srvsvc.srvsvc_Statistics.syserrors", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Syserrors", "srvsvc.srvsvc_Statistics.syserrors", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetShareCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetShareCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_path,
-	  { "Path", "srvsvc.srvsvc_NetPathCanonicalize.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetPathCanonicalize.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQSetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetCharDevQSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetCharDevQSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo1_device,
-	  { "Device", "srvsvc.srvsvc_NetCharDevQInfo1.device", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device", "srvsvc.srvsvc_NetCharDevQInfo1.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetServiceBits_servicebits,
-	  { "Servicebits", "srvsvc.srvsvc_NetSetServiceBits.servicebits", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servicebits", "srvsvc.srvsvc_NetSetServiceBits.servicebits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1522_minkeepsearch,
-	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo1522.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo1522.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_idle_time,
-	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo1.idle_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo1.idle_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_pathflags,
-	  { "Pathflags", "srvsvc.srvsvc_NetPathCanonicalize.pathflags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathflags", "srvsvc.srvsvc_NetPathCanonicalize.pathflags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_logonalert,
-	  { "Logonalert", "srvsvc.srvsvc_NetSrvInfo402.logonalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logonalert", "srvsvc.srvsvc_NetSrvInfo402.logonalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareGetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetShareGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetShareGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetDiskEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetDiskEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_minfreeworkitems,
-	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo503.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo503.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_connections,
-	  { "Connections", "srvsvc.srvsvc_NetSrvInfo402.connections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Connections", "srvsvc.srvsvc_NetSrvInfo402.connections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetCharDevQCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetCharDevQCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxfreeconnections,
-	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo503.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxfreeconnections", "srvsvc.srvsvc_NetSrvInfo503.maxfreeconnections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_lanmask,
-	  { "Lanmask", "srvsvc.srvsvc_NetSrvInfo402.lanmask", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lanmask", "srvsvc.srvsvc_NetSrvInfo402.lanmask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetShareEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetShareEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo10_idle_time,
-	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo10.idle_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo10.idle_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetServiceBits_transport,
-	  { "Transport", "srvsvc.srvsvc_NetSetServiceBits.transport", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Transport", "srvsvc.srvsvc_NetSetServiceBits.transport", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_emulated_server_unc,
-	  { "Emulated Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.emulated_server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Emulated Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.emulated_server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_tinterval,
-	  { "Tinterval", "srvsvc.srvsvc_NetRemoteTODInfo.tinterval", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Tinterval", "srvsvc.srvsvc_NetRemoteTODInfo.tinterval", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1536_enableoplocks,
-	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo1536.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo1536.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_hours,
-	  { "Hours", "srvsvc.srvsvc_NetRemoteTODInfo.hours", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hours", "srvsvc.srvsvc_NetRemoteTODInfo.hours", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo1_num_ahead,
-	  { "Num Ahead", "srvsvc.srvsvc_NetCharDevQInfo1.num_ahead", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Ahead", "srvsvc.srvsvc_NetCharDevQInfo1.num_ahead", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_timesource,
-	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo599.timesource", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo599.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_domain,
-	  { "Domain", "srvsvc.srvsvc_NetSrvInfo599.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "srvsvc.srvsvc_NetSrvInfo599.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo402.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo402.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1006,
-	  { "Ctr1006", "srvsvc.srvsvc_NetShareCtr.ctr1006", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1006", "srvsvc.srvsvc_NetShareCtr.ctr1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetShareEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetShareEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareAdd_info,
-	  { "Info", "srvsvc.srvsvc_NetShareAdd.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetShareAdd.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetConnCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetConnCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQSetInfo_queue_name,
-	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQSetInfo.queue_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQSetInfo.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo100_server_name,
-	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo100.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo100.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetShareEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetShareEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1535,
-	  { "Info1535", "srvsvc.srvsvc_NetSrvInfo.info1535", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1535", "srvsvc.srvsvc_NetSrvInfo.info1535", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_time,
-	  { "Time", "srvsvc.srvsvc_NetSessInfo1.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time", "srvsvc.srvsvc_NetSessInfo1.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetFileSecurity_sd_buf,
-	  { "Sd Buf", "srvsvc.srvsvc_NetSetFileSecurity.sd_buf", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sd Buf", "srvsvc.srvsvc_NetSetFileSecurity.sd_buf", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1521,
-	  { "Info1521", "srvsvc.srvsvc_NetSrvInfo.info1521", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1521", "srvsvc.srvsvc_NetSrvInfo.info1521", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareGetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetShareGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetShareGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_level,
-	  { "Level", "srvsvc.srvsvc_NetShareEnumAll.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetShareEnumAll.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo10_time,
-	  { "Time", "srvsvc.srvsvc_NetSessInfo10.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time", "srvsvc.srvsvc_NetSessInfo10.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1004_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1004.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1004.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1502_sessvcs,
-	  { "Sessvcs", "srvsvc.srvsvc_NetSrvInfo1502.sessvcs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessvcs", "srvsvc.srvsvc_NetSrvInfo1502.sessvcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_numadmin,
-	  { "Numadmin", "srvsvc.srvsvc_NetSrvInfo403.numadmin", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numadmin", "srvsvc.srvsvc_NetSrvInfo403.numadmin", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1548_errortreshold,
-	  { "Errortreshold", "srvsvc.srvsvc_NetSrvInfo1548.errortreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Errortreshold", "srvsvc.srvsvc_NetSrvInfo1548.errortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskInfo_disks,
-	  { "Disks", "srvsvc.srvsvc_NetDiskInfo.disks", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Disks", "srvsvc.srvsvc_NetDiskInfo.disks", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr10_array,
-	  { "Array", "srvsvc.srvsvc_NetSessCtr10.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetSessCtr10.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_opnum,
-	  { "Operation", "srvsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "srvsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetConnCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetConnCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1006_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1006.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1006.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCheck_type,
-	  { "Type", "srvsvc.srvsvc_NetShareCheck.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, "", HFILL }},
+	  { "Type", "srvsvc.srvsvc_NetShareCheck.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvGetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSrvGetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSrvGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_diskalert,
-	  { "Diskalert", "srvsvc.srvsvc_NetSrvInfo403.diskalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Diskalert", "srvsvc.srvsvc_NetSrvInfo403.diskalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_server_type,
-	  { "Server Type", "srvsvc.srvsvc_NetSrvInfo102.server_type", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Server Type", "srvsvc.srvsvc_NetSrvInfo102.server_type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1542,
-	  { "Info1542", "srvsvc.srvsvc_NetSrvInfo.info1542", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1542", "srvsvc.srvsvc_NetSrvInfo.info1542", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1512,
-	  { "Info1512", "srvsvc.srvsvc_NetSrvInfo.info1512", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1512", "srvsvc.srvsvc_NetSrvInfo.info1512", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1503,
-	  { "Info1503", "srvsvc.srvsvc_NetSrvInfo.info1503", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1503", "srvsvc.srvsvc_NetSrvInfo.info1503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_client,
-	  { "Client", "srvsvc.srvsvc_NetSessEnum.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessEnum.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetConnCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetConnCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_transport_flags,
-	  { "Transport Flags", "srvsvc.srvsvc_NetTransportInfo2.transport_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Transport Flags", "srvsvc.srvsvc_NetTransportInfo2.transport_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr502,
-	  { "Ctr502", "srvsvc.srvsvc_NetShareCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr502", "srvsvc.srvsvc_NetShareCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_ulist_mtime,
-	  { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo403.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo403.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1006,
-	  { "Info1006", "srvsvc.srvsvc_NetShareInfo.info1006", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1006", "srvsvc.srvsvc_NetShareInfo.info1006", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1_type,
-	  { "Type", "srvsvc.srvsvc_NetShareInfo1.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, "", HFILL }},
+	  { "Type", "srvsvc.srvsvc_NetShareInfo1.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetCharDevEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetCharDevEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_shares,
-	  { "Shares", "srvsvc.srvsvc_NetSrvInfo403.shares", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Shares", "srvsvc.srvsvc_NetSrvInfo403.shares", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1016_hidden,
-	  { "Hidden", "srvsvc.srvsvc_NetSrvInfo1016.hidden", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hidden", "srvsvc.srvsvc_NetSrvInfo1016.hidden", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_user,
-	  { "User", "srvsvc.srvsvc_NetSessInfo1.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileGetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetFileGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetFileGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1543,
-	  { "Info1543", "srvsvc.srvsvc_NetSrvInfo.info1543", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1543", "srvsvc.srvsvc_NetSrvInfo.info1543", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxrawbuflen,
-	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo599.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo599.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo403.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo403.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetDiskEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetDiskEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetCharDevQEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetCharDevQEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_client,
-	  { "Client", "srvsvc.srvsvc_NetSessInfo2.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessInfo2.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr2_array,
-	  { "Array", "srvsvc.srvsvc_NetSessCtr2.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetSessCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessDel_user,
-	  { "User", "srvsvc.srvsvc_NetSessDel.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessDel.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr3_count,
-	  { "Count", "srvsvc.srvsvc_NetTransportCtr3.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetTransportCtr3.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvSetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetSrvSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetSrvSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_serrorout,
-	  { "Serrorout", "srvsvc.srvsvc_Statistics.serrorout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Serrorout", "srvsvc.srvsvc_Statistics.serrorout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1005_comment,
-	  { "Comment", "srvsvc.srvsvc_NetSrvInfo1005.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetSrvInfo1005.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_sopens,
-	  { "Sopens", "srvsvc.srvsvc_Statistics.sopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sopens", "srvsvc.srvsvc_Statistics.sopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1544,
-	  { "Info1544", "srvsvc.srvsvc_NetSrvInfo.info1544", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1544", "srvsvc.srvsvc_NetSrvInfo.info1544", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1010,
-	  { "Info1010", "srvsvc.srvsvc_NetSrvInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1010", "srvsvc.srvsvc_NetSrvInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1515,
-	  { "Info1515", "srvsvc.srvsvc_NetSrvInfo.info1515", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1515", "srvsvc.srvsvc_NetSrvInfo.info1515", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_numbigbufs,
-	  { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo402.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo402.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_addr,
-	  { "Addr", "srvsvc.srvsvc_NetTransportInfo3.addr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr", "srvsvc.srvsvc_NetTransportInfo3.addr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1511_sesscons,
-	  { "Sesscons", "srvsvc.srvsvc_NetSrvInfo1511.sesscons", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesscons", "srvsvc.srvsvc_NetSrvInfo1511.sesscons", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1545_initfiletable,
-	  { "Initfiletable", "srvsvc.srvsvc_NetSrvInfo1545.initfiletable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initfiletable", "srvsvc.srvsvc_NetSrvInfo1545.initfiletable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetFileSecurity_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSetFileSecurity.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSetFileSecurity.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_acceptdownlevelapis,
-	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo502.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Acceptdownlevelapis", "srvsvc.srvsvc_NetSrvInfo502.acceptdownlevelapis", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetGetFileSecurity_file,
-	  { "File", "srvsvc.srvsvc_NetGetFileSecurity.file", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "File", "srvsvc.srvsvc_NetGetFileSecurity.file", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_ulist_mtime,
-	  { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo402.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ulist Mtime", "srvsvc.srvsvc_NetSrvInfo402.ulist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1522,
-	  { "Info1522", "srvsvc.srvsvc_NetSrvInfo.info1522", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1522", "srvsvc.srvsvc_NetSrvInfo.info1522", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_version_major,
-	  { "Version Major", "srvsvc.srvsvc_NetSrvInfo101.version_major", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Major", "srvsvc.srvsvc_NetSrvInfo101.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetNameValidate_name_type,
-	  { "Name Type", "srvsvc.srvsvc_NetNameValidate.name_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Type", "srvsvc.srvsvc_NetNameValidate.name_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_scavqosinfoupdatetime,
-	  { "Scavqosinfoupdatetime", "srvsvc.srvsvc_NetSrvInfo599.scavqosinfoupdatetime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavqosinfoupdatetime", "srvsvc.srvsvc_NetSrvInfo599.scavqosinfoupdatetime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enablesoftcompat,
-	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo599.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo599.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_xactmemsize,
-	  { "Xactmemsize", "srvsvc.srvsvc_NetSrvInfo599.xactmemsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Xactmemsize", "srvsvc.srvsvc_NetSrvInfo599.xactmemsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareGetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareGetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPRNameCompare_name2,
-	  { "Name2", "srvsvc.srvsvc_NetPRNameCompare.name2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name2", "srvsvc.srvsvc_NetPRNameCompare.name2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_time,
-	  { "Time", "srvsvc.srvsvc_NetSessInfo502.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time", "srvsvc.srvsvc_NetSessInfo502.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxrawbuflen,
-	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo503.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo503.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakwait,
-	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo503.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo503.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelSticky_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareDelSticky.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareDelSticky.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1524,
-	  { "Info1524", "srvsvc.srvsvc_NetSrvInfo.info1524", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1524", "srvsvc.srvsvc_NetSrvInfo.info1524", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_maxaudits,
-	  { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo403.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxaudits", "srvsvc.srvsvc_NetSrvInfo403.maxaudits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_info,
-	  { "Info", "srvsvc.srvsvc_NetDiskEnum.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetDiskEnum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr_ctr2,
-	  { "Ctr2", "srvsvc.srvsvc_NetFileCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "srvsvc.srvsvc_NetFileCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetFileSecurity_securityinformation,
-	  { "Securityinformation", "srvsvc.srvsvc_NetSetFileSecurity.securityinformation", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Securityinformation", "srvsvc.srvsvc_NetSetFileSecurity.securityinformation", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info2,
-	  { "Info2", "srvsvc.srvsvc_NetShareInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "srvsvc.srvsvc_NetShareInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1525,
-	  { "Info1525", "srvsvc.srvsvc_NetSrvInfo.info1525", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1525", "srvsvc.srvsvc_NetSrvInfo.info1525", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1539_enableraw,
-	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo1539.enableraw", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo1539.enableraw", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_alist_mtime,
-	  { "Alist Mtime", "srvsvc.srvsvc_NetSrvInfo403.alist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alist Mtime", "srvsvc.srvsvc_NetSrvInfo403.alist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1515_enableforcedlogoff,
-	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo1515.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo1515.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevGetInfo_device_name,
-	  { "Device Name", "srvsvc.srvsvc_NetCharDevGetInfo.device_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device Name", "srvsvc.srvsvc_NetCharDevGetInfo.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr2_array,
-	  { "Array", "srvsvc.srvsvc_NetFileCtr2.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetFileCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetSessEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetSessEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1516,
-	  { "Info1516", "srvsvc.srvsvc_NetSrvInfo.info1516", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1516", "srvsvc.srvsvc_NetSrvInfo.info1516", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_licenses,
-	  { "Licenses", "srvsvc.srvsvc_NetSrvInfo102.licenses", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Licenses", "srvsvc.srvsvc_NetSrvInfo102.licenses", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetConnEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetConnEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetConnCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetConnCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_platform_id,
-	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo101.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, "", HFILL }},
+	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo101.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_chdevs,
-	  { "Chdevs", "srvsvc.srvsvc_NetSrvInfo402.chdevs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevs", "srvsvc.srvsvc_NetSrvInfo402.chdevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxnonpagedmemoryusage,
-	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo599.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo599.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_domain,
-	  { "Domain", "srvsvc.srvsvc_NetSrvInfo503.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "srvsvc.srvsvc_NetSrvInfo503.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_pathtype,
-	  { "Pathtype", "srvsvc.srvsvc_NetPathCanonicalize.pathtype", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathtype", "srvsvc.srvsvc_NetPathCanonicalize.pathtype", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_sizereqbufs,
-	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo503.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo503.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1018,
-	  { "Info1018", "srvsvc.srvsvc_NetSrvInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1018", "srvsvc.srvsvc_NetSrvInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo1_device,
-	  { "Device", "srvsvc.srvsvc_NetCharDevInfo1.device", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device", "srvsvc.srvsvc_NetCharDevInfo1.device", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_openfiles,
-	  { "Openfiles", "srvsvc.srvsvc_NetSrvInfo403.openfiles", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Openfiles", "srvsvc.srvsvc_NetSrvInfo403.openfiles", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo0_net_addr,
-	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo0.net_addr", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo0.net_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_shares,
-	  { "Shares", "srvsvc.srvsvc_NetSrvInfo402.shares", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Shares", "srvsvc.srvsvc_NetSrvInfo402.shares", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_pwerrors,
-	  { "Pwerrors", "srvsvc.srvsvc_Statistics.pwerrors", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pwerrors", "srvsvc.srvsvc_Statistics.pwerrors", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetCharDevEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetCharDevEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1512_maxnonpagedmemoryusage,
-	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1512.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1512.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1533,
-	  { "Info1533", "srvsvc.srvsvc_NetSrvInfo.info1533", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1533", "srvsvc.srvsvc_NetSrvInfo.info1533", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_maxworkitems,
-	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo502.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo502.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1549,
-	  { "Info1549", "srvsvc.srvsvc_NetSrvInfo.info1549", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1549", "srvsvc.srvsvc_NetSrvInfo.info1549", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_numlockthreads,
-	  { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo599.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo599.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info101,
-	  { "Info101", "srvsvc.srvsvc_NetSrvInfo.info101", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info101", "srvsvc.srvsvc_NetSrvInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCompare_pathtype,
-	  { "Pathtype", "srvsvc.srvsvc_NetPathCompare.pathtype", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathtype", "srvsvc.srvsvc_NetPathCompare.pathtype", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1005,
-	  { "Info1005", "srvsvc.srvsvc_NetShareInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1005", "srvsvc.srvsvc_NetShareInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1007_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1007.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1007.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1005,
-	  { "Info1005", "srvsvc.srvsvc_NetSrvInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1005", "srvsvc.srvsvc_NetSrvInfo.info1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathType_pathflags,
-	  { "Pathflags", "srvsvc.srvsvc_NetPathType.pathflags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathflags", "srvsvc.srvsvc_NetPathType.pathflags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_oplockbreakwait,
-	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo599.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakwait", "srvsvc.srvsvc_NetSrvInfo599.oplockbreakwait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetCharDevCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetCharDevCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetCharDevQCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetCharDevQCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerTransportAddEx_info,
-	  { "Info", "srvsvc.srvsvc_NetServerTransportAddEx.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetServerTransportAddEx.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr2_count,
-	  { "Count", "srvsvc.srvsvc_NetFileCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetFileCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCompare_pathflags,
-	  { "Pathflags", "srvsvc.srvsvc_NetPathCompare.pathflags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathflags", "srvsvc.srvsvc_NetPathCompare.pathflags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelStart_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareDelStart.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareDelStart.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_num_open,
-	  { "Num Open", "srvsvc.srvsvc_NetConnInfo1.num_open", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Open", "srvsvc.srvsvc_NetConnInfo1.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo501_name,
-	  { "Name", "srvsvc.srvsvc_NetShareInfo501.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetShareInfo501.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info501,
-	  { "Info501", "srvsvc.srvsvc_NetShareInfo.info501", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info501", "srvsvc.srvsvc_NetShareInfo.info501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCompare_path2,
-	  { "Path2", "srvsvc.srvsvc_NetPathCompare.path2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path2", "srvsvc.srvsvc_NetPathCompare.path2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareAdd_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareAdd.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareAdd.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_maxnonpagedmemoryusage,
-	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxnonpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo502.maxnonpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_client_type,
-	  { "Client Type", "srvsvc.srvsvc_NetSessInfo2.client_type", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client Type", "srvsvc.srvsvc_NetSessInfo2.client_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1554,
-	  { "Info1554", "srvsvc.srvsvc_NetSrvInfo.info1554", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1554", "srvsvc.srvsvc_NetSrvInfo.info1554", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitemidletime,
-	  { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo599.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitemidletime", "srvsvc.srvsvc_NetSrvInfo599.maxworkitemidletime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathType_path,
-	  { "Path", "srvsvc.srvsvc_NetPathType.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetPathType.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_FLAGS_ALLOW_NAMESPACE_CACHING,
-	  { "Flags Allow Namespace Caching", "srvsvc.srvsvc_DFSFlags.FLAGS_ALLOW_NAMESPACE_CACHING", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_ALLOW_NAMESPACE_CACHING_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Flags Allow Namespace Caching", "srvsvc.srvsvc_DFSFlags.FLAGS_ALLOW_NAMESPACE_CACHING", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_ALLOW_NAMESPACE_CACHING_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_users,
-	  { "Users", "srvsvc.srvsvc_NetSrvInfo102.users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Users", "srvsvc.srvsvc_NetSrvInfo102.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr_ctr2,
-	  { "Ctr2", "srvsvc.srvsvc_NetTransportCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "srvsvc.srvsvc_NetTransportCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enableforcedlogoff,
-	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo503.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo503.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_time,
-	  { "Time", "srvsvc.srvsvc_NetSessInfo2.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Time", "srvsvc.srvsvc_NetSessInfo2.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPRNameCompare_name_type,
-	  { "Name Type", "srvsvc.srvsvc_NetPRNameCompare.name_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Type", "srvsvc.srvsvc_NetPRNameCompare.name_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_maxbuf,
-	  { "Maxbuf", "srvsvc.srvsvc_NetPathCanonicalize.maxbuf", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxbuf", "srvsvc.srvsvc_NetPathCanonicalize.maxbuf", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareGetInfo_share_name,
-	  { "Share Name", "srvsvc.srvsvc_NetShareGetInfo.share_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share Name", "srvsvc.srvsvc_NetShareGetInfo.share_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPRNameCompare_name1,
-	  { "Name1", "srvsvc.srvsvc_NetPRNameCompare.name1", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name1", "srvsvc.srvsvc_NetPRNameCompare.name1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelSticky_reserved,
-	  { "Reserved", "srvsvc.srvsvc_NetShareDelSticky.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "srvsvc.srvsvc_NetShareDelSticky.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1005_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1005.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1005.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1524_minkeepcomplsearch,
-	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo1524.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepcomplsearch", "srvsvc.srvsvc_NetSrvInfo1524.minkeepcomplsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportDel_unknown,
-	  { "Unknown", "srvsvc.srvsvc_NetTransportDel.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "srvsvc.srvsvc_NetTransportDel.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_numlockthreads,
-	  { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo503.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numlockthreads", "srvsvc.srvsvc_NetSrvInfo503.numlockthreads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_enableforcedlogoff,
-	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo502.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableforcedlogoff", "srvsvc.srvsvc_NetSrvInfo502.enableforcedlogoff", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetCharDevCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetCharDevCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_errortreshold,
-	  { "Errortreshold", "srvsvc.srvsvc_NetSrvInfo599.errortreshold", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Errortreshold", "srvsvc.srvsvc_NetSrvInfo599.errortreshold", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo1_user_flags,
-	  { "User Flags", "srvsvc.srvsvc_NetSessInfo1.user_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "User Flags", "srvsvc.srvsvc_NetSessInfo1.user_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1004_comment,
-	  { "Comment", "srvsvc.srvsvc_NetShareInfo1004.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetShareInfo1004.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_reqbufneed,
-	  { "Reqbufneed", "srvsvc.srvsvc_Statistics.reqbufneed", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reqbufneed", "srvsvc.srvsvc_Statistics.reqbufneed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enablesharednetdrives,
-	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo599.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesharednetdrives", "srvsvc.srvsvc_NetSrvInfo599.enablesharednetdrives", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_permissions,
-	  { "Permissions", "srvsvc.srvsvc_NetShareInfo502.permissions", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Permissions", "srvsvc.srvsvc_NetShareInfo502.permissions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetFileEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetFileEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_addr,
-	  { "Addr", "srvsvc.srvsvc_NetTransportInfo1.addr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr", "srvsvc.srvsvc_NetTransportInfo1.addr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_type,
-	  { "Type", "srvsvc.srvsvc_NetShareInfo502.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, "", HFILL }},
+	  { "Type", "srvsvc.srvsvc_NetShareInfo502.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCheck_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareCheck.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareCheck.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_FLAGS_RESTRICT_EXCLUSIVE_OPENS,
-	  { "Flags Restrict Exclusive Opens", "srvsvc.srvsvc_DFSFlags.FLAGS_RESTRICT_EXCLUSIVE_OPENS", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_RESTRICT_EXCLUSIVE_OPENS_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Flags Restrict Exclusive Opens", "srvsvc.srvsvc_DFSFlags.FLAGS_RESTRICT_EXCLUSIVE_OPENS", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_RESTRICT_EXCLUSIVE_OPENS_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerTransportAddEx_level,
-	  { "Level", "srvsvc.srvsvc_NetServerTransportAddEx.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetServerTransportAddEx.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevControl_opcode,
-	  { "Opcode", "srvsvc.srvsvc_NetCharDevControl.opcode", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opcode", "srvsvc.srvsvc_NetCharDevControl.opcode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetConnCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetConnCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1516_timesource,
-	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo1516.timesource", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timesource", "srvsvc.srvsvc_NetSrvInfo1516.timesource", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQGetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetCharDevQGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetCharDevQGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_SHARE_1005_FLAGS_IN_DFS,
-	  { "Share 1005 Flags In Dfs", "srvsvc.srvsvc_DFSFlags.SHARE_1005_FLAGS_IN_DFS", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_SHARE_1005_FLAGS_IN_DFS_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Share 1005 Flags In Dfs", "srvsvc.srvsvc_DFSFlags.SHARE_1005_FLAGS_IN_DFS", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_SHARE_1005_FLAGS_IN_DFS_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetShareCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetShareCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info503,
-	  { "Info503", "srvsvc.srvsvc_NetSrvInfo.info503", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info503", "srvsvc.srvsvc_NetSrvInfo.info503", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_chdevqs,
-	  { "Chdevqs", "srvsvc.srvsvc_NetSrvInfo402.chdevqs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevqs", "srvsvc.srvsvc_NetSrvInfo402.chdevqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_rawworkitems,
-	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo503.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Rawworkitems", "srvsvc.srvsvc_NetSrvInfo503.rawworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1017,
-	  { "Info1017", "srvsvc.srvsvc_NetSrvInfo.info1017", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1017", "srvsvc.srvsvc_NetSrvInfo.info1017", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_idle_time,
-	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo2.idle_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Idle Time", "srvsvc.srvsvc_NetSessInfo2.idle_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_comment,
-	  { "Comment", "srvsvc.srvsvc_NetSrvInfo102.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetSrvInfo102.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_sesssvc,
-	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo402.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo402.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo1_status,
-	  { "Status", "srvsvc.srvsvc_NetCharDevInfo1.status", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Status", "srvsvc.srvsvc_NetCharDevInfo1.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetSessEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetSessEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQPurge_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQPurge.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQPurge.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_path,
-	  { "Path", "srvsvc.srvsvc_NetFileEnum.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetFileEnum.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_servicebits,
-	  { "Servicebits", "srvsvc.srvsvc_NetServerSetServiceBitsEx.servicebits", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Servicebits", "srvsvc.srvsvc_NetServerSetServiceBitsEx.servicebits", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr0_array,
-	  { "Array", "srvsvc.srvsvc_NetSessCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetSessCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCompare_path1,
-	  { "Path1", "srvsvc.srvsvc_NetPathCompare.path1", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path1", "srvsvc.srvsvc_NetPathCompare.path1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetServerSetServiceBitsEx.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileGetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetFileGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetFileGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetCharDevQCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetCharDevQCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_connections,
-	  { "Connections", "srvsvc.srvsvc_NetSrvInfo403.connections", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Connections", "srvsvc.srvsvc_NetSrvInfo403.connections", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_sizereqbufs,
-	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo599.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo599.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileCtr_ctr3,
-	  { "Ctr3", "srvsvc.srvsvc_NetFileCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr3", "srvsvc.srvsvc_NetFileCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_initfiletable,
-	  { "Initfiletable", "srvsvc.srvsvc_NetSrvInfo599.initfiletable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initfiletable", "srvsvc.srvsvc_NetSrvInfo599.initfiletable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1528_scavtimeout,
-	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo1528.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo1528.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetCharDevEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetCharDevEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetPathCanonicalize.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetPathCanonicalize.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_password,
-	  { "Password", "srvsvc.srvsvc_NetShareInfo2.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "srvsvc.srvsvc_NetShareInfo2.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr_ctr0,
-	  { "Ctr0", "srvsvc.srvsvc_NetCharDevCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "srvsvc.srvsvc_NetCharDevCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileClose_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetFileClose.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetFileClose.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_lmannounce,
-	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo503.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo503.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetTransportEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetTransportEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDelStart_share,
-	  { "Share", "srvsvc.srvsvc_NetShareDelStart.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "srvsvc.srvsvc_NetShareDelStart.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_num_open,
-	  { "Num Open", "srvsvc.srvsvc_NetSessInfo2.num_open", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Open", "srvsvc.srvsvc_NetSessInfo2.num_open", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_server_name,
-	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo101.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo101.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr_ctr3,
-	  { "Ctr3", "srvsvc.srvsvc_NetTransportCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr3", "srvsvc.srvsvc_NetTransportCtr.ctr3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr2_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1518,
-	  { "Info1518", "srvsvc.srvsvc_NetSrvInfo.info1518", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1518", "srvsvc.srvsvc_NetSrvInfo.info1518", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_netioalert,
-	  { "Netioalert", "srvsvc.srvsvc_NetSrvInfo402.netioalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Netioalert", "srvsvc.srvsvc_NetSrvInfo402.netioalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1004,
-	  { "Info1004", "srvsvc.srvsvc_NetShareInfo.info1004", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1004", "srvsvc.srvsvc_NetShareInfo.info1004", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_numadmin,
-	  { "Numadmin", "srvsvc.srvsvc_NetSrvInfo402.numadmin", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numadmin", "srvsvc.srvsvc_NetSrvInfo402.numadmin", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_lmannounce,
-	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo599.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo599.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_sizereqbufs,
-	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo402.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo402.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1523,
-	  { "Info1523", "srvsvc.srvsvc_NetSrvInfo.info1523", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1523", "srvsvc.srvsvc_NetSrvInfo.info1523", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSetFileSecurity_share,
-	  { "Share", "srvsvc.srvsvc_NetSetFileSecurity.share", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Share", "srvsvc.srvsvc_NetSetFileSecurity.share", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_maxrawbuflen,
-	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo502.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxrawbuflen", "srvsvc.srvsvc_NetSrvInfo502.maxrawbuflen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1548,
-	  { "Info1548", "srvsvc.srvsvc_NetSrvInfo.info1548", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1548", "srvsvc.srvsvc_NetSrvInfo.info1548", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTOD_info,
-	  { "Info", "srvsvc.srvsvc_NetRemoteTOD.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetRemoteTOD.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetConnEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetConnEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr1_count,
-	  { "Count", "srvsvc.srvsvc_NetSessCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetSessCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1518_lmannounce,
-	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo1518.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lmannounce", "srvsvc.srvsvc_NetSrvInfo1518.lmannounce", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo2_user,
-	  { "User", "srvsvc.srvsvc_NetSessInfo2.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessInfo2.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_vcs,
-	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo1.vcs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo1.vcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_queue_name,
-	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQPurgeSelf.queue_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Queue Name", "srvsvc.srvsvc_NetCharDevQPurgeSelf.queue_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnInfo1_num_users,
-	  { "Num Users", "srvsvc.srvsvc_NetConnInfo1.num_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Users", "srvsvc.srvsvc_NetConnInfo1.num_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportDel_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetTransportDel.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetTransportDel.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_sessopen,
-	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo503.sessopen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo503.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetCharDevCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetCharDevCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr1_array,
-	  { "Array", "srvsvc.srvsvc_NetSessCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetSessCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_initconntable,
-	  { "Initconntable", "srvsvc.srvsvc_NetSrvInfo599.initconntable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initconntable", "srvsvc.srvsvc_NetSrvInfo599.initconntable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareSetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareSetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareSetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1545,
-	  { "Info1545", "srvsvc.srvsvc_NetSrvInfo.info1545", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1545", "srvsvc.srvsvc_NetSrvInfo.info1545", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1553,
-	  { "Info1553", "srvsvc.srvsvc_NetSrvInfo.info1553", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1553", "srvsvc.srvsvc_NetSrvInfo.info1553", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetSessEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetSessEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1514,
-	  { "Info1514", "srvsvc.srvsvc_NetSrvInfo.info1514", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1514", "srvsvc.srvsvc_NetSrvInfo.info1514", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareSetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetShareSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetShareSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_fopens,
-	  { "Fopens", "srvsvc.srvsvc_Statistics.fopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Fopens", "srvsvc.srvsvc_Statistics.fopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1016,
-	  { "Info1016", "srvsvc.srvsvc_NetSrvInfo.info1016", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1016", "srvsvc.srvsvc_NetSrvInfo.info1016", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxworkitems,
-	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo599.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo599.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskInfo_count,
-	  { "Count", "srvsvc.srvsvc_NetDiskInfo.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetDiskInfo.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_glist_mtime,
-	  { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo402.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Glist Mtime", "srvsvc.srvsvc_NetSrvInfo402.glist_mtime", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_bigbufneed,
-	  { "Bigbufneed", "srvsvc.srvsvc_Statistics.bigbufneed", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bigbufneed", "srvsvc.srvsvc_Statistics.bigbufneed", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr2,
-	  { "Ctr2", "srvsvc.srvsvc_NetShareCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "srvsvc.srvsvc_NetShareCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1510_sessusers,
-	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo1510.sessusers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo1510.sessusers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportDel_transport,
-	  { "Transport", "srvsvc.srvsvc_NetTransportDel.transport", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Transport", "srvsvc.srvsvc_NetTransportDel.transport", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_enablesoftcompat,
-	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo502.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo502.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathType_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetPathType.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetPathType.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1513_maxpagedmemoryusage,
-	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1513.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxpagedmemoryusage", "srvsvc.srvsvc_NetSrvInfo1513.maxpagedmemoryusage", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerStatisticsGet_service,
-	  { "Service", "srvsvc.srvsvc_NetServerStatisticsGet.service", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Service", "srvsvc.srvsvc_NetServerStatisticsGet.service", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr3_array,
-	  { "Array", "srvsvc.srvsvc_NetTransportCtr3.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetTransportCtr3.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo1_devices,
-	  { "Devices", "srvsvc.srvsvc_NetCharDevQInfo1.devices", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Devices", "srvsvc.srvsvc_NetCharDevQInfo1.devices", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_SessionUserFlags_SESS_GUEST,
-	  { "Sess Guest", "srvsvc.srvsvc_SessionUserFlags.SESS_GUEST", FT_BOOLEAN, 32, TFS(&srvsvc_SessionUserFlags_SESS_GUEST_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Sess Guest", "srvsvc.srvsvc_SessionUserFlags.SESS_GUEST", FT_BOOLEAN, 32, TFS(&srvsvc_SessionUserFlags_SESS_GUEST_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo502_client_type,
-	  { "Client Type", "srvsvc.srvsvc_NetSessInfo502.client_type", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client Type", "srvsvc.srvsvc_NetSessInfo502.client_type", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_activelocks,
-	  { "Activelocks", "srvsvc.srvsvc_NetSrvInfo403.activelocks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Activelocks", "srvsvc.srvsvc_NetSrvInfo403.activelocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerStatisticsGet_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetServerStatisticsGet.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetServerStatisticsGet.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr_ctr502,
-	  { "Ctr502", "srvsvc.srvsvc_NetSessCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr502", "srvsvc.srvsvc_NetSessCtr.ctr502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_netioalert,
-	  { "Netioalert", "srvsvc.srvsvc_NetSrvInfo403.netioalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Netioalert", "srvsvc.srvsvc_NetSrvInfo403.netioalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1553_minlinkthroughput,
-	  { "Minlinkthroughput", "srvsvc.srvsvc_NetSrvInfo1553.minlinkthroughput", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minlinkthroughput", "srvsvc.srvsvc_NetSrvInfo1553.minlinkthroughput", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_current_users,
-	  { "Current Users", "srvsvc.srvsvc_NetShareInfo2.current_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Current Users", "srvsvc.srvsvc_NetShareInfo2.current_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_sessusers,
-	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo502.sessusers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo502.sessusers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_irpstacksize,
-	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo599.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo599.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQSetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetCharDevQSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetCharDevQSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_sizereqbufs,
-	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo403.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo403.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1530_minfreeworkitems,
-	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo1530.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minfreeworkitems", "srvsvc.srvsvc_NetSrvInfo1530.minfreeworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_max_users,
-	  { "Max Users", "srvsvc.srvsvc_NetShareInfo2.max_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Users", "srvsvc.srvsvc_NetShareInfo2.max_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_domain,
-	  { "Domain", "srvsvc.srvsvc_NetTransportInfo2.domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain", "srvsvc.srvsvc_NetTransportInfo2.domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_type,
-	  { "Type", "srvsvc.srvsvc_NetShareInfo2.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, "", HFILL }},
+	  { "Type", "srvsvc.srvsvc_NetShareInfo2.type", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_ShareType_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minrcvqueue,
-	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo599.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minrcvqueue", "srvsvc.srvsvc_NetSrvInfo599.minrcvqueue", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetSessCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetSessCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevControl_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevControl.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevControl.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_name,
-	  { "Name", "srvsvc.srvsvc_NetShareInfo2.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetShareInfo2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_maxcopywritelen,
-	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo599.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo599.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevGetInfo_info,
-	  { "Info", "srvsvc.srvsvc_NetCharDevGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetCharDevGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_sizereqbufs,
-	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo502.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sizereqbufs", "srvsvc.srvsvc_NetSrvInfo502.sizereqbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_password_len,
-	  { "Password Len", "srvsvc.srvsvc_NetTransportInfo3.password_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password Len", "srvsvc.srvsvc_NetTransportInfo3.password_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevInfo1_user,
-	  { "User", "srvsvc.srvsvc_NetCharDevInfo1.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetCharDevInfo1.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_security,
-	  { "Security", "srvsvc.srvsvc_NetSrvInfo403.security", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Security", "srvsvc.srvsvc_NetSrvInfo403.security", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevGetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevGetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevGetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessDel_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSessDel.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSessDel.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1547_alertsched,
-	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo1547.alertsched", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo1547.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1546,
-	  { "Info1546", "srvsvc.srvsvc_NetSrvInfo.info1546", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1546", "srvsvc.srvsvc_NetSrvInfo.info1546", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQGetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetCharDevQGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetCharDevQGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_unknown,
-	  { "Unknown", "srvsvc.srvsvc_NetShareInfo502.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "srvsvc.srvsvc_NetShareInfo502.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_avresponse,
-	  { "Avresponse", "srvsvc.srvsvc_Statistics.avresponse", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Avresponse", "srvsvc.srvsvc_Statistics.avresponse", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareDel_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetShareDel.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetShareDel.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_addr_len,
-	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo2.addr_len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Addr Len", "srvsvc.srvsvc_NetTransportInfo2.addr_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_alerts,
-	  { "Alerts", "srvsvc.srvsvc_NetSrvInfo403.alerts", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alerts", "srvsvc.srvsvc_NetSrvInfo403.alerts", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevControl_device_name,
-	  { "Device Name", "srvsvc.srvsvc_NetCharDevControl.device_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Device Name", "srvsvc.srvsvc_NetCharDevControl.device_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_sessopen,
-	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo502.sessopen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo502.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enableraw,
-	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo599.enableraw", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo599.enableraw", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1523_maxkeepsearch,
-	  { "Maxkeepsearch", "srvsvc.srvsvc_NetSrvInfo1523.maxkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxkeepsearch", "srvsvc.srvsvc_NetSrvInfo1523.maxkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_sessopen,
-	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo403.sessopen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo403.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1107_users,
-	  { "Users", "srvsvc.srvsvc_NetSrvInfo1107.users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Users", "srvsvc.srvsvc_NetSrvInfo1107.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_scavtimeout,
-	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo599.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Scavtimeout", "srvsvc.srvsvc_NetSrvInfo599.scavtimeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1520_maxcopyreadlen,
-	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo1520.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopyreadlen", "srvsvc.srvsvc_NetSrvInfo1520.maxcopyreadlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1506,
-	  { "Info1506", "srvsvc.srvsvc_NetSrvInfo.info1506", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1506", "srvsvc.srvsvc_NetSrvInfo.info1506", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo0_client,
-	  { "Client", "srvsvc.srvsvc_NetSessInfo0.client", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Client", "srvsvc.srvsvc_NetSessInfo0.client", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_initsearchtable,
-	  { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo599.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo599.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxworkitems,
-	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo503.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo503.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_reserved,
-	  { "Reserved", "srvsvc.srvsvc_NetSrvInfo599.reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "srvsvc.srvsvc_NetSrvInfo599.reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvSetInfo_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSrvSetInfo.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSrvSetInfo.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileEnum_user,
-	  { "User", "srvsvc.srvsvc_NetFileEnum.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetFileEnum.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_path,
-	  { "Path", "srvsvc.srvsvc_NetShareInfo502.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetShareInfo502.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo3_fid,
-	  { "Fid", "srvsvc.srvsvc_NetFileInfo3.fid", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Fid", "srvsvc.srvsvc_NetFileInfo3.fid", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1538,
-	  { "Info1538", "srvsvc.srvsvc_NetSrvInfo.info1538", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1538", "srvsvc.srvsvc_NetSrvInfo.info1538", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_permerrors,
-	  { "Permerrors", "srvsvc.srvsvc_Statistics.permerrors", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Permerrors", "srvsvc.srvsvc_Statistics.permerrors", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportAdd_info,
-	  { "Info", "srvsvc.srvsvc_NetTransportAdd.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "srvsvc.srvsvc_NetTransportAdd.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetDiskEnum_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetDiskEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetDiskEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo0_vcs,
-	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo0.vcs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Vcs", "srvsvc.srvsvc_NetTransportInfo0.vcs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo3_path,
-	  { "Path", "srvsvc.srvsvc_NetFileInfo3.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetFileInfo3.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_level,
-	  { "Level", "srvsvc.srvsvc_NetCharDevEnum.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetCharDevEnum.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1_name,
-	  { "Name", "srvsvc.srvsvc_NetShareInfo1.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetShareInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_ctr,
-	  { "Ctr", "srvsvc.srvsvc_NetCharDevQEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "srvsvc.srvsvc_NetCharDevQEnum.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr10_count,
-	  { "Count", "srvsvc.srvsvc_NetSessCtr10.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetSessCtr10.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_sec_desc_buf_len,
-	  { "Sec Desc Buf Len", "srvsvc.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Sec Desc Buf Len", "srvsvc.sec_desc_buf_len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1005,
-	  { "Ctr1005", "srvsvc.srvsvc_NetShareCtr.ctr1005", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1005", "srvsvc.srvsvc_NetShareCtr.ctr1005", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_sessconns,
-	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo503.sessconns", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessconns", "srvsvc.srvsvc_NetSrvInfo503.sessconns", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_initworkitems,
-	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo599.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initworkitems", "srvsvc.srvsvc_NetSrvInfo599.initworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_password,
-	  { "Password", "srvsvc.srvsvc_NetShareInfo502.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "srvsvc.srvsvc_NetShareInfo502.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1521_maxcopywritelen,
-	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo1521.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxcopywritelen", "srvsvc.srvsvc_NetSrvInfo1521.maxcopywritelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_minkeepsearch,
-	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Minkeepsearch", "srvsvc.srvsvc_NetSrvInfo599.minkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_srvheuristics,
-	  { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo403.srvheuristics", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Srvheuristics", "srvsvc.srvsvc_NetSrvInfo403.srvheuristics", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo_info2,
-	  { "Info2", "srvsvc.srvsvc_NetTransportInfo.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "srvsvc.srvsvc_NetTransportInfo.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_lanmask,
-	  { "Lanmask", "srvsvc.srvsvc_NetSrvInfo403.lanmask", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lanmask", "srvsvc.srvsvc_NetSrvInfo403.lanmask", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1541,
-	  { "Info1541", "srvsvc.srvsvc_NetSrvInfo.info1541", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1541", "srvsvc.srvsvc_NetSrvInfo.info1541", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr_ctr2,
-	  { "Ctr2", "srvsvc.srvsvc_NetSessCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "srvsvc.srvsvc_NetSessCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo1_comment,
-	  { "Comment", "srvsvc.srvsvc_NetShareInfo1.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetShareInfo1.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr502_count,
-	  { "Count", "srvsvc.srvsvc_NetSessCtr502.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetSessCtr502.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1506_maxworkitems,
-	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo1506.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxworkitems", "srvsvc.srvsvc_NetSrvInfo1506.maxworkitems", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_current_users,
-	  { "Current Users", "srvsvc.srvsvc_NetShareInfo502.current_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Current Users", "srvsvc.srvsvc_NetShareInfo502.current_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerStatisticsGet_stat,
-	  { "Stat", "srvsvc.srvsvc_NetServerStatisticsGet.stat", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Stat", "srvsvc.srvsvc_NetServerStatisticsGet.stat", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo_info1,
-	  { "Info1", "srvsvc.srvsvc_NetCharDevQInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "srvsvc.srvsvc_NetCharDevQInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetSessEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetSessEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_chdevs,
-	  { "Chdevs", "srvsvc.srvsvc_NetSrvInfo403.chdevs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevs", "srvsvc.srvsvc_NetSrvInfo403.chdevs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetCharDevEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetCharDevEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info402,
-	  { "Info402", "srvsvc.srvsvc_NetSrvInfo.info402", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info402", "srvsvc.srvsvc_NetSrvInfo.info402", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_name,
-	  { "Name", "srvsvc.srvsvc_NetTransportInfo2.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetTransportInfo2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enablesoftcompat,
-	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo503.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablesoftcompat", "srvsvc.srvsvc_NetSrvInfo503.enablesoftcompat", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo_info3,
-	  { "Info3", "srvsvc.srvsvc_NetTransportInfo.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "srvsvc.srvsvc_NetTransportInfo.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_month,
-	  { "Month", "srvsvc.srvsvc_NetRemoteTODInfo.month", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Month", "srvsvc.srvsvc_NetRemoteTODInfo.month", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1501_sessopens,
-	  { "Sessopens", "srvsvc.srvsvc_NetSrvInfo1501.sessopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopens", "srvsvc.srvsvc_NetSrvInfo1501.sessopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_werror,
-	  { "Windows Error", "srvsvc.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "srvsvc.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_day,
-	  { "Day", "srvsvc.srvsvc_NetRemoteTODInfo.day", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Day", "srvsvc.srvsvc_NetRemoteTODInfo.day", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetNameValidate_flags,
-	  { "Flags", "srvsvc.srvsvc_NetNameValidate.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "srvsvc.srvsvc_NetNameValidate.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo3_permissions,
-	  { "Permissions", "srvsvc.srvsvc_NetFileInfo3.permissions", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Permissions", "srvsvc.srvsvc_NetFileInfo3.permissions", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_sessusers,
-	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo503.sessusers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessusers", "srvsvc.srvsvc_NetSrvInfo503.sessusers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetConnEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetConnEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enableoplocks,
-	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo503.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableoplocks", "srvsvc.srvsvc_NetSrvInfo503.enableoplocks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo100_platform_id,
-	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo100.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, "", HFILL }},
+	  { "Platform Id", "srvsvc.srvsvc_NetSrvInfo100.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr502_array,
-	  { "Array", "srvsvc.srvsvc_NetSessCtr502.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetSessCtr502.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_msecs,
-	  { "Msecs", "srvsvc.srvsvc_NetRemoteTODInfo.msecs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Msecs", "srvsvc.srvsvc_NetRemoteTODInfo.msecs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_irpstacksize,
-	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo503.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Irpstacksize", "srvsvc.srvsvc_NetSrvInfo503.irpstacksize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_enableraw,
-	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo503.enableraw", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enableraw", "srvsvc.srvsvc_NetSrvInfo503.enableraw", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerStatisticsGet_level,
-	  { "Level", "srvsvc.srvsvc_NetServerStatisticsGet.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetServerStatisticsGet.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_sesssvc,
-	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo403.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sesssvc", "srvsvc.srvsvc_NetSrvInfo403.sesssvc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerStatisticsGet_options,
-	  { "Options", "srvsvc.srvsvc_NetServerStatisticsGet.options", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Options", "srvsvc.srvsvc_NetServerStatisticsGet.options", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info102,
-	  { "Info102", "srvsvc.srvsvc_NetSrvInfo.info102", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info102", "srvsvc.srvsvc_NetSrvInfo.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_bytesrcvd_high,
-	  { "Bytesrcvd High", "srvsvc.srvsvc_Statistics.bytesrcvd_high", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Bytesrcvd High", "srvsvc.srvsvc_Statistics.bytesrcvd_high", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_numbigbufs,
-	  { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo403.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Numbigbufs", "srvsvc.srvsvc_NetSrvInfo403.numbigbufs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCanonicalize_can_path,
-	  { "Can Path", "srvsvc.srvsvc_NetPathCanonicalize.can_path", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Can Path", "srvsvc.srvsvc_NetPathCanonicalize.can_path", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo_info1,
-	  { "Info1", "srvsvc.srvsvc_NetShareInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "srvsvc.srvsvc_NetShareInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_totalentries,
-	  { "Totalentries", "srvsvc.srvsvc_NetTransportEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Totalentries", "srvsvc.srvsvc_NetTransportEnum.totalentries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1007_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1007.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1007.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareEnumAll_resume_handle,
-	  { "Resume Handle", "srvsvc.srvsvc_NetShareEnumAll.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "srvsvc.srvsvc_NetShareEnumAll.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPRNameCompare_flags,
-	  { "Flags", "srvsvc.srvsvc_NetPRNameCompare.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "srvsvc.srvsvc_NetPRNameCompare.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathType_pathtype,
-	  { "Pathtype", "srvsvc.srvsvc_NetPathType.pathtype", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pathtype", "srvsvc.srvsvc_NetPathType.pathtype", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1533_maxmpxct,
-	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo1533.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxmpxct", "srvsvc.srvsvc_NetSrvInfo1533.maxmpxct", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_Statistics_devopens,
-	  { "Devopens", "srvsvc.srvsvc_Statistics.devopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Devopens", "srvsvc.srvsvc_Statistics.devopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1556,
-	  { "Info1556", "srvsvc.srvsvc_NetSrvInfo.info1556", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1556", "srvsvc.srvsvc_NetSrvInfo.info1556", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQEnum_max_buffer,
-	  { "Max Buffer", "srvsvc.srvsvc_NetCharDevQEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "srvsvc.srvsvc_NetCharDevQEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetConnEnum_path,
-	  { "Path", "srvsvc.srvsvc_NetConnEnum.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetConnEnum.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_sessopen,
-	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo402.sessopen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessopen", "srvsvc.srvsvc_NetSrvInfo402.sessopen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_disc,
-	  { "Disc", "srvsvc.srvsvc_NetSrvInfo102.disc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Disc", "srvsvc.srvsvc_NetSrvInfo102.disc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetFileInfo3_num_locks,
-	  { "Num Locks", "srvsvc.srvsvc_NetFileInfo3.num_locks", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Locks", "srvsvc.srvsvc_NetFileInfo3.num_locks", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo3_net_addr,
-	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo3.net_addr", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo3.net_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvSetInfo_level,
-	  { "Level", "srvsvc.srvsvc_NetSrvSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "srvsvc.srvsvc_NetSrvSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1006_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr1006.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr1006.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo402_sessreqs,
-	  { "Sessreqs", "srvsvc.srvsvc_NetSrvInfo402.sessreqs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Sessreqs", "srvsvc.srvsvc_NetSrvInfo402.sessreqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_autopath,
-	  { "Autopath", "srvsvc.srvsvc_NetSrvInfo403.autopath", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Autopath", "srvsvc.srvsvc_NetSrvInfo403.autopath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_server_name,
-	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo102.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "srvsvc.srvsvc_NetSrvInfo102.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1546_initsearchtable,
-	  { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo1546.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Initsearchtable", "srvsvc.srvsvc_NetSrvInfo1546.initsearchtable", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr1005_count,
-	  { "Count", "srvsvc.srvsvc_NetShareCtr1005.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetShareCtr1005.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo2_path,
-	  { "Path", "srvsvc.srvsvc_NetShareInfo2.path", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Path", "srvsvc.srvsvc_NetShareInfo2.path", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetSessEnum.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetSessEnum.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_chdevqs,
-	  { "Chdevqs", "srvsvc.srvsvc_NetSrvInfo403.chdevqs", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Chdevqs", "srvsvc.srvsvc_NetSrvInfo403.chdevqs", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo2_net_addr,
-	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo2.net_addr", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo2.net_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetServerSetServiceBitsEx_transport,
-	  { "Transport", "srvsvc.srvsvc_NetServerSetServiceBitsEx.transport", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Transport", "srvsvc.srvsvc_NetServerSetServiceBitsEx.transport", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_logonalert,
-	  { "Logonalert", "srvsvc.srvsvc_NetSrvInfo403.logonalert", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logonalert", "srvsvc.srvsvc_NetSrvInfo403.logonalert", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo403_auditprofile,
-	  { "Auditprofile", "srvsvc.srvsvc_NetSrvInfo403.auditprofile", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Auditprofile", "srvsvc.srvsvc_NetSrvInfo403.auditprofile", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_enablefcbopens,
-	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo599.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enablefcbopens", "srvsvc.srvsvc_NetSrvInfo599.enablefcbopens", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessEnum_user,
-	  { "User", "srvsvc.srvsvc_NetSessEnum.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessEnum.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetRemoteTODInfo_timezone,
-	  { "Timezone", "srvsvc.srvsvc_NetRemoteTODInfo.timezone", FT_INT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timezone", "srvsvc.srvsvc_NetRemoteTODInfo.timezone", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_oplockbreakresponsewait,
-	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo503.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo503.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_net_addr,
-	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo1.net_addr", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Net Addr", "srvsvc.srvsvc_NetTransportInfo1.net_addr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_CSC_CACHE_AUTO_REINT,
-	  { "Csc Cache Auto Reint", "srvsvc.srvsvc_DFSFlags.CSC_CACHE_AUTO_REINT", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_CSC_CACHE_AUTO_REINT_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Csc Cache Auto Reint", "srvsvc.srvsvc_DFSFlags.CSC_CACHE_AUTO_REINT", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_CSC_CACHE_AUTO_REINT_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQGetInfo_user,
-	  { "User", "srvsvc.srvsvc_NetCharDevQGetInfo.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetCharDevQGetInfo.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo503_maxkeepsearch,
-	  { "Maxkeepsearch", "srvsvc.srvsvc_NetSrvInfo503.maxkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maxkeepsearch", "srvsvc.srvsvc_NetSrvInfo503.maxkeepsearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQCtr0_count,
-	  { "Count", "srvsvc.srvsvc_NetCharDevQCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "srvsvc.srvsvc_NetCharDevQCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1503_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo1503.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo1503.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_userpath,
-	  { "Userpath", "srvsvc.srvsvc_NetSrvInfo102.userpath", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Userpath", "srvsvc.srvsvc_NetSrvInfo102.userpath", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1555,
-	  { "Info1555", "srvsvc.srvsvc_NetSrvInfo.info1555", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1555", "srvsvc.srvsvc_NetSrvInfo.info1555", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessInfo10_user,
-	  { "User", "srvsvc.srvsvc_NetSessInfo10.user", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User", "srvsvc.srvsvc_NetSessInfo10.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo599_alertsched,
-	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo599.alertsched", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alertsched", "srvsvc.srvsvc_NetSrvInfo599.alertsched", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetPathCompare_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetPathCompare.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetPathCompare.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1547,
-	  { "Info1547", "srvsvc.srvsvc_NetSrvInfo.info1547", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1547", "srvsvc.srvsvc_NetSrvInfo.info1547", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportInfo1_name,
-	  { "Name", "srvsvc.srvsvc_NetTransportInfo1.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetTransportInfo1.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_max_users,
-	  { "Max Users", "srvsvc.srvsvc_NetShareInfo502.max_users", FT_INT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Users", "srvsvc.srvsvc_NetShareInfo502.max_users", FT_INT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo502_opensearch,
-	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo502.opensearch", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Opensearch", "srvsvc.srvsvc_NetSrvInfo502.opensearch", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_DFSFlags_FLAGS_ACCESS_BASED_DIRECTORY_ENUM,
-	  { "Flags Access Based Directory Enum", "srvsvc.srvsvc_DFSFlags.FLAGS_ACCESS_BASED_DIRECTORY_ENUM", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_ACCESS_BASED_DIRECTORY_ENUM_tfs), ( 0x00000800 ), "", HFILL }},
+	  { "Flags Access Based Directory Enum", "srvsvc.srvsvc_DFSFlags.FLAGS_ACCESS_BASED_DIRECTORY_ENUM", FT_BOOLEAN, 32, TFS(&srvsvc_DFSFlags_FLAGS_ACCESS_BASED_DIRECTORY_ENUM_tfs), ( 0x00000800 ), NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo_info0,
-	  { "Info0", "srvsvc.srvsvc_NetCharDevQInfo.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "srvsvc.srvsvc_NetCharDevQInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo102_hidden,
-	  { "Hidden", "srvsvc.srvsvc_NetSrvInfo102.hidden", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hidden", "srvsvc.srvsvc_NetSrvInfo102.hidden", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr_ctr1501,
-	  { "Ctr1501", "srvsvc.srvsvc_NetShareCtr.ctr1501", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1501", "srvsvc.srvsvc_NetShareCtr.ctr1501", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1539,
-	  { "Info1539", "srvsvc.srvsvc_NetSrvInfo.info1539", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1539", "srvsvc.srvsvc_NetSrvInfo.info1539", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo501_comment,
-	  { "Comment", "srvsvc.srvsvc_NetShareInfo501.comment", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Comment", "srvsvc.srvsvc_NetShareInfo501.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportEnum_transports,
-	  { "Transports", "srvsvc.srvsvc_NetTransportEnum.transports", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Transports", "srvsvc.srvsvc_NetTransportEnum.transports", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetTransportCtr2_array,
-	  { "Array", "srvsvc.srvsvc_NetTransportCtr2.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetTransportCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareInfo502_name,
-	  { "Name", "srvsvc.srvsvc_NetShareInfo502.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "srvsvc.srvsvc_NetShareInfo502.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1535_oplockbreakresponsewait,
-	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo1535.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Oplockbreakresponsewait", "srvsvc.srvsvc_NetSrvInfo1535.oplockbreakresponsewait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQInfo1_users,
-	  { "Users", "srvsvc.srvsvc_NetCharDevQInfo1.users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Users", "srvsvc.srvsvc_NetCharDevQInfo1.users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSessCtr_ctr1,
-	  { "Ctr1", "srvsvc.srvsvc_NetSessCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "srvsvc.srvsvc_NetSessCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_server_unc,
-	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQPurgeSelf.server_unc", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Unc", "srvsvc.srvsvc_NetCharDevQPurgeSelf.server_unc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo1010_disc,
-	  { "Disc", "srvsvc.srvsvc_NetSrvInfo1010.disc", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Disc", "srvsvc.srvsvc_NetSrvInfo1010.disc", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetCharDevQPurgeSelf_computer_name,
-	  { "Computer Name", "srvsvc.srvsvc_NetCharDevQPurgeSelf.computer_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Computer Name", "srvsvc.srvsvc_NetCharDevQPurgeSelf.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo101_server_type,
-	  { "Server Type", "srvsvc.srvsvc_NetSrvInfo101.server_type", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Server Type", "srvsvc.srvsvc_NetSrvInfo101.server_type", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetShareCtr502_array,
-	  { "Array", "srvsvc.srvsvc_NetShareCtr502.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "srvsvc.srvsvc_NetShareCtr502.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_srvsvc_srvsvc_NetSrvInfo_info1530,
-	  { "Info1530", "srvsvc.srvsvc_NetSrvInfo.info1530", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1530", "srvsvc.srvsvc_NetSrvInfo.info1530", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-svcctl.c b/epan/dissectors/packet-dcerpc-svcctl.c
index 361eeb2416..2d337067d1 100644
--- a/epan/dissectors/packet-dcerpc-svcctl.c
+++ b/epan/dissectors/packet-dcerpc-svcctl.c
@@ -617,7 +617,7 @@ proto_register_dcerpc_svcctl(void)
         static hf_register_info hf[] = {
 	  { &hf_svcctl_opnum,
 	    { "Operation", "svcctl.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }},
+	      NULL, 0x0, NULL, HFILL }},
 	  { &hf_svcctl_machinename,
 	    { "MachineName", "svcctl.machinename", FT_STRING, BASE_NONE,
 	      NULL, 0x0, "Name of the host we want to open the database on", HFILL }},
diff --git a/epan/dissectors/packet-dcerpc-tapi.c b/epan/dissectors/packet-dcerpc-tapi.c
index 846fe0496c..c379567104 100644
--- a/epan/dissectors/packet-dcerpc-tapi.c
+++ b/epan/dissectors/packet-dcerpc-tapi.c
@@ -206,7 +206,7 @@ proto_register_dcerpc_tapi(void)
 static hf_register_info hf[] = {
 	{ &hf_tapi_opnum, { 
 		"Operation", "tapi.opnum", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_tapi_rc, {
 		"Return code", "tapi.rc", FT_UINT32, BASE_HEX,
 		VALS(NT_errors), 0x0, "TAPI return code", HFILL }},
@@ -217,10 +217,10 @@ static hf_register_info hf[] = {
 		"Unknown long", "tapi.unknown.long", FT_UINT32, BASE_HEX,
 		NULL, 0x0, "Unknown long. If you know what this is, contact wireshark developers.", HFILL }},
 	{ &hf_tapi_unknown_string, {
-		"Unknown string", "tapi.unknown.string", FT_STRING, BASE_HEX,
+		"Unknown string", "tapi.unknown.string", FT_STRING, BASE_NONE,
 		NULL, 0x0, "Unknown string. If you know what this is, contact wireshark developers.", HFILL }},
 	{ &hf_tapi_unknown_bytes, {
-		"Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_HEX,
+		"Unknown bytes", "tapi.unknown.bytes", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Unknown bytes. If you know what this is, contact wireshark developers.", HFILL }}
 	};
 
diff --git a/epan/dissectors/packet-dcerpc-tkn4int.c b/epan/dissectors/packet-dcerpc-tkn4int.c
index 3c2b1bc650..74eb3ebf6e 100644
--- a/epan/dissectors/packet-dcerpc-tkn4int.c
+++ b/epan/dissectors/packet-dcerpc-tkn4int.c
@@ -73,7 +73,7 @@ proto_register_tkn4int (void)
 	static hf_register_info hf[] = {
 	  { &hf_tkn4int_opnum,
 	    { "Operation", "tkn4int.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-trksvr.c b/epan/dissectors/packet-dcerpc-trksvr.c
index d397eb1818..e0436cc116 100644
--- a/epan/dissectors/packet-dcerpc-trksvr.c
+++ b/epan/dissectors/packet-dcerpc-trksvr.c
@@ -69,7 +69,7 @@ proto_register_dcerpc_trksvr(void)
 static hf_register_info hf[] = {
 	{ &hf_trksvr_opnum, { 
 		"Operation", "trksvr.opnum", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_trksvr_rc, {
 		"Return code", "trksvr.rc", FT_UINT32, BASE_HEX,
 		VALS(NT_errors), 0x0, "TRKSVR return code", HFILL }},
diff --git a/epan/dissectors/packet-dcerpc-ubikdisk.c b/epan/dissectors/packet-dcerpc-ubikdisk.c
index ffda6a27cd..4c0057aedd 100644
--- a/epan/dissectors/packet-dcerpc-ubikdisk.c
+++ b/epan/dissectors/packet-dcerpc-ubikdisk.c
@@ -76,7 +76,7 @@ proto_register_ubikdisk (void)
 	static hf_register_info hf[] = {
 	  { &hf_ubikdisk_opnum,
 	    { "Operation", "ubikdisk.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-ubikvote.c b/epan/dissectors/packet-dcerpc-ubikvote.c
index 5edffce40e..2e59b82dbe 100644
--- a/epan/dissectors/packet-dcerpc-ubikvote.c
+++ b/epan/dissectors/packet-dcerpc-ubikvote.c
@@ -71,7 +71,7 @@ proto_register_ubikvote (void)
 	static hf_register_info hf[] = {
 	  { &hf_ubikvote_opnum,
 	    { "Operation", "ubikvote.opnum", FT_UINT16, BASE_DEC,
-	      NULL, 0x0, "Operation", HFILL }}
+	      NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcerpc-update.c b/epan/dissectors/packet-dcerpc-update.c
index b926f5ae02..f8832e6261 100644
--- a/epan/dissectors/packet-dcerpc-update.c
+++ b/epan/dissectors/packet-dcerpc-update.c
@@ -68,7 +68,7 @@ proto_register_dce_update (void)
   static hf_register_info hf[] = {
     {&hf_dce_update_opnum,
      {"Operation", "dce_update.opnum", FT_UINT16, BASE_DEC,
-      NULL, 0x0, "Operation", HFILL}}
+      NULL, 0x0, NULL, HFILL}}
 
   };
 
diff --git a/epan/dissectors/packet-dcerpc-winreg.c b/epan/dissectors/packet-dcerpc-winreg.c
index c8c0fea5d5..5761e73bc6 100644
--- a/epan/dissectors/packet-dcerpc-winreg.c
+++ b/epan/dissectors/packet-dcerpc-winreg.c
@@ -3997,229 +3997,229 @@ void proto_register_dcerpc_winreg(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_winreg_winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS, 
-	  { "Key Enumerate Sub Keys", "winreg.winreg_AccessMask.KEY_ENUMERATE_SUB_KEYS", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS_tfs), ( 0x00008 ), "", HFILL }},
+	  { "Key Enumerate Sub Keys", "winreg.winreg_AccessMask.KEY_ENUMERATE_SUB_KEYS", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_ENUMERATE_SUB_KEYS_tfs), ( 0x00008 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_string2, 
-	  { "String2", "winreg.winreg_NotifyChangeKeyValue.string2", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "String2", "winreg.winreg_NotifyChangeKeyValue.string2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdown_message, 
-	  { "Message", "winreg.winreg_InitiateSystemShutdown.message", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Message", "winreg.winreg_InitiateSystemShutdown.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_KeySecurityData_size, 
-	  { "Size", "winreg.KeySecurityData.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "winreg.KeySecurityData.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_String_name, 
-	  { "Name", "winreg.winreg_String.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_String.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_message, 
-	  { "Message", "winreg.winreg_InitiateSystemShutdownEx.message", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Message", "winreg.winreg_InitiateSystemShutdownEx.message", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdown_reboot, 
-	  { "Reboot", "winreg.winreg_InitiateSystemShutdown.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reboot", "winreg.winreg_InitiateSystemShutdown.reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_enum_index, 
-	  { "Enum Index", "winreg.winreg_EnumValue.enum_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enum Index", "winreg.winreg_EnumValue.enum_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_access_mask, 
-	  { "Access Mask", "winreg.access_mask", FT_UINT32, BASE_HEX, NULL, 0, " ", HFILL }},
+	  { "Access Mask", "winreg.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryMultipleValues_key_handle, 
-	  { "Key Handle", "winreg.winreg_QueryMultipleValues.key_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Key Handle", "winreg.winreg_QueryMultipleValues.key_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_LoadKey_keyname, 
-	  { "Keyname", "winreg.winreg_LoadKey.keyname", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Keyname", "winreg.winreg_LoadKey.keyname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumKey_name, 
-	  { "Name", "winreg.winreg_EnumKey.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_EnumKey.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_options, 
-	  { "Options", "winreg.winreg_CreateKey.options", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Options", "winreg.winreg_CreateKey.options", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_type, 
-	  { "Type", "winreg.winreg_EnumValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }},
+	  { "Type", "winreg.winreg_EnumValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_timeout, 
-	  { "Timeout", "winreg.winreg_InitiateSystemShutdownEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "winreg.winreg_InitiateSystemShutdownEx.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumKey_last_changed_time, 
-	  { "Last Changed Time", "winreg.winreg_EnumKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Changed Time", "winreg.winreg_EnumKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryValue_size, 
-	  { "Size", "winreg.winreg_QueryValue.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "winreg.winreg_QueryValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_size, 
-	  { "Size", "winreg.winreg_EnumValue.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "winreg.winreg_EnumValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_handle, 
-	  { "Handle", "winreg.handle", FT_BYTES, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "Handle", "winreg.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SaveKey_sec_attrib, 
-	  { "Sec Attrib", "winreg.winreg_SaveKey.sec_attrib", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Attrib", "winreg.winreg_SaveKey.sec_attrib", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_max_valnamelen, 
-	  { "Max Valnamelen", "winreg.winreg_QueryInfoKey.max_valnamelen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Valnamelen", "winreg.winreg_QueryInfoKey.max_valnamelen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SecBuf_length, 
-	  { "Length", "winreg.winreg_SecBuf.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "winreg.winreg_SecBuf.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_reboot, 
-	  { "Reboot", "winreg.winreg_InitiateSystemShutdownEx.reboot", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reboot", "winreg.winreg_InitiateSystemShutdownEx.reboot", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_sd, 
-	  { "KeySecurityData", "winreg.sd", FT_NONE, BASE_NONE, NULL, 0, " ", HFILL }},
+	  { "KeySecurityData", "winreg.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SaveKey_filename, 
-	  { "Filename", "winreg.winreg_SaveKey.filename", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Filename", "winreg.winreg_SaveKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryMultipleValues_buffer_size, 
-	  { "Buffer Size", "winreg.winreg_QueryMultipleValues.buffer_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buffer Size", "winreg.winreg_QueryMultipleValues.buffer_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryValue_data, 
-	  { "Data", "winreg.winreg_QueryValue.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "winreg.winreg_QueryValue.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_new_handle, 
-	  { "New Handle", "winreg.winreg_CreateKey.new_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "New Handle", "winreg.winreg_CreateKey.new_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_max_subkeysize, 
-	  { "Max Subkeysize", "winreg.winreg_QueryInfoKey.max_subkeysize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Subkeysize", "winreg.winreg_QueryInfoKey.max_subkeysize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdown_hostname, 
-	  { "Hostname", "winreg.winreg_InitiateSystemShutdown.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hostname", "winreg.winreg_InitiateSystemShutdown.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_KeySecurityData_data, 
-	  { "Data", "winreg.KeySecurityData.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "winreg.KeySecurityData.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_KeySecurityAttribute_sec_data, 
-	  { "Sec Data", "winreg.KeySecurityAttribute.sec_data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sec Data", "winreg.KeySecurityAttribute.sec_data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenKey_access_mask, 
-	  { "Access Mask", "winreg.winreg_OpenKey.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "winreg.winreg_OpenKey.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_QueryMultipleValue_name, 
-	  { "Name", "winreg.QueryMultipleValue.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.QueryMultipleValue.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_GetKeySecurity_sec_info, 
-	  { "Sec Info", "winreg.winreg_GetKeySecurity.sec_info", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Sec Info", "winreg.winreg_GetKeySecurity.sec_info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_StringBuf_size, 
-	  { "Size", "winreg.winreg_StringBuf.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "winreg.winreg_StringBuf.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SecBuf_sd, 
-	  { "Sd", "winreg.winreg_SecBuf.sd", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Sd", "winreg.winreg_SecBuf.sd", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_secdescsize, 
-	  { "Secdescsize", "winreg.winreg_QueryInfoKey.secdescsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Secdescsize", "winreg.winreg_QueryInfoKey.secdescsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenKey_keyname, 
-	  { "Keyname", "winreg.winreg_OpenKey.keyname", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Keyname", "winreg.winreg_OpenKey.keyname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_QueryMultipleValue_type, 
-	  { "Type", "winreg.QueryMultipleValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }},
+	  { "Type", "winreg.QueryMultipleValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SetValue_name, 
-	  { "Name", "winreg.winreg_SetValue.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_SetValue.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_RestoreKey_flags, 
-	  { "Flags", "winreg.winreg_RestoreKey.flags", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Flags", "winreg.winreg_RestoreKey.flags", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_watch_subtree, 
-	  { "Watch Subtree", "winreg.winreg_NotifyChangeKeyValue.watch_subtree", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Watch Subtree", "winreg.winreg_NotifyChangeKeyValue.watch_subtree", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_secdesc, 
-	  { "Secdesc", "winreg.winreg_CreateKey.secdesc", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Secdesc", "winreg.winreg_CreateKey.secdesc", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_force_apps, 
-	  { "Force Apps", "winreg.winreg_InitiateSystemShutdownEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Apps", "winreg.winreg_InitiateSystemShutdownEx.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SetValue_type, 
-	  { "Type", "winreg.winreg_SetValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }},
+	  { "Type", "winreg.winreg_SetValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_name, 
-	  { "Name", "winreg.winreg_CreateKey.name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_CreateKey.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_KeySecurityData_len, 
-	  { "Len", "winreg.KeySecurityData.len", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Len", "winreg.KeySecurityData.len", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_String_name_len, 
-	  { "Name Len", "winreg.winreg_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Len", "winreg.winreg_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_opnum, 
-	  { "Operation", "winreg.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "winreg.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_DeleteKey_key, 
-	  { "Key", "winreg.winreg_DeleteKey.key", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Key", "winreg.winreg_DeleteKey.key", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_name, 
-	  { "Name", "winreg.winreg_EnumValue.name", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_EnumValue.name", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_LoadKey_filename, 
-	  { "Filename", "winreg.winreg_LoadKey.filename", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Filename", "winreg.winreg_LoadKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_LINK, 
-	  { "Key Create Link", "winreg.winreg_AccessMask.KEY_CREATE_LINK", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_LINK_tfs), ( 0x00020 ), "", HFILL }},
+	  { "Key Create Link", "winreg.winreg_AccessMask.KEY_CREATE_LINK", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_LINK_tfs), ( 0x00020 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_DeleteValue_value, 
-	  { "Value", "winreg.winreg_DeleteValue.value", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Value", "winreg.winreg_DeleteValue.value", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_system_name, 
-	  { "System Name", "winreg.system_name", FT_UINT16, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "System Name", "winreg.system_name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_QueryMultipleValue_length, 
-	  { "Length", "winreg.QueryMultipleValue.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "winreg.QueryMultipleValue.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryMultipleValues_num_values, 
-	  { "Num Values", "winreg.winreg_QueryMultipleValues.num_values", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Values", "winreg.winreg_QueryMultipleValues.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_NOTIFY, 
-	  { "Key Notify", "winreg.winreg_AccessMask.KEY_NOTIFY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_NOTIFY_tfs), ( 0x00010 ), "", HFILL }},
+	  { "Key Notify", "winreg.winreg_AccessMask.KEY_NOTIFY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_NOTIFY_tfs), ( 0x00010 ), NULL, HFILL }},
 	{ &hf_winreg_KeySecurityAttribute_data_size, 
-	  { "Data Size", "winreg.KeySecurityAttribute.data_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data Size", "winreg.KeySecurityAttribute.data_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenKey_parent_handle, 
-	  { "Parent Handle", "winreg.winreg_OpenKey.parent_handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Parent Handle", "winreg.winreg_OpenKey.parent_handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_StringBuf_name, 
-	  { "Name", "winreg.winreg_StringBuf.name", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "winreg.winreg_StringBuf.name", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown2, 
-	  { "Unknown2", "winreg.winreg_NotifyChangeKeyValue.unknown2", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "winreg.winreg_NotifyChangeKeyValue.unknown2", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_num_subkeys, 
-	  { "Num Subkeys", "winreg.winreg_QueryInfoKey.num_subkeys", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Subkeys", "winreg.winreg_QueryInfoKey.num_subkeys", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_sd_offset, 
-	  { "Offset", "winreg.sd.offset", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Offset", "winreg.sd.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_32KEY, 
-	  { "Key Wow64 32key", "winreg.winreg_AccessMask.KEY_WOW64_32KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_32KEY_tfs), ( 0x00200 ), "", HFILL }},
+	  { "Key Wow64 32key", "winreg.winreg_AccessMask.KEY_WOW64_32KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_32KEY_tfs), ( 0x00200 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_StringBuf_length, 
-	  { "Length", "winreg.winreg_StringBuf.length", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "winreg.winreg_StringBuf.length", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_last_changed_time, 
-	  { "Last Changed Time", "winreg.winreg_QueryInfoKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Last Changed Time", "winreg.winreg_QueryInfoKey.last_changed_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenHKPD_access_mask, 
-	  { "Access Mask", "winreg.winreg_OpenHKPD.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "winreg.winreg_OpenHKPD.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AbortSystemShutdown_server, 
-	  { "Server", "winreg.winreg_AbortSystemShutdown.server", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server", "winreg.winreg_AbortSystemShutdown.server", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryValue_type, 
-	  { "Type", "winreg.winreg_QueryValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, "", HFILL }},
+	  { "Type", "winreg.winreg_QueryValue.type", FT_UINT32, BASE_DEC, VALS(winreg_winreg_Type_vals), 0, NULL, HFILL }},
 	{ &hf_winreg_sd_actual_size, 
-	  { "Actual Size", "winreg.sd.actual_size", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Actual Size", "winreg.sd.actual_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_String_name_size, 
-	  { "Name Size", "winreg.winreg_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Size", "winreg.winreg_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_unknown, 
-	  { "Unknown", "winreg.winreg_NotifyChangeKeyValue.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "winreg.winreg_NotifyChangeKeyValue.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryValue_length, 
-	  { "Length", "winreg.winreg_QueryValue.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "winreg.winreg_QueryValue.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_CREATE_SUB_KEY, 
-	  { "Key Create Sub Key", "winreg.winreg_AccessMask.KEY_CREATE_SUB_KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_SUB_KEY_tfs), ( 0x00004 ), "", HFILL }},
+	  { "Key Create Sub Key", "winreg.winreg_AccessMask.KEY_CREATE_SUB_KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_CREATE_SUB_KEY_tfs), ( 0x00004 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenKey_unknown, 
-	  { "Unknown", "winreg.winreg_OpenKey.unknown", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "winreg.winreg_OpenKey.unknown", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_RestoreKey_filename, 
-	  { "Filename", "winreg.winreg_RestoreKey.filename", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Filename", "winreg.winreg_RestoreKey.filename", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_max_valbufsize, 
-	  { "Max Valbufsize", "winreg.winreg_QueryInfoKey.max_valbufsize", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Valbufsize", "winreg.winreg_QueryInfoKey.max_valbufsize", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_reason, 
-	  { "Reason", "winreg.winreg_InitiateSystemShutdownEx.reason", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reason", "winreg.winreg_InitiateSystemShutdownEx.reason", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SecBuf_inherit, 
-	  { "Inherit", "winreg.winreg_SecBuf.inherit", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Inherit", "winreg.winreg_SecBuf.inherit", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SetValue_size, 
-	  { "Size", "winreg.winreg_SetValue.size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size", "winreg.winreg_SetValue.size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_length, 
-	  { "Length", "winreg.winreg_EnumValue.length", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Length", "winreg.winreg_EnumValue.length", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryMultipleValues_values, 
-	  { "Values", "winreg.winreg_QueryMultipleValues.values", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Values", "winreg.winreg_QueryMultipleValues.values", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_max_subkeylen, 
-	  { "Max Subkeylen", "winreg.winreg_QueryInfoKey.max_subkeylen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Subkeylen", "winreg.winreg_QueryInfoKey.max_subkeylen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdown_timeout, 
-	  { "Timeout", "winreg.winreg_InitiateSystemShutdown.timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Timeout", "winreg.winreg_InitiateSystemShutdown.timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdownEx_hostname, 
-	  { "Hostname", "winreg.winreg_InitiateSystemShutdownEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Hostname", "winreg.winreg_InitiateSystemShutdownEx.hostname", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SaveKey_handle, 
-	  { "Handle", "winreg.winreg_SaveKey.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "winreg.winreg_SaveKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_KeySecurityAttribute_inherit, 
-	  { "Inherit", "winreg.KeySecurityAttribute.inherit", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Inherit", "winreg.KeySecurityAttribute.inherit", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_werror, 
-	  { "Windows Error", "winreg.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "winreg.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_GetVersion_version, 
-	  { "Version", "winreg.winreg_GetVersion.version", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version", "winreg.winreg_GetVersion.version", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_QUERY_VALUE, 
-	  { "Key Query Value", "winreg.winreg_AccessMask.KEY_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_QUERY_VALUE_tfs), ( 0x00001 ), "", HFILL }},
+	  { "Key Query Value", "winreg.winreg_AccessMask.KEY_QUERY_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_QUERY_VALUE_tfs), ( 0x00001 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_action_taken, 
-	  { "Action Taken", "winreg.winreg_CreateKey.action_taken", FT_UINT32, BASE_DEC, VALS(winreg_winreg_CreateAction_vals), 0, "", HFILL }},
+	  { "Action Taken", "winreg.winreg_CreateKey.action_taken", FT_UINT32, BASE_DEC, VALS(winreg_winreg_CreateAction_vals), 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_num_values, 
-	  { "Num Values", "winreg.winreg_QueryInfoKey.num_values", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Values", "winreg.winreg_QueryInfoKey.num_values", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumKey_keyclass, 
-	  { "Keyclass", "winreg.winreg_EnumKey.keyclass", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Keyclass", "winreg.winreg_EnumKey.keyclass", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_SET_VALUE, 
-	  { "Key Set Value", "winreg.winreg_AccessMask.KEY_SET_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_SET_VALUE_tfs), ( 0x00002 ), "", HFILL }},
+	  { "Key Set Value", "winreg.winreg_AccessMask.KEY_SET_VALUE", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_SET_VALUE_tfs), ( 0x00002 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumKey_enum_index, 
-	  { "Enum Index", "winreg.winreg_EnumKey.enum_index", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Enum Index", "winreg.winreg_EnumKey.enum_index", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_RestoreKey_handle, 
-	  { "Handle", "winreg.winreg_RestoreKey.handle", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Handle", "winreg.winreg_RestoreKey.handle", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SetValue_data, 
-	  { "Data", "winreg.winreg_SetValue.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "winreg.winreg_SetValue.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_CreateKey_keyclass, 
-	  { "Keyclass", "winreg.winreg_CreateKey.keyclass", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Keyclass", "winreg.winreg_CreateKey.keyclass", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_InitiateSystemShutdown_force_apps, 
-	  { "Force Apps", "winreg.winreg_InitiateSystemShutdown.force_apps", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Apps", "winreg.winreg_InitiateSystemShutdown.force_apps", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_EnumValue_value, 
-	  { "Value", "winreg.winreg_EnumValue.value", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Value", "winreg.winreg_EnumValue.value", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_string1, 
-	  { "String1", "winreg.winreg_NotifyChangeKeyValue.string1", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "String1", "winreg.winreg_NotifyChangeKeyValue.string1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryMultipleValues_buffer, 
-	  { "Buffer", "winreg.winreg_QueryMultipleValues.buffer", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buffer", "winreg.winreg_QueryMultipleValues.buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_SetKeySecurity_access_mask, 
-	  { "Access Mask", "winreg.winreg_SetKeySecurity.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "winreg.winreg_SetKeySecurity.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryValue_value_name, 
-	  { "Value Name", "winreg.winreg_QueryValue.value_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Value Name", "winreg.winreg_QueryValue.value_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_QueryInfoKey_classname, 
-	  { "Classname", "winreg.winreg_QueryInfoKey.classname", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Classname", "winreg.winreg_QueryInfoKey.classname", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_AccessMask_KEY_WOW64_64KEY, 
-	  { "Key Wow64 64key", "winreg.winreg_AccessMask.KEY_WOW64_64KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_64KEY_tfs), ( 0x00100 ), "", HFILL }},
+	  { "Key Wow64 64key", "winreg.winreg_AccessMask.KEY_WOW64_64KEY", FT_BOOLEAN, 32, TFS(&winreg_AccessMask_KEY_WOW64_64KEY_tfs), ( 0x00100 ), NULL, HFILL }},
 	{ &hf_winreg_winreg_OpenHKCU_access_mask, 
-	  { "Access Mask", "winreg.winreg_OpenHKCU.access_mask", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Access Mask", "winreg.winreg_OpenHKCU.access_mask", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_sd_max_size, 
-	  { "Max Size", "winreg.sd.max_size", FT_UINT32, BASE_DEC, NULL, 0, " ", HFILL }},
+	  { "Max Size", "winreg.sd.max_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_winreg_NotifyChangeKeyValue_notify_filter, 
-	  { "Notify Filter", "winreg.winreg_NotifyChangeKeyValue.notify_filter", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Notify Filter", "winreg.winreg_NotifyChangeKeyValue.notify_filter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_winreg_QueryMultipleValue_offset, 
-	  { "Offset", "winreg.QueryMultipleValue.offset", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Offset", "winreg.QueryMultipleValue.offset", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-wkssvc.c b/epan/dissectors/packet-dcerpc-wkssvc.c
index 18ab33948f..01323006a6 100644
--- a/epan/dissectors/packet-dcerpc-wkssvc.c
+++ b/epan/dissectors/packet-dcerpc-wkssvc.c
@@ -9943,757 +9943,757 @@ void proto_register_dcerpc_wkssvc(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_use_count, 
-	  { "Use Count", "wkssvc.wkssvc_NetrUseInfo2.use_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Count", "wkssvc.wkssvc_NetrUseInfo2.use_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_quality_of_service, 
-	  { "Quality Of Service", "wkssvc.wkssvc_NetWkstaTransportInfo0.quality_of_service", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Quality Of Service", "wkssvc.wkssvc_NetWkstaTransportInfo0.quality_of_service", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1045_pipe_maximum, 
-	  { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo1045.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo1045.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_password, 
-	  { "Password", "wkssvc.wkssvc_NetrUseInfo2.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "wkssvc.wkssvc_NetrUseInfo2.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_join_flags, 
-	  { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain2.join_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain2.join_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr1, 
-	  { "Ctr1", "wkssvc.wkssvc_NetrUseEnumCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr1", "wkssvc.wkssvc_NetrUseEnumCtr.ctr1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetrWkstaUserSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrWkstaUserSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnum_entries_read, 
-	  { "Entries Read", "wkssvc.wkssvc_NetrUseEnum.entries_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entries Read", "wkssvc.wkssvc_NetrUseEnum.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrSetPrimaryComputername.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrSetPrimaryComputername.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_parm_err, 
-	  { "Parm Err", "wkssvc.wkssvc_NetrWkstaUserSetInfo.parm_err", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Err", "wkssvc.wkssvc_NetrWkstaUserSetInfo.parm_err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnum_info, 
-	  { "Info", "wkssvc.wkssvc_NetrUseEnum.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetrUseEnum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrSetPrimaryComputername.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrSetPrimaryComputername.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown14, 
-	  { "Unknown14", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown14", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown14", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown14", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user0, 
-	  { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_user_name, 
-	  { "User Name", "wkssvc.wkssvc_NetrUseInfo2.user_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User Name", "wkssvc.wkssvc_NetrUseInfo2.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_version_major, 
-	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo101.version_major", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo101.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_other_domains, 
-	  { "Other Domains", "wkssvc.wkssvc_NetrWkstaUserInfo1.other_domains", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Other Domains", "wkssvc.wkssvc_NetrWkstaUserInfo1.other_domains", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrGetJoinableOus.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrGetJoinableOus.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportCtr_ctr0, 
-	  { "Ctr0", "wkssvc.wkssvc_NetWkstaTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "wkssvc.wkssvc_NetWkstaTransportCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_dgram_event_reset_freq, 
-	  { "Dgram Event Reset Freq", "wkssvc.wkssvc_NetWkstaInfo502.dgram_event_reset_freq", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dgram Event Reset Freq", "wkssvc.wkssvc_NetWkstaInfo502.dgram_event_reset_freq", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_lan_root, 
-	  { "Lan Root", "wkssvc.wkssvc_NetWkstaInfo102.lan_root", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lan Root", "wkssvc.wkssvc_NetWkstaInfo102.lan_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_user_name, 
-	  { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo1.user_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo1.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info502, 
-	  { "Info502", "wkssvc.wkssvc_NetWkstaInfo.info502", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info502", "wkssvc.wkssvc_NetWkstaInfo.info502", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown32, 
-	  { "Unknown32", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown32", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown32", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown32", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown29, 
-	  { "Unknown29", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown29", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown29", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown29", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1055_use_raw_write, 
-	  { "Use Raw Write", "wkssvc.wkssvc_NetWkstaInfo1055.use_raw_write", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Raw Write", "wkssvc.wkssvc_NetWkstaInfo1055.use_raw_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1051, 
-	  { "Info1051", "wkssvc.wkssvc_NetWkstaInfo.info1051", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1051", "wkssvc.wkssvc_NetWkstaInfo.info1051", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName2_name, 
-	  { "Name", "wkssvc.wkssvc_NetrValidateName2.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "wkssvc.wkssvc_NetrValidateName2.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_dormant_file_limit, 
-	  { "Dormant File Limit", "wkssvc.wkssvc_NetWkstaInfo502.dormant_file_limit", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dormant File Limit", "wkssvc.wkssvc_NetWkstaInfo502.dormant_file_limit", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_maximum_collection_count, 
-	  { "Maximum Collection Count", "wkssvc.wkssvc_NetWkstaInfo502.maximum_collection_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maximum Collection Count", "wkssvc.wkssvc_NetWkstaInfo502.maximum_collection_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrMessageBufferSend_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrMessageBufferSend.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrMessageBufferSend.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_write_raw_data, 
-	  { "Use Write Raw Data", "wkssvc.wkssvc_NetWkstaInfo502.use_write_raw_data", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Write Raw Data", "wkssvc.wkssvc_NetWkstaInfo502.use_write_raw_data", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_Reserved, 
-	  { "Reserved", "wkssvc.wkssvc_NetrEnumerateComputerNames.Reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "wkssvc.wkssvc_NetrEnumerateComputerNames.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_size_char_buf, 
-	  { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo502.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo502.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportCtr0_array, 
-	  { "Array", "wkssvc.wkssvc_NetWkstaTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "wkssvc.wkssvc_NetWkstaTransportCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_name_type, 
-	  { "Name Type", "wkssvc.wkssvc_NetrEnumerateComputerNames.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_ComputerNameType_vals), 0, "", HFILL }},
+	  { "Name Type", "wkssvc.wkssvc_NetrEnumerateComputerNames.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_ComputerNameType_vals), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseAdd_parm_err, 
-	  { "Parm Err", "wkssvc.wkssvc_NetrUseAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Err", "wkssvc.wkssvc_NetrUseAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown9, 
-	  { "Unknown9", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown9", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown9", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown9", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_num_ous, 
-	  { "Num Ous", "wkssvc.wkssvc_NetrGetJoinableOus2.num_ous", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Ous", "wkssvc.wkssvc_NetrGetJoinableOus2.num_ous", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrRenameMachineInDomain.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrRenameMachineInDomain.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown38, 
-	  { "Unknown38", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown38", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown38", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown38", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo1101_other_domains, 
-	  { "Other Domains", "wkssvc.wkssvc_NetrWkstaUserInfo1101.other_domains", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Other Domains", "wkssvc.wkssvc_NetrWkstaUserInfo1101.other_domains", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaGetInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetWkstaGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetWkstaGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_ref_count, 
-	  { "Ref Count", "wkssvc.wkssvc_NetrUseInfo1.ref_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ref Count", "wkssvc.wkssvc_NetrUseInfo1.ref_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown4, 
-	  { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown4", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown4", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrJoinDomain2.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrJoinDomain2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr2, 
-	  { "Ctr2", "wkssvc.wkssvc_NetrUseEnumCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr2", "wkssvc.wkssvc_NetrUseEnumCtr.ctr2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown3, 
-	  { "Unknown3", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown3", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown3", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_join_flags, 
-	  { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain.join_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Join Flags", "wkssvc.wkssvc_NetrJoinDomain.join_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseDel_use_name, 
-	  { "Use Name", "wkssvc.wkssvc_NetrUseDel.use_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Name", "wkssvc.wkssvc_NetrUseDel.use_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_buf_files_deny_write, 
-	  { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo502.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo502.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfo_use_name, 
-	  { "Use Name", "wkssvc.wkssvc_NetrUseGetInfo.use_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Name", "wkssvc.wkssvc_NetrUseGetInfo.use_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1060, 
-	  { "Info1060", "wkssvc.wkssvc_NetWkstaInfo.info1060", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1060", "wkssvc.wkssvc_NetWkstaInfo.info1060", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown4, 
-	  { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown4", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown4", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown4", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1057, 
-	  { "Info1057", "wkssvc.wkssvc_NetWkstaInfo.info1057", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1057", "wkssvc.wkssvc_NetWkstaInfo.info1057", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetWkstaTransportInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetWkstaTransportInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_name, 
-	  { "Name", "wkssvc.wkssvc_NetWkstaTransportInfo0.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "wkssvc.wkssvc_NetWkstaTransportInfo0.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr1_array, 
-	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr1.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr1.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown20, 
-	  { "Unknown20", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown20", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown20", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown20", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnum_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUseEnum.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUseEnum.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_lsa_String_name_size, 
-	  { "Name Size", "wkssvc.lsa_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Size", "wkssvc.lsa_String.name_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_entries_read, 
-	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.entries_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown37, 
-	  { "Unknown37", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown37", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown37", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown37", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1058, 
-	  { "Info1058", "wkssvc.wkssvc_NetWkstaInfo.info1058", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1058", "wkssvc.wkssvc_NetWkstaInfo.info1058", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_lsa_String_name_len, 
-	  { "Name Len", "wkssvc.lsa_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Len", "wkssvc.lsa_String.name_len", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfo_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUseGetInfo.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUseGetInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE, 
-	  { "Wkssvc Join Flags Account Delete", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE_tfs), ( 0x00000004 ), "", HFILL }},
+	  { "Wkssvc Join Flags Account Delete", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE_tfs), ( 0x00000004 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1043_lock_maximum, 
-	  { "Lock Maximum", "wkssvc.wkssvc_NetWkstaInfo1043.lock_maximum", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Maximum", "wkssvc.wkssvc_NetWkstaInfo1043.lock_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown24, 
-	  { "Unknown24", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown24", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown24", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown24", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo102.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo102.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseDel_force_cond, 
-	  { "Force Cond", "wkssvc.wkssvc_NetrUseDel.force_cond", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Cond", "wkssvc.wkssvc_NetrUseDel.force_cond", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsers_resume_handle, 
-	  { "Resume Handle", "wkssvc.wkssvc_NetWkstaEnumUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "wkssvc.wkssvc_NetWkstaEnumUsers.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr0_count, 
-	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1053_utilize_nt_caching, 
-	  { "Utilize Nt Caching", "wkssvc.wkssvc_NetWkstaInfo1053.utilize_nt_caching", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Utilize Nt Caching", "wkssvc.wkssvc_NetWkstaInfo1053.utilize_nt_caching", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_num_srv_announce_buffers, 
-	  { "Num Srv Announce Buffers", "wkssvc.wkssvc_NetWkstaInfo502.num_srv_announce_buffers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Srv Announce Buffers", "wkssvc.wkssvc_NetWkstaInfo502.num_srv_announce_buffers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo100_platform_id, 
-	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo100.platform_id", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo100.platform_id", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_primary_name, 
-	  { "Primary Name", "wkssvc.wkssvc_NetrSetPrimaryComputername.primary_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Primary Name", "wkssvc.wkssvc_NetrSetPrimaryComputername.primary_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown36, 
-	  { "Unknown36", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown36", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown36", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown36", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info0, 
-	  { "Info0", "wkssvc.wkssvc_NetrUseGetInfoCtr.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "wkssvc.wkssvc_NetrUseGetInfoCtr.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfo_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetrUseGetInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetrUseGetInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo3_unknown2, 
-	  { "Unknown2", "wkssvc.wkssvc_NetrUseInfo3.unknown2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "wkssvc.wkssvc_NetrUseInfo3.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1, 
-	  { "Info1", "wkssvc.wkssvc_NetrWkstaUserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "wkssvc.wkssvc_NetrWkstaUserInfo.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1048_use_opportunistic_locking, 
-	  { "Use Opportunistic Locking", "wkssvc.wkssvc_NetWkstaInfo1048.use_opportunistic_locking", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Opportunistic Locking", "wkssvc.wkssvc_NetWkstaInfo1048.use_opportunistic_locking", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown27, 
-	  { "Unknown27", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown27", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown27", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown27", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_vc_count, 
-	  { "Vc Count", "wkssvc.wkssvc_NetWkstaTransportInfo0.vc_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Vc Count", "wkssvc.wkssvc_NetWkstaTransportInfo0.vc_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrAddAlternateComputerName.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrAddAlternateComputerName.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_info, 
-	  { "Info", "wkssvc.wkssvc_NetrWkstaUserGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetrWkstaUserGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsers_entries_read, 
-	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsers.entries_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsers.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsers_prefmaxlen, 
-	  { "Prefmaxlen", "wkssvc.wkssvc_NetWkstaEnumUsers.prefmaxlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Prefmaxlen", "wkssvc.wkssvc_NetWkstaEnumUsers.prefmaxlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_domain, 
-	  { "Logon Domain", "wkssvc.wkssvc_NetrWkstaUserInfo1.logon_domain", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logon Domain", "wkssvc.wkssvc_NetrWkstaUserInfo1.logon_domain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown16, 
-	  { "Unknown16", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown16", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown16", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown16", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_log_election_packets, 
-	  { "Log Election Packets", "wkssvc.wkssvc_NetWkstaInfo502.log_election_packets", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Log Election Packets", "wkssvc.wkssvc_NetWkstaInfo502.log_election_packets", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_read, 
-	  { "Use Raw Read", "wkssvc.wkssvc_NetWkstaInfo502.use_raw_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Raw Read", "wkssvc.wkssvc_NetWkstaInfo502.use_raw_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_unknown, 
-	  { "Unknown", "wkssvc.wkssvc_NetrGetJoinableOus.unknown", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "wkssvc.wkssvc_NetrGetJoinableOus.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_Reserved, 
-	  { "Reserved", "wkssvc.wkssvc_NetrSetPrimaryComputername.Reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "wkssvc.wkssvc_NetrSetPrimaryComputername.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1027_errorlog_sz, 
-	  { "Errorlog Sz", "wkssvc.wkssvc_NetWkstaInfo1027.errorlog_sz", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Errorlog Sz", "wkssvc.wkssvc_NetWkstaInfo1027.errorlog_sz", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1052, 
-	  { "Info1052", "wkssvc.wkssvc_NetWkstaInfo.info1052", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1052", "wkssvc.wkssvc_NetWkstaInfo.info1052", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1012_maximum_collection_count, 
-	  { "Maximum Collection Count", "wkssvc.wkssvc_NetWkstaInfo1012.maximum_collection_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Maximum Collection Count", "wkssvc.wkssvc_NetWkstaInfo1012.maximum_collection_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_admin_account, 
-	  { "Admin Account", "wkssvc.wkssvc_NetrJoinDomain2.admin_account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Admin Account", "wkssvc.wkssvc_NetrJoinDomain2.admin_account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr_ctr0, 
-	  { "Ctr0", "wkssvc.wkssvc_NetrUseEnumCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr0", "wkssvc.wkssvc_NetrUseEnumCtr.ctr0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1050_use_close_behind, 
-	  { "Use Close Behind", "wkssvc.wkssvc_NetWkstaInfo1050.use_close_behind", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Close Behind", "wkssvc.wkssvc_NetWkstaInfo1050.use_close_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_unlock_behind, 
-	  { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo502.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo502.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr_user1, 
-	  { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr.user1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_version_minor, 
-	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo102.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_ComputerNamesCtr_count, 
-	  { "Count", "wkssvc.wkssvc_ComputerNamesCtr.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "wkssvc.wkssvc_ComputerNamesCtr.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1048, 
-	  { "Info1048", "wkssvc.wkssvc_NetWkstaInfo.info1048", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1048", "wkssvc.wkssvc_NetWkstaInfo.info1048", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1018_session_timeout, 
-	  { "Session Timeout", "wkssvc.wkssvc_NetWkstaInfo1018.session_timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Session Timeout", "wkssvc.wkssvc_NetWkstaInfo1018.session_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_keep_connection, 
-	  { "Keep Connection", "wkssvc.wkssvc_NetWkstaInfo502.keep_connection", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Keep Connection", "wkssvc.wkssvc_NetWkstaInfo502.keep_connection", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown31, 
-	  { "Unknown31", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown31", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown31", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown31", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_max_commands, 
-	  { "Max Commands", "wkssvc.wkssvc_NetWkstaInfo502.max_commands", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Commands", "wkssvc.wkssvc_NetWkstaInfo502.max_commands", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_lock_quota, 
-	  { "Lock Quota", "wkssvc.wkssvc_NetWkstaInfo502.lock_quota", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Quota", "wkssvc.wkssvc_NetWkstaInfo502.lock_quota", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown40, 
-	  { "Unknown40", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown40", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown40", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown40", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1033_max_threads, 
-	  { "Max Threads", "wkssvc.wkssvc_NetWkstaInfo1033.max_threads", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Threads", "wkssvc.wkssvc_NetWkstaInfo1033.max_threads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseAdd_level, 
-	  { "Level", "wkssvc.wkssvc_NetrUseAdd.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrUseAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE, 
-	  { "Wkssvc Join Flags Account Create", "wkssvc.wkssvc_renameflags.WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE", FT_BOOLEAN, 32, TFS(&wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Wkssvc Join Flags Account Create", "wkssvc.wkssvc_renameflags.WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE", FT_BOOLEAN, 32, TFS(&wkssvc_renameflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown25, 
-	  { "Unknown25", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown25", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown25", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown25", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseDel_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUseDel.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUseDel.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo1_logon_server, 
-	  { "Logon Server", "wkssvc.wkssvc_NetrWkstaUserInfo1.logon_server", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logon Server", "wkssvc.wkssvc_NetrWkstaUserInfo1.logon_server", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_PasswordBuffer_data, 
-	  { "Data", "wkssvc.wkssvc_PasswordBuffer.data", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Data", "wkssvc.wkssvc_PasswordBuffer.data", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo3_unknown1, 
-	  { "Unknown1", "wkssvc.wkssvc_NetrUseInfo3.unknown1", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "wkssvc.wkssvc_NetrUseInfo3.unknown1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_cache_file_timeout, 
-	  { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo502.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo502.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_num_mailslot_buffers, 
-	  { "Num Mailslot Buffers", "wkssvc.wkssvc_NetWkstaInfo502.num_mailslot_buffers", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Mailslot Buffers", "wkssvc.wkssvc_NetWkstaInfo502.num_mailslot_buffers", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1055, 
-	  { "Info1055", "wkssvc.wkssvc_NetWkstaInfo.info1055", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1055", "wkssvc.wkssvc_NetWkstaInfo.info1055", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_password, 
-	  { "Password", "wkssvc.wkssvc_NetrRenameMachineInDomain.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "wkssvc.wkssvc_NetrRenameMachineInDomain.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown13, 
-	  { "Unknown13", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown13", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown13", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown13", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_utilize_nt_caching, 
-	  { "Utilize Nt Caching", "wkssvc.wkssvc_NetWkstaInfo502.utilize_nt_caching", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Utilize Nt Caching", "wkssvc.wkssvc_NetWkstaInfo502.utilize_nt_caching", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1061_use_512_byte_max_transfer, 
-	  { "Use 512 Byte Max Transfer", "wkssvc.wkssvc_NetWkstaInfo1061.use_512_byte_max_transfer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use 512 Byte Max Transfer", "wkssvc.wkssvc_NetWkstaInfo1061.use_512_byte_max_transfer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_info, 
-	  { "Info", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaSetInfo_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaSetInfo.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaSetInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_encrypted_password, 
-	  { "Encrypted Password", "wkssvc.wkssvc_NetrJoinDomain2.encrypted_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encrypted Password", "wkssvc.wkssvc_NetrJoinDomain2.encrypted_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnum_prefmaxlen, 
-	  { "Prefmaxlen", "wkssvc.wkssvc_NetrUseEnum.prefmaxlen", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Prefmaxlen", "wkssvc.wkssvc_NetrUseEnum.prefmaxlen", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown2, 
-	  { "Unknown2", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown2", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown2", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportDel_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrWkstaTransportDel.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrWkstaTransportDel.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN, 
-	  { "Wkssvc Join Flags Defer Spn", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DEFER_SPN", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN_tfs), ( 0x00000100 ), "", HFILL }},
+	  { "Wkssvc Join Flags Defer Spn", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DEFER_SPN", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DEFER_SPN_tfs), ( 0x00000100 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1010_char_wait, 
-	  { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo1010.char_wait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo1010.char_wait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_RenameOptions, 
-	  { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsers_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaEnumUsers.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaEnumUsers.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrRenameMachineInDomain.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrRenameMachineInDomain.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown23, 
-	  { "Unknown23", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown23", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown23", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown23", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumInfo_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetrUseEnumInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetrUseEnumInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_user0, 
-	  { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.user0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "User0", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.user0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_lsa_String_name, 
-	  { "Name", "wkssvc.lsa_String.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "wkssvc.lsa_String.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_buf_read_only_files, 
-	  { "Buf Read Only Files", "wkssvc.wkssvc_NetWkstaInfo502.buf_read_only_files", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Read Only Files", "wkssvc.wkssvc_NetWkstaInfo502.buf_read_only_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUnjoinDomain.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUnjoinDomain.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_lan_root, 
-	  { "Lan Root", "wkssvc.wkssvc_NetWkstaInfo101.lan_root", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lan Root", "wkssvc.wkssvc_NetWkstaInfo101.lan_root", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE, 
-	  { "Wkssvc Join Flags Join Type", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_TYPE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE_tfs), ( 0x00000001 ), "", HFILL }},
+	  { "Wkssvc Join Flags Join Type", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_TYPE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_TYPE_tfs), ( 0x00000001 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_buf_named_pipes, 
-	  { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo502.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo502.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_ref_count, 
-	  { "Ref Count", "wkssvc.wkssvc_NetrUseInfo2.ref_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ref Count", "wkssvc.wkssvc_NetrUseInfo2.ref_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1044_pipe_increment, 
-	  { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo1044.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo1044.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED, 
-	  { "Wkssvc Join Flags Domain Join If Joined", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED_tfs), ( 0x00000020 ), "", HFILL }},
+	  { "Wkssvc Join Flags Domain Join If Joined", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_DOMAIN_JOIN_IF_JOINED_tfs), ( 0x00000020 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_AlternateMachineNameToRemove, 
-	  { "Alternatemachinenametoremove", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.AlternateMachineNameToRemove", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Alternatemachinenametoremove", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.AlternateMachineNameToRemove", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr2_array, 
-	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr2.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr2.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaGetInfo_info, 
-	  { "Info", "wkssvc.wkssvc_NetWkstaGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetWkstaGetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_max_illegal_dgram_events, 
-	  { "Max Illegal Dgram Events", "wkssvc.wkssvc_NetWkstaInfo502.max_illegal_dgram_events", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Illegal Dgram Events", "wkssvc.wkssvc_NetWkstaInfo502.max_illegal_dgram_events", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1047, 
-	  { "Info1047", "wkssvc.wkssvc_NetWkstaInfo.info1047", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1047", "wkssvc.wkssvc_NetWkstaInfo.info1047", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName_Password, 
-	  { "Password", "wkssvc.wkssvc_NetrValidateName.Password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "wkssvc.wkssvc_NetrValidateName.Password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1028_print_buf_time, 
-	  { "Print Buf Time", "wkssvc.wkssvc_NetWkstaInfo1028.print_buf_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Print Buf Time", "wkssvc.wkssvc_NetWkstaInfo1028.print_buf_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info3, 
-	  { "Info3", "wkssvc.wkssvc_NetrUseGetInfoCtr.info3", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info3", "wkssvc.wkssvc_NetrUseGetInfoCtr.info3", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrGetJoinableOus2.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrGetJoinableOus2.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_RenameOptions, 
-	  { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain2.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Renameoptions", "wkssvc.wkssvc_NetrRenameMachineInDomain2.RenameOptions", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info1101, 
-	  { "Info1101", "wkssvc.wkssvc_NetrWkstaUserInfo.info1101", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1101", "wkssvc.wkssvc_NetrWkstaUserInfo.info1101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_account_name, 
-	  { "Account Name", "wkssvc.wkssvc_NetrJoinDomain2.account_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account Name", "wkssvc.wkssvc_NetrJoinDomain2.account_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown17, 
-	  { "Unknown17", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown17", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown17", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown17", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1013, 
-	  { "Info1013", "wkssvc.wkssvc_NetWkstaInfo.info1013", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1013", "wkssvc.wkssvc_NetWkstaInfo.info1013", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName2_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrValidateName2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrValidateName2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown34, 
-	  { "Unknown34", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown34", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown34", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown34", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1018, 
-	  { "Info1018", "wkssvc.wkssvc_NetWkstaInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1018", "wkssvc.wkssvc_NetWkstaInfo.info1018", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr0_entries_read, 
-	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.entries_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Entries Read", "wkssvc.wkssvc_NetWkstaEnumUsersCtr0.entries_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1057_use_encryption, 
-	  { "Use Encryption", "wkssvc.wkssvc_NetWkstaInfo1057.use_encryption", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Encryption", "wkssvc.wkssvc_NetWkstaInfo1057.use_encryption", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_status, 
-	  { "Status", "wkssvc.wkssvc_NetrUseInfo1.status", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Status", "wkssvc.wkssvc_NetrUseInfo1.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_wan_link, 
-	  { "Wan Link", "wkssvc.wkssvc_NetWkstaTransportInfo0.wan_link", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Wan Link", "wkssvc.wkssvc_NetWkstaTransportInfo0.wan_link", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown35, 
-	  { "Unknown35", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown35", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown35", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown35", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown7, 
-	  { "Unknown7", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown7", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown7", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown7", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaSetInfo_parm_error, 
-	  { "Parm Error", "wkssvc.wkssvc_NetWkstaSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Error", "wkssvc.wkssvc_NetWkstaSetInfo.parm_error", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo0_remote, 
-	  { "Remote", "wkssvc.wkssvc_NetrUseInfo0.remote", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Remote", "wkssvc.wkssvc_NetrUseInfo0.remote", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo_info0, 
-	  { "Info0", "wkssvc.wkssvc_NetrWkstaUserInfo.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "wkssvc.wkssvc_NetrWkstaUserInfo.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1060_force_core_create_mode, 
-	  { "Force Core Create Mode", "wkssvc.wkssvc_NetWkstaInfo1060.force_core_create_mode", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Core Create Mode", "wkssvc.wkssvc_NetWkstaInfo1060.force_core_create_mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserInfo0_user_name, 
-	  { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo0.user_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "User Name", "wkssvc.wkssvc_NetrWkstaUserInfo0.user_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info101, 
-	  { "Info101", "wkssvc.wkssvc_NetWkstaInfo.info101", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info101", "wkssvc.wkssvc_NetWkstaInfo.info101", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo0_address, 
-	  { "Address", "wkssvc.wkssvc_NetWkstaTransportInfo0.address", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Address", "wkssvc.wkssvc_NetWkstaTransportInfo0.address", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown39, 
-	  { "Unknown39", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown39", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown39", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown39", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr2_count, 
-	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr2.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinInformation_name_buffer, 
-	  { "Name Buffer", "wkssvc.wkssvc_NetrGetJoinInformation.name_buffer", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name Buffer", "wkssvc.wkssvc_NetrGetJoinInformation.name_buffer", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain_NewMachineName, 
-	  { "Newmachinename", "wkssvc.wkssvc_NetrRenameMachineInDomain.NewMachineName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Newmachinename", "wkssvc.wkssvc_NetrRenameMachineInDomain.NewMachineName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_lock_maximum, 
-	  { "Lock Maximum", "wkssvc.wkssvc_NetWkstaInfo502.lock_maximum", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Maximum", "wkssvc.wkssvc_NetWkstaInfo502.lock_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrUnjoinDomain.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrUnjoinDomain.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetrWkstaUserGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrWkstaUserGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1049, 
-	  { "Info1049", "wkssvc.wkssvc_NetWkstaInfo.info1049", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1049", "wkssvc.wkssvc_NetWkstaInfo.info1049", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_num_ous, 
-	  { "Num Ous", "wkssvc.wkssvc_NetrGetJoinableOus.num_ous", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Num Ous", "wkssvc.wkssvc_NetrGetJoinableOus.num_ous", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_asg_type, 
-	  { "Asg Type", "wkssvc.wkssvc_NetrUseInfo2.asg_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Asg Type", "wkssvc.wkssvc_NetrUseInfo2.asg_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_password, 
-	  { "Password", "wkssvc.wkssvc_NetrUseInfo1.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "wkssvc.wkssvc_NetrUseInfo1.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_unknown, 
-	  { "Unknown", "wkssvc.wkssvc_NetrJoinDomain.unknown", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "wkssvc.wkssvc_NetrJoinDomain.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_local, 
-	  { "Local", "wkssvc.wkssvc_NetrUseInfo1.local", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Local", "wkssvc.wkssvc_NetrUseInfo1.local", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1054_use_raw_read, 
-	  { "Use Raw Read", "wkssvc.wkssvc_NetWkstaInfo1054.use_raw_read", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Raw Read", "wkssvc.wkssvc_NetWkstaInfo1054.use_raw_read", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrRenameMachineInDomain2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrRenameMachineInDomain2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1023_size_char_buf, 
-	  { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo1023.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Size Char Buf", "wkssvc.wkssvc_NetWkstaInfo1023.size_char_buf", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo100_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo100.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo100.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportEnum_max_buffer, 
-	  { "Max Buffer", "wkssvc.wkssvc_NetWkstaTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Buffer", "wkssvc.wkssvc_NetWkstaTransportEnum.max_buffer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT, 
-	  { "Wkssvc Join Flags Join Dc Account", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT_tfs), ( 0x00000200 ), "", HFILL }},
+	  { "Wkssvc Join Flags Join Dc Account", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_DC_ACCOUNT_tfs), ( 0x00000200 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1042, 
-	  { "Info1042", "wkssvc.wkssvc_NetWkstaInfo.info1042", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1042", "wkssvc.wkssvc_NetWkstaInfo.info1042", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_unknown, 
-	  { "Unknown", "wkssvc.wkssvc_NetrWkstaUserSetInfo.unknown", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "wkssvc.wkssvc_NetrWkstaUserSetInfo.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1045, 
-	  { "Info1045", "wkssvc.wkssvc_NetWkstaInfo.info1045", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1045", "wkssvc.wkssvc_NetWkstaInfo.info1045", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1011, 
-	  { "Info1011", "wkssvc.wkssvc_NetWkstaInfo.info1011", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1011", "wkssvc.wkssvc_NetWkstaInfo.info1011", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1049_use_unlock_behind, 
-	  { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo1049.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Unlock Behind", "wkssvc.wkssvc_NetWkstaInfo1049.use_unlock_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1062_read_ahead_throughput, 
-	  { "Read Ahead Throughput", "wkssvc.wkssvc_NetWkstaInfo1062.read_ahead_throughput", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Read Ahead Throughput", "wkssvc.wkssvc_NetWkstaInfo1062.read_ahead_throughput", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1056_use_write_raw_data, 
-	  { "Use Write Raw Data", "wkssvc.wkssvc_NetWkstaInfo1056.use_write_raw_data", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Write Raw Data", "wkssvc.wkssvc_NetWkstaInfo1056.use_write_raw_data", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportAdd_info0, 
-	  { "Info0", "wkssvc.wkssvc_NetrWkstaTransportAdd.info0", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info0", "wkssvc.wkssvc_NetrWkstaTransportAdd.info0", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName_name, 
-	  { "Name", "wkssvc.wkssvc_NetrValidateName.name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Name", "wkssvc.wkssvc_NetrValidateName.name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown18, 
-	  { "Unknown18", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown18", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown18", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown18", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_size, 
-	  { "Message Size", "wkssvc.wkssvc_NetrMessageBufferSend.message_size", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Size", "wkssvc.wkssvc_NetrMessageBufferSend.message_size", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_UNSECURE, 
-	  { "Wkssvc Join Flags Join Unsecure", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_UNSECURE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_UNSECURE_tfs), ( 0x00000040 ), "", HFILL }},
+	  { "Wkssvc Join Flags Join Unsecure", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_UNSECURE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_UNSECURE_tfs), ( 0x00000040 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_ComputerNamesCtr_computer_name, 
-	  { "Computer Name", "wkssvc.wkssvc_ComputerNamesCtr.computer_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Computer Name", "wkssvc.wkssvc_ComputerNamesCtr.computer_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName2_name_type, 
-	  { "Name Type", "wkssvc.wkssvc_NetrValidateName2.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetValidateNameType_vals), 0, "", HFILL }},
+	  { "Name Type", "wkssvc.wkssvc_NetrValidateName2.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetValidateNameType_vals), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName2_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrValidateName2.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrValidateName2.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinableOus.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinableOus.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportEnum_total_entries, 
-	  { "Total Entries", "wkssvc.wkssvc_NetWkstaTransportEnum.total_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Total Entries", "wkssvc.wkssvc_NetWkstaTransportEnum.total_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE, 
-	  { "Wkssvc Join Flags Win9x Upgrade", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE_tfs), ( 0x00000010 ), "", HFILL }},
+	  { "Wkssvc Join Flags Win9x Upgrade", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_WIN9X_UPGRADE_tfs), ( 0x00000010 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName2_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrValidateName2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrValidateName2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportDel_unknown3, 
-	  { "Unknown3", "wkssvc.wkssvc_NetrWkstaTransportDel.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "wkssvc.wkssvc_NetrWkstaTransportDel.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1062, 
-	  { "Info1062", "wkssvc.wkssvc_NetWkstaInfo.info1062", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1062", "wkssvc.wkssvc_NetWkstaInfo.info1062", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserGetInfo_unknown, 
-	  { "Unknown", "wkssvc.wkssvc_NetrWkstaUserGetInfo.unknown", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown", "wkssvc.wkssvc_NetrWkstaUserGetInfo.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrAddAlternateComputerName.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrAddAlternateComputerName.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain2_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrJoinDomain2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrJoinDomain2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info102, 
-	  { "Info102", "wkssvc.wkssvc_NetWkstaInfo.info102", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info102", "wkssvc.wkssvc_NetWkstaInfo.info102", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrJoinDomain.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrJoinDomain.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1046_dormant_file_limit, 
-	  { "Dormant File Limit", "wkssvc.wkssvc_NetWkstaInfo1046.dormant_file_limit", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Dormant File Limit", "wkssvc.wkssvc_NetWkstaInfo1046.dormant_file_limit", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportAdd_parm_err, 
-	  { "Parm Err", "wkssvc.wkssvc_NetrWkstaTransportAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Parm Err", "wkssvc.wkssvc_NetrWkstaTransportAdd.parm_err", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_version_major, 
-	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo102.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_platform_id, 
-	  { "Platform Id", "wkssvc.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, " ", HFILL }},
+	  { "Platform Id", "wkssvc.platform_id", FT_UINT32, BASE_DEC, VALS(srvsvc_srvsvc_PlatformId_vals), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown22, 
-	  { "Unknown22", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown22", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown22", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown22", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_use_count, 
-	  { "Use Count", "wkssvc.wkssvc_NetrUseInfo1.use_count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Count", "wkssvc.wkssvc_NetrUseInfo1.use_count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain2_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUnjoinDomain2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUnjoinDomain2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_512_byte_max_transfer, 
-	  { "Use 512 Byte Max Transfer", "wkssvc.wkssvc_NetWkstaInfo502.use_512_byte_max_transfer", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use 512 Byte Max Transfer", "wkssvc.wkssvc_NetWkstaInfo502.use_512_byte_max_transfer", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportEnum_info, 
-	  { "Info", "wkssvc.wkssvc_NetWkstaTransportEnum.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetWkstaTransportEnum.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1033, 
-	  { "Info1033", "wkssvc.wkssvc_NetWkstaInfo.info1033", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1033", "wkssvc.wkssvc_NetWkstaInfo.info1033", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1046, 
-	  { "Info1046", "wkssvc.wkssvc_NetWkstaInfo.info1046", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1046", "wkssvc.wkssvc_NetWkstaInfo.info1046", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaSetInfo_info, 
-	  { "Info", "wkssvc.wkssvc_NetWkstaSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetWkstaSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_sender_name, 
-	  { "Message Sender Name", "wkssvc.wkssvc_NetrMessageBufferSend.message_sender_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Sender Name", "wkssvc.wkssvc_NetrMessageBufferSend.message_sender_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_remote, 
-	  { "Remote", "wkssvc.wkssvc_NetrUseInfo1.remote", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Remote", "wkssvc.wkssvc_NetrUseInfo1.remote", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrUseInfo2.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrUseInfo2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr1_count, 
-	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "wkssvc.wkssvc_NetrUseEnumCtr1.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1047_cache_file_timeout, 
-	  { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo1047.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Cache File Timeout", "wkssvc.wkssvc_NetWkstaInfo1047.cache_file_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info2, 
-	  { "Info2", "wkssvc.wkssvc_NetrUseGetInfoCtr.info2", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info2", "wkssvc.wkssvc_NetrUseGetInfoCtr.info2", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown30, 
-	  { "Unknown30", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown30", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown30", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown30", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1028, 
-	  { "Info1028", "wkssvc.wkssvc_NetWkstaInfo.info1028", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1028", "wkssvc.wkssvc_NetWkstaInfo.info1028", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info100, 
-	  { "Info100", "wkssvc.wkssvc_NetWkstaInfo.info100", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info100", "wkssvc.wkssvc_NetWkstaInfo.info100", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrLogonDomainNameDel_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrLogonDomainNameDel.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrLogonDomainNameDel.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1013_keep_connection, 
-	  { "Keep Connection", "wkssvc.wkssvc_NetWkstaInfo1013.keep_connection", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Keep Connection", "wkssvc.wkssvc_NetWkstaInfo1013.keep_connection", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrEnumerateComputerNames.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrEnumerateComputerNames.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaUserSetInfo_info, 
-	  { "Info", "wkssvc.wkssvc_NetrWkstaUserSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetrWkstaUserSetInfo.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_name, 
-	  { "Message Name", "wkssvc.wkssvc_NetrMessageBufferSend.message_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Name", "wkssvc.wkssvc_NetrMessageBufferSend.message_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_session_timeout, 
-	  { "Session Timeout", "wkssvc.wkssvc_NetWkstaInfo502.session_timeout", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Session Timeout", "wkssvc.wkssvc_NetWkstaInfo502.session_timeout", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumCtr0_array, 
-	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr0.array", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Array", "wkssvc.wkssvc_NetrUseEnumCtr0.array", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown6, 
-	  { "Unknown6", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown6", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown6", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown6", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportInfo_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetWkstaTransportInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetWkstaTransportInfo.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_collection_time, 
-	  { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo502.collection_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo502.collection_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1054, 
-	  { "Info1054", "wkssvc.wkssvc_NetWkstaInfo.info1054", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1054", "wkssvc.wkssvc_NetWkstaInfo.info1054", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown10, 
-	  { "Unknown10", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown10", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown10", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown10", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1032_wrk_heuristics, 
-	  { "Wrk Heuristics", "wkssvc.wkssvc_NetWkstaInfo1032.wrk_heuristics", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Wrk Heuristics", "wkssvc.wkssvc_NetWkstaInfo1032.wrk_heuristics", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_version_minor, 
-	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo101.version_minor", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo101.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED, 
-	  { "Wkssvc Join Flags Machine Pwd Passed", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED_tfs), ( 0x00000080 ), "", HFILL }},
+	  { "Wkssvc Join Flags Machine Pwd Passed", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_MACHINE_PWD_PASSED_tfs), ( 0x00000080 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportAdd_level, 
-	  { "Level", "wkssvc.wkssvc_NetrWkstaTransportAdd.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrWkstaTransportAdd.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown33, 
-	  { "Unknown33", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown33", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown33", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown33", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrEnumerateComputerNames_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetrEnumerateComputerNames.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetrEnumerateComputerNames.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportEnum_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaTransportEnum.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaTransportEnum.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_max_threads, 
-	  { "Max Threads", "wkssvc.wkssvc_NetWkstaInfo502.max_threads", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Max Threads", "wkssvc.wkssvc_NetWkstaInfo502.max_threads", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1042_lock_increment, 
-	  { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo1042.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo1042.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetrUseGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrUseGetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1050, 
-	  { "Info1050", "wkssvc.wkssvc_NetWkstaInfo.info1050", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1050", "wkssvc.wkssvc_NetWkstaInfo.info1050", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_lock_increment, 
-	  { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo502.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Increment", "wkssvc.wkssvc_NetWkstaInfo502.lock_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_local, 
-	  { "Local", "wkssvc.wkssvc_NetrUseInfo2.local", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Local", "wkssvc.wkssvc_NetrUseInfo2.local", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrValidateName.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrValidateName.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1041, 
-	  { "Info1041", "wkssvc.wkssvc_NetWkstaInfo.info1041", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1041", "wkssvc.wkssvc_NetWkstaInfo.info1041", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_status, 
-	  { "Status", "wkssvc.wkssvc_NetrUseInfo2.status", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Status", "wkssvc.wkssvc_NetrUseInfo2.status", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown12, 
-	  { "Unknown12", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown12", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown12", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown12", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_account_ou, 
-	  { "Account Ou", "wkssvc.wkssvc_NetrJoinDomain.account_ou", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account Ou", "wkssvc.wkssvc_NetrJoinDomain.account_ou", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown3, 
-	  { "Unknown3", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown3", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown3", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown3", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown19, 
-	  { "Unknown19", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown19", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown19", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown19", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrAddAlternateComputerName.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrAddAlternateComputerName.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1058_buf_files_deny_write, 
-	  { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo1058.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Files Deny Write", "wkssvc.wkssvc_NetWkstaInfo1058.buf_files_deny_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain2_account, 
-	  { "Account", "wkssvc.wkssvc_NetrUnjoinDomain2.account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrUnjoinDomain2.account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatisticsGet_unknown2, 
-	  { "Unknown2", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown2", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown2", "wkssvc.wkssvc_NetrWorkstationStatisticsGet.unknown2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1043, 
-	  { "Info1043", "wkssvc.wkssvc_NetWkstaInfo.info1043", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1043", "wkssvc.wkssvc_NetWkstaInfo.info1043", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown21, 
-	  { "Unknown21", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown21", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown21", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown21", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo102.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo102.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_encryption, 
-	  { "Use Encryption", "wkssvc.wkssvc_NetWkstaInfo502.use_encryption", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Encryption", "wkssvc.wkssvc_NetWkstaInfo502.use_encryption", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1059, 
-	  { "Info1059", "wkssvc.wkssvc_NetWkstaInfo.info1059", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1059", "wkssvc.wkssvc_NetWkstaInfo.info1059", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName_name_type, 
-	  { "Name Type", "wkssvc.wkssvc_NetrValidateName.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetValidateNameType_vals), 0, "", HFILL }},
+	  { "Name Type", "wkssvc.wkssvc_NetrValidateName.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetValidateNameType_vals), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrMessageBufferSend_message_buffer, 
-	  { "Message Buffer", "wkssvc.wkssvc_NetrMessageBufferSend.message_buffer", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Message Buffer", "wkssvc.wkssvc_NetrMessageBufferSend.message_buffer", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportCtr0_count, 
-	  { "Count", "wkssvc.wkssvc_NetWkstaTransportCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Count", "wkssvc.wkssvc_NetWkstaTransportCtr0.count", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnumInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetrUseEnumInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetrUseEnumInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1041_lock_quota, 
-	  { "Lock Quota", "wkssvc.wkssvc_NetWkstaInfo1041.lock_quota", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Lock Quota", "wkssvc.wkssvc_NetWkstaInfo1041.lock_quota", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseAdd_ctr, 
-	  { "Ctr", "wkssvc.wkssvc_NetrUseAdd.ctr", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Ctr", "wkssvc.wkssvc_NetrUseAdd.ctr", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseEnum_resume_handle, 
-	  { "Resume Handle", "wkssvc.wkssvc_NetrUseEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "wkssvc.wkssvc_NetrUseEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo100_version_major, 
-	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo100.version_major", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Major", "wkssvc.wkssvc_NetWkstaInfo100.version_major", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Reserved, 
-	  { "Reserved", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.Reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseAdd_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrUseAdd.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrUseAdd.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown11, 
-	  { "Unknown11", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown11", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown11", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown11", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1012, 
-	  { "Info1012", "wkssvc.wkssvc_NetWkstaInfo.info1012", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1012", "wkssvc.wkssvc_NetWkstaInfo.info1012", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain_password, 
-	  { "Password", "wkssvc.wkssvc_NetrUnjoinDomain.password", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Password", "wkssvc.wkssvc_NetrUnjoinDomain.password", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_werror, 
-	  { "Windows Error", "wkssvc.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, "", HFILL }},
+	  { "Windows Error", "wkssvc.werror", FT_UINT32, BASE_HEX, VALS(WERR_errors), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus2.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrGetJoinableOus2.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_increment, 
-	  { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo502.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pipe Increment", "wkssvc.wkssvc_NetWkstaInfo502.pipe_increment", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1044, 
-	  { "Info1044", "wkssvc.wkssvc_NetWkstaInfo.info1044", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1044", "wkssvc.wkssvc_NetWkstaInfo.info1044", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrGetJoinableOus2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrGetJoinableOus2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1010, 
-	  { "Info1010", "wkssvc.wkssvc_NetWkstaInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1010", "wkssvc.wkssvc_NetWkstaInfo.info1010", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1051_buf_named_pipes, 
-	  { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo1051.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Named Pipes", "wkssvc.wkssvc_NetWkstaInfo1051.buf_named_pipes", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_read_ahead_throughput, 
-	  { "Read Ahead Throughput", "wkssvc.wkssvc_NetWkstaInfo502.read_ahead_throughput", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Read Ahead Throughput", "wkssvc.wkssvc_NetWkstaInfo502.read_ahead_throughput", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus_ous, 
-	  { "Ous", "wkssvc.wkssvc_NetrGetJoinableOus.ous", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ous", "wkssvc.wkssvc_NetrGetJoinableOus.ous", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown5, 
-	  { "Unknown5", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown5", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown5", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown5", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_NewMachineName, 
-	  { "Newmachinename", "wkssvc.wkssvc_NetrRenameMachineInDomain2.NewMachineName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Newmachinename", "wkssvc.wkssvc_NetrRenameMachineInDomain2.NewMachineName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportDel_transport_name, 
-	  { "Transport Name", "wkssvc.wkssvc_NetrWkstaTransportDel.transport_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Transport Name", "wkssvc.wkssvc_NetrWkstaTransportDel.transport_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo0_local, 
-	  { "Local", "wkssvc.wkssvc_NetrUseInfo0.local", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Local", "wkssvc.wkssvc_NetrUseInfo0.local", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_raw_write, 
-	  { "Use Raw Write", "wkssvc.wkssvc_NetWkstaInfo502.use_raw_write", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Raw Write", "wkssvc.wkssvc_NetWkstaInfo502.use_raw_write", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_ous, 
-	  { "Ous", "wkssvc.wkssvc_NetrGetJoinableOus2.ous", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Ous", "wkssvc.wkssvc_NetrGetJoinableOus2.ous", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo101.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo101.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinableOus2_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinableOus2.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinableOus2.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1059_buf_read_only_files, 
-	  { "Buf Read Only Files", "wkssvc.wkssvc_NetWkstaInfo1059.buf_read_only_files", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Buf Read Only Files", "wkssvc.wkssvc_NetWkstaInfo1059.buf_read_only_files", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo100_version_minor, 
-	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo100.version_minor", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Version Minor", "wkssvc.wkssvc_NetWkstaInfo100.version_minor", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE, 
-	  { "Wkssvc Join Flags Account Create", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE_tfs), ( 0x00000002 ), "", HFILL }},
+	  { "Wkssvc Join Flags Account Create", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE_tfs), ( 0x00000002 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_close_behind, 
-	  { "Use Close Behind", "wkssvc.wkssvc_NetWkstaInfo502.use_close_behind", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Close Behind", "wkssvc.wkssvc_NetWkstaInfo502.use_close_behind", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_opnum, 
-	  { "Operation", "wkssvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "wkssvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_force_core_create_mode, 
-	  { "Force Core Create Mode", "wkssvc.wkssvc_NetWkstaInfo502.force_core_create_mode", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Force Core Create Mode", "wkssvc.wkssvc_NetWkstaInfo502.force_core_create_mode", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1011_collection_time, 
-	  { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo1011.collection_time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Collection Time", "wkssvc.wkssvc_NetWkstaInfo1011.collection_time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinInformation_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinInformation.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrGetJoinInformation.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo101.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetWkstaInfo101.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1061, 
-	  { "Info1061", "wkssvc.wkssvc_NetWkstaInfo.info1061", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1061", "wkssvc.wkssvc_NetWkstaInfo.info1061", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseGetInfoCtr_info1, 
-	  { "Info1", "wkssvc.wkssvc_NetrUseGetInfoCtr.info1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1", "wkssvc.wkssvc_NetrUseGetInfoCtr.info1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetWkstaEnumUsersInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrSetPrimaryComputername_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrSetPrimaryComputername.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrSetPrimaryComputername.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain_unjoin_flags, 
-	  { "Unjoin Flags", "wkssvc.wkssvc_NetrUnjoinDomain.unjoin_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Unjoin Flags", "wkssvc.wkssvc_NetrUnjoinDomain.unjoin_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaTransportEnum_resume_handle, 
-	  { "Resume Handle", "wkssvc.wkssvc_NetWkstaTransportEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Resume Handle", "wkssvc.wkssvc_NetWkstaTransportEnum.resume_handle", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrJoinDomain.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrJoinDomain.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_platform_id, 
-	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo102.platform_id", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo102.platform_id", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown8, 
-	  { "Unknown8", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown8", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown8", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown8", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_Reserved, 
-	  { "Reserved", "wkssvc.wkssvc_NetrAddAlternateComputerName.Reserved", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Reserved", "wkssvc.wkssvc_NetrAddAlternateComputerName.Reserved", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME, 
-	  { "Wkssvc Join Flags Join With New Name", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME_tfs), ( 0x00000400 ), "", HFILL }},
+	  { "Wkssvc Join Flags Join With New Name", "wkssvc.wkssvc_joinflags.WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME", FT_BOOLEAN, 32, TFS(&wkssvc_joinflags_WKSSVC_JOIN_FLAGS_JOIN_WITH_NEW_NAME_tfs), ( 0x00000400 ), NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWkstaTransportAdd_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrWkstaTransportAdd.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrWkstaTransportAdd.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo101_platform_id, 
-	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo101.platform_id", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Platform Id", "wkssvc.wkssvc_NetWkstaInfo101.platform_id", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_opportunistic_locking, 
-	  { "Use Opportunistic Locking", "wkssvc.wkssvc_NetWkstaInfo502.use_opportunistic_locking", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Opportunistic Locking", "wkssvc.wkssvc_NetWkstaInfo502.use_opportunistic_locking", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo100_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo100.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaInfo100.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown28, 
-	  { "Unknown28", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown28", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown28", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown28", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsersCtr1_user1, 
-	  { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.user1", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "User1", "wkssvc.wkssvc_NetWkstaEnumUsersCtr1.user1", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaGetInfo_server_name, 
-	  { "Server Name", "wkssvc.wkssvc_NetWkstaGetInfo.server_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Server Name", "wkssvc.wkssvc_NetWkstaGetInfo.server_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1023, 
-	  { "Info1023", "wkssvc.wkssvc_NetWkstaInfo.info1023", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1023", "wkssvc.wkssvc_NetWkstaInfo.info1023", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown15, 
-	  { "Unknown15", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown15", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown15", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown15", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_use_lock_read_unlock, 
-	  { "Use Lock Read Unlock", "wkssvc.wkssvc_NetWkstaInfo502.use_lock_read_unlock", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Lock Read Unlock", "wkssvc.wkssvc_NetWkstaInfo502.use_lock_read_unlock", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo1_asg_type, 
-	  { "Asg Type", "wkssvc.wkssvc_NetrUseInfo1.asg_type", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Asg Type", "wkssvc.wkssvc_NetrUseInfo1.asg_type", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain2_unjoin_flags, 
-	  { "Unjoin Flags", "wkssvc.wkssvc_NetrUnjoinDomain2.unjoin_flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+	  { "Unjoin Flags", "wkssvc.wkssvc_NetrUnjoinDomain2.unjoin_flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown1, 
-	  { "Unknown1", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown1", FT_UINT64, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown1", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown1", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrLogonDomainNameAdd_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrLogonDomainNameAdd.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrLogonDomainNameAdd.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrWorkstationStatistics_unknown26, 
-	  { "Unknown26", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown26", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Unknown26", "wkssvc.wkssvc_NetrWorkstationStatistics.unknown26", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrRenameMachineInDomain2.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrRenameMachineInDomain2.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaEnumUsers_info, 
-	  { "Info", "wkssvc.wkssvc_NetWkstaEnumUsers.info", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info", "wkssvc.wkssvc_NetWkstaEnumUsers.info", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrGetJoinInformation_name_type, 
-	  { "Name Type", "wkssvc.wkssvc_NetrGetJoinInformation.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetJoinStatus_vals), 0, "", HFILL }},
+	  { "Name Type", "wkssvc.wkssvc_NetrGetJoinInformation.name_type", FT_UINT16, BASE_DEC, VALS(wkssvc_wkssvc_NetJoinStatus_vals), 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrAddAlternateComputerName_NewAlternateMachineName, 
-	  { "Newalternatemachinename", "wkssvc.wkssvc_NetrAddAlternateComputerName.NewAlternateMachineName", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Newalternatemachinename", "wkssvc.wkssvc_NetrAddAlternateComputerName.NewAlternateMachineName", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUnjoinDomain2_encrypted_password, 
-	  { "Encrypted Password", "wkssvc.wkssvc_NetrUnjoinDomain2.encrypted_password", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encrypted Password", "wkssvc.wkssvc_NetrUnjoinDomain2.encrypted_password", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_char_wait, 
-	  { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo502.char_wait", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Char Wait", "wkssvc.wkssvc_NetWkstaInfo502.char_wait", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo502_pipe_maximum, 
-	  { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo502.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Pipe Maximum", "wkssvc.wkssvc_NetWkstaInfo502.pipe_maximum", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1027, 
-	  { "Info1027", "wkssvc.wkssvc_NetWkstaInfo.info1027", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1027", "wkssvc.wkssvc_NetWkstaInfo.info1027", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo1052_use_lock_read_unlock, 
-	  { "Use Lock Read Unlock", "wkssvc.wkssvc_NetWkstaInfo1052.use_lock_read_unlock", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Use Lock Read Unlock", "wkssvc.wkssvc_NetWkstaInfo1052.use_lock_read_unlock", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1056, 
-	  { "Info1056", "wkssvc.wkssvc_NetWkstaInfo.info1056", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1056", "wkssvc.wkssvc_NetWkstaInfo.info1056", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrValidateName_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrValidateName.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrValidateName.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1032, 
-	  { "Info1032", "wkssvc.wkssvc_NetWkstaInfo.info1032", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1032", "wkssvc.wkssvc_NetWkstaInfo.info1032", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRemoveAlternateComputerName_Account, 
-	  { "Account", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.Account", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Account", "wkssvc.wkssvc_NetrRemoveAlternateComputerName.Account", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo_info1053, 
-	  { "Info1053", "wkssvc.wkssvc_NetWkstaInfo.info1053", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Info1053", "wkssvc.wkssvc_NetWkstaInfo.info1053", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrRenameMachineInDomain2_EncryptedPassword, 
-	  { "Encryptedpassword", "wkssvc.wkssvc_NetrRenameMachineInDomain2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+	  { "Encryptedpassword", "wkssvc.wkssvc_NetrRenameMachineInDomain2.EncryptedPassword", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaSetInfo_level, 
-	  { "Level", "wkssvc.wkssvc_NetWkstaSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Level", "wkssvc.wkssvc_NetWkstaSetInfo.level", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrJoinDomain_domain_name, 
-	  { "Domain Name", "wkssvc.wkssvc_NetrJoinDomain.domain_name", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Domain Name", "wkssvc.wkssvc_NetrJoinDomain.domain_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetWkstaInfo102_logged_on_users, 
-	  { "Logged On Users", "wkssvc.wkssvc_NetWkstaInfo102.logged_on_users", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Logged On Users", "wkssvc.wkssvc_NetWkstaInfo102.logged_on_users", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_wkssvc_wkssvc_NetrUseInfo2_remote, 
-	  { "Remote", "wkssvc.wkssvc_NetrUseInfo2.remote", FT_STRING, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Remote", "wkssvc.wkssvc_NetrUseInfo2.remote", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc-wzcsvc.c b/epan/dissectors/packet-dcerpc-wzcsvc.c
index 35d13e91af..1ef7929e95 100644
--- a/epan/dissectors/packet-dcerpc-wzcsvc.c
+++ b/epan/dissectors/packet-dcerpc-wzcsvc.c
@@ -416,7 +416,7 @@ void proto_register_dcerpc_wzcsvc(void)
 {
 	static hf_register_info hf[] = {
 	{ &hf_wzcsvc_opnum, 
-	  { "Operation", "wzcsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+	  { "Operation", "wzcsvc.opnum", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index 5472a72e7e..14e2e4ecc4 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -5127,214 +5127,214 @@ proto_register_dcerpc (void)
 		{ "Referent ID", "dcerpc.referent_id", FT_UINT32, BASE_HEX,
 		NULL, 0, "Referent ID for this NDR encoded pointer", HFILL }},
         { &hf_dcerpc_ver,
-          { "Version", "dcerpc.ver", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Version", "dcerpc.ver", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_ver_minor,
-          { "Version (minor)", "dcerpc.ver_minor", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Version (minor)", "dcerpc.ver_minor", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_packet_type,
-          { "Packet type", "dcerpc.pkt_type", FT_UINT8, BASE_DEC, VALS (pckt_vals), 0x0, "", HFILL }},
+          { "Packet type", "dcerpc.pkt_type", FT_UINT8, BASE_DEC, VALS (pckt_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_flags,
-          { "Packet Flags", "dcerpc.cn_flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Packet Flags", "dcerpc.cn_flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_first_frag,
-          { "First Frag", "dcerpc.cn_flags.first_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_FIRST_FRAG, "", HFILL }},
+          { "First Frag", "dcerpc.cn_flags.first_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_FIRST_FRAG, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_last_frag,
-          { "Last Frag", "dcerpc.cn_flags.last_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_LAST_FRAG, "", HFILL }},
+          { "Last Frag", "dcerpc.cn_flags.last_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_LAST_FRAG, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_cancel_pending,
-          { "Cancel Pending", "dcerpc.cn_flags.cancel_pending", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_PENDING_CANCEL, "", HFILL }},
+          { "Cancel Pending", "dcerpc.cn_flags.cancel_pending", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_PENDING_CANCEL, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_reserved,
-          { "Reserved", "dcerpc.cn_flags.reserved", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_RESERVED_1, "", HFILL }},
+          { "Reserved", "dcerpc.cn_flags.reserved", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_RESERVED_1, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_mpx,
-          { "Multiplex", "dcerpc.cn_flags.mpx", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_CONC_MPX, "", HFILL }},
+          { "Multiplex", "dcerpc.cn_flags.mpx", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_CONC_MPX, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_dne,
-          { "Did Not Execute", "dcerpc.cn_flags.dne", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_DID_NOT_EXECUTE, "", HFILL }},
+          { "Did Not Execute", "dcerpc.cn_flags.dne", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_DID_NOT_EXECUTE, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_maybe,
-          { "Maybe", "dcerpc.cn_flags.maybe", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_MAYBE, "", HFILL }},
+          { "Maybe", "dcerpc.cn_flags.maybe", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_MAYBE, NULL, HFILL }},
         { &hf_dcerpc_cn_flags_object,
-          { "Object", "dcerpc.cn_flags.object", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_OBJECT_UUID, "", HFILL }},
+          { "Object", "dcerpc.cn_flags.object", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFC_OBJECT_UUID, NULL, HFILL }},
         { &hf_dcerpc_drep,
-          { "Data Representation", "dcerpc.drep", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Data Representation", "dcerpc.drep", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_drep_byteorder,
-          { "Byte order", "dcerpc.drep.byteorder", FT_UINT8, BASE_DEC, VALS (drep_byteorder_vals), 0x0, "", HFILL }},
+          { "Byte order", "dcerpc.drep.byteorder", FT_UINT8, BASE_DEC, VALS (drep_byteorder_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_drep_character,
-          { "Character", "dcerpc.drep.character", FT_UINT8, BASE_DEC, VALS (drep_character_vals), 0x0, "", HFILL }},
+          { "Character", "dcerpc.drep.character", FT_UINT8, BASE_DEC, VALS (drep_character_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_drep_fp,
-          { "Floating-point", "dcerpc.drep.fp", FT_UINT8, BASE_DEC, VALS (drep_fp_vals), 0x0, "", HFILL }},
+          { "Floating-point", "dcerpc.drep.fp", FT_UINT8, BASE_DEC, VALS (drep_fp_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_frag_len,
-          { "Frag Length", "dcerpc.cn_frag_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Frag Length", "dcerpc.cn_frag_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_auth_len,
-          { "Auth Length", "dcerpc.cn_auth_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Auth Length", "dcerpc.cn_auth_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_call_id,
-          { "Call ID", "dcerpc.cn_call_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Call ID", "dcerpc.cn_call_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_max_xmit,
-          { "Max Xmit Frag", "dcerpc.cn_max_xmit", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Max Xmit Frag", "dcerpc.cn_max_xmit", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_max_recv,
-          { "Max Recv Frag", "dcerpc.cn_max_recv", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Max Recv Frag", "dcerpc.cn_max_recv", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_assoc_group,
-          { "Assoc Group", "dcerpc.cn_assoc_group", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Assoc Group", "dcerpc.cn_assoc_group", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_num_ctx_items,
-          { "Num Ctx Items", "dcerpc.cn_num_ctx_items", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Num Ctx Items", "dcerpc.cn_num_ctx_items", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ctx_item,
-          { "Ctx Item", "dcerpc.cn_ctx_item", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Ctx Item", "dcerpc.cn_ctx_item", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ctx_id,
-          { "Context ID", "dcerpc.cn_ctx_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Context ID", "dcerpc.cn_ctx_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_num_trans_items,
-          { "Num Trans Items", "dcerpc.cn_num_trans_items", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Num Trans Items", "dcerpc.cn_num_trans_items", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_abstract_syntax,
-          { "Abstract Syntax", "dcerpc.cn_bind_abstract_syntax", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Abstract Syntax", "dcerpc.cn_bind_abstract_syntax", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_if_id,
-          { "Interface UUID", "dcerpc.cn_bind_to_uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Interface UUID", "dcerpc.cn_bind_to_uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_if_ver,
-          { "Interface Ver", "dcerpc.cn_bind_if_ver", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Interface Ver", "dcerpc.cn_bind_if_ver", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_if_ver_minor,
-          { "Interface Ver Minor", "dcerpc.cn_bind_if_ver_minor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Interface Ver Minor", "dcerpc.cn_bind_if_ver_minor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_trans_syntax,
-          { "Transfer Syntax", "dcerpc.cn_bind_trans", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Transfer Syntax", "dcerpc.cn_bind_trans", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_trans_id,
-          { "ID", "dcerpc.cn_bind_trans_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "ID", "dcerpc.cn_bind_trans_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_bind_trans_ver,
-          { "ver", "dcerpc.cn_bind_trans_ver", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "ver", "dcerpc.cn_bind_trans_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_alloc_hint,
-          { "Alloc hint", "dcerpc.cn_alloc_hint", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Alloc hint", "dcerpc.cn_alloc_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_sec_addr_len,
-          { "Scndry Addr len", "dcerpc.cn_sec_addr_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Scndry Addr len", "dcerpc.cn_sec_addr_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_sec_addr,
-          { "Scndry Addr", "dcerpc.cn_sec_addr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Scndry Addr", "dcerpc.cn_sec_addr", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_num_results,
-          { "Num results", "dcerpc.cn_num_results", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Num results", "dcerpc.cn_num_results", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ack_result,
-          { "Ack result", "dcerpc.cn_ack_result", FT_UINT16, BASE_DEC, VALS(p_cont_result_vals), 0x0, "", HFILL }},
+          { "Ack result", "dcerpc.cn_ack_result", FT_UINT16, BASE_DEC, VALS(p_cont_result_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ack_reason,
-          { "Ack reason", "dcerpc.cn_ack_reason", FT_UINT16, BASE_DEC, VALS(p_provider_reason_vals), 0x0, "", HFILL }},
+          { "Ack reason", "dcerpc.cn_ack_reason", FT_UINT16, BASE_DEC, VALS(p_provider_reason_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ack_trans_id,
-          { "Transfer Syntax", "dcerpc.cn_ack_trans_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Transfer Syntax", "dcerpc.cn_ack_trans_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_ack_trans_ver,
-          { "Syntax ver", "dcerpc.cn_ack_trans_ver", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Syntax ver", "dcerpc.cn_ack_trans_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_reject_reason,
-          { "Reject reason", "dcerpc.cn_reject_reason", FT_UINT16, BASE_DEC, VALS(reject_reason_vals), 0x0, "", HFILL }},
+          { "Reject reason", "dcerpc.cn_reject_reason", FT_UINT16, BASE_DEC, VALS(reject_reason_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_num_protocols,
-          { "Number of protocols", "dcerpc.cn_num_protocols", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Number of protocols", "dcerpc.cn_num_protocols", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_protocol_ver_major,
-          { "Protocol major version", "dcerpc.cn_protocol_ver_major", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Protocol major version", "dcerpc.cn_protocol_ver_major", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_protocol_ver_minor,
-          { "Protocol minor version", "dcerpc.cn_protocol_ver_minor", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Protocol minor version", "dcerpc.cn_protocol_ver_minor", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_cancel_count,
-          { "Cancel count", "dcerpc.cn_cancel_count", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Cancel count", "dcerpc.cn_cancel_count", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_status,
-          { "Status", "dcerpc.cn_status", FT_UINT32, BASE_HEX, VALS(reject_status_vals), 0x0, "", HFILL }},
+          { "Status", "dcerpc.cn_status", FT_UINT32, BASE_HEX, VALS(reject_status_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_cn_deseg_req,
-          { "Desegmentation Required", "dcerpc.cn_deseg_req", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Desegmentation Required", "dcerpc.cn_deseg_req", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_auth_type,
-          { "Auth type", "dcerpc.auth_type", FT_UINT8, BASE_DEC, VALS (authn_protocol_vals), 0x0, "", HFILL }},
+          { "Auth type", "dcerpc.auth_type", FT_UINT8, BASE_DEC, VALS (authn_protocol_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_auth_level,
-          { "Auth level", "dcerpc.auth_level", FT_UINT8, BASE_DEC, VALS (authn_level_vals), 0x0, "", HFILL }},
+          { "Auth level", "dcerpc.auth_level", FT_UINT8, BASE_DEC, VALS (authn_level_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_auth_pad_len,
-          { "Auth pad len", "dcerpc.auth_pad_len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Auth pad len", "dcerpc.auth_pad_len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_auth_rsrvd,
-          { "Auth Rsrvd", "dcerpc.auth_rsrvd", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Auth Rsrvd", "dcerpc.auth_rsrvd", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_auth_ctx_id,
-          { "Auth Context ID", "dcerpc.auth_ctx_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Auth Context ID", "dcerpc.auth_ctx_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1,
-          { "Flags1", "dcerpc.dg_flags1", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Flags1", "dcerpc.dg_flags1", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_rsrvd_01,
-          { "Reserved", "dcerpc.dg_flags1_rsrvd_01", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_RESERVED_01, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags1_rsrvd_01", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_RESERVED_01, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_last_frag,
-          { "Last Fragment", "dcerpc.dg_flags1_last_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_LASTFRAG, "", HFILL }},
+          { "Last Fragment", "dcerpc.dg_flags1_last_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_LASTFRAG, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_frag,
-          { "Fragment", "dcerpc.dg_flags1_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_FRAG, "", HFILL }},
+          { "Fragment", "dcerpc.dg_flags1_frag", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_FRAG, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_nofack,
-          { "No Fack", "dcerpc.dg_flags1_nofack", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_NOFACK, "", HFILL }},
+          { "No Fack", "dcerpc.dg_flags1_nofack", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_NOFACK, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_maybe,
-          { "Maybe", "dcerpc.dg_flags1_maybe", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_MAYBE, "", HFILL }},
+          { "Maybe", "dcerpc.dg_flags1_maybe", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_MAYBE, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_idempotent,
-          { "Idempotent", "dcerpc.dg_flags1_idempotent", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_IDEMPOTENT, "", HFILL }},
+          { "Idempotent", "dcerpc.dg_flags1_idempotent", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_IDEMPOTENT, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_broadcast,
-          { "Broadcast", "dcerpc.dg_flags1_broadcast", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_BROADCAST, "", HFILL }},
+          { "Broadcast", "dcerpc.dg_flags1_broadcast", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_BROADCAST, NULL, HFILL }},
         { &hf_dcerpc_dg_flags1_rsrvd_80,
-          { "Reserved", "dcerpc.dg_flags1_rsrvd_80", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_RESERVED_80, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags1_rsrvd_80", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL1_RESERVED_80, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2,
-          { "Flags2", "dcerpc.dg_flags2", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Flags2", "dcerpc.dg_flags2", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_01,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_01", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_01, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_01", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_01, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_cancel_pending,
-          { "Cancel Pending", "dcerpc.dg_flags2_cancel_pending", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_CANCEL_PENDING, "", HFILL }},
+          { "Cancel Pending", "dcerpc.dg_flags2_cancel_pending", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_CANCEL_PENDING, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_04,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_04", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_04, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_04", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_04, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_08,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_08", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_08, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_08", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_08, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_10,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_10", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_10, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_10", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_10, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_20,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_20", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_20, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_20", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_20, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_40,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_40", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_40, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_40", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_40, NULL, HFILL }},
         { &hf_dcerpc_dg_flags2_rsrvd_80,
-          { "Reserved", "dcerpc.dg_flags2_rsrvd_80", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_80, "", HFILL }},
+          { "Reserved", "dcerpc.dg_flags2_rsrvd_80", FT_BOOLEAN, 8, TFS (&flags_set_truth), PFCL2_RESERVED_80, NULL, HFILL }},
         { &hf_dcerpc_dg_serial_lo,
-          { "Serial Low", "dcerpc.dg_serial_lo", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Serial Low", "dcerpc.dg_serial_lo", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_serial_hi,
-          { "Serial High", "dcerpc.dg_serial_hi", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Serial High", "dcerpc.dg_serial_hi", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_ahint,
-          { "Activity Hint", "dcerpc.dg_ahint", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Activity Hint", "dcerpc.dg_ahint", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_ihint,
-          { "Interface Hint", "dcerpc.dg_ihint", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Interface Hint", "dcerpc.dg_ihint", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_frag_len,
-          { "Fragment len", "dcerpc.dg_frag_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Fragment len", "dcerpc.dg_frag_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_frag_num,
-          { "Fragment num", "dcerpc.dg_frag_num", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Fragment num", "dcerpc.dg_frag_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_auth_proto,
-          { "Auth proto", "dcerpc.dg_auth_proto", FT_UINT8, BASE_DEC, VALS (authn_protocol_vals), 0x0, "", HFILL }},
+          { "Auth proto", "dcerpc.dg_auth_proto", FT_UINT8, BASE_DEC, VALS (authn_protocol_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_seqnum,
-          { "Sequence num", "dcerpc.dg_seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Sequence num", "dcerpc.dg_seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_server_boot,
-          { "Server boot time", "dcerpc.dg_server_boot", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Server boot time", "dcerpc.dg_server_boot", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_if_ver,
-          { "Interface Ver", "dcerpc.dg_if_ver", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Interface Ver", "dcerpc.dg_if_ver", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_krb5_av_prot_level,
-          { "Protection Level", "dcerpc.krb5_av.prot_level", FT_UINT8, BASE_DEC, VALS(authn_level_vals), 0x0, "", HFILL }},
+          { "Protection Level", "dcerpc.krb5_av.prot_level", FT_UINT8, BASE_DEC, VALS(authn_level_vals), 0x0, NULL, HFILL }},
         { &hf_dcerpc_krb5_av_key_vers_num,
-          { "Key Version Number", "dcerpc.krb5_av.key_vers_num", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Key Version Number", "dcerpc.krb5_av.key_vers_num", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_krb5_av_key_auth_verifier,
-          { "Authentication Verifier", "dcerpc.krb5_av.auth_verifier", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Authentication Verifier", "dcerpc.krb5_av.auth_verifier", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_obj_id,
-          { "Object", "dcerpc.obj_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Object", "dcerpc.obj_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_if_id,
-          { "Interface", "dcerpc.dg_if_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Interface", "dcerpc.dg_if_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_dg_act_id,
-          { "Activity", "dcerpc.dg_act_id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Activity", "dcerpc.dg_act_id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dcerpc_opnum,
-          { "Opnum", "dcerpc.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Opnum", "dcerpc.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_cancel_vers,
-          { "Cancel Version", "dcerpc.dg_cancel_vers", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Cancel Version", "dcerpc.dg_cancel_vers", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_cancel_id,
-          { "Cancel ID", "dcerpc.dg_cancel_id", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Cancel ID", "dcerpc.dg_cancel_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_server_accepting_cancels,
-          { "Server accepting cancels", "dcerpc.server_accepting_cancels", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+          { "Server accepting cancels", "dcerpc.server_accepting_cancels", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_vers,
-          { "FACK Version", "dcerpc.fack_vers", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "FACK Version", "dcerpc.fack_vers", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_window_size,
-          { "Window Size", "dcerpc.fack_window_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Window Size", "dcerpc.fack_window_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_max_tsdu,
-          { "Max TSDU", "dcerpc.fack_max_tsdu", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Max TSDU", "dcerpc.fack_max_tsdu", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_max_frag_size,
-          { "Max Frag Size", "dcerpc.fack_max_frag_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Max Frag Size", "dcerpc.fack_max_frag_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_serial_num,
-          { "Serial Num", "dcerpc.fack_serial_num", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Serial Num", "dcerpc.fack_serial_num", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_selack_len,
-          { "Selective ACK Len", "dcerpc.fack_selack_len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Selective ACK Len", "dcerpc.fack_selack_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_fack_selack,
-          { "Selective ACK", "dcerpc.fack_selack", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+          { "Selective ACK", "dcerpc.fack_selack", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_dg_status,
-          { "Status", "dcerpc.dg_status", FT_UINT32, BASE_HEX, VALS(reject_status_vals), 0x0, "", HFILL }},
+          { "Status", "dcerpc.dg_status", FT_UINT32, BASE_HEX, VALS(reject_status_vals), 0x0, NULL, HFILL }},
 
         { &hf_dcerpc_array_max_count,
           { "Max Count", "dcerpc.array.max_count", FT_UINT32, BASE_DEC, NULL, 0x0, "Maximum Count: Number of elements in the array", HFILL }},
@@ -5349,7 +5349,7 @@ proto_register_dcerpc (void)
 	  { "Buffer", "dcerpc.array.buffer", FT_BYTES, BASE_NONE, NULL, 0x0, "Buffer: Buffer containing elements of the array", HFILL }},
 
         { &hf_dcerpc_op,
-          { "Operation", "dcerpc.op", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+          { "Operation", "dcerpc.op", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_dcerpc_fragments,
 	  { "Reassembled DCE/RPC Fragments", "dcerpc.fragments", FT_NONE, BASE_NONE,
@@ -5357,7 +5357,7 @@ proto_register_dcerpc (void)
 
 	{ &hf_dcerpc_fragment,
 	  { "DCE/RPC Fragment", "dcerpc.fragment", FT_FRAMENUM, BASE_NONE,
-	  NULL, 0x0, "DCE/RPC Fragment", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_dcerpc_fragment_overlap,
 	  { "Fragment overlap",	"dcerpc.fragment.overlap", FT_BOOLEAN, BASE_NONE,
@@ -5388,7 +5388,7 @@ proto_register_dcerpc (void)
       NULL, 0x0, "The DCE/RPC PDU is completely reassembled in the packet with this number", HFILL }},
 
 	{ &hf_dcerpc_unknown_if_id,
-	  { "Unknown DCERPC interface id", "dcerpc.unknown_if_id", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+	  { "Unknown DCERPC interface id", "dcerpc.unknown_if_id", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
    };
     static gint *ett[] = {
         &ett_dcerpc,
diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c
index 3c46f29edc..8648bae6ee 100644
--- a/epan/dissectors/packet-dcom-dispatch.c
+++ b/epan/dissectors/packet-dcom-dispatch.c
@@ -547,74 +547,74 @@ proto_register_dcom_dispatch(void)
 
 	static hf_register_info hf_dispatch_array[] = {
         { &hf_dispatch_opnum,
-	    { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+	    { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_dispatch_riid,
-		{ "RIID", "dispatch_riid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "RIID", "dispatch_riid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_name,
-        { "Name", "hf_dispatch_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "Name", "hf_dispatch_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_names,
-		{ "Names", "dispatch_names", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Names", "dispatch_names", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_lcid,
-        { "LCID", "dispatch_lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, "", HFILL }},
+        { "LCID", "dispatch_lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, NULL, HFILL }},
         { &hf_dispatch_id,
-        { "DispID", "dispatch_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "DispID", "dispatch_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_flags,
-        { "Flags", "dispatch_flags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "Flags", "dispatch_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_dispatch_arg,
-		{ "Argument", "dispatch_arg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "Argument", "dispatch_arg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_args,
-		{ "Args", "dispatch_args", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Args", "dispatch_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_named_args,
-		{ "NamedArgs", "dispatch_named_args", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "NamedArgs", "dispatch_named_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_varref,
-		{ "VarRef", "dispatch_varref", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VarRef", "dispatch_varref", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_varrefidx,
-		{ "VarRefIdx", "dispatch_varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VarRefIdx", "dispatch_varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_varrefarg,
-		{ "VarRef", "dispatch_varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VarRef", "dispatch_varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dispatch_varresult,
-		{ "VarResult", "dispatch_varresult", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VarResult", "dispatch_varresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_flags_method,
-        { "Method", "dispatch_flags_method", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_METHOD, "", HFILL }},
+        { "Method", "dispatch_flags_method", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_METHOD, NULL, HFILL }},
         { &hf_dispatch_flags_propget,
-        { "PropertyGet", "dispatch_flags_propget", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPGET, "", HFILL }},
+        { "PropertyGet", "dispatch_flags_propget", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPGET, NULL, HFILL }},
         { &hf_dispatch_flags_propput,
-        { "PropertyPut", "dispatch_flags_propput", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUT, "", HFILL }},
+        { "PropertyPut", "dispatch_flags_propput", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUT, NULL, HFILL }},
         { &hf_dispatch_flags_propputref,
-        { "PropertyPutRef", "dispatch_flags_propputref", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUTREF, "", HFILL }},
+        { "PropertyPutRef", "dispatch_flags_propputref", FT_BOOLEAN, 32, TFS (&flags_set_truth), DISPATCH_FLAGS_PROPPUTREF, NULL, HFILL }},
 
         { &hf_dispatch_code,
-        { "Code", "dispatch_code", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "Code", "dispatch_code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_reserved16,
-        { "Reserved", "dispatch_reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "Reserved", "dispatch_reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_source,
-        { "Source", "dispatch_source", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "Source", "dispatch_source", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_description,
-        { "Description", "dispatch_description", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "Description", "dispatch_description", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_help_file,
-        { "HelpFile", "dispatch_help_file", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "HelpFile", "dispatch_help_file", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_help_context,
-        { "HelpContext", "dispatch_help_context", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "HelpContext", "dispatch_help_context", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_reserved32,
-        { "Reserved", "dispatch_reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "Reserved", "dispatch_reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_deferred_fill_in,
-        { "DeferredFillIn", "dispatch_deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+        { "DeferredFillIn", "dispatch_deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_arg_err,
-        { "ArgErr", "dispatch_arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+        { "ArgErr", "dispatch_arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_tinfo,
-        { "TInfo", "dispatch_tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+        { "TInfo", "dispatch_tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_itinfo,
-        { "TInfo", "dispatch_itinfo", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "TInfo", "dispatch_itinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_dispparams,
-        { "DispParams", "dispatch_dispparams", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "DispParams", "dispatch_dispparams", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_excepinfo,
-        { "ExcepInfo", "dispatch_excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "ExcepInfo", "dispatch_excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_scode,
-        { "SCode", "dispatch_scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, "", HFILL }}
+        { "SCode", "dispatch_scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, NULL, HFILL }}
     };
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c
index 4929454fa7..a8c2119de4 100644
--- a/epan/dissectors/packet-dcom-oxid.c
+++ b/epan/dissectors/packet-dcom-oxid.c
@@ -301,41 +301,41 @@ proto_register_oxid (void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_oxid_opnum,
-		  { "Operation", "oxid.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Operation", "oxid.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_setid,
-		{ "SetId", "oxid_setid",  FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "SetId", "oxid_setid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_seqnum,
-		{ "SeqNum", "oxid_seqnum",  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "SeqNum", "oxid_seqnum",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_addtoset,
-		{ "AddToSet", "oxid_addtoset",  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "AddToSet", "oxid_addtoset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_delfromset,
-		{ "DelFromSet", "oxid_delfromset",  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "DelFromSet", "oxid_delfromset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_oid,
-		{ "OID", "oxid_oid",  FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "OID", "oxid_oid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_ping_backoff_factor,
-		{ "PingBackoffFactor", "oxid_ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "PingBackoffFactor", "oxid_ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_oxid,
-		{ "OXID", "oxid_oxid",  FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "OXID", "oxid_oxid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_requested_protseqs,
-		{ "RequestedProtSeq", "oxid_requested_protseqs",  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "RequestedProtSeq", "oxid_requested_protseqs",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_protseqs,
-		{ "ProtSeq", "oxid_protseqs",  FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, "", HFILL }},
+		{ "ProtSeq", "oxid_protseqs",  FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_bindings,
-		{ "OxidBindings", "oxid_bindings", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "OxidBindings", "oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_oxid_ipid,
-        { "IPID", "oxid_ipid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+        { "IPID", "oxid_ipid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_authn_hint,
-		{ "AuthnHint", "oxid_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "AuthnHint", "oxid_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_ds_array,
-		  { "Address", "dcom.oxid.address", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Address", "dcom.oxid.address", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_Unknown1,
-		  { "unknown 8 bytes 1", "oxid5.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "unknown 8 bytes 1", "oxid5.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_Unknown2,
-                  { "unknown 8 bytes 2", "oxid5.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }}
+                  { "unknown 8 bytes 2", "oxid5.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_oxid
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c
index 29f2373ecb..46615e0a85 100644
--- a/epan/dissectors/packet-dcom-remact.c
+++ b/epan/dissectors/packet-dcom-remact.c
@@ -218,29 +218,29 @@ proto_register_remact (void)
 {
 	static hf_register_info hf_remact[] = {
         { &hf_remact_opnum,
-	    { "Operation", "remact_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+	    { "Operation", "remact_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_remact_requested_protseqs,
-		{ "RequestedProtSeqs", "remact_req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "RequestedProtSeqs", "remact_req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_protseqs,
-		{ "ProtSeqs", "remact_prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, "", HFILL }},
+		{ "ProtSeqs", "remact_prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
 		{ &hf_remact_interfaces,
-		{ "Interfaces", "remact_interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Interfaces", "remact_interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_mode,
-		{ "Mode", "remact_mode", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Mode", "remact_mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_client_impl_level,
-		{ "ClientImplLevel", "remact_client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "ClientImplLevel", "remact_client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_object_name,
-		{ "ObjectName", "remact_object_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "ObjectName", "remact_object_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_object_storage,
-		{ "ObjectStorage", "remact_object_storage", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "ObjectStorage", "remact_object_storage", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_interface_data,
-		{ "InterfaceData", "remact_interface_data", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "InterfaceData", "remact_interface_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_remact_oxid_bindings,
-		{ "OxidBindings", "hf_remact_oxid_bindings", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "OxidBindings", "hf_remact_oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_authn_hint,
-		{ "AuthnHint", "remact_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "AuthnHint", "remact_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 4e2a35fe6e..34fdb78437 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -333,24 +333,24 @@ proto_register_remunk (void)
 {
 	static hf_register_info hf_remunk_rqi_array[] = {
         { &hf_remunk_opnum,
-	    { "Operation", "remunk_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Operation", HFILL }},
+	    { "Operation", "remunk_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_remunk_refs,
-		{ "Refs", "remunk_refs", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Refs", "remunk_refs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_iids,
-		{ "IIDs", "remunk_iids", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "IIDs", "remunk_iids", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_qiresult,
-		{ "QIResult", "remunk_qiresult", FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "QIResult", "remunk_qiresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_flags,
-		{ "Flags", "remunk_flags",  FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Flags", "remunk_flags",  FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_public_refs,
-		{ "PublicRefs", "remunk_public_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "PublicRefs", "remunk_public_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_reminterfaceref,
-		{ "RemInterfaceRef", "remunk_reminterfaceref",  FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "RemInterfaceRef", "remunk_reminterfaceref",  FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_interface_refs,
-		{ "InterfaceRefs", "remunk_int_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "InterfaceRefs", "remunk_int_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remunk_private_refs,
-		{ "PrivateRefs", "remunk_private_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}
+		{ "PrivateRefs", "remunk_private_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett_remunk_array[] = {
diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index 1b85255593..b3605040b2 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -97,9 +97,9 @@ proto_register_ISystemActivator (void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_opnum,
-		  { "Operation", "isystemactivator.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Operation", "isystemactivator.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_sysact_unknown,
-		{ "IUnknown", "isystemactivator.unknown", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "IUnknown", "isystemactivator.unknown", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_ISystemActivator
diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c
index 72e10d0c08..647be90161 100644
--- a/epan/dissectors/packet-dcom.c
+++ b/epan/dissectors/packet-dcom.c
@@ -2058,211 +2058,211 @@ proto_register_dcom (void)
 
 	static hf_register_info hf_dcom_this_array[] = {
 		{ &hf_dcom_this_version_major,
-		{ "VersionMajor", "dcom.this.version_major", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VersionMajor", "dcom.this.version_major", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_this_version_minor,
-		{ "VersionMinor", "dcom.this.version_minor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VersionMinor", "dcom.this.version_minor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_this_flags,
-		{ "Flags", "dcom.this.flags", FT_UINT32, BASE_HEX, VALS(dcom_thisthat_flag_vals), 0x0, "", HFILL }},
+		{ "Flags", "dcom.this.flags", FT_UINT32, BASE_HEX, VALS(dcom_thisthat_flag_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_this_res,
-		{ "Reserved", "dcom.this.res", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Reserved", "dcom.this.res", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dcom_this_cid,
-        { "Causality ID", "dcom.this.uuid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}
+        { "Causality ID", "dcom.this.uuid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 	
 	static hf_register_info hf_dcom_that_array[] = {
 		{ &hf_dcom_that_flags,
-		{ "Flags", "dcom.that.flags", FT_UINT32, BASE_HEX, VALS(dcom_thisthat_flag_vals), 0x0, "", HFILL }}
+		{ "Flags", "dcom.that.flags", FT_UINT32, BASE_HEX, VALS(dcom_thisthat_flag_vals), 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_extent_array[] = {
 		{ &hf_dcom_extent,
-		{ "Extension", "dcom.extent", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "Extension", "dcom.extent", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_extent_array_count,
-		{ "Extension Count", "dcom.extent.array_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Extension Count", "dcom.extent.array_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_extent_array_res,
-		{ "Reserved", "dcom.extent.array_res", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Reserved", "dcom.extent.array_res", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_extent_size,
-		{ "Extension Size", "dcom.extent.size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Extension Size", "dcom.extent.size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_extent_id,
-		{ "Extension Id", "dcom.extent.id", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}
+		{ "Extension Id", "dcom.extent.id", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_array[] = {
 		{ &hf_dcom_version_major,
-		{ "VersionMajor", "dcom.version_major", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VersionMajor", "dcom.version_major", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_version_minor,
-		{ "VersionMinor", "dcom.version_minor", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VersionMinor", "dcom.version_minor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_hresult,
-		{ "HResult", "dcom.hresult", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, "", HFILL }},
+		{ "HResult", "dcom.hresult", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_max_count,
-		{ "MaxCount", "dcom.max_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "MaxCount", "dcom.max_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_offset,
-		{ "Offset", "dcom.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Offset", "dcom.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_byte_length,
-		{ "ByteLength", "dcom.byte_length", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "ByteLength", "dcom.byte_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_actual_count,
-		{ "ActualCount", "dcom.actual_count", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "ActualCount", "dcom.actual_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_tobedone,
-		{ "To Be Done", "dcom.tobedone", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "To Be Done", "dcom.tobedone", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_nospec,
-		{ "No Specification Available", "dcom.nospec", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "No Specification Available", "dcom.nospec", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant,
-		{ "Variant", "dcom.variant", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Variant", "dcom.variant", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant_type,
-		{ "VarType", "dcom.variant_type", FT_UINT16, BASE_HEX, VALS(dcom_variant_type_vals), 0x0, "", HFILL }},
+		{ "VarType", "dcom.variant_type", FT_UINT16, BASE_HEX, VALS(dcom_variant_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant_type32,
-		{ "VarType32", "dcom.variant_type32", FT_UINT32, BASE_HEX, VALS(dcom_variant_type_vals), 0x0, "", HFILL }},
+		{ "VarType32", "dcom.variant_type32", FT_UINT32, BASE_HEX, VALS(dcom_variant_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant_size,
-		{ "Size", "dcom.variant_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Size", "dcom.variant_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant_rpc_res,
-		{ "RPC-Reserved", "dcom.variant_rpc_res", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "RPC-Reserved", "dcom.variant_rpc_res", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_variant_wres,
-		{ "Reserved", "dcom.variant_wres", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Reserved", "dcom.variant_wres", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_array_size,
-		{ "(ArraySize)", "dcom.array_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "(ArraySize)", "dcom.array_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_pointer_val,
-		{ "(PointerVal)", "dcom.pointer_val", FT_UINT32, BASE_HEX, VALS(dcom_dcerpc_pointer_vals), 0x0, "", HFILL }}
+		{ "(PointerVal)", "dcom.pointer_val", FT_UINT32, BASE_HEX, VALS(dcom_dcerpc_pointer_vals), 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_interface_pointer_array[] = {
 		{ &hf_dcom_interface_pointer,
-		{ "InterfacePointer", "dcom.ifp", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "InterfacePointer", "dcom.ifp", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_ip_cnt_data,
-		{ "CntData", "dcom.ip_cnt_data", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}
+		{ "CntData", "dcom.ip_cnt_data", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 	
 	static hf_register_info hf_dcom_objref_array[] = {
 		{ &hf_dcom_objref,
-		{ "OBJREF", "dcom.objref", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "OBJREF", "dcom.objref", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_objref_signature,
-		{ "Signature", "dcom.objref.signature", FT_UINT32, BASE_HEX, VALS(dcom_objref_signature_vals), 0x0, "", HFILL }},
+		{ "Signature", "dcom.objref.signature", FT_UINT32, BASE_HEX, VALS(dcom_objref_signature_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_objref_flags,
-		{ "Flags", "dcom.objref.flags", FT_UINT32, BASE_HEX, VALS(dcom_objref_flag_vals), 0x0, "", HFILL }},
+		{ "Flags", "dcom.objref.flags", FT_UINT32, BASE_HEX, VALS(dcom_objref_flag_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_iid,
-		{ "IID", "dcom.iid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "IID", "dcom.iid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_clsid,
-		{ "CLSID", "dcom.clsid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "CLSID", "dcom.clsid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_objref_resolver_address,
-		{ "ResolverAddress", "dcom.objref.resolver_address", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "ResolverAddress", "dcom.objref.resolver_address", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_objref_cbextension,
 		{ "CBExtension", "dcom.objref.cbextension", FT_UINT32, BASE_DEC, NULL, 0x0, "Size of extension data", HFILL }},
 		{ &hf_dcom_objref_size,
-		{ "Size", "dcom.objref.size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }}
+		{ "Size", "dcom.objref.size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_stdobjref_array[] = {
 		{ &hf_dcom_stdobjref,
-		{ "STDOBJREF", "dcom.stdobjref", FT_NONE, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "STDOBJREF", "dcom.stdobjref", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_stdobjref_flags,
-		{ "Flags", "dcom.stdobjref.flags", FT_UINT32, BASE_HEX, VALS(dcom_stdobjref_flag_vals), 0x0, "", HFILL }},
+		{ "Flags", "dcom.stdobjref.flags", FT_UINT32, BASE_HEX, VALS(dcom_stdobjref_flag_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_stdobjref_public_refs,
-		{ "PublicRefs", "dcom.stdobjref.public_refs", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "PublicRefs", "dcom.stdobjref.public_refs", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_oxid,
-		{ "OXID", "dcom.oxid", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "OXID", "dcom.oxid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_oid,
-		{ "OID", "dcom.oid", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "OID", "dcom.oid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_ipid,
-		{ "IPID", "dcom.ipid", FT_GUID, BASE_NONE, NULL, 0x0, "", HFILL }}
+		{ "IPID", "dcom.ipid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_dualstringarray_array[] = {
 		{ &hf_dcom_dualstringarray_num_entries,
-		{ "NumEntries", "dcom.dualstringarray.num_entries", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "NumEntries", "dcom.dualstringarray.num_entries", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_security_offset,
-		{ "SecurityOffset", "dcom.dualstringarray.security_offset", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "SecurityOffset", "dcom.dualstringarray.security_offset", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_string,
-		{ "StringBinding", "dcom.dualstringarray.string", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "StringBinding", "dcom.dualstringarray.string", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_string_tower_id,
-		{ "TowerId", "dcom.dualstringarray.tower_id", FT_UINT16, BASE_HEX, VALS(dcom_protseq_vals), 0x0, "", HFILL }},
+		{ "TowerId", "dcom.dualstringarray.tower_id", FT_UINT16, BASE_HEX, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_string_network_addr,
-		{ "NetworkAddr", "dcom.dualstringarray.network_addr", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "NetworkAddr", "dcom.dualstringarray.network_addr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_security,
-		{ "SecurityBinding", "dcom.dualstringarray.security", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "SecurityBinding", "dcom.dualstringarray.security", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_security_authn_svc,
-		{ "AuthnSvc", "dcom.dualstringarray.security_authn_svc", FT_UINT16, BASE_HEX, VALS(dcom_dualstringarray_authn), 0x0, "", HFILL }},
+		{ "AuthnSvc", "dcom.dualstringarray.security_authn_svc", FT_UINT16, BASE_HEX, VALS(dcom_dualstringarray_authn), 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_security_authz_svc,
-		{ "AuthzSvc", "dcom.dualstringarray.security_authz_svc", FT_UINT16, BASE_HEX, VALS(dcom_dualstringarray_authz), 0x0, "", HFILL }},
+		{ "AuthzSvc", "dcom.dualstringarray.security_authz_svc", FT_UINT16, BASE_HEX, VALS(dcom_dualstringarray_authz), 0x0, NULL, HFILL }},
 		{ &hf_dcom_dualstringarray_security_princ_name,
-		{ "PrincName", "dcom.dualstringarray.security_princ_name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}
+		{ "PrincName", "dcom.dualstringarray.security_princ_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_vt_array[] = {
 		{ &hf_dcom_vt_bool,
-		{ "VT_BOOL", "dcom.vt.bool", FT_UINT16, BASE_HEX, VALS(dcom_vt_bool_vals), 0x0, "", HFILL }},
+		{ "VT_BOOL", "dcom.vt.bool", FT_UINT16, BASE_HEX, VALS(dcom_vt_bool_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_i1,
-		{ "VT_I1", "dcom.vt.i1", FT_INT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_I1", "dcom.vt.i1", FT_INT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_i2,
-		{ "VT_I2", "dcom.vt.i2", FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_I2", "dcom.vt.i2", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_i4,
-		{ "VT_I4", "dcom.vt.i4", FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_I4", "dcom.vt.i4", FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_i8,
-		{ "VT_I8", "dcom.vt.i8", FT_INT64, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_I8", "dcom.vt.i8", FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_ui1,
-		{ "VT_UI1", "dcom.vt.ui1", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_UI1", "dcom.vt.ui1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_ui2,
-		{ "VT_UI2", "dcom.vt.ui2", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_UI2", "dcom.vt.ui2", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_ui4,
-		{ "VT_UI4", "dcom.vt.ui4", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "VT_UI4", "dcom.vt.ui4", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_r4,
-		{ "VT_R4", "dcom.vt.r4", FT_FLOAT, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VT_R4", "dcom.vt.r4", FT_FLOAT, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_r8,
-		{ "VT_R8", "dcom.vt.r8", FT_DOUBLE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VT_R8", "dcom.vt.r8", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_date,
-		{ "VT_DATE", "dcom.vt.date", FT_DOUBLE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VT_DATE", "dcom.vt.date", FT_DOUBLE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_bstr,
-		{ "VT_BSTR", "dcom.vt.bstr", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "VT_BSTR", "dcom.vt.bstr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_byref,
-		{ "BYREF", "dcom.vt.byref", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "BYREF", "dcom.vt.byref", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_vt_dispatch,
-		{ "VT_DISPATCH", "dcom.vt.dispatch", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}
+		{ "VT_DISPATCH", "dcom.vt.dispatch", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	static hf_register_info hf_dcom_sa_array[] = {
 		{ &hf_dcom_safearray,
-		{ "SAFEARRAY", "dcom.sa", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "SAFEARRAY", "dcom.sa", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_dims32,
-		{ "Dims32", "dcom.sa.dims32", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Dims32", "dcom.sa.dims32", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_dims16,
-		{ "Dims16", "dcom.sa.dims16", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Dims16", "dcom.sa.dims16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_features,
-		{ "Features", "dcom.sa.features", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Features", "dcom.sa.features", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_element_size,
-		{ "ElementSize", "dcom.sa.element_size", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "ElementSize", "dcom.sa.element_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_locks,
-		{ "Locks", "dcom.sa.locks", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Locks", "dcom.sa.locks", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_vartype32,
-		{ "VarType32", "dcom.sa.vartype", FT_UINT32, BASE_DEC, VALS(dcom_variant_type_vals), 0x0, "", HFILL }},
+		{ "VarType32", "dcom.sa.vartype", FT_UINT32, BASE_DEC, VALS(dcom_variant_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_vartype16,
-		{ "VarType16", "dcom.sa.vartype", FT_UINT16, BASE_DEC, VALS(dcom_variant_type_vals), 0x0, "", HFILL }},
+		{ "VarType16", "dcom.sa.vartype", FT_UINT16, BASE_DEC, VALS(dcom_variant_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_elements,
-		{ "Elements", "dcom.sa.elements", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Elements", "dcom.sa.elements", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_bound_elements,
-		{ "BoundElements", "dcom.sa.bound_elements", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "BoundElements", "dcom.sa.bound_elements", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_dcom_sa_low_bound,
-		{ "LowBound", "dcom.sa.low_bound", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "LowBound", "dcom.sa.low_bound", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_dcom_sa_features_auto,
-		{ "AUTO", "dcom.sa.features_auto", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_AUTO, "", HFILL }},
+		{ "AUTO", "dcom.sa.features_auto", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_AUTO, NULL, HFILL }},
 		{ &hf_dcom_sa_features_static,
-		{ "STATIC", "dcom.sa.features_static", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_STATIC, "", HFILL }},
+		{ "STATIC", "dcom.sa.features_static", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_STATIC, NULL, HFILL }},
 		{ &hf_dcom_sa_features_embedded,
-		{ "EMBEDDED", "dcom.sa.features_embedded", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_EMBEDDED, "", HFILL }},
+		{ "EMBEDDED", "dcom.sa.features_embedded", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_EMBEDDED, NULL, HFILL }},
 		{ &hf_dcom_sa_features_fixedsize,
-		{ "FIXEDSIZE", "dcom.sa.features_fixedsize", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_FIXEDSIZE, "", HFILL }},
+		{ "FIXEDSIZE", "dcom.sa.features_fixedsize", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_FIXEDSIZE, NULL, HFILL }},
 		{ &hf_dcom_sa_features_record,
-		{ "RECORD", "dcom.sa.features_record", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_RECORD, "", HFILL }},
+		{ "RECORD", "dcom.sa.features_record", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_RECORD, NULL, HFILL }},
 		{ &hf_dcom_sa_features_have_iid,
-		{ "HAVEIID", "dcom.sa.features_have_iid", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEIID, "", HFILL }},
+		{ "HAVEIID", "dcom.sa.features_have_iid", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEIID, NULL, HFILL }},
 		{ &hf_dcom_sa_features_have_vartype,
-		{ "HAVEVARTYPE", "dcom.sa.features_have_vartype", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEVARTYPE, "", HFILL }},
+		{ "HAVEVARTYPE", "dcom.sa.features_have_vartype", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_HAVEVARTYPE, NULL, HFILL }},
 		{ &hf_dcom_sa_features_bstr,
-		{ "BSTR", "dcom.sa.features_bstr", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_BSTR, "", HFILL }},
+		{ "BSTR", "dcom.sa.features_bstr", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_BSTR, NULL, HFILL }},
 		{ &hf_dcom_sa_features_unknown,
-		{ "UNKNOWN", "dcom.sa.features_unknown", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_UNKNOWN, "", HFILL }},
+		{ "UNKNOWN", "dcom.sa.features_unknown", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_UNKNOWN, NULL, HFILL }},
 		{ &hf_dcom_sa_features_dispatch,
-		{ "DISPATCH", "dcom.sa.features_dispatch", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_DISPATCH, "", HFILL }},
+		{ "DISPATCH", "dcom.sa.features_dispatch", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_DISPATCH, NULL, HFILL }},
 		{ &hf_dcom_sa_features_variant,
-		{ "VARIANT", "dcom.sa.features_variant", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_VARIANT, "", HFILL }}
+		{ "VARIANT", "dcom.sa.features_variant", FT_BOOLEAN, 16, TFS (&flags_set_truth), WIRESHARK_FADF_VARIANT, NULL, HFILL }}
 	};
 
 	static gint *ett_dcom[] = {
diff --git a/epan/dissectors/packet-dcp-etsi.c b/epan/dissectors/packet-dcp-etsi.c
index b3dc069fd0..d614c2a47b 100644
--- a/epan/dissectors/packet-dcp-etsi.c
+++ b/epan/dissectors/packet-dcp-etsi.c
@@ -729,11 +729,11 @@ proto_register_dcp_etsi (void)
     {&hf_edcp_crc,
      {"CRC", "dcp-af.crc",
       FT_UINT16, BASE_HEX, NULL, 0,
-      "CRC", HFILL}
+      NULL, HFILL}
      },
     {&hf_edcp_crc_ok,
      {"CRC OK", "dcp-af.crc_ok",
-      FT_BOOLEAN, BASE_NONE, NULL, 0,
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0,
       "AF CRC OK", HFILL}
      }
     };
@@ -801,7 +801,7 @@ proto_register_dcp_etsi (void)
      },
     {&hf_edcp_hcrc_ok,
      {"PFT CRC OK", "dcp-pft.crc_ok",
-      FT_BOOLEAN, BASE_NONE, NULL, 0,
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0,
       "PFT Header CRC OK", HFILL}
      },
     {&hf_edcp_fragments,
@@ -812,18 +812,18 @@ proto_register_dcp_etsi (void)
       FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}},
     {&hf_edcp_fragment_overlap,
      {"Message fragment overlap", "dcp-pft.fragment.overlap",
-      FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}},
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_edcp_fragment_overlap_conflicts,
      {"Message fragment overlapping with conflicting data",
       "dcp-pft.fragment.overlap.conflicts",
-      FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}},
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_edcp_fragment_multiple_tails,
      {"Message has multiple tail fragments",
       "dcp-pft.fragment.multiple_tails",
-      FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}},
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_edcp_fragment_too_long_fragment,
      {"Message fragment too long", "dcp-pft.fragment.too_long_fragment",
-      FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL}},
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     {&hf_edcp_fragment_error,
      {"Message defragmentation error", "dcp-pft.fragment.error",
       FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL}},
@@ -847,12 +847,12 @@ proto_register_dcp_etsi (void)
      },
     {&hf_edcp_rs_ok,
      {"RS decode OK", "dcp-pft.rs_ok",
-      FT_BOOLEAN, BASE_NONE, NULL, 0,
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0,
       "successfully decoded RS blocks", HFILL}
      },
     {&hf_edcp_pft_payload,
      {"payload", "dcp-pft.payload",
-      FT_BYTES, BASE_HEX, NULL, 0,
+      FT_BYTES, BASE_NONE, NULL, 0,
       "PFT Payload", HFILL}
     }
   };
@@ -860,7 +860,7 @@ proto_register_dcp_etsi (void)
   static hf_register_info hf_tpl[] = {
     {&hf_tpl_tlv,
      {"tag", "dcp-tpl.tlv",
-      FT_BYTES, BASE_HEX, NULL, 0,
+      FT_BYTES, BASE_NONE, NULL, 0,
       "Tag Packet", HFILL}
      },
     {&hf_tpl_ptr,
diff --git a/epan/dissectors/packet-ddtp.c b/epan/dissectors/packet-ddtp.c
index 235c5229ab..9cdb569d18 100644
--- a/epan/dissectors/packet-ddtp.c
+++ b/epan/dissectors/packet-ddtp.c
@@ -181,7 +181,7 @@ proto_register_ddtp(void)
     static hf_register_info hf_ddtp[] = {
 	{ &hf_ddtp_version,
 	    { "Version", "ddtp.version", FT_UINT32, BASE_DEC, VALS(vals_ddtp_version), 0x0,
-		"Version", HFILL }},
+		NULL, HFILL }},
 	{ &hf_ddtp_encrypt,
 	    { "Encryption", "ddtp.encrypt", FT_UINT32, BASE_DEC, VALS(vals_ddtp_encrypt), 0x0,
 		"Encryption type", HFILL }},
@@ -196,7 +196,7 @@ proto_register_ddtp(void)
 		"Update query opcode", HFILL }},
 	{ &hf_ddtp_ipaddr,
 	    { "IP address", "ddtp.ipaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
-		"IP address", HFILL }},
+		NULL, HFILL }},
 	{ &hf_ddtp_status,
 	    { "Status", "ddtp.status", FT_UINT32, BASE_DEC, VALS(vals_ddtp_status), 0x0,
 		"Update reply status", HFILL }}
diff --git a/epan/dissectors/packet-dec-bpdu.c b/epan/dissectors/packet-dec-bpdu.c
index 7bcebdf0ab..fdb0ebfbd5 100644
--- a/epan/dissectors/packet-dec-bpdu.c
+++ b/epan/dissectors/packet-dec-bpdu.c
@@ -205,71 +205,71 @@ proto_register_dec_bpdu(void)
     { &hf_dec_bpdu_proto_id,
       { "Protocol Identifier",		"dec_stp.protocol",
 	FT_UINT8,	BASE_HEX,	VALS(&protocol_id_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_type,
       { "BPDU Type",			"dec_stp.type",
 	FT_UINT8,	BASE_DEC,	VALS(&bpdu_type_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_version_id,
       { "BPDU Version",			"dec_stp.version",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags,
       { "BPDU flags",			"dec_stp.flags",
 	FT_UINT8,	BASE_HEX,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_short_timers,
       { "Use short timers",		"dec_stp.flags.short_timers",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_SHORT_TIMERS,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_tcack,
       { "Topology Change Acknowledgment",  "dec_stp.flags.tcack",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TCACK,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_flags_tc,
       { "Topology Change",		"dec_stp.flags.tc",
 	FT_BOOLEAN,	8,		TFS(&tfs_yes_no),	BPDU_FLAGS_TC,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_pri,
       { "Root Priority",		"dec_stp.root.pri",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_mac,
       { "Root MAC",			"dec_stp.root.mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_root_cost,
       { "Root Path Cost",		"dec_stp.root.cost",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_bridge_pri,
       { "Bridge Priority",		"dec_stp.bridge.pri",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_bridge_mac,
       { "Bridge MAC",			"dec_stp.bridge.mac",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_port_id,
       { "Port identifier",		"dec_stp.port",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_msg_age,
       { "Message Age",			"dec_stp.msg_age",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_hello_time,
       { "Hello Time",			"dec_stp.hello",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_max_age,
       { "Max Age",			"dec_stp.max_age",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_dec_bpdu_forward_delay,
       { "Forward Delay",		"dec_stp.forward",
 	FT_UINT8,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_dec_bpdu,
diff --git a/epan/dissectors/packet-dec-dnart.c b/epan/dissectors/packet-dec-dnart.c
index 5f721cb42a..7e6e83745c 100644
--- a/epan/dissectors/packet-dec-dnart.c
+++ b/epan/dissectors/packet-dec-dnart.c
@@ -1325,7 +1325,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_ctrl_msg,
       { "Control packet",            "dec_dna.flags.control",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_CTRL_MSG,
-          "Control packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_long_msg,
       { "Long data packet format",     "dec_dna.flags.msglen",
         FT_UINT8,    BASE_HEX,    NULL, 0x06,
@@ -1341,15 +1341,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_rts,
       { "Packet on return trip",    "dec_dna.flags.RTS",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_RTS,
-          "Packet on return trip", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_inter_eth,
       { "Intra-ethernet packet",    "dec_dna.flags.intra_eth",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_INTRA_ETHER,
-          "Intra-ethernet packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_discard,
       { "Discarded packet",            "dec_dna.flags.discard",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    RT_FLAGS_DISCARD,
-          "Discarded packet", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_dst_addr,
       { "Destination Address",        "dec_dna.dst.address",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
@@ -1373,7 +1373,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_visit_count,
       { "Visit count",            "dec_dna.visit_cnt",
         FT_UINT8,    BASE_HEX,    NULL,   0x0,
-          "Visit count", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_flow_control,
       { "Flow control",            "dec_dna.nsp.flow_control",
         FT_UINT8,    BASE_HEX,    VALS(&rt_flow_control_vals),   0x3,
@@ -1385,11 +1385,11 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_info,
       { "Version info",            "dec_dna.nsp.info",
         FT_UINT8,    BASE_HEX,    VALS(&rt_info_version_vals),   0x03,
-          "Version info", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_dst_node,
       { "Destination node",            "dec_dna.dst_node",
         FT_UINT16,    BASE_HEX,    NULL,   0x0,
-          "Destination node", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_seg_size,
       { "Maximum data segment size", "dec_dna.nsp.segsize",
         FT_UINT16,    BASE_DEC,    NULL,   0x0,
@@ -1397,7 +1397,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_src_node,
       { "Source node",            "dec_dna.src_node",
         FT_UINT16,    BASE_HEX,    NULL,   0x0,
-          "Source node", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_segnum,
       { "Message number",        "dec_dna.nsp.segnum",
         FT_UINT16,    BASE_DEC,    NULL,   0xfff,
@@ -1430,15 +1430,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_fc_val,
       { "Flow control",            "dec_dna.nsp.fc_val",
         FT_NONE,    BASE_NONE,    NULL,    0x0,
-          "Flow control", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_tiinfo,
       { "Routing information",    "dec_dna.ctl.tiinfo",
         FT_UINT8,    BASE_HEX,    VALS(&rt_tiinfo_vals), 0x0,
-          "Routing information", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_blk_size,
       { "Block size",            "dec_dna.ctl.blk_size",
         FT_UINT16,    BASE_DEC,    NULL,    0x0,
-          "Block size", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_disc_reason,
       { "Reason for disconnect","dec_dna.nsp.disc_reason",
         FT_UINT16,    BASE_HEX,    VALS(&rt_disc_reason_vals),    0x0,
@@ -1454,7 +1454,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_reserved,
       { "Reserved", "dec_dna.ctl.reserved",
          FT_BYTES, BASE_NONE, NULL, 0x0,
-         "Reserved", HFILL }},
+         NULL, HFILL }},
     { &hf_dec_rt_fcnval,
       { "Verification message function value", "dec_dna.ctl.fcnval",
          FT_BYTES, BASE_NONE, NULL, 0x0,
@@ -1470,15 +1470,15 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_id,
       { "Transmitting system ID",            "dec_dna.ctl.id",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
-          "Transmitting system ID", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo,
       { "Routing information",        "dec_dna.ctl.tiinfo",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,
-          "Routing information", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo_node_type,
       { "Node type",            "dec_dna.ctl.iinfo.node_type",
         FT_UINT8,    BASE_HEX,    VALS(&rt_iinfo_node_type_vals),    0x03,
-          "Node type", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_iinfo_vrf,
       { "Verification required",            "dec_dna.ctl.iinfo.vrf",
         FT_BOOLEAN,    8,        TFS(&tfs_yes_no),    0x4,
@@ -1502,7 +1502,7 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_iprio,
       { "Routing priority",        "dec_dna.ctl.prio",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,
-          "Routing priority", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_neighbor,
       { "Neighbor",                "dec_dna.ctl_neighbor",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
@@ -1510,31 +1510,31 @@ proto_register_dec_rt(void)
     { &hf_dec_rt_seed,
       { "Verification seed",    "dec_dna.ctl.seed",
         FT_BYTES,    BASE_NONE,    NULL, 0x0,
-          "Verification seed", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_elist,
       { "List of router states",    "dec_dna.ctl.elist",
         FT_NONE,    BASE_NONE,    NULL, 0x0,
           "Router states", HFILL }},
     { &hf_dec_rt_ename,
       { "Ethernet name",      "dec_dna.ctl.ename",
-        FT_BYTES,    BASE_HEX,    NULL,    0x0,
-          "Ethernet name", HFILL }},
+        FT_BYTES,    BASE_NONE,    NULL,    0x0,
+          NULL, HFILL }},
     { &hf_dec_rt_router_id,
       { "Router ID",                "dec_dna.ctl.router_id",
         FT_ETHER,    BASE_NONE,    NULL,    0x0,
-          "Router ID", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_router_state,
       { "Router state",    "dec_dna.ctl.router_state",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Router state", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_conn_contents,
       { "Session connect data",    "dec_dna.sess.conn",
         FT_NONE,    BASE_NONE,    NULL, 0x0,
-          "Session connect data", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_rt_router_prio,
       { "Router priority",    "dec_dna.ctl.router_prio",
         FT_UINT8,    BASE_HEX,    NULL, 0x7f,
-          "Router priority", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_grp_code,
       { "Session Group code",    "dec_dna.sess.grp_code",
         FT_UINT16,    BASE_HEX,    NULL, 0x0,
@@ -1542,15 +1542,15 @@ proto_register_dec_rt(void)
     { &hf_dec_sess_usr_code,
       { "Session User code",    "dec_dna.sess.usr_code",
         FT_UINT16,    BASE_HEX,    NULL, 0x0,
-          "Session User code", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_dst_name,
       { "Session Destination end user",    "dec_dna.sess.dst_name",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Session Destination end user", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_src_name,
       { "Session Source end user",    "dec_dna.sess.src_name",
         FT_STRING,    BASE_NONE,    NULL, 0x0,
-          "Session Source end user", HFILL }},
+          NULL, HFILL }},
     { &hf_dec_sess_obj_type,
       { "Session Object type",    "dec_dna.sess.obj_type",
         FT_UINT8,    BASE_HEX,    NULL, 0x0,
diff --git a/epan/dissectors/packet-dhcp-failover.c b/epan/dissectors/packet-dhcp-failover.c
index 8e05618622..56eca4da42 100644
--- a/epan/dissectors/packet-dhcp-failover.c
+++ b/epan/dissectors/packet-dhcp-failover.c
@@ -979,208 +979,208 @@ proto_register_dhcpfo(void)
 		{ &hf_dhcpfo_length,
 			{ "Message length",	   "dhcpfo.length",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_dhcpfo_type,
 			{ "Message Type",	   "dhcpfo.type",
 			FT_UINT8, BASE_DEC, VALS(failover_vals), 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_poffset,
 			{ "Payload Offset",	   "dhcpfo.poffset",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_time,
 			{ "Time",	   "dhcpfo.time",
 			FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_xid,
 			{ "Xid",	   "dhcpfo.xid",
 			FT_UINT32, BASE_HEX, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_additional_HB,
 			{"Additional Header Bytes",	"dhcpfo.additionalheaderbytes",
 			FT_BYTES, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_payload_data,
 			{"Payload Data",	"dhcpfo.payloaddata",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_dhcp_style_option,
 			{"DHCP Style Option",	"dhcpfo.dhcpstyleoption",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_dhcpfo_option_code,
 			{"Option Code",		"dhcpfo.optioncode",
 			FT_UINT16, BASE_DEC, VALS(option_code_vals), 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_option_length,
 			{"Length",		"dhcpfo.optionlength",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_binding_status,
 			{"Type", "dhcpfo.bindingstatus",
 			FT_UINT32, BASE_DEC, VALS(binding_status_vals), 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 
 		{&hf_dhcpfo_server_state,
 			{"server status", "dhcpfo.serverstatus",
 			FT_UINT8, BASE_DEC, VALS(server_state_vals), 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 
 		{&hf_dhcpfo_assigned_ip_address,
 			{"assigned ip address", "dhcpfo.assignedipaddress",
 			FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_sending_server_ip_address,
 			{"sending server ip-address", "dhcpfo.sendingserveripaddress",
 			FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 
 		{&hf_dhcpfo_addresses_transferred,
 			{"addresses transferred", "dhcpfo.addressestransferred",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 
 		{&hf_dhcpfo_client_identifier,
 			{"Client Identifier", "dhcpfo.clientidentifier",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_client_hw_type,
 			{"Client Hardware Type", "dhcpfo.clienthardwaretype",
 			FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{&hf_dhcpfo_client_hardware_address,
 			{"Client Hardware Address", "dhcpfo.clienthardwareaddress",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_ftddns,
 			{"FTDDNS", "dhcpfo.ftddns",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_reject_reason,
 			{"Reject reason", "dhcpfo.rejectreason",
 			FT_UINT8, BASE_DEC, VALS(reject_reason_vals), 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_message,
 			{"Message", "dhcpfo.message",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 
 		{&hf_dhcpfo_mclt,
 			{"MCLT", "dhcpfo.mclt",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_vendor_class,
 			{"Vendor class", "dhcpfo.vendorclass",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_lease_expiration_time,
 			{"Lease expiration time", "dhcpfo.leaseexpirationtime",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_grace_expiration_time,
 			{"Grace expiration time", "dhcpfo.graceexpirationtime",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_potential_expiration_time,
 			{"Potential expiration time", "dhcpfo.potentialexpirationtime",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_client_last_transaction_time,
 			{"Client last transaction time", "dhcpfo.clientlasttransactiontime",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_start_time_of_state,
 			{"Start time of state", "dhcpfo.starttimeofstate",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_vendor_option,
 			{"Vendor option", "dhcpfo.vendoroption",
 			FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_max_unacked_bndupd,
 			{"Max unacked BNDUPD", "dhcpfo.maxunackedbndupd",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_protocol_version,
 			{"Protocol version", "dhcpfo.protocolversion",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_receive_timer,
 			{"Receive timer", "dhcpfo.receivetimer",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_message_digest,
 			{"Message digest", "dhcpfo.messagedigest",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 
 		{&hf_dhcpfo_hash_bucket_assignment,
 			{"Hash bucket assignment", "dhcpfo.hashbucketassignment",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index 5ce239517c..bb05209d05 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -1284,15 +1284,15 @@ proto_register_dhcpv6(void)
     { &hf_dhcpv6_msgtype,
       { "Message type",			"dhcpv6.msgtype",	 FT_UINT8,
          BASE_DEC, 			VALS(msgtype_vals),   0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_fqdn_1,
-      { "Reserved", "dhcpv6.msgtype.reserved", FT_UINT8, BASE_HEX, NULL, 0xF8, "", HFILL}},
+      { "Reserved", "dhcpv6.msgtype.reserved", FT_UINT8, BASE_HEX, NULL, 0xF8, NULL, HFILL}},
     { &hf_fqdn_2,
-      { "N", "dhcpv6.msgtype.n", FT_BOOLEAN, 8, TFS(&fqdn_n), 0x4, "", HFILL}},
+      { "N", "dhcpv6.msgtype.n", FT_BOOLEAN, 8, TFS(&fqdn_n), 0x4, NULL, HFILL}},
     { &hf_fqdn_3,
-      { "O", "dhcpv6.msgtype.o", FT_BOOLEAN, 8, TFS(&fqdn_o), 0x2, "", HFILL}},
+      { "O", "dhcpv6.msgtype.o", FT_BOOLEAN, 8, TFS(&fqdn_o), 0x2, NULL, HFILL}},
     { &hf_fqdn_4,
-      { "S", "dhcpv6.msgtype.s", FT_BOOLEAN, 8, TFS(&fqdn_s), 0x1, "", HFILL}}
+      { "S", "dhcpv6.msgtype.s", FT_BOOLEAN, 8, TFS(&fqdn_s), 0x1, NULL, HFILL}}
     
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c
index b6de03d352..e26ff49c9f 100644
--- a/epan/dissectors/packet-diameter.c
+++ b/epan/dissectors/packet-diameter.c
@@ -1386,95 +1386,95 @@ proto_register_diameter(void)
 	hf_register_info hf_base[] = {
 	{ &hf_diameter_version,
 		  { "Version", "diameter.version", FT_UINT8, BASE_HEX, NULL, 0x00,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_length,
 		  { "Length","diameter.length", FT_UINT24, BASE_DEC, NULL, 0x0,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags,
 		  { "Flags", "diameter.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_request,
 		  { "Request", "diameter.flags.request", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_R,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_proxyable,
 		  { "Proxyable", "diameter.flags.proxyable", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_P,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_error,
 		  { "Error","diameter.flags.error", FT_BOOLEAN, 8, TFS(&flags_set_truth), DIAM_FLAGS_E,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_T,
 		  { "T(Potentially re-transmitted message)","diameter.flags.T", FT_BOOLEAN, 8, TFS(&flags_set_truth),DIAM_FLAGS_T,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_flags_reserved4,
 		  { "Reserved","diameter.flags.reserved4", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED4, "", HFILL }},
+			  DIAM_FLAGS_RESERVED4, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved5,
 		  { "Reserved","diameter.flags.reserved5", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED5, "", HFILL }},
+			  DIAM_FLAGS_RESERVED5, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved6,
 		  { "Reserved","diameter.flags.reserved6", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED6, "", HFILL }},
+			  DIAM_FLAGS_RESERVED6, NULL, HFILL }},
 	{ &hf_diameter_flags_reserved7,
 		  { "Reserved","diameter.flags.reserved7", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  DIAM_FLAGS_RESERVED7, "", HFILL }},
+			  DIAM_FLAGS_RESERVED7, NULL, HFILL }},
 	{ &hf_diameter_vendor_id,
 		  { "VendorId",	"diameter.vendorId", FT_UINT32, BASE_DEC, VALS(sminmpec_values),
-			  0x0,"", HFILL }},
+			  0x0,NULL, HFILL }},
 	{ &hf_diameter_application_id,
 		  { "ApplicationId",	"diameter.applicationId", FT_UINT32, BASE_DEC, dictionary.applications,
-			  0x0,"", HFILL }},
+			  0x0,NULL, HFILL }},
 	{ &hf_diameter_hopbyhopid,
 		  { "Hop-by-Hop Identifier", "diameter.hopbyhopid", FT_UINT32,
-			  BASE_HEX, NULL, 0x0, "", HFILL }},
+			  BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_endtoendid,
 		  { "End-to-End Identifier", "diameter.endtoendid", FT_UINT32,
-			  BASE_HEX, NULL, 0x0, "", HFILL }},
+			  BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp,
-		  { "AVP","diameter.avp", FT_BYTES, BASE_HEX,
-			  NULL, 0x0, "", HFILL }},
+		  { "AVP","diameter.avp", FT_BYTES, BASE_NONE,
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_len,
 		  { "AVP Length","diameter.avp.len", FT_UINT24, BASE_DEC,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_flags,
 		  { "AVP Flags","diameter.avp.flags", FT_UINT8, BASE_HEX,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_flags_vendor_specific,
 		  { "Vendor-Specific", "diameter.flags.vendorspecific", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_V,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_mandatory,
 		  { "Mandatory", "diameter.flags.mandatory", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_M,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_protected,
 		  { "Protected","diameter.avp.flags.protected", FT_BOOLEAN, 8, TFS(&flags_set_truth), AVP_FLAGS_P,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved3,
 		  { "Reserved","diameter.avp.flags.reserved3", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED3,	"", HFILL }},
+			  AVP_FLAGS_RESERVED3,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved4,
 		  { "Reserved","diameter.avp.flags.reserved4", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED4,	"", HFILL }},
+			  AVP_FLAGS_RESERVED4,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved5,
 		  { "Reserved","diameter.avp.flags.reserved5", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED5,	"", HFILL }},
+			  AVP_FLAGS_RESERVED5,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved6,
 		  { "Reserved","diameter.avp.flags.reserved6", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED6,	"", HFILL }},
+			  AVP_FLAGS_RESERVED6,	NULL, HFILL }},
 	{ &hf_diameter_avp_flags_reserved7,
 		  { "Reserved","diameter.avp.flags.reserved7", FT_BOOLEAN, 8, TFS(&tfs_set_notset),
-			  AVP_FLAGS_RESERVED7,	"", HFILL }},
+			  AVP_FLAGS_RESERVED7,	NULL, HFILL }},
 	{ &hf_diameter_avp_vendor_id,
 		  { "AVP Vendor Id","diameter.avp.vendorId", FT_UINT32, BASE_DEC,
-			  VALS(sminmpec_values), 0x0, "", HFILL }},
+			  VALS(sminmpec_values), 0x0, NULL, HFILL }},
 	{ &(unknown_avp.hf_value),
 		  { "Value","diameter.avp.unknown", FT_BYTES, BASE_NONE,
-			  NULL, 0x0, "", HFILL }},
+			  NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_avp_data_wrong_length,
 		  { "Data","diameter.avp.invalid-data", FT_BYTES, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 	{ &hf_diameter_code,
-		  { "Command Code", "diameter.cmd.code", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+		  { "Command Code", "diameter.cmd.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_diameter_avp_code,
-		  { "AVP Code", "diameter.avp.code", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+		  { "AVP Code", "diameter.avp.code", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	{ &hf_diameter_answer_in,
 		{ "Answer In", "diameter.answer_in", FT_FRAMENUM, BASE_DEC, NULL, 0x0,
 		"The answer to this diameter request is in this frame", HFILL }},
diff --git a/epan/dissectors/packet-diameter_3gpp.c b/epan/dissectors/packet-diameter_3gpp.c
index c17a42f372..bd58cf3f97 100644
--- a/epan/dissectors/packet-diameter_3gpp.c
+++ b/epan/dissectors/packet-diameter_3gpp.c
@@ -162,28 +162,28 @@ proto_register_diameter_3gpp(void)
 	static hf_register_info hf[] = {
 		{ &hf_diameter_3gpp_msisdn,
 			{ "MSISDN",           "diameter.3gpp.msisdn",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
-			"MSISDN", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
+			NULL, HFILL }
 		},
 		{ &hf_diameter_3gpp_ipaddr,
 			{ "IPv4 Address",           "diameter.3gpp.ipaddr",
-			FT_IPv4, BASE_DEC, NULL, 0x0,          
-			"IPv4 Address", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x0,          
+			NULL, HFILL }
 		},
 		{ &hf_diameter_3gpp_mbms_required_qos_prio,
 			{ "Allocation/Retention Priority",           "diameter.3gpp.mbms_required_qos_prio",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"Allocation/Retention Priority", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_diameter_3gpp_tmgi,
 			{ "TMGI",           "diameter.3gpp.tmgi",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
-			"TMGI", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
+			NULL, HFILL }
 		},
 		{ &hf_diameter_mbms_service_id,
 			{ "MBMS Service ID",           "diameter.3gpp.mbms_service_id",
 			FT_UINT24, BASE_HEX, NULL, 0x0,          
-			"MBMS Service ID", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 389bbb4e87..e1bd4ddc4a 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -1683,7 +1683,7 @@ void proto_register_disp(void) {
         "dsp.AccessPoint", HFILL }},
     { &hf_disp_secondaryShadows,
       { "secondaryShadows", "disp.secondaryShadows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_area,
       { "area", "disp.area",
@@ -1699,7 +1699,7 @@ void proto_register_disp(void) {
         "disp.Knowledge", HFILL }},
     { &hf_disp_subordinates,
       { "subordinates", "disp.subordinates",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_contextSelection,
       { "contextSelection", "disp.contextSelection",
@@ -1735,7 +1735,7 @@ void proto_register_disp(void) {
         "disp.T_knowledgeType", HFILL }},
     { &hf_disp_extendedKnowledge,
       { "extendedKnowledge", "disp.extendedKnowledge",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_AttributeSelection_item,
       { "ClassAttributeSelection", "disp.ClassAttributeSelection",
@@ -1775,7 +1775,7 @@ void proto_register_disp(void) {
         "disp.ConsumerUpdateMode", HFILL }},
     { &hf_disp_onChange,
       { "onChange", "disp.onChange",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_scheduled,
       { "scheduled", "disp.scheduled",
@@ -1787,7 +1787,7 @@ void proto_register_disp(void) {
         "disp.PeriodicStrategy", HFILL }},
     { &hf_disp_othertimes,
       { "othertimes", "disp.othertimes",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_beginTime,
       { "beginTime", "disp.beginTime",
@@ -1843,7 +1843,7 @@ void proto_register_disp(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_disp_encrypted,
       { "encrypted", "disp.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "disp.BIT_STRING", HFILL }},
     { &hf_disp_null,
       { "null", "disp.null",
@@ -1859,7 +1859,7 @@ void proto_register_disp(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_disp_aliasDereferenced,
       { "aliasDereferenced", "disp.aliasDereferenced",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_notification,
       { "notification", "disp.notification",
@@ -1963,15 +1963,15 @@ void proto_register_disp(void) {
         "disp.Subtree", HFILL }},
     { &hf_disp_sDSEType,
       { "sDSEType", "disp.sDSEType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "disp.SDSEType", HFILL }},
     { &hf_disp_subComplete,
       { "subComplete", "disp.subComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_attComplete,
       { "attComplete", "disp.attComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "disp.BOOLEAN", HFILL }},
     { &hf_disp_attributes,
       { "attributes", "disp.attributes",
diff --git a/epan/dissectors/packet-distcc.c b/epan/dissectors/packet-distcc.c
index 5b5e558520..f39b09e5f0 100644
--- a/epan/dissectors/packet-distcc.c
+++ b/epan/dissectors/packet-distcc.c
@@ -354,7 +354,7 @@ proto_register_distcc(void)
     static hf_register_info hf[] = {
 	{&hf_distcc_version,
 	 {"DISTCC Version", "distcc.version",
-	  FT_UINT32, BASE_DEC, NULL, 0x0, "DISTCC Version", HFILL }
+	  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_distcc_argc,
 	 {"ARGC", "distcc.argc",
@@ -382,7 +382,7 @@ proto_register_distcc(void)
 	},
 	{&hf_distcc_doto_object,
 	 {"Object", "distcc.doto_object",
-	  FT_BYTES, BASE_HEX, NULL, 0x0, "DOTO Compiled object file (.o)", HFILL }
+	  FT_BYTES, BASE_NONE, NULL, 0x0, "DOTO Compiled object file (.o)", HFILL }
 	}
 
 	};
diff --git a/epan/dissectors/packet-dlm3.c b/epan/dissectors/packet-dlm3.c
index c1c78e851e..3ecf22916b 100644
--- a/epan/dissectors/packet-dlm3.c
+++ b/epan/dissectors/packet-dlm3.c
@@ -1092,7 +1092,7 @@ proto_register_dlm3(void)
         NULL, HFILL}},
     { &hf_dlm3_m_extra,
       { "Extra Message", "dlm3.m.extra",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL}},
 
     /* dlm_rcom */
@@ -1118,7 +1118,7 @@ proto_register_dlm3(void)
         NULL, HFILL}},
     { &hf_dlm3_rc_buf,
       { "Recovery Buffer", "dlm3.rc.buf",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL}},
 
     /* rcom_config */
@@ -1178,7 +1178,7 @@ proto_register_dlm3(void)
         NULL, HFILL }},
     { &hf_dlm3_rl_name,
       { "Name of Resource", "dlm.rl.name",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_name_contents,
       { "Contents actually occupying `name' field", "dlm.rl.name_contents",
@@ -1186,11 +1186,11 @@ proto_register_dlm3(void)
         NULL, HFILL }},
     { &hf_dlm3_rl_name_padding,
       { "Padding", "dlm.rl.name_padding",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_dlm3_rl_lvb,
       { "Lock Value Block", "dlm.rl.lvb",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }}
   };
 
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 5ed3b5a888..e44f11f033 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -3610,32 +3610,32 @@ void proto_register_dmp (void)
     */
     { &hf_envelope,
       { "Envelope", "dmp.envelope", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Envelope", HFILL}},
+	NULL, 0x0, NULL, HFILL}},
 
     /* Protocol data */
     { &hf_envelope_protocol_id,
       { "Protocol Identifier", "dmp.protocol_id", FT_UINT8,
-	BASE_HEX, NULL, 0xF8, "Protocol Identifier", HFILL}},
+	BASE_HEX, NULL, 0xF8, NULL, HFILL}},
     { &hf_envelope_version,
       { "Protocol Version", "dmp.version", FT_UINT8, BASE_DEC,
-	VALS(version_vals), 0x07, "Protocol Version", HFILL } },
+	VALS(version_vals), 0x07, NULL, HFILL } },
 
     /* Envelope elements (byte 1) */
     { &hf_envelope_hop_count,
       { "Hop Count", "dmp.hop_count", FT_UINT8, BASE_DEC,
-	NULL, 0xE0, "Hop Count", HFILL } },
+	NULL, 0xE0, NULL, HFILL } },
     { &hf_envelope_rec_present,
       { "Recipient Present", "dmp.rec_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x20, "Recipient Present", HFILL } },
+	TFS (&tfs_present_absent), 0x20, NULL, HFILL } },
     { &hf_envelope_addr_enc,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x10, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x10, NULL, HFILL } },
     { &hf_envelope_checksum,
       { "Checksum", "dmp.checksum_used", FT_BOOLEAN, 8,
 	TFS (&tfs_used_notused), 0x08, "Checksum Used", HFILL } },
     { &hf_envelope_type,
       { "Content Type", "dmp.content_type", FT_UINT8, BASE_DEC,
-	VALS(type_vals), 0x07, "Content Type", HFILL } },
+	VALS(type_vals), 0x07, NULL, HFILL } },
 
     /* Message identifier */
     { &hf_envelope_msg_id,
@@ -3645,19 +3645,19 @@ void proto_register_dmp (void)
     /* Submission time */
     { &hf_envelope_subm_time,
       { "Submission Time", "dmp.subm_time", FT_UINT16, BASE_HEX,
-	NULL, 0x0, "Submission Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_envelope_time_diff_present,
       { "Time Diff", "dmp.time_diff_present", FT_BOOLEAN, 16,
 	TFS (&tfs_present_absent), 0x8000, "Time Diff Present", HFILL } },
     { &hf_envelope_subm_time_value,
       { "Submission Time Value", "dmp.subm_time_value", FT_UINT16,
-	BASE_HEX, NULL, 0x7FFF, "Submission Time Value", HFILL } },
+	BASE_HEX, NULL, 0x7FFF, NULL, HFILL } },
     { &hf_envelope_time_diff,
       { "Time Difference", "dmp.time_diff", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "Time Difference", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
     { &hf_envelope_time_diff_value,
       { "Time Difference Value", "dmp.time_diff_value", FT_UINT8,
-	BASE_HEX, NULL, 0xFF, "Time Difference Value", HFILL } },
+	BASE_HEX, NULL, 0xFF, NULL, HFILL } },
 
     /* Envelope flags */
     { &hf_envelope_flags,
@@ -3673,16 +3673,16 @@ void proto_register_dmp (void)
 	"Recipient Reassign prohibited", HFILL }},
     { &hf_envelope_dl_expansion_prohib,
       { "DL expansion prohibited", "dmp.dl_expansion_prohib",
-	FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, "DL expansion prohibited",
+	FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x20, NULL,
 	HFILL } },
 
     /* Recipient Count */
     { &hf_envelope_recipients,
       { "Recipient Count", "dmp.rec_count", FT_UINT8, BASE_DEC,
-	NULL, 0x1F, "Recipient Count", HFILL}},
+	NULL, 0x1F, NULL, HFILL}},
     { &hf_envelope_ext_recipients,
       { "Extended Recipient Count", "dmp.ext_rec_count", FT_UINT16,
-	BASE_DEC, NULL, 0x7FFF, "Extended Recipient Count", HFILL}},
+	BASE_DEC, NULL, 0x7FFF, NULL, HFILL}},
 
     /*
     ** Address
@@ -3692,7 +3692,7 @@ void proto_register_dmp (void)
 	NULL, 0x0, "Recipient", HFILL } },
     { &hf_addr_originator,
       { "Originator", "dmp.originator", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Originator", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_addr_reporting_name,
       { "Reporting Name Number", "dmp.reporting_name", FT_NONE,
 	BASE_NONE, NULL, 0x0, "Reporting Name", HFILL } },
@@ -3702,10 +3702,10 @@ void proto_register_dmp (void)
     */
     { &hf_addr_dir_addr_ext,
       { "Address Extended", "dmp.addr_ext", FT_BOOLEAN, 8,
-	NULL, 0x80, "Address Extended", HFILL } },
+	NULL, 0x80, NULL, HFILL } },
     { &hf_addr_dir_rec_no,
       { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
-	BASE_DEC, NULL, 0xF0, "Recipient Number Offset", HFILL } },
+	BASE_DEC, NULL, 0xF0, NULL, HFILL } },
     { &hf_addr_dir_rec_no_generated,
       { "Recipient Number", "dmp.rec_no", FT_UINT32,
 	BASE_DEC, NULL, 0x0, "Recipient Number Offset", HFILL } },
@@ -3720,65 +3720,65 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0x1F, "Recipient Number (bits 14-10) Offset",HFILL } },
     { &hf_addr_dir_rep_req1,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals_ext), 0x0C, "Report Request", HFILL } },
+	VALS (report_vals_ext), 0x0C, NULL, HFILL } },
     { &hf_addr_dir_rep_req2,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals_ext), 0xC0, "Report Request", HFILL } },
+	VALS (report_vals_ext), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_rep_req3,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals), 0xC0, "Report Request", HFILL } },
+	VALS (report_vals), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_not_req1,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals_ext), 0x03, "Notification Request", HFILL } },
+	VALS (notif_vals_ext), 0x03, NULL, HFILL } },
     { &hf_addr_dir_not_req2,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals_ext), 0xC0, "Notification Request", HFILL } },
+	VALS (notif_vals_ext), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_not_req3,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals), 0xC0, "Notification Request", HFILL } },
+	VALS (notif_vals), 0xC0, NULL, HFILL } },
     { &hf_addr_dir_action,
       { "Action", "dmp.action", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x80, "Action", HFILL } },
+	TFS (&tfs_yes_no), 0x80, NULL, HFILL } },
     { &hf_addr_dir_address,
       { "Direct Address", "dmp.direct_addr", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Direct Address", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_dir_address_generated,
       { "Direct Address", "dmp.direct_addr", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Direct Address", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_dir_address1,
       { "Direct Address (bits 6-0)", "dmp.direct_addr1", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Direct Address (bits 6-0)", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_dir_address2,
       { "Direct Address (bits 12-7)", "dmp.direct_addr2", FT_UINT8,
-	BASE_DEC, NULL, 0x3F, "Direct Address (bits 12-7)", HFILL } },
+	BASE_DEC, NULL, 0x3F, NULL, HFILL } },
     { &hf_addr_dir_address3,
       { "Direct Address (bits 18-13)", "dmp.direct_addr3", FT_UINT8,
-	BASE_DEC, NULL, 0x3F, "Direct Address (bits 18-13)", HFILL } },
+	BASE_DEC, NULL, 0x3F, NULL, HFILL } },
 
     /*
     ** Address Extended
     */
     { &hf_addr_ext_form,
       { "Address Form", "dmp.addr_form", FT_UINT8, BASE_DEC,
-	VALS (&addr_form), 0xE0, "Address Form", HFILL } },
+	VALS (&addr_form), 0xE0, NULL, HFILL } },
     { &hf_addr_ext_action,
       { "Action", "dmp.action", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x10, "Action", HFILL } },
+	TFS (&tfs_yes_no), 0x10, NULL, HFILL } },
     { &hf_addr_ext_rep_req,
       { "Report Request", "dmp.rep_rec", FT_UINT8, BASE_HEX,
-	VALS (report_vals), 0x0C, "Report Request", HFILL } },
+	VALS (report_vals), 0x0C, NULL, HFILL } },
     { &hf_addr_ext_not_req,
       { "Notification Request", "dmp.not_req", FT_UINT8, BASE_HEX,
-	VALS (notif_vals), 0x03, "Notification Request", HFILL } },
+	VALS (notif_vals), 0x03, NULL, HFILL } },
     { &hf_addr_ext_rec_ext,
       { "Recipient Number Extended", "dmp.rec_no_ext", FT_BOOLEAN, 8,
-	NULL, 0x80, "Recipient Number Extended", HFILL } },
+	NULL, 0x80, NULL, HFILL } },
     { &hf_addr_ext_rec_no,
       { "Recipient Number Offset", "dmp.rec_no_offset", FT_UINT8,
-	BASE_DEC, NULL, 0x7F, "Recipient Number Offset", HFILL } },
+	BASE_DEC, NULL, 0x7F, NULL, HFILL } },
     { &hf_addr_ext_rec_no_generated,
       { "Recipient Number", "dmp.rec_no", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Recipient Number", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_rec_no1,
       { "Recipient Number (bits 6-0)", "dmp.rec_no_offset1", FT_UINT8,
 	BASE_DEC, NULL, 0x7F, "Recipient Number (bits 6-0) Offset", HFILL } },
@@ -3787,162 +3787,162 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0xFF, "Recipient Number (bits 14-7) Offset", HFILL } },
     { &hf_addr_ext_address,
       { "Extended Address", "dmp.addr_form", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Extended Address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_type,
       { "Address Type", "dmp.addr_type", FT_UINT8, BASE_DEC,
-	VALS (&ext_addr_type), 0xE0, "Address Type", HFILL } },
+	VALS (&ext_addr_type), 0xE0, NULL, HFILL } },
     { &hf_addr_ext_type_ext,
       { "Address Type Extended", "dmp.addr_type_ext", FT_UINT8,
-	BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, "Address Type Extended",
+	BASE_DEC, VALS (&ext_addr_type_ext), 0xE0, NULL,
 	HFILL } },
     { &hf_addr_ext_length,
       { "Address Length", "dmp.addr_length", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_length_generated,
       { "Address Length", "dmp.addr_length", FT_UINT32,
-	BASE_DEC, NULL, 0x0, "Address Length", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_length1,
       { "Address Length (bits 4-0)", "dmp.addr_length1", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length (bits 4-0)", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_length2,
       { "Address Length (bits 9-5)", "dmp.addr_length2", FT_UINT8,
-	BASE_DEC, NULL, 0x1F, "Address Length (bits 9-5)", HFILL } },
+	BASE_DEC, NULL, 0x1F, NULL, HFILL } },
     { &hf_addr_ext_asn1_ber,
       { "ASN.1 BER-encoded OR-name", "dmp.or_name", FT_NONE,
-	BASE_NONE, NULL, 0x0, "ASN.1 BER-encoded OR-name", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_asn1_per,
       { "ASN.1 PER-encoded OR-name", "dmp.asn1_per", FT_BYTES,
-	BASE_DEC, NULL, 0x0, "ASN.1 PER-encoded OR-name", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_unknown,
       { "Unknown encoded address", "dmp.addr_unknown", FT_BYTES,
-	BASE_DEC, NULL, 0x0, "Unknown encoded address", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Message content
     */
     { &hf_message_content,
       { "Message Content", "dmp.message", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Message Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_report_content,
       { "Report Content", "dmp.report", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Report Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_notif_content,
       { "Notification Content", "dmp.notification", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Notification Content", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     { &hf_message_st_type,
       { "Message type", "dmp.msg_type", FT_UINT8, BASE_DEC,
-	VALS (message_type_vals), 0xC0, "Message type", HFILL } },
+	VALS (message_type_vals), 0xC0, NULL, HFILL } },
     { &hf_message_precedence,
       { "Precedence", "dmp.precedence", FT_UINT8, BASE_DEC,
-	VALS (precedence), 0x1C, "Precedence", HFILL } },
+	VALS (precedence), 0x1C, NULL, HFILL } },
     { &hf_message_importance,
       { "Importance", "dmp.importance", FT_UINT8, BASE_DEC,
-	VALS (importance), 0x1C, "Importance", HFILL } },
+	VALS (importance), 0x1C, NULL, HFILL } },
     { &hf_message_body_format,
       { "Body format", "dmp.body_format", FT_UINT8, BASE_DEC,
-	VALS (body_format_vals), 0x03, "Body format", HFILL } },
+	VALS (body_format_vals), 0x03, NULL, HFILL } },
 
     /* Security Values */
     { &hf_message_sec_class_nat,
       { "Security Classification", "dmp.sec_class", FT_UINT8,
-	BASE_DEC, VALS (sec_class), 0xE0, "Security Classification", HFILL}},
+	BASE_DEC, VALS (sec_class), 0xE0, NULL, HFILL}},
     { &hf_message_sec_class_val,
       { "Security Classification", "dmp.sec_class", FT_UINT8,
-	BASE_DEC, NULL, 0xE0, "Security Classification", HFILL}},
+	BASE_DEC, NULL, 0xE0, NULL, HFILL}},
     { &hf_message_sec_pol,
       { "Security Policy", "dmp.sec_pol", FT_UINT8, BASE_DEC,
-	VALS (sec_pol), 0x1C, "Security Policy", HFILL } },
+	VALS (sec_pol), 0x1C, NULL, HFILL } },
     { &hf_message_heading_flags,
       { "Heading Flags", "dmp.heading_flags", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Heading Flags", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_auth_users,
       { "Authorizing users discarded", "dmp.auth_discarded",
 	FT_BOOLEAN, 8, TFS (&tfs_yes_no), 0x02,
-	"Authorizing users discarded", HFILL }},
+	NULL, HFILL }},
     { &hf_message_subject_disc,
       { "Subject discarded", "dmp.subject_discarded", FT_BOOLEAN, 8,
-	TFS (&tfs_yes_no), 0x01, "Subject discarded", HFILL } },
+	TFS (&tfs_yes_no), 0x01, NULL, HFILL } },
 
     /* National Policy Identifier */
     { &hf_message_national_policy_id,
       { "National Policy Identifier", "dmp.nat_pol_id", FT_UINT8,
-	BASE_DEC, VALS(nat_pol_id), 0x0, "National Policy Identifier",
+	BASE_DEC, VALS(nat_pol_id), 0x0, NULL,
 	HFILL } },
 
     /* Mission Policy Identifier */
     { &hf_message_mission_policy_id,
       { "Mission Policy Identifier", "dmp.mission_pol_id", FT_UINT8,
-	BASE_DEC, NULL, 0x0, "Mission Policy Identifier",
+	BASE_DEC, NULL, 0x0, NULL,
 	HFILL } },
 
     /* Security Categories */
     { &hf_message_sec_cat_nat,
       { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Security Categories", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sec_cat_val,
       { "Security Categories", "dmp.sec_cat", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Security Categories", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sec_cat_cl,
       { "Clear", "dmp.sec_cat.cl", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x80, "Clear", HFILL } },
+	TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
     { &hf_message_sec_cat_cs,
       { "Crypto Security", "dmp.sec_cat.cs", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x40, "Crypto Security", HFILL } },
+	TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
     { &hf_message_sec_cat_ex,
       { "Exclusive", "dmp.sec_cat.ex", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x20, "Exclusive", HFILL } },
+	TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
     { &hf_message_sec_cat_ne,
       { "National Eyes Only", "dmp.sec_cat.ne", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x10, "National Eyes Only", HFILL } },
+	TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
     { &hf_message_sec_cat_bit0,
       { "Bit 0", "dmp.sec_cat.bit0", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x01, "Bit 0", HFILL } },
+	TFS (&tfs_set_notset), 0x01, NULL, HFILL } },
     { &hf_message_sec_cat_bit1,
       { "Bit 1", "dmp.sec_cat.bit1", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x02, "Bit 1", HFILL } },
+	TFS (&tfs_set_notset), 0x02, NULL, HFILL } },
     { &hf_message_sec_cat_bit2,
       { "Bit 2", "dmp.sec_cat.bit2", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x04, "Bit 2", HFILL } },
+	TFS (&tfs_set_notset), 0x04, NULL, HFILL } },
     { &hf_message_sec_cat_bit3,
       { "Bit 3", "dmp.sec_cat.bit3", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x08, "Bit 3", HFILL } },
+	TFS (&tfs_set_notset), 0x08, NULL, HFILL } },
     { &hf_message_sec_cat_bit4,
       { "Bit 4", "dmp.sec_cat.bit4", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x10, "Bit 4", HFILL } },
+	TFS (&tfs_set_notset), 0x10, NULL, HFILL } },
     { &hf_message_sec_cat_bit5,
       { "Bit 5", "dmp.sec_cat.bit5", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x20, "Bit 5", HFILL } },
+	TFS (&tfs_set_notset), 0x20, NULL, HFILL } },
     { &hf_message_sec_cat_bit6,
       { "Bit 6", "dmp.sec_cat.bit6", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x40, "Bit 6", HFILL } },
+	TFS (&tfs_set_notset), 0x40, NULL, HFILL } },
     { &hf_message_sec_cat_bit7,
       { "Bit 7", "dmp.sec_cat.bit7", FT_BOOLEAN, 8,
-	TFS (&tfs_set_notset), 0x80, "Bit 7", HFILL } },
+	TFS (&tfs_set_notset), 0x80, NULL, HFILL } },
 
     /* Expiry Time */
     { &hf_message_exp_time,
       { "Expiry Time", "dmp.expiry_time", FT_UINT8, BASE_HEX,
-	NULL, 0x0, "Expiry Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_exp_time_val,
       { "Expiry Time Value", "dmp.expiry_time_val", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "Expiry Time Value", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
 
     /* DTG */
     { &hf_message_dtg,
       { "DTG", "dmp.dtg", FT_UINT8, BASE_HEX,
-	NULL, 0xFF, "DTG", HFILL } },
+	NULL, 0xFF, NULL, HFILL } },
     { &hf_message_dtg_sign,
       { "DTG in the", "dmp.dtg.sign", FT_BOOLEAN, 8, TFS (&dtg_sign),
 	0x80, "Sign", HFILL } },
     { &hf_message_dtg_val,
       { "DTG Value", "dmp.dtg.val", FT_UINT8, BASE_HEX, NULL,
-	0x7F, "DTG Value", HFILL } },
+	0x7F, NULL, HFILL } },
 
     /* SIC */
     { &hf_message_sic,
-      { "SIC", "dmp.sic", FT_STRING, BASE_DEC,
-	NULL, 0x0, "SIC", HFILL } },
+      { "SIC", "dmp.sic", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_sic_key,
       { "SICs", "dmp.sic_key", FT_NONE, BASE_NONE,
 	NULL, 0x0, "SIC Content", HFILL } },
@@ -3957,7 +3957,7 @@ void proto_register_dmp (void)
 	TFS (&sic_key_chars), 0x08, "SIC Valid Characters", HFILL } },
     { &hf_message_sic_key_num,
       { "Number of SICs", "dmp.sic_key.num", FT_UINT8, BASE_HEX,
-	VALS (sic_key_num), 0x07, "Number of SICs", HFILL } },
+	VALS (sic_key_num), 0x07, NULL, HFILL } },
     { &hf_message_sic_bitmap,
       { "Length Bitmap (0 = 3 bytes, 1 = 4-8 bytes)", "dmp.sic_bitmap",
 	FT_UINT8, BASE_HEX, NULL, 0xFF, "SIC Length Bitmap", HFILL } },
@@ -3973,14 +3973,14 @@ void proto_register_dmp (void)
     /* Subject Message Id */
     { &hf_message_subj_id,
       { "Subject Message Identifier", "dmp.subj_id", FT_UINT16,
-	BASE_DEC, NULL, 0x0, "Subject Message Identifier", HFILL } },
+	BASE_DEC, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Message body
     */
     { &hf_message_body,
       { "Message Body", "dmp.body", FT_NONE, BASE_NONE, NULL,
-	0x0, "Message Body", HFILL}},
+	0x0, NULL, HFILL}},
 
     /* Body Id */
     { &hf_message_eit,
@@ -3988,20 +3988,20 @@ void proto_register_dmp (void)
 	VALS(eit_vals), 0xE0, "Encoded Information Type", HFILL } },
     { &hf_message_compr,
       { "Compression", "dmp.body.compression", FT_UINT8, BASE_DEC,
-	VALS(compression_vals), 0x18, "Compression", HFILL } },
+	VALS(compression_vals), 0x18, NULL, HFILL } },
 
     /* Subject */
     { &hf_message_subject,
-      { "Subject", "dmp.subject", FT_STRINGZ, BASE_DEC,
-	NULL, 0x0, "Subject", HFILL } },
+      { "Subject", "dmp.subject", FT_STRINGZ, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
 
     /* Message Body */
     { &hf_message_body_data,
       { "User data", "dmp.body.data", FT_NONE, BASE_NONE,
-	NULL, 0x0, "User data", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_plain,
-      { "Message Body", "dmp.body.plain", FT_STRING, BASE_DEC,
-	NULL, 0x0, "Message Body", HFILL } },
+      { "Message Body", "dmp.body.plain", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_bodyid_uint8,
       { "Structured Id", "dmp.body.id", FT_UINT8, BASE_DEC,
 	NULL, 0x0, "Structured Body Id (1 byte)", HFILL } },
@@ -4015,21 +4015,21 @@ void proto_register_dmp (void)
       { "Structured Id", "dmp.body.id", FT_UINT64, BASE_DEC,
 	NULL, 0x0, "Structured Body Id (8 bytes)", HFILL } },
     { &hf_message_bodyid_string,
-      { "Structured Id", "dmp.body.id", FT_STRING, BASE_DEC,
+      { "Structured Id", "dmp.body.id", FT_STRING, BASE_NONE,
 	NULL, 0x0, "Structured Body Id (fixed text string)", HFILL } },
     { &hf_message_bodyid_zstring,
-      { "Structured Id", "dmp.body.id", FT_STRINGZ, BASE_DEC,
+      { "Structured Id", "dmp.body.id", FT_STRINGZ, BASE_NONE,
 	NULL, 0x0, "Structured Body Id (zero terminated text string)",
 	HFILL } },
     { &hf_message_body_structured,
-      { "Structured Body", "dmp.body.structured", FT_BYTES, BASE_DEC,
-	NULL, 0x0, "Structured Body", HFILL } },
+      { "Structured Body", "dmp.body.structured", FT_BYTES, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_uncompr,
       { "Uncompressed User data", "dmp.body.uncompressed", FT_NONE,
-	BASE_NONE, NULL, 0x0, "Uncompressed User data", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_message_body_uncompressed,
       { "Uncompressed Message Body", "dmp.body.uncompressed",
-	FT_STRING, BASE_DEC, NULL, 0x0, "Uncompressed Message Body",
+	FT_STRING, BASE_NONE, NULL, 0x0, NULL,
 	HFILL } },
 
     /*
@@ -4037,33 +4037,33 @@ void proto_register_dmp (void)
     */
     { &hf_delivery_report,
       { "Delivery Report", "dmp.dr", FT_NONE, BASE_NONE, NULL,
-	0x0, "Delivery Report", HFILL}},
+	0x0, NULL, HFILL}},
     { &hf_non_delivery_report,
       { "Non-Delivery Report", "dmp.ndr", FT_NONE, BASE_NONE, NULL,
-	0x0, "Non-Delivery Report", HFILL}},
+	0x0, NULL, HFILL}},
 
     { &hf_report_type,
       { "Report Type", "dmp.report_type", FT_BOOLEAN, 8,
-	TFS (&report_type), 0x80, "Report Type", HFILL } },
+	TFS (&report_type), 0x80, NULL, HFILL } },
     { &hf_report_info_present_dr,
       { "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x40, "Info Present", HFILL } },
+	TFS (&tfs_present_absent), 0x40, NULL, HFILL } },
     { &hf_report_addr_enc_dr,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x20, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x20, NULL, HFILL } },
     { &hf_report_del_time,
       { "Delivery Time", "dmp.delivery_time", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "Delivery Time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_report_addr_enc_ndr,
       { "Address Encoding", "dmp.addr_encoding", FT_BOOLEAN, 8,
-	TFS (&addr_enc), 0x40, "Address Encoding", HFILL } },
+	TFS (&addr_enc), 0x40, NULL, HFILL } },
     { &hf_report_reason,
       { "Reason (X.411)", "dmp.report_reason", FT_UINT8, BASE_DEC,
 	VALS (x411_NonDeliveryReasonCode_vals), 0x3F,
 	"Reason", HFILL } },
     { &hf_report_info_present_ndr,
       { "Info Present", "dmp.info_present", FT_BOOLEAN, 8,
-	TFS (&tfs_present_absent), 0x80, "Info Present", HFILL } },
+	TFS (&tfs_present_absent), 0x80, NULL, HFILL } },
     { &hf_report_diagn,
       { "Diagnostic (X.411)", "dmp.report_diagnostic", FT_UINT8, BASE_DEC,
 	VALS (x411_NonDeliveryDiagnosticCode_vals), 0x7F,
@@ -4073,62 +4073,62 @@ void proto_register_dmp (void)
 	BASE_DEC, NULL, 0x0, "Supplementary Information Length", HFILL } },
     { &hf_report_suppl_info,
       { "Supplementary Information", "dmp.suppl_info", FT_STRINGZ,
-	BASE_DEC, NULL, 0x0, "Supplementary Information", HFILL } },
+	BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Notification
     */
     { &hf_receipt_notif,
       { "Receipt Notification (RN)", "dmp.rn", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Receipt Notification (RN)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
     { &hf_non_receipt_notif,
       { "Non-Receipt Notification (NRN)", "dmp.nrn", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Non-Receipt Notification (NRN)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
     { &hf_other_notif,
       { "Other Notification (ON)", "dmp.on", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Other Notification (ON)", HFILL} },
+	NULL, 0x0, NULL, HFILL} },
 
     { &hf_notif_type,
       { "Notification Type", "dmp.notif_type", FT_UINT8, BASE_DEC,
-	VALS (notif_type), 0x03, "Notification Type", HFILL } },
+	VALS (notif_type), 0x03, NULL, HFILL } },
     { &hf_notif_rec_time,
       { "Receipt Time", "dmp.receipt_time", FT_UINT8, BASE_HEX,
 	NULL, 0x0, "Receipt time", HFILL } },
     { &hf_notif_rec_time_val,
       { "Receipt Time Value", "dmp.receipt_time_val", FT_UINT8,
-	BASE_HEX, NULL, 0xFF, "Receipt Time Value", HFILL } },
+	BASE_HEX, NULL, 0xFF, NULL, HFILL } },
     { &hf_notif_suppl_info_len,
       { "Supplementary Information", "dmp.suppl_info_len",
 	FT_UINT8, BASE_DEC, NULL, 0x0, "Supplementary Information Length",
 	HFILL } },
     { &hf_notif_suppl_info,
       { "Supplementary Information", "dmp.suppl_info",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0, "Supplementary Information",
+	FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL,
 	HFILL } },
     { &hf_notif_non_rec_reason,
       { "Non-Receipt Reason", "dmp.notif_non_rec_reason",
 	FT_UINT8, BASE_DEC, VALS (x420_NonReceiptReasonField_vals), 0x0,
-	"Non-Receipt Reason", HFILL } },
+	NULL, HFILL } },
     { &hf_notif_discard_reason,
       { "Discard Reason", "dmp.notif_discard_reason", FT_UINT8,
 	BASE_DEC, VALS (x420_DiscardReasonField_vals), 0x0,
-	"Discard Reason", HFILL } },
+	NULL, HFILL } },
     { &hf_notif_on_type,
       { "ON Type", "dmp.notif_on_type", FT_UINT8, BASE_DEC,
-	VALS (on_type), 0x0, "ON Type", HFILL } },
+	VALS (on_type), 0x0, NULL, HFILL } },
     { &hf_notif_acp127,
       { "ACP127 Recipient", "dmp.acp127recip_len", FT_UINT8,
 	BASE_DEC, NULL, 0x0, "ACP 127 Recipient Length", HFILL } },
     { &hf_notif_acp127recip,
       { "ACP127 Recipient", "dmp.acp127recip", FT_STRINGZ,
-	BASE_DEC, NULL, 0x0, "ACP 127 Recipient", HFILL } },
+	BASE_NONE, NULL, 0x0, "ACP 127 Recipient", HFILL } },
 
     /*
     ** Acknowledgement
     */
     { &hf_ack,
       { "Acknowledgement", "dmp.ack", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Acknowledgement", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_ack_reason,
       { "Ack Reason", "dmp.ack_reason", FT_UINT8, BASE_DEC,
 	VALS (&ack_reason), 0x0, "Reason", HFILL } },
@@ -4137,22 +4137,20 @@ void proto_register_dmp (void)
 	NULL, 0x0, "Diagnostic", HFILL } },
     { &hf_ack_recips,
       { "Recipient List", "dmp.ack_rec_list", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Recipient List", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /*
     ** Checksum
     */
     { &hf_checksum,
       { "Checksum", "dmp.checksum", FT_UINT16, BASE_HEX,
-	NULL, 0x0, "Checksum", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_checksum_good,
       { "Good", "dmp.checksum_good", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x0, "True: checksum matches packet content; "
-	"False: doesn't match content or not checked", HFILL } },
+	NULL, 0x0, "True: checksum matches packet content; False: doesn't match content or not checked", HFILL } },
     { &hf_checksum_bad,
       { "Bad", "dmp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x0, "True: checksum doesn't match packet content; "
-	"False: matches content or not checked", HFILL } },
+	NULL, 0x0, "True: checksum doesn't match packet content; False: matches content or not checked", HFILL } },
 
     /*
     ** Ack matching / Resend
@@ -4221,37 +4219,37 @@ void proto_register_dmp (void)
     */
     { &hf_reserved_0x01,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x01, "Reserved", HFILL } },
+	NULL, 0x01, NULL, HFILL } },
     { &hf_reserved_0x02,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x02, "Reserved", HFILL } },
+	NULL, 0x02, NULL, HFILL } },
     { &hf_reserved_0x04,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x04, "Reserved", HFILL } },
+	NULL, 0x04, NULL, HFILL } },
     { &hf_reserved_0x07,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x07, "Reserved", HFILL } },
+	NULL, 0x07, NULL, HFILL } },
     { &hf_reserved_0x08,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x08, "Reserved", HFILL } },
+	NULL, 0x08, NULL, HFILL } },
     { &hf_reserved_0x1F,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x1F, "Reserved", HFILL } },
+	NULL, 0x1F, NULL, HFILL } },
     { &hf_reserved_0x20,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x20, "Reserved", HFILL } },
+	NULL, 0x20, NULL, HFILL } },
     { &hf_reserved_0x40,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0x40, "Reserved", HFILL } },
+	NULL, 0x40, NULL, HFILL } },
     { &hf_reserved_0xC0,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0xC0, "Reserved", HFILL } },
+	NULL, 0xC0, NULL, HFILL } },
     { &hf_reserved_0xE0,
       { "Reserved", "dmp.reserved", FT_UINT8, BASE_DEC,
-	NULL, 0xE0, "Reserved", HFILL } },
+	NULL, 0xE0, NULL, HFILL } },
     { &hf_reserved_0x8000,
       { "Reserved", "dmp.reserved", FT_UINT16, BASE_DEC,
-	NULL, 0x8000, "Reserved", HFILL } },
+	NULL, 0x8000, NULL, HFILL } },
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 6f42e490ab..1ab23039dd 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -2665,7 +2665,7 @@ proto_register_dnp3(void)
 /* Setup list of header fields */
   static hf_register_info hf[] = {
     { &hf_dnp3_start,
-    { "Start Bytes", "dnp3.start", FT_UINT16, BASE_HEX, NULL, 0x0, "Start Bytes", HFILL }},
+    { "Start Bytes", "dnp3.start", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_len,
     { "Length", "dnp3.len", FT_UINT8, BASE_DEC, NULL, 0x0, "Frame Data Length", HFILL }},
@@ -2682,19 +2682,19 @@ proto_register_dnp3(void)
       VALS(dnp3_ctl_func_sec_vals), DNP3_CTL_FUNC, "Frame Control Function Code", HFILL }},
 
     { &hf_dnp3_ctl_dir,
-    { "Direction", "dnp3.ctl.dir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_DIR, "", HFILL }},
+    { "Direction", "dnp3.ctl.dir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_DIR, NULL, HFILL }},
 
     { &hf_dnp3_ctl_prm,
-    { "Primary", "dnp3.ctl.prm", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_PRM, "", HFILL }},
+    { "Primary", "dnp3.ctl.prm", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_PRM, NULL, HFILL }},
 
     { &hf_dnp3_ctl_fcb,
-    { "Frame Count Bit", "dnp3.ctl.fcb", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_FCB, "", HFILL }},
+    { "Frame Count Bit", "dnp3.ctl.fcb", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_FCB, NULL, HFILL }},
 
     { &hf_dnp3_ctl_fcv,
-    { "Frame Count Valid", "dnp3.ctl.fcv", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_FCV, "", HFILL }},
+    { "Frame Count Valid", "dnp3.ctl.fcv", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_FCV, NULL, HFILL }},
 
     { &hf_dnp3_ctl_dfc,
-    { "Data Flow Control", "dnp3.ctl.dfc", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_DFC, "", HFILL }},
+    { "Data Flow Control", "dnp3.ctl.dfc", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_CTL_DFC, NULL, HFILL }},
 
     { &hf_dnp3_dst,
     { "Destination", "dnp3.dst", FT_UINT16, BASE_DEC, NULL, 0x0, "Destination Address", HFILL }},
@@ -2703,19 +2703,19 @@ proto_register_dnp3(void)
     { "Source", "dnp3.src", FT_UINT16, BASE_DEC, NULL, 0x0, "Source Address", HFILL }},
 
     { &hf_dnp_hdr_CRC,
-    { "CRC", "dnp3.hdr.CRC", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+    { "CRC", "dnp3.hdr.CRC", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp_hdr_CRC_bad,
-    { "Bad CRC", "dnp3.hdr.CRC_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+    { "Bad CRC", "dnp3.hdr.CRC_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_tr_ctl,
     { "Transport Control", "dnp3.tr.ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "Transport Layer Control Byte", HFILL }},
 
     { &hf_dnp3_tr_fin,
-    { "Final", "dnp3.tr.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIN, "", HFILL }},
+    { "Final", "dnp3.tr.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIN, NULL, HFILL }},
 
     { &hf_dnp3_tr_fir,
-    { "First", "dnp3.tr.fir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIR, "", HFILL }},
+    { "First", "dnp3.tr.fir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_TR_FIR, NULL, HFILL }},
 
     { &hf_dnp3_tr_seq,
     { "Sequence", "dnp3.tr.seq", FT_UINT8, BASE_DEC, NULL, DNP3_TR_SEQ, "Frame Sequence Number", HFILL }},
@@ -2724,13 +2724,13 @@ proto_register_dnp3(void)
     { "Application Control", "dnp3.al.ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "Application Layer Control Byte", HFILL }},
 
     { &hf_dnp3_al_fir,
-    { "First", "dnp3.al.fir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_FIR, "", HFILL }},
+    { "First", "dnp3.al.fir", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_FIR, NULL, HFILL }},
 
     { &hf_dnp3_al_fin,
-    { "Final", "dnp3.al.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_FIN, "", HFILL }},
+    { "Final", "dnp3.al.fin", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_FIN, NULL, HFILL }},
 
     { &hf_dnp3_al_con,
-    { "Confirm", "dnp3.al.con", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_CON, "", HFILL }},
+    { "Confirm", "dnp3.al.con", FT_BOOLEAN, 8, TFS(&tfs_set_notset), DNP3_AL_CON, NULL, HFILL }},
 
     { &hf_dnp3_al_seq,
     { "Sequence", "dnp3.al.seq", FT_UINT8, BASE_DEC, NULL, DNP3_AL_SEQ, "Frame Sequence Number", HFILL }},
@@ -2743,43 +2743,43 @@ proto_register_dnp3(void)
     { "Application Layer IIN bits", "dnp3.al.iin", FT_UINT16, BASE_DEC, NULL, 0x0, "Application Layer IIN", HFILL }},
 
     { &hf_dnp3_al_iin_bmsg,
-    { "Broadcast Msg Rx", "dnp3.al.iin.bmsg", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_BMSG, "", HFILL }},
+    { "Broadcast Msg Rx", "dnp3.al.iin.bmsg", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_BMSG, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_cls1d,
-    { "Class 1 Data Available", "dnp3.al.iin.cls1d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS1D, "", HFILL }},
+    { "Class 1 Data Available", "dnp3.al.iin.cls1d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS1D, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_cls2d,
-    { "Class 2 Data Available", "dnp3.al.iin.cls2d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS2D, "", HFILL }},
+    { "Class 2 Data Available", "dnp3.al.iin.cls2d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS2D, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_cls3d,
-    { "Class 3 Data Available", "dnp3.al.iin.cls3d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS3D, "", HFILL }},
+    { "Class 3 Data Available", "dnp3.al.iin.cls3d", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CLS3D, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_tsr,
-    { "Time Sync Required", "dnp3.al.iin.tsr", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_TSR, "", HFILL }},
+    { "Time Sync Required", "dnp3.al.iin.tsr", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_TSR, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_dol,
-    { "Digital Outputs in Local", "dnp3.al.iin.dol", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_DOL, "", HFILL }},
+    { "Digital Outputs in Local", "dnp3.al.iin.dol", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_DOL, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_dt,
-    { "Device Trouble", "dnp3.al.iin.dt", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_DT, "", HFILL }},
+    { "Device Trouble", "dnp3.al.iin.dt", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_DT, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_rst,
-    { "Device Restart", "dnp3.al.iin.rst", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_RST, "", HFILL }},
+    { "Device Restart", "dnp3.al.iin.rst", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_RST, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_obju,
-    { "Requested Objects Unknown", "dnp3.al.iin.obju", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_OBJU, "", HFILL }},
+    { "Requested Objects Unknown", "dnp3.al.iin.obju", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_OBJU, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_pioor,
-    { "Parameters Invalid or Out of Range", "dnp3.al.iin.pioor", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_PIOOR, "", HFILL }},
+    { "Parameters Invalid or Out of Range", "dnp3.al.iin.pioor", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_PIOOR, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_ebo,
-    { "Event Buffer Overflow", "dnp3.al.iin.ebo", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_EBO, "", HFILL }},
+    { "Event Buffer Overflow", "dnp3.al.iin.ebo", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_EBO, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_oae,
-    { "Operation Already Executing", "dnp3.al.iin.oae", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_OAE, "", HFILL }},
+    { "Operation Already Executing", "dnp3.al.iin.oae", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_OAE, NULL, HFILL }},
 
     { &hf_dnp3_al_iin_cc,
-    { "Configuration Corrupt", "dnp3.al.iin.cc", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CC, "", HFILL }},
+    { "Configuration Corrupt", "dnp3.al.iin.cc", FT_BOOLEAN, 16, TFS(&tfs_set_notset), AL_IIN_CC, NULL, HFILL }},
 
     { &hf_dnp3_al_obj,
     { "Object", "dnp3.al.obj", FT_UINT16, BASE_HEX, VALS(dnp3_al_obj_vals), 0x0, "Application Layer Object", HFILL }},
@@ -2836,7 +2836,7 @@ proto_register_dnp3(void)
     { "Index (32 bit)", "dnp3.al.index", FT_UINT32, BASE_DEC, NULL, 0x0, "Object Index", HFILL }},
 
     { &hf_dnp3_al_ptnum,
-    { "Object Point Number", "dnp3.al.ptnum", FT_UINT16, BASE_DEC, NULL, 0x0, "Object Point Number", HFILL }},
+    { "Object Point Number", "dnp3.al.ptnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_al_bit,
     { "Value (bit)", "dnp3.al.bit", FT_BOOLEAN, 8, TFS(&tfs_on_off), 0x1, "Digital Value (1 bit)", HFILL }},
@@ -2857,13 +2857,13 @@ proto_register_dnp3(void)
     { "Value (double)", "dnp3.al.ana", FT_DOUBLE, BASE_DEC, NULL, 0x0, "Analog Value (double)", HFILL }},
 
     { &hf_dnp3_al_anaout16,
-    { "Output Value (16 bit)", "dnp3.al.anaout", FT_UINT16, BASE_DEC, NULL, 0x0, "Output Value (16 bit)", HFILL }},
+    { "Output Value (16 bit)", "dnp3.al.anaout", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_al_anaout32,
-    { "Output Value (32 bit)", "dnp3.al.anaout", FT_UINT32, BASE_DEC, NULL, 0x0, "Output Value (32 bit)", HFILL }},
+    { "Output Value (32 bit)", "dnp3.al.anaout", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_al_anaoutflt,
-    { "Output Value (float)", "dnp3.al.anaout", FT_FLOAT, BASE_DEC, NULL, 0x0, "Output Value (float)", HFILL }},
+    { "Output Value (float)", "dnp3.al.anaout", FT_FLOAT, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_dnp3_al_anaoutdbl,
     { "Output (double)", "dnp3.al.anaout", FT_DOUBLE, BASE_DEC, NULL, 0x0, "Output Value (double)", HFILL }},
@@ -2875,127 +2875,127 @@ proto_register_dnp3(void)
     { "Counter (32 bit)", "dnp3.al.cnt", FT_UINT32, BASE_DEC, NULL, 0x0, "Counter Value (32 bit)", HFILL }},
 
     { &hf_dnp3_al_ctrlstatus,
-    { "Control Status", "dnp3.al.ctrlstatus", FT_UINT8, BASE_DEC, dnp3_al_ctl_status_vals, 0xff, "Control Status", HFILL }},
+    { "Control Status", "dnp3.al.ctrlstatus", FT_UINT8, BASE_DEC, dnp3_al_ctl_status_vals, 0xff, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b0,
-    { "Online", "dnp3.al.biq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG0, "", HFILL }},
+    { "Online", "dnp3.al.biq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG0, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b1,
-    { "Restart", "dnp3.al.biq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG1, "", HFILL }},
+    { "Restart", "dnp3.al.biq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG1, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b2,
-    { "Comm Fail", "dnp3.al.biq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG2, "", HFILL }},
+    { "Comm Fail", "dnp3.al.biq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG2, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b3,
-    { "Remote Force", "dnp3.al.biq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG3, "", HFILL }},
+    { "Remote Force", "dnp3.al.biq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG3, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b4,
-    { "Local Force", "dnp3.al.biq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG4, "", HFILL }},
+    { "Local Force", "dnp3.al.biq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG4, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b5,
-    { "Chatter Filter", "dnp3.al.biq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG5, "", HFILL }},
+    { "Chatter Filter", "dnp3.al.biq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG5, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b6,
-    { "Reserved", "dnp3.al.biq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG6, "", HFILL }},
+    { "Reserved", "dnp3.al.biq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG6, NULL, HFILL }},
 
     { &hf_dnp3_al_biq_b7,
-    { "Point Value", "dnp3.al.biq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG7, "", HFILL }},
+    { "Point Value", "dnp3.al.biq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BI_FLAG7, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b0,
-    { "Online", "dnp3.al.boq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG0, "", HFILL }},
+    { "Online", "dnp3.al.boq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG0, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b1,
-    { "Restart", "dnp3.al.boq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG1, "", HFILL }},
+    { "Restart", "dnp3.al.boq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG1, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b2,
-    { "Comm Fail", "dnp3.al.boq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG2, "", HFILL }},
+    { "Comm Fail", "dnp3.al.boq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG2, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b3,
-    { "Remote Force", "dnp3.al.boq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG3, "", HFILL }},
+    { "Remote Force", "dnp3.al.boq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG3, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b4,
-    { "Local Force", "dnp3.al.boq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG4, "", HFILL }},
+    { "Local Force", "dnp3.al.boq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG4, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b5,
-    { "Reserved", "dnp3.al.boq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG5, "", HFILL }},
+    { "Reserved", "dnp3.al.boq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG5, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b6,
-    { "Reserved", "dnp3.al.boq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG6, "", HFILL }},
+    { "Reserved", "dnp3.al.boq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG6, NULL, HFILL }},
 
     { &hf_dnp3_al_boq_b7,
-    { "Point Value", "dnp3.al.boq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG7, "", HFILL }},
+    { "Point Value", "dnp3.al.boq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_BO_FLAG7, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b0,
-    { "Online", "dnp3.al.ctrq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG0, "", HFILL }},
+    { "Online", "dnp3.al.ctrq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG0, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b1,
-    { "Restart", "dnp3.al.ctrq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG1, "", HFILL }},
+    { "Restart", "dnp3.al.ctrq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG1, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b2,
-    { "Comm Fail", "dnp3.al.ctrq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG2, "", HFILL }},
+    { "Comm Fail", "dnp3.al.ctrq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG2, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b3,
-    { "Remote Force", "dnp3.al.ctrq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG3, "", HFILL }},
+    { "Remote Force", "dnp3.al.ctrq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG3, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b4,
-    { "Local Force", "dnp3.al.ctrq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG4, "", HFILL }},
+    { "Local Force", "dnp3.al.ctrq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG4, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b5,
-    { "Roll-Over", "dnp3.al.ctrq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG5, "", HFILL }},
+    { "Roll-Over", "dnp3.al.ctrq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG5, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b6,
-    { "Discontinuity", "dnp3.al.ctrq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG6, "", HFILL }},
+    { "Discontinuity", "dnp3.al.ctrq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG6, NULL, HFILL }},
 
     { &hf_dnp3_al_ctrq_b7,
-    { "Reserved", "dnp3.al.ctrq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG7, "", HFILL }},
+    { "Reserved", "dnp3.al.ctrq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_CTR_FLAG7, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b0,
-    { "Online", "dnp3.al.aiq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG0, "", HFILL }},
+    { "Online", "dnp3.al.aiq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG0, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b1,
-    { "Restart", "dnp3.al.aiq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG1, "", HFILL }},
+    { "Restart", "dnp3.al.aiq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG1, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b2,
-    { "Comm Fail", "dnp3.al.aiq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG2, "", HFILL }},
+    { "Comm Fail", "dnp3.al.aiq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG2, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b3,
-    { "Remote Force", "dnp3.al.aiq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG3, "", HFILL }},
+    { "Remote Force", "dnp3.al.aiq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG3, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b4,
-    { "Local Force", "dnp3.al.aiq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG4, "", HFILL }},
+    { "Local Force", "dnp3.al.aiq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG4, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b5,
-    { "Over-Range", "dnp3.al.aiq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG5, "", HFILL }},
+    { "Over-Range", "dnp3.al.aiq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG5, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b6,
-    { "Reference Check", "dnp3.al.aiq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG6, "", HFILL }},
+    { "Reference Check", "dnp3.al.aiq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG6, NULL, HFILL }},
 
     { &hf_dnp3_al_aiq_b7,
-    { "Reserved", "dnp3.al.aiq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG7, "", HFILL }},
+    { "Reserved", "dnp3.al.aiq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AI_FLAG7, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b0,
-    { "Online", "dnp3.al.aoq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG0, "", HFILL }},
+    { "Online", "dnp3.al.aoq.b0", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG0, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b1,
-    { "Restart", "dnp3.al.aoq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG1, "", HFILL }},
+    { "Restart", "dnp3.al.aoq.b1", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG1, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b2,
-    { "Comm Fail", "dnp3.al.aoq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG2, "", HFILL }},
+    { "Comm Fail", "dnp3.al.aoq.b2", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG2, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b3,
-    { "Remote Force", "dnp3.al.aoq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG3, "", HFILL }},
+    { "Remote Force", "dnp3.al.aoq.b3", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG3, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b4,
-    { "Local Force", "dnp3.al.aoq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG4, "", HFILL }},
+    { "Local Force", "dnp3.al.aoq.b4", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG4, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b5,
-    { "Reserved", "dnp3.al.aoq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG5, "", HFILL }},
+    { "Reserved", "dnp3.al.aoq.b5", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG5, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b6,
-    { "Reserved", "dnp3.al.aoq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG6, "", HFILL }},
+    { "Reserved", "dnp3.al.aoq.b6", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG6, NULL, HFILL }},
 
     { &hf_dnp3_al_aoq_b7,
-    { "Reserved", "dnp3.al.aoq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG7, "", HFILL }},
+    { "Reserved", "dnp3.al.aoq.b7", FT_BOOLEAN, 8, TFS(&tfs_set_notset), AL_OBJ_AO_FLAG7, NULL, HFILL }},
 
     { &hf_dnp3_al_timestamp,
     { "Timestamp", "dnp3.al.timestamp", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "Object Timestamp", HFILL }},
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 25facd5e20..d7a41c4790 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -2950,7 +2950,7 @@ proto_register_dns(void)
     { &hf_dns_flags,
       { "Flags",		"dns.flags",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_dns_flags_response,
       { "Response",		"dns.flags.response",
 	FT_BOOLEAN, 16, TFS(&tfs_flags_response), F_RESPONSE,
@@ -3002,7 +3002,7 @@ proto_register_dns(void)
     { &hf_dns_flags_rcode,
       { "Reply code",		"dns.flags.rcode",
 	FT_UINT16, BASE_DEC, VALS(rcode_vals), F_RCODE,
-	"Reply code", HFILL }},
+	NULL, HFILL }},
     { &hf_dns_transaction_id,
       { "Transaction ID",      	"dns.id",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -3082,11 +3082,11 @@ proto_register_dns(void)
     { &hf_dns_nsec3_algo,
       { "Hash algorithm", "dns.nsec3.algo",
         FT_UINT8, BASE_DEC, VALS(hash_algorithms), 0,
-        "Hash algorithm", HFILL }},
+        NULL, HFILL }},
     { &hf_dns_nsec3_flags,
       { "NSEC3 flags", "dns.nsec3.flags",
         FT_UINT8, BASE_DEC, NULL, 0,
-        "NSEC3 flags", HFILL }},
+        NULL, HFILL }},
     { &hf_dns_nsec3_flag_optout,
       { "NSEC3 Opt-out flag", "dns.nsec3.flags.opt_out",
         FT_BOOLEAN, 8, TFS(&tfs_flags_nsec3_optout), NSEC3_FLAG_OPTOUT,
@@ -3101,20 +3101,20 @@ proto_register_dns(void)
         "Length of salt in bytes", HFILL }},
     { &hf_dns_nsec3_salt_value,
       { "Salt value", "dns.nsec3.salt_value",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "Salt value", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_dns_nsec3_hash_length,
       { "Hash length", "dns.nsec3.hash_length",
         FT_UINT8, BASE_DEC, NULL, 0,
         "Length in bytes of next hashed owner", HFILL }},
     { &hf_dns_nsec3_hash_value,
       { "Next hashed owner", "dns.nsec3.hash_value",
-        FT_BYTES, BASE_HEX, NULL, 0,
-        "Next hashed owner", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_dns_tsig_original_id,
       { "Original Id",       	"dns.tsig.original_id",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"Original Id", HFILL }},
+	NULL, HFILL }},
     { &hf_dns_tsig_error,
       { "Error",       	"dns.tsig.error",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -3134,11 +3134,11 @@ proto_register_dns(void)
     { &hf_dns_tsig_mac,
       { "MAC",       	"dns.tsig.mac",
 	FT_NONE, BASE_NONE, NULL, 0x0,
-	"MAC", HFILL }},
+	NULL, HFILL }},
     { &hf_dns_tsig_other_data,
       { "Other Data",       	"dns.tsig.other_data",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
-	"Other Data", HFILL }},
+	FT_BYTES, BASE_NONE, NULL, 0x0,
+	NULL, HFILL }},
     { &hf_dns_tsig_algorithm_name,
       { "Algorithm Name",      	"dns.tsig.algorithm_name",
 	FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-dop.c b/epan/dissectors/packet-dop.c
index 96e0e3990b..ea5b75c0d9 100644
--- a/epan/dissectors/packet-dop.c
+++ b/epan/dissectors/packet-dop.c
@@ -2214,7 +2214,7 @@ void proto_register_dop(void) {
 #line 1 "packet-dop-hfarr.c"
     { &hf_dop_DSEType_PDU,
       { "DSEType", "dop.DSEType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dop.DSEType", HFILL }},
     { &hf_dop_SupplierInformation_PDU,
       { "SupplierInformation", "dop.SupplierInformation",
@@ -2282,7 +2282,7 @@ void proto_register_dop(void) {
         "dop.OperationalBindingID", HFILL }},
     { &hf_dop_supplier_is_master,
       { "supplier-is-master", "dop.supplier_is_master",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dop.BOOLEAN", HFILL }},
     { &hf_dop_non_supplying_master,
       { "non-supplying-master", "dop.non_supplying_master",
@@ -2354,7 +2354,7 @@ void proto_register_dop(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dop_encrypted,
       { "encrypted", "dop.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dop.BIT_STRING", HFILL }},
     { &hf_dop_identifier,
       { "identifier", "dop.identifier",
@@ -2414,7 +2414,7 @@ void proto_register_dop(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_dop_aliasDereferenced,
       { "aliasDereferenced", "dop.aliasDereferenced",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dop.BOOLEAN", HFILL }},
     { &hf_dop_notification,
       { "notification", "dop.notification",
@@ -2594,7 +2594,7 @@ void proto_register_dop(void) {
         "x509if.Attribute", HFILL }},
     { &hf_dop_alias,
       { "alias", "dop.alias",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dop.BOOLEAN", HFILL }},
     { &hf_dop_identificationTag,
       { "identificationTag", "dop.identificationTag",
@@ -2770,7 +2770,7 @@ void proto_register_dop(void) {
         "x509if.SubtreeSpecification", HFILL }},
     { &hf_dop_grantsAndDenials,
       { "grantsAndDenials", "dop.grantsAndDenials",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dop.GrantsAndDenials", HFILL }},
     { &hf_dop_basicLevels,
       { "basicLevels", "dop.basicLevels",
@@ -2786,7 +2786,7 @@ void proto_register_dop(void) {
         "dop.INTEGER", HFILL }},
     { &hf_dop_signed,
       { "signed", "dop.signed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dop.BOOLEAN", HFILL }},
     { &hf_dop_other,
       { "other", "dop.other",
@@ -2795,175 +2795,175 @@ void proto_register_dop(void) {
     { &hf_dop_DSEType_root,
       { "root", "dop.root",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_glue,
       { "glue", "dop.glue",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_cp,
       { "cp", "dop.cp",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_entry,
       { "entry", "dop.entry",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_alias,
       { "alias", "dop.alias",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_subr,
       { "subr", "dop.subr",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_nssr,
       { "nssr", "dop.nssr",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_supr,
       { "supr", "dop.supr",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_xr,
       { "xr", "dop.xr",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_admPoint,
       { "admPoint", "dop.admPoint",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_subentry,
       { "subentry", "dop.subentry",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_shadow,
       { "shadow", "dop.shadow",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_immSupr,
       { "immSupr", "dop.immSupr",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_rhob,
       { "rhob", "dop.rhob",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_sa,
       { "sa", "dop.sa",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_dsSubentry,
       { "dsSubentry", "dop.dsSubentry",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_DSEType_familyMember,
       { "familyMember", "dop.familyMember",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantAdd,
       { "grantAdd", "dop.grantAdd",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyAdd,
       { "denyAdd", "dop.denyAdd",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantDiscloseOnError,
       { "grantDiscloseOnError", "dop.grantDiscloseOnError",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyDiscloseOnError,
       { "denyDiscloseOnError", "dop.denyDiscloseOnError",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRead,
       { "grantRead", "dop.grantRead",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRead,
       { "denyRead", "dop.denyRead",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRemove,
       { "grantRemove", "dop.grantRemove",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRemove,
       { "denyRemove", "dop.denyRemove",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantBrowse,
       { "grantBrowse", "dop.grantBrowse",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyBrowse,
       { "denyBrowse", "dop.denyBrowse",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantExport,
       { "grantExport", "dop.grantExport",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyExport,
       { "denyExport", "dop.denyExport",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantImport,
       { "grantImport", "dop.grantImport",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyImport,
       { "denyImport", "dop.denyImport",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantModify,
       { "grantModify", "dop.grantModify",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyModify,
       { "denyModify", "dop.denyModify",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantRename,
       { "grantRename", "dop.grantRename",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyRename,
       { "denyRename", "dop.denyRename",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantReturnDN,
       { "grantReturnDN", "dop.grantReturnDN",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyReturnDN,
       { "denyReturnDN", "dop.denyReturnDN",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantCompare,
       { "grantCompare", "dop.grantCompare",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyCompare,
       { "denyCompare", "dop.denyCompare",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantFilterMatch,
       { "grantFilterMatch", "dop.grantFilterMatch",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyFilterMatch,
       { "denyFilterMatch", "dop.denyFilterMatch",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_grantInvoke,
       { "grantInvoke", "dop.grantInvoke",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_dop_GrantsAndDenials_denyInvoke,
       { "denyInvoke", "dop.denyInvoke",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-dop-hfarr.c ---*/
 #line 251 "packet-dop-template.c"
diff --git a/epan/dissectors/packet-dplay.c b/epan/dissectors/packet-dplay.c
index f88f94186e..4be8409558 100644
--- a/epan/dissectors/packet-dplay.c
+++ b/epan/dissectors/packet-dplay.c
@@ -1216,48 +1216,48 @@ void proto_register_dplay(void)
     /* Common data fields */
     { &hf_dplay_size,
         { "DirectPlay package size", "dplay.size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_token,
         { "DirectPlay token", "dplay.token", FT_UINT32, BASE_HEX,
-        VALS(dplay_token_val), 0x0, "", HFILL}},
+        VALS(dplay_token_val), 0x0, NULL, HFILL}},
     { &hf_dplay_saddr_af,
         { "DirectPlay s_addr_in address family", "dplay.saddr.af", FT_UINT16, BASE_HEX,
-        VALS(dplay_af_val), 0x0, "", HFILL}},
+        VALS(dplay_af_val), 0x0, NULL, HFILL}},
     { &hf_dplay_saddr_port,
         { "DirectPlay s_addr_in port", "dplay.saddr.port", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_saddr_ip,
         { "DirectPlay s_addr_in ip address", "dplay.saddr.ip", FT_IPv4, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_saddr_padding,
         { "DirectPlay s_addr_in null padding", "dplay.saddr.padding", FT_BYTES, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_play_str,
         { "DirectPlay action string", "dplay.dplay_str", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_command,
         { "DirectPlay command", "dplay.command", FT_UINT16, BASE_HEX,
-        VALS(dplay_command_val), 0x0, "", HFILL}},
+        VALS(dplay_command_val), 0x0, NULL, HFILL}},
     { &hf_dplay_proto_dialect,
         { "DirectPlay dialect version", "dplay.dialect.version", FT_UINT16, BASE_HEX,
-        VALS(dplay_proto_dialect_val), 0x0, "", HFILL}},
+        VALS(dplay_proto_dialect_val), 0x0, NULL, HFILL}},
     { &hf_dplay_play_str_2,
         { "DirectPlay second action string", "dplay.dplay_str_2", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_command_2,
         { "DirectPlay second command", "dplay.command_2", FT_UINT16, BASE_HEX,
-        VALS(dplay_command_val), 0x0, "", HFILL}},
+        VALS(dplay_command_val), 0x0, NULL, HFILL}},
     { &hf_dplay_proto_dialect_2,
         { "DirectPlay second dialect version", "dplay.dialect.version_2", FT_UINT16, BASE_HEX,
-        VALS(dplay_proto_dialect_val), 0x0, "", HFILL}},
+        VALS(dplay_proto_dialect_val), 0x0, NULL, HFILL}},
     { &hf_dplay_player_msg,
-        { "DirectPlay Player to Player message", "dplay.player_msg", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "DirectPlay Player to Player message", "dplay.player_msg", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* Session Desc structure fields */
     { &hf_dplay_sess_desc_flags,
         { "DirectPlay session desc flags", "dplay.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_flags_no_create_players,
         { "no create players flag", "dplay.flags.no_create_players", FT_BOOLEAN, 32,
         TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_CREATE_PLAYERS, "No Create Players", HFILL}},
@@ -1314,239 +1314,239 @@ void proto_register_dplay(void)
         TFS(&tfs_dplay_flag), DPLAY_FLAG_NO_SESS_DESC_CHANGES, "No Sess Desc Changes", HFILL}},
     { &hf_dplay_instance_guid,
         { "DirectPlay instance guid", "dplay.instance.guid", FT_GUID, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_game_guid,
         { "DirectPlay game GUID", "dplay.game.guid", FT_GUID, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_length,
         { "DirectPlay session desc length", "dplay.sess_desc.length", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_max_players,
-        { "DirectPlay max players ", "dplay.sess_desc.max_players", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        { "DirectPlay max players", "dplay.sess_desc.max_players", FT_UINT32, BASE_DEC,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_curr_players,
         { "DirectPlay current players", "dplay.sess_desc.curr_players", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_name_ptr,
-        { "Session description name pointer placeholder", "dplay.sess_desc.name_ptr", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description name pointer placeholder", "dplay.sess_desc.name_ptr", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_passwd_ptr,
-        { "Session description password pointer placeholder", "dplay.sess_desc.pw_ptr", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description password pointer placeholder", "dplay.sess_desc.pw_ptr", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_reserved_1,
-        { "Session description reserved 1", "dplay.sess_desc.res_1", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description reserved 1", "dplay.sess_desc.res_1", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_reserved_2,
-        { "Session description reserved 2", "dplay.sess_desc.res_2", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description reserved 2", "dplay.sess_desc.res_2", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_user_1,
-        { "Session description user defined 1", "dplay.sess_desc.user_1", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description user defined 1", "dplay.sess_desc.user_1", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_user_2,
-        { "Session description user defined 2", "dplay.sess_desc.user_2", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description user defined 2", "dplay.sess_desc.user_2", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_user_3,
-        { "Session description user defined 3", "dplay.sess_desc.user_3", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description user defined 3", "dplay.sess_desc.user_3", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sess_desc_user_4,
-        { "Session description user defined 4", "dplay.sess_desc.user_4", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Session description user defined 4", "dplay.sess_desc.user_4", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* PackedPlayer structure fields */
     { &hf_dplay_pp_size,
         { "PackedPlayer size", "dplay.pp.size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_flags,
         { "PackedPlayer flags", "dplay.pp.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_flag_sysplayer,
         { "is system player", "dplay.pp.flags.sysplayer", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_SYSPLAYER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_SYSPLAYER, NULL, HFILL}},
     { &hf_dplay_pp_flag_nameserver,
         { "is name server", "dplay.pp.flags.nameserver", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_NAMESERVER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_NAMESERVER, NULL, HFILL}},
     { &hf_dplay_pp_flag_in_group,
         { "in group", "dplay.pp.flags.in_group", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_IN_GROUP, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_PP_FLAG_IN_GROUP, NULL, HFILL}},
     { &hf_dplay_pp_flag_sending,
         { "sending player on local machine", "dplay.pp.flags.sending", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}},
     { &hf_dplay_pp_id,
-        { "PackedPlayer ID", "dplay.pp.id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer ID", "dplay.pp.id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_short_name_len,
         { "PackedPlayer short name length", "dplay.pp.short_name_len", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_long_name_len,
         { "PackedPlayer long name length", "dplay.pp.long_name_len", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_sp_data_size,
         { "PackedPlayer service provider data size", "dplay.pp.sp_data_size", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_player_data_size,
         { "PackedPlayer player data size", "dplay.pp.player_data_size", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_num_players,
         { "PackedPlayer player count", "dplay.pp.player_count", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_system_player,
-        { "PackedPlayer system player ID", "dplay.pp.sysplayer_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer system player ID", "dplay.pp.sysplayer_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_fixed_size,
         { "PackedPlayer fixed size", "dplay.pp.fixed_size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_dialect,
         { "PackedPlayer dialect version", "dplay.pp.dialect", FT_UINT32, BASE_HEX,
-        VALS(&dplay_proto_dialect_val), 0x0, "", HFILL}},
+        VALS(&dplay_proto_dialect_val), 0x0, NULL, HFILL}},
     { &hf_dplay_pp_unknown_1,
-        { "PackedPlayer unknown 1", "dplay.pp.unknown_1", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer unknown 1", "dplay.pp.unknown_1", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_short_name,
         { "PackedPlayer short name", "dplay.pp.short_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_long_name,
         { "PackedPlayer long name", "dplay.pp.short_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_player_data,
-        { "PackedPlayer player data", "dplay.pp.player_data", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer player data", "dplay.pp.player_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_sp_data,
-        { "PackedPlayer service provider data", "dplay.pp.sp_data", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer service provider data", "dplay.pp.sp_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_player_id,
-        { "PackedPlayer player ID", "dplay.pp.player_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer player ID", "dplay.pp.player_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_pp_parent_id,
-        { "PackedPlayer parent ID", "dplay.pp.parent_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "PackedPlayer parent ID", "dplay.pp.parent_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* SuperPackedPlayer structure fields */
     { &hf_dplay_spp_size,
         { "SuperPackedPlayer size", "dplay.spp.size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_flags,
         { "SuperPackedPlayer flags", "dplay.spp.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_flags_sysplayer,
         { "is system player", "dplay.spp.flags.sysplayer", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SYSPLAYER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SYSPLAYER, NULL, HFILL}},
     { &hf_dplay_spp_flags_nameserver,
         { "is name server", "dplay.spp.flags.nameserver", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_NAMESERVER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_NAMESERVER, NULL, HFILL}},
     { &hf_dplay_spp_flags_in_group,
         { "in group", "dplay.spp.flags.in_group", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_IN_GROUP, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_IN_GROUP, NULL, HFILL}},
     { &hf_dplay_spp_flags_sending,
         { "sending player on local machine", "dplay.spp.flags.sending", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_SPP_FLAG_SENDING, NULL, HFILL}},
     { &hf_dplay_spp_id,
-        { "SuperPackedPlayer ID", "dplay.spp.id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer ID", "dplay.spp.id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_info_mask,
         { "SuperPackedPlayer player info mask", "dplay.spp.pim", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_have_short_name,
         { "SuperPackedPlayer have short name", "dplay.spp.pim.short_name", FT_UINT32, BASE_HEX,
-        VALS(yes_no_val), 0x0, "", HFILL}},
+        VALS(yes_no_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_have_long_name,
         { "SuperPackedPlayer have long name", "dplay.spp.pim.long_name", FT_UINT32, BASE_HEX,
-        VALS(yes_no_val), 0x0, "", HFILL}},
+        VALS(yes_no_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_sp_length_type,
         { "SuperPackedPlayer service provider length info", "dplay.spp.pim.sp_length", FT_UINT32, BASE_HEX,
-        VALS(dplay_spp_length_val), 0x0, "", HFILL}},
+        VALS(dplay_spp_length_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_pd_length_type,
         { "SuperPackedPlayer player data length info", "dplay.spp.pim.pd_length", FT_UINT32, BASE_HEX,
-        VALS(dplay_spp_length_val), 0x0, "", HFILL}},
+        VALS(dplay_spp_length_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_count_type,
         { "SuperPackedPlayer player count info", "dplay.spp.pim.player_count", FT_UINT32, BASE_HEX,
-        VALS(dplay_spp_length_val), 0x0, "", HFILL}},
+        VALS(dplay_spp_length_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_have_parent_id,
         { "SuperPackedPlayer have parent ID", "dplay.spp.pim.parent_id", FT_UINT32, BASE_HEX,
-        VALS(yes_no_val), 0x0, "", HFILL}},
+        VALS(yes_no_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_shortcut_count_type,
         { "SuperPackedPlayer shortcut count info", "dplay.spp.pim.shortcut_count", FT_UINT32, BASE_HEX,
-        VALS(dplay_spp_length_val), 0x0, "", HFILL}},
+        VALS(dplay_spp_length_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_dialect,
         { "SuperPackedPlayer dialect version", "dplay.spp.dialect", FT_UINT32, BASE_HEX,
-        VALS(&dplay_proto_dialect_val), 0x0, "", HFILL}},
+        VALS(&dplay_proto_dialect_val), 0x0, NULL, HFILL}},
     { &hf_dplay_spp_sys_player_id,
-        { "SuperPackedPlayer system player ID", "dplay.spp.sysplayer_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer system player ID", "dplay.spp.sysplayer_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_short_name,
         { "SuperPackedPlayer short name", "dplay.spp.short_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_long_name,
         { "SuperPackedPlayer long name", "dplay.spp.short_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_data_length,
         { "SuperPackedPlayer player data length", "dplay.spp.pd_length", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_data,
-        { "SuperPackedPlayer player data", "dplay.spp.player_data", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer player data", "dplay.spp.player_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_sp_data_length,
         { "SuperPackedPlayer service provider data length", "dplay.spp.sp_data_length", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_sp_data,
-        { "SuperPackedPlayer service provider data", "dplay.spp.sp_data", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer service provider data", "dplay.spp.sp_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_count,
         { "SuperPackedPlayer player count", "dplay.spp.player_count", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_player_id,
-        { "SuperPackedPlayer player ID", "dplay.spp.player_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer player ID", "dplay.spp.player_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_parent_id,
-        { "SuperPackedPlayer parent ID", "dplay.spp.parent_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer parent ID", "dplay.spp.parent_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_shortcut_count,
         { "SuperPackedPlayer shortcut count", "dplay.spp.shortcut_count", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_spp_shortcut_id,
-        { "SuperPackedPlayer shortcut ID", "dplay.spp.shortcut_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SuperPackedPlayer shortcut ID", "dplay.spp.shortcut_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for SecDesc struct */
     { &hf_dplay_sd_size,
         { "SecDesc struct size", "dplay.sd.size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sd_flags,
         { "SecDesc flags", "dplay.sd.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sd_sspi,
-        { "SecDesc SSPI provider ptr", "dplay.sd.sspi", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SecDesc SSPI provider ptr", "dplay.sd.sspi", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sd_capi,
-        { "SecDesc CAPI provider ptr", "dplay.sd.capi", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "SecDesc CAPI provider ptr", "dplay.sd.capi", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sd_capi_type,
         { "SecDesc CAPI provider type", "dplay.sd.capi_type", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_sd_enc_alg,
         { "SecDesc encryption algorithm" , "dplay.sd.enc_alg", FT_UINT32, BASE_HEX,
-        VALS(dplay_enc_alg_val), 0x0, "", HFILL}},
+        VALS(dplay_enc_alg_val), 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0001 */
     { &hf_dplay_type_01_name_offset,
         { "Enum Session Reply name offset", "dplay.type_01.name_offs", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_01_game_name,
         { "Enum Session Reply game name", "dplay.type_01.game_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0002 */
     { &hf_dplay_type_02_game_guid,
         { "DirectPlay game GUID", "dplay.type02.game.guid", FT_GUID, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_02_password_offset,
         { "Enum Sessions password offset", "dplay.type02.password_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_02_flags,
         { "Enum Session flags", "dplay.type02.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_02_password,
         { "Session password", "dplay.type02.password", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_enum_sess_flag_join,
         { "Enumerate joinable sessions", "dplay.type02.joinable", FT_BOOLEAN, 32,
         TFS(&tfs_dplay_flag), DPLAY_ENUM_SESS_FLAG_JOIN, "Joinable", HFILL}},
@@ -1560,185 +1560,185 @@ void proto_register_dplay(void)
     /* Data fields for message type 0x0005 */
     { &hf_dplay_type_05_flags,
         { "Player ID request flags", "dplay.type_05.flags", FT_UINT32, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_05_system_player,
         { "is system player", "dplay.type_05.flags.sys_player", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SYSPLAYER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SYSPLAYER, NULL, HFILL}},
     { &hf_dplay_type_05_name_server,
         { "is name server", "dplay.type_05.flags.name_server", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_NAMESERVER, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_NAMESERVER, NULL, HFILL}},
     { &hf_dplay_type_05_local,
         { "is local player", "dplay.type_05.flags.local", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_LOCAL, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_LOCAL, NULL, HFILL}},
     { &hf_dplay_type_05_unknown,
         { "unknown", "dplay.type_05.flags.unknown", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_UNKNOWN, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_UNKNOWN, NULL, HFILL}},
     { &hf_dplay_type_05_secure,
         { "is secure session", "dplay.type_05.flags.secure", FT_BOOLEAN, 32,
-        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SECURE, "", HFILL}},
+        TFS(&tfs_dplay_flag), DPLAY_TYPE05_FLAG_SECURE, NULL, HFILL}},
 
     /* Data fields for message type 0x0007 */
     { &hf_dplay_type_07_dpid,
-        { "DirectPlay ID", "dplay.type_07.dpid", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "DirectPlay ID", "dplay.type_07.dpid", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_07_sspi_offset,
         { "SSPI provider offset", "dplay.type_07.sspi_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_07_capi_offset,
         { "CAPI provider offset", "dplay.type_07.capi_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_07_hresult,
         { "Request player HRESULT", "dplay.type_07.hresult", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_07_sspi,
         { "SSPI provider", "dplay.type_07.sspi", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_07_capi,
         { "CAPI provider", "dplay.type_07.capi", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0008, 0x0009, 0x000b, 0x000c, 0x000d,
      * 0x000e, 0x002e and 0x0038*/
     { &hf_dplay_multi_id_to,
-        { "ID to", "dplay.multi.id_to", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID to", "dplay.multi.id_to", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_multi_player_id,
-        { "Player ID", "dplay.multi.player_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Player ID", "dplay.multi.player_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_multi_group_id,
-        { "Group ID", "dplay.multi.group_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Group ID", "dplay.multi.group_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_multi_create_offset,
         { "Offset to PackedPlayer struct", "dplay.multi.create_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_multi_password_offset,
         { "Offset to password", "dplay.multi.password_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_multi_password,
         { "Password", "dplay.multi.password", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x000f */
     { &hf_dplay_type_0f_id_to,
-        { "ID to", "dplay.type_0f.id_to", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID to", "dplay.type_0f.id_to", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_0f_id,
-        { "Player ID", "dplay.type_0f.player_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Player ID", "dplay.type_0f.player_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_0f_data_size,
         { "Data Size", "dplay.multi.group_id", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_0f_data_offset,
         { "Data Offset", "dplay.type_0f.data_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_0f_data,
-        { "Player Data", "dplay.type_0f.player_data", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Player Data", "dplay.type_0f.player_data", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0013 */
     { &hf_dplay_type_13_id_to,
-        { "ID to", "dplay.type_13.id_to", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID to", "dplay.type_13.id_to", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_player_id,
-        { "Player ID", "dplay.type_13.player_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Player ID", "dplay.type_13.player_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_group_id,
-        { "Group ID", "dplay.type_13.group_id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Group ID", "dplay.type_13.group_id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_create_offset,
         { "Create Offset", "dplay.type_13.create_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_password_offset,
         { "Password Offset", "dplay.type_13.password_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_password,
         { "Password", "dplay.type_13.password", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_13_tick_count,
-        { "Tick count? Looks like an ID", "dplay.type_13.tick_count", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "Tick count? Looks like an ID", "dplay.type_13.tick_count", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0015 */
     { &hf_dplay_message_guid,
         { "Message GUID", "dplay.message.guid", FT_GUID, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_packet_idx,
         { "Packet Index", "dplay.type_15.packet_idx", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_data_size,
         { "Data Size", "dplay.type_15.data_size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_offset,
         { "Offset", "dplay.type_15.offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_total_packets,
         { "Total Packets", "dplay.type_15.total_packets", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_msg_size,
         { "Message size", "dplay.type_15.message.size", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_15_packet_offset,
         { "Packet offset", "dplay.type_15.packet_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data field for message type 0x0016 and 0x0017 */
     { &hf_dplay_ping_id_from,
-        { "ID From", "dplay.ping.id_from", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID From", "dplay.ping.id_from", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_ping_tick_count,
         { "Tick Count", "dplay.ping.tick_count", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x001a */
     { &hf_dplay_type_1a_id_to,
-        { "ID From", "dplay.type_1a.id_to", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID From", "dplay.type_1a.id_to", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_1a_sess_name_ofs,
         { "Session Name Offset", "dplay.type_1a.sess_name_ofs", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_1a_password_ofs,
         { "Password Offset", "dplay.type_1a.password_offset", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_1a_session_name,
         { "Session Name", "dplay.type_1a.session_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_1a_password,
         { "Password", "dplay.type_1a.password", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x0029 */
     { &hf_dplay_type_29_player_count,
         { "SuperEnumPlayers Reply player count", "dplay.type_29.player_count", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_group_count,
         { "SuperEnumPlayers Reply group count", "dplay.type_29.group_count", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_packed_offset,
         { "SuperEnumPlayers Reply packed offset", "dplay.type_29.packed_offset", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_shortcut_count,
         { "SuperEnumPlayers Reply shortcut count", "dplay.type_29.shortcut_count", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_description_offset,
         { "SuperEnumPlayers Reply description offset", "dplay.type_29.desc_offset", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_name_offset,
         { "SuperEnumPlayers Reply name offset", "dplay.type_29.name_offset", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_password_offset,
         { "SuperEnumPlayers Reply password offset", "dplay.type_29.pass_offset", FT_UINT32,
-        BASE_DEC, NULL, 0x0, "", HFILL}},
+        BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_game_name,
         { "SuperEnumPlayers Reply game name", "dplay.type_29.game_name", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
     { &hf_dplay_type_29_password,
         { "SuperEnumPlayers Reply Password", "dplay.type_29.password", FT_STRING, BASE_NONE,
-        NULL, 0x0, "", HFILL}},
+        NULL, 0x0, NULL, HFILL}},
 
     /* Data fields for message type 0x002f */
     { &hf_dplay_type_2f_dpid,
-        { "ID of the forwarded player", "dplay.type_29.id", FT_BYTES, BASE_HEX,
-        NULL, 0x0, "", HFILL}},
+        { "ID of the forwarded player", "dplay.type_29.id", FT_BYTES, BASE_NONE,
+        NULL, 0x0, NULL, HFILL}},
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c
index 9e1c5afb7e..6873f62d38 100644
--- a/epan/dissectors/packet-dsi.c
+++ b/epan/dissectors/packet-dsi.c
@@ -651,12 +651,12 @@ proto_register_dsi(void)
     { &hf_dsi_offset,
       { "Data offset",      "dsi.data_offset",
 	FT_INT32, BASE_DEC, NULL, 0x0,
-      	"Data offset", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_error,
       { "Error code",       "dsi.error_code",
 	FT_INT32, BASE_DEC, VALS(asp_error_vals), 0x0,
-      	"Error code", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_length,
       { "Length",           "dsi.length",
@@ -675,31 +675,31 @@ proto_register_dsi(void)
     { &hf_dsi_utf8_server_name,
       { "UTF8 Server name",         "dsi.utf8_server_name",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-      	"UTF8 Server name", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_server_name,
       { "Server name",         "dsi.server_name",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"Server name", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_server_type,
       { "Server type",         "dsi.server_type",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"Server type", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_server_vers,
       { "AFP version",         "dsi.server_vers",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"AFP version", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_server_uams,
       { "UAM",         "dsi.server_uams",
 	FT_UINT_STRING, BASE_NONE, NULL, 0x0,
-      	"UAM", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_dsi_server_icon,
       { "Icon bitmap",         "dsi.server_icon",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Server icon bitmap", HFILL }},
 
     { &hf_dsi_server_directory,
@@ -709,8 +709,8 @@ proto_register_dsi(void)
 
     { &hf_dsi_server_signature,
       { "Server signature",         "dsi.server_signature",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
-      	"Server signature", HFILL }},
+	FT_BYTES, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_dsi_server_flag,
       { "Flag",         "dsi.server_flag",
@@ -727,15 +727,15 @@ proto_register_dsi(void)
     { &hf_dsi_server_flag_no_save_passwd,
       { "Don't allow save password",      "dsi.server_flag.no_save_passwd",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_NOSAVEPASSWD,
-      	"Don't allow save password", HFILL }},
+      	NULL, HFILL }},
     { &hf_dsi_server_flag_srv_msg,
       { "Support server message",      "dsi.server_flag.srv_msg",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_SRVMSGS,
-      	"Support server message", HFILL }},
+      	NULL, HFILL }},
     { &hf_dsi_server_flag_srv_sig,
       { "Support server signature",      "dsi.server_flag.srv_sig",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_SRVSIGNATURE,
-      	"Support server signature", HFILL }},
+      	NULL, HFILL }},
     { &hf_dsi_server_flag_tcpip,
       { "Support TCP/IP",      "dsi.server_flag.tcpip",
 		FT_BOOLEAN, 16, NULL, AFPSRVRINFO_TCPIP,
@@ -778,7 +778,7 @@ proto_register_dsi(void)
 
     { &hf_dsi_server_addr_value,
       { "Value",          "dsi.server_addr.value",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Address value", HFILL }},
 
     { &hf_dsi_open_type,
@@ -798,7 +798,7 @@ proto_register_dsi(void)
 
     { &hf_dsi_open_option,
       { "Option",          "dsi.open_option",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	"Open session options (undecoded)", HFILL }},
 
     { &hf_dsi_attn_flag,
diff --git a/epan/dissectors/packet-dsp.c b/epan/dissectors/packet-dsp.c
index 394cf3986a..a719e7c8c8 100644
--- a/epan/dissectors/packet-dsp.c
+++ b/epan/dissectors/packet-dsp.c
@@ -1977,7 +1977,7 @@ void proto_register_dsp(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_dsp_encrypted,
       { "encrypted", "dsp.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "dsp.BIT_STRING", HFILL }},
     { &hf_dsp_chainedResults,
       { "chainedResults", "dsp.chainedResults",
@@ -2241,7 +2241,7 @@ void proto_register_dsp(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_dsp_aliasDereferenced,
       { "aliasDereferenced", "dsp.aliasDereferenced",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_notification,
       { "notification", "dsp.notification",
@@ -2285,7 +2285,7 @@ void proto_register_dsp(void) {
         "dsp.INTEGER", HFILL }},
     { &hf_dsp_returnCrossRefs,
       { "returnCrossRefs", "dsp.returnCrossRefs",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_referenceType,
       { "referenceType", "dsp.referenceType",
@@ -2301,11 +2301,11 @@ void proto_register_dsp(void) {
         "dsp.Time", HFILL }},
     { &hf_dsp_entryOnly,
       { "entryOnly", "dsp.entryOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_uniqueIdentifier,
       { "uniqueIdentifier", "dsp.uniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_dsp_authenticationLevel,
       { "authenticationLevel", "dsp.authenticationLevel",
@@ -2317,11 +2317,11 @@ void proto_register_dsp(void) {
         "dsp.Exclusions", HFILL }},
     { &hf_dsp_excludeShadows,
       { "excludeShadows", "dsp.excludeShadows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_nameResolveOnMaster,
       { "nameResolveOnMaster", "dsp.nameResolveOnMaster",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_operationIdentifier,
       { "operationIdentifier", "dsp.operationIdentifier",
@@ -2405,7 +2405,7 @@ void proto_register_dsp(void) {
         "dsp.APCategory", HFILL }},
     { &hf_dsp_chainingRequired,
       { "chainingRequired", "dsp.chainingRequired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_MasterAndShadowAccessPoints_item,
       { "MasterOrShadowAccessPoint", "dsp.MasterOrShadowAccessPoint",
@@ -2437,7 +2437,7 @@ void proto_register_dsp(void) {
         "dsp.AccessPointInformation", HFILL }},
     { &hf_dsp_returnToDUA,
       { "returnToDUA", "dsp.returnToDUA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_basicLevels,
       { "basicLevels", "dsp.basicLevels",
@@ -2453,7 +2453,7 @@ void proto_register_dsp(void) {
         "dsp.INTEGER", HFILL }},
     { &hf_dsp_signed,
       { "signed", "dsp.signed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "dsp.BOOLEAN", HFILL }},
     { &hf_dsp_other,
       { "other", "dsp.other",
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 6f02817624..4c28105453 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1973,12 +1973,12 @@ proto_register_dtls(void)
     { &hf_dtls_record_epoch,
       { "Epoch", "dtls.record.epoch",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"Epoch", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_record_sequence_number,
       { "Sequence Number", "dtls.record.sequence_number",
 	FT_DOUBLE, BASE_DEC, NULL, 0x0,
-	"Sequence Number", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_record_length,
       { "Length", "dtls.record.length",
@@ -1987,7 +1987,7 @@ proto_register_dtls(void)
     },
     { &hf_dtls_record_appdata,
       { "Encrypted Application Data", "dtls.app_data",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
 	"Payload is encrypted application data", HFILL }
     },
     { &hf_dtls_change_cipher_spec,
@@ -2083,7 +2083,7 @@ proto_register_dtls(void)
     { &hf_dtls_handshake_cookie,
       { "Cookie", "dtls.handshake.cookie",
 	FT_BYTES, BASE_NONE, NULL, 0x0,
-	"Cookie", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_handshake_session_id,
       { "Session ID", "dtls.handshake.session_id",
@@ -2103,7 +2103,7 @@ proto_register_dtls(void)
     { &hf_dtls_handshake_comp_method,
       { "Compression Method", "dtls.handshake.comp_method",
 	FT_UINT8, BASE_DEC, VALS(ssl_31_compression_method), 0x0,
-	"Compression Method", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_handshake_extensions_len,
       { "Extensions Length", "dtls.handshake.extensions_length",
@@ -2138,7 +2138,7 @@ proto_register_dtls(void)
     { &hf_dtls_handshake_certificate,
       { "Certificate", "dtls.handshake.certificate",
 	FT_BYTES, BASE_NONE, NULL, 0x0,
-	"Certificate", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_handshake_certificate_len,
       { "Certificate Length", "dtls.handshake.certificate_length",
@@ -2158,7 +2158,7 @@ proto_register_dtls(void)
     { &hf_dtls_handshake_cert_type,
       { "Certificate type", "dtls.handshake.cert_type",
 	FT_UINT8, BASE_DEC, VALS(ssl_31_client_certificate_type), 0x0,
-	"Certificate type", HFILL }
+	NULL, HFILL }
     },
     { &hf_dtls_handshake_finished,
       { "Verify Data", "dtls.handshake.verify_data",
@@ -2210,21 +2210,21 @@ proto_register_dtls(void)
     },
     { &hf_dtls_fragment_overlap,
       { "Message fragment overlap", "dtls.fragment.overlap",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dtls_fragment_overlap_conflicts,
       { "Message fragment overlapping with conflicting data",
 	"dtls.fragment.overlap.conflicts",
-       FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+       FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dtls_fragment_multiple_tails,
       { "Message has multiple tail fragments",
 	"dtls.fragment.multiple_tails", 
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dtls_fragment_too_long_fragment,
       { "Message fragment too long", "dtls.fragment.too_long_fragment",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dtls_fragment_error,
       { "Message defragmentation error", "dtls.fragment.error",
diff --git a/epan/dissectors/packet-dtp.c b/epan/dissectors/packet-dtp.c
index 5beb8ba7a2..967bcdd9f4 100644
--- a/epan/dissectors/packet-dtp.c
+++ b/epan/dissectors/packet-dtp.c
@@ -204,15 +204,15 @@ proto_register_dtp(void)
 	static hf_register_info hf[] = {
 	{ &hf_dtp_version,
 		{ "Version",	"dtp.version", FT_UINT8, BASE_HEX, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_dtp_tlvtype,
 		{ "Type",	"dtp.tlv_type", FT_UINT16, BASE_HEX, 
-		VALS(dtp_tlv_type_vals), 0x0, "", HFILL }},
+		VALS(dtp_tlv_type_vals), 0x0, NULL, HFILL }},
 
 	{ &hf_dtp_tlvlength,
 		{ "Length",	"dtp.tlv_len", FT_UINT16, BASE_DEC, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_dtp_some_mac,
 		{ "Neighbor", "dtp.neighbor", FT_ETHER, BASE_NONE, 
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index cf6255e0b9..2853f528c1 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -885,63 +885,63 @@ proto_register_dtpt(void)
     { &hf_dtpt_flags_deep,
       { "DEEP", "dtpt.flags.deep",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_DEEP,
-	"DEEP", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_containers,
       { "CONTAINERS", "dtpt.flags.containers",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_CONTAINERS,
-	"CONTAINERS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_nocontainers,
       { "NOCONTAINERS", "dtpt.flags.nocontainers",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_NOCONTAINERS,
-	"NOCONTAINERS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_nearest,
       { "NEAREST", "dtpt.flags.nearest",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_NEAREST,
-	"NEAREST", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_name,
       { "RETURN_NAME", "dtpt.flags.return_name",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_NAME,
-	"RETURN_NAME", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_type,
       { "RETURN_TYPE", "dtpt.flags.return_type",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_TYPE,
-	"RETURN_TYPE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_version,
       { "RETURN_VERSION", "dtpt.flags.return_version",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_VERSION,
-	"RETURN_VERSION", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_comment,
       { "RETURN_COMMENT", "dtpt.flags.return_comment",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_COMMENT,
-	"RETURN_COMMENT", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_addr,
       { "RETURN_ADDR", "dtpt.flags.return_addr",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_ADDR,
-	"RETURN_ADDR", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_blob,
       { "RETURN_BLOB", "dtpt.flags.return_blob",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_BLOB,
-	"RETURN_BLOB", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_aliases,
       { "RETURN_ALIASES", "dtpt.flags.return_aliases",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_ALIASES,
-	"RETURN_ALIASES", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_return_query_string,
       { "RETURN_QUERY_STRING", "dtpt.flags.return_query_string",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RETURN_QUERY_STRING,
-	"RETURN_QUERY_STRING", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_flushcache,
       { "FLUSHCACHE", "dtpt.flags.flushcache",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_FLUSHCACHE,
-	"FLUSHCACHE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_flushprevious,
       { "FLUSHPREVIOUS", "dtpt.flags.flushprevious",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_FLUSHPREVIOUS,
-	"FLUSHPREVIOUS", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_flags_res_service,
       { "RES_SERVICE", "dtpt.flags.res_service",
 	FT_BOOLEAN, 32, TFS(&flags_set_truth), LUP_RES_SERVICE,
-	"RES_SERVICE", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_payload_size,
       { "Payload Size", "dtpt.payload_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -953,15 +953,15 @@ proto_register_dtpt(void)
     { &hf_dtpt_error,
       { "Last Error", "dtpt.error",
 	FT_UINT32, BASE_DEC, VALS(names_error), 0x0,
-	"Last Error", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_buffer_size,
       { "Buffer Size", "dtpt.buffer_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Buffer Size", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_data_size,
       { "Data Size", "dtpt.data_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Data Size", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_queryset_rawsize,
       { "QuerySet Size", "dtpt.queryset_size",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1045,31 +1045,31 @@ proto_register_dtpt(void)
     { &hf_dtpt_service_instance_name,
       { "Service Instance Name", "dtpt.service_instance_name",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Service Instance Name", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_service_class_id,
       { "Service Class ID", "dtpt.service_class_id",
 	FT_GUID, BASE_NONE, NULL, 0x0,
-	"Service Class ID", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_comment,
       { "Comment", "dtpt.comment",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Comment", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_ns_provider_id,
       { "NS Provider ID", "dtpt.ns_provider_id",
 	FT_GUID, BASE_NONE, NULL, 0x0,
-	"NS Provider ID", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_context,
       { "Context", "dtpt.context",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Context", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocols_number,
       { "Number of Protocols", "dtpt.protocols.number",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Number of Protocols", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocols_length,
       { "Length of Protocols", "dtpt.protocols.length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Length of Protocols", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_protocol_family,
       { "Family", "dtpt.protocol.family",
 	FT_UINT32, BASE_DEC, VALS(names_family), 0x0,
@@ -1081,27 +1081,27 @@ proto_register_dtpt(void)
     { &hf_dtpt_query_string,
       { "Query String", "dtpt.query_string",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
-	"Query String", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addrs_number,
       { "Number of CS Addresses", "dtpt.cs_addrs.number",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Number of CS Addresses", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addrs_length1,
       { "Length of CS Addresses Part 1", "dtpt.cs_addrs.length1",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Length of CS Addresses Part 1", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_socket_type,
       { "Socket Type", "dtpt.cs_addrs.socket_type",
 	FT_UINT32, BASE_DEC, VALS(names_socket_type), 0x0,
-	"Socket Type", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_protocol,
       { "Protocol", "dtpt.cs_addrs.protocol",
 	FT_UINT32, BASE_DEC, VALS(names_protocol), 0x0,
-	"Protocol", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_local_pointer,
       { "Local Address Pointer", "dtpt.cs_addr.local_pointer",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"Local Address Pointer", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_local_length,
       { "Local Address Length", "dtpt.cs_addr.local_length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1109,11 +1109,11 @@ proto_register_dtpt(void)
     { &hf_dtpt_cs_addr_local,
       { "Local Address", "dtpt.cs_addr.local",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Local Address", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_remote_pointer,
       { "Remote Address Pointer", "dtpt.cs_addr.remote_pointer",
 	FT_UINT32, BASE_HEX, NULL, 0x0,
-	"Remote Address Pointer", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_cs_addr_remote_length,
       { "Remote Address Length", "dtpt.cs_addr.remote_length",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -1121,7 +1121,7 @@ proto_register_dtpt(void)
     { &hf_dtpt_cs_addr_remote,
       { "Remote Address", "dtpt.cs_addr.remote",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Remote Address", HFILL }},
+	NULL, HFILL }},
     { &hf_dtpt_sockaddr_length,
       { "Length", "dtpt.sockaddr.length",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1156,7 +1156,7 @@ proto_register_dtpt(void)
 	"Length of the Blob Data Block", HFILL }},
     { &hf_dtpt_blob_data,
       { "Data", "dtpt.blob.data",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
 	"Blob Data Block", HFILL }},
     { &hf_dtpt_connect_addr,
       { "Address", "dtpt.blob.data",
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index c826a700ff..bc602c566f 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -715,36 +715,36 @@ proto_register_dua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_int_interface_id,      { "Integer interface identifier", "dua.int_interface_identifier",  FT_UINT32,   BASE_HEX,  NULL,                           0x0,               "", HFILL } },
-    { &hf_text_interface_id,     { "Text interface identifier",    "dua.text_interface_identifier", FT_STRING,  BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_info_string,           { "Info string",                  "dua.info_string",               FT_STRING,  BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_dlci_reserved,         { "Reserved",                     "dua.dlci_reserved",             FT_UINT16,  BASE_DEC,  NULL,                           RESERVED_BIT_MASK, "", HFILL } },
-    { &hf_dlci_v_bit,            { "V-bit",                        "dua.dlci_v_bit",                FT_BOOLEAN, 16,        NULL,                           V_BIT_MASK,        "", HFILL } },
-    { &hf_dlci_zero_bit,         { "Zero bit",                     "dua.dlci_zero_bit",             FT_BOOLEAN, 16,        NULL,                           ZERO_BIT_MASK,     "", HFILL } },
-    { &hf_dlci_channel,          { "Channel",                      "dua.dlci_channel",              FT_UINT16,   BASE_DEC, NULL,                           CHANNEL_BIT_MASK,  "", HFILL } },
-    { &hf_dlci_one_bit,          { "One bit",                      "dua.dlci_one_bit",              FT_BOOLEAN, 16,        NULL,                           ONE_BIT_MASK,      "", HFILL } },
-    { &hf_dlci_spare,            { "Spare",                        "dua.dlci_spare",                FT_UINT16,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_diag_info,             { "Diagnostic information",       "dua.diagnostic_information",    FT_BYTES,   BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_interface_range_start, { "Start",                        "dua.interface_range_start",     FT_UINT32,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_interface_range_end,   { "End",                          "dua.interface_range_end",       FT_UINT32,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_heartbeat_data,        { "Heartbeat data",               "dua.heartbeat_data",            FT_BYTES,   BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_traffic_mode_type,     { "Traffic mode type",            "dua.traffic_mode_type",         FT_UINT32,  BASE_HEX,  VALS(traffic_mode_type_values), 0x0,               "", HFILL } },
-    { &hf_error_code,            { "Error code",                   "dua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_values),        0x0,               "", HFILL } },
-    { &hf_status_type,           { "Status type",                  "dua.status_type",               FT_UINT16,  BASE_DEC,  VALS(status_type_values),       0x0,               "", HFILL } },
-    { &hf_status_id,             { "Status identification",        "dua.status_identification",     FT_UINT16,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_release_reason,        { "Reason",                       "dua.release_reason",            FT_UINT32,  BASE_HEX,  VALS(release_reason_values),    0x0,               "", HFILL } },
-    { &hf_tei_status,            { "TEI status",                   "dua.tei_status",                FT_UINT32,  BASE_HEX,  VALS(tei_status_values),        0x0,               "", HFILL } },
-    { &hf_asp_id,                { "ASP identifier",               "dua.asp_identifier",            FT_UINT32,  BASE_HEX,  NULL,                           0x0,               "", HFILL } },
-    { &hf_states,                { "States",                       "dua.states",                    FT_BYTES,   BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_parameter_tag,         { "Parameter Tag",                "dua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_values),     0x0,               "", HFILL } },
-    { &hf_parameter_length,      { "Parameter length",             "dua.parameter_length",          FT_UINT16,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_parameter_value,       { "Parameter value",              "dua.parameter_value",           FT_BYTES,   BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_parameter_padding,     { "Parameter padding",            "dua.parameter_padding",         FT_BYTES,   BASE_NONE, NULL,                           0x0,               "", HFILL } },
-    { &hf_version,               { "Version",                      "dua.version",                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),  0x0,               "", HFILL } },
-    { &hf_reserved,              { "Reserved",                     "dua.reserved",                  FT_UINT8,   BASE_HEX,  NULL,                           0x0,               "", HFILL } },
-    { &hf_message_class,         { "Message class",                "dua.message_class",             FT_UINT8,   BASE_DEC,  VALS(message_class_values),     0x0,               "", HFILL } },
-    { &hf_message_type,          { "Message Type",                 "dua.message_type",              FT_UINT8,   BASE_DEC,  NULL,                           0x0,               "", HFILL } },
-    { &hf_message_length,        { "Message length",               "dua.message_length",            FT_UINT32,  BASE_DEC,  NULL,                           0x0,               "", HFILL } },
+    { &hf_int_interface_id,      { "Integer interface identifier", "dua.int_interface_identifier",  FT_UINT32,   BASE_HEX,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_text_interface_id,     { "Text interface identifier",    "dua.text_interface_identifier", FT_STRING,  BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_info_string,           { "Info string",                  "dua.info_string",               FT_STRING,  BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_dlci_reserved,         { "Reserved",                     "dua.dlci_reserved",             FT_UINT16,  BASE_DEC,  NULL,                           RESERVED_BIT_MASK, NULL, HFILL } },
+    { &hf_dlci_v_bit,            { "V-bit",                        "dua.dlci_v_bit",                FT_BOOLEAN, 16,        NULL,                           V_BIT_MASK,        NULL, HFILL } },
+    { &hf_dlci_zero_bit,         { "Zero bit",                     "dua.dlci_zero_bit",             FT_BOOLEAN, 16,        NULL,                           ZERO_BIT_MASK,     NULL, HFILL } },
+    { &hf_dlci_channel,          { "Channel",                      "dua.dlci_channel",              FT_UINT16,   BASE_DEC, NULL,                           CHANNEL_BIT_MASK,  NULL, HFILL } },
+    { &hf_dlci_one_bit,          { "One bit",                      "dua.dlci_one_bit",              FT_BOOLEAN, 16,        NULL,                           ONE_BIT_MASK,      NULL, HFILL } },
+    { &hf_dlci_spare,            { "Spare",                        "dua.dlci_spare",                FT_UINT16,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_diag_info,             { "Diagnostic information",       "dua.diagnostic_information",    FT_BYTES,   BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_interface_range_start, { "Start",                        "dua.interface_range_start",     FT_UINT32,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_interface_range_end,   { "End",                          "dua.interface_range_end",       FT_UINT32,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_heartbeat_data,        { "Heartbeat data",               "dua.heartbeat_data",            FT_BYTES,   BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_traffic_mode_type,     { "Traffic mode type",            "dua.traffic_mode_type",         FT_UINT32,  BASE_HEX,  VALS(traffic_mode_type_values), 0x0,               NULL, HFILL } },
+    { &hf_error_code,            { "Error code",                   "dua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_values),        0x0,               NULL, HFILL } },
+    { &hf_status_type,           { "Status type",                  "dua.status_type",               FT_UINT16,  BASE_DEC,  VALS(status_type_values),       0x0,               NULL, HFILL } },
+    { &hf_status_id,             { "Status identification",        "dua.status_identification",     FT_UINT16,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_release_reason,        { "Reason",                       "dua.release_reason",            FT_UINT32,  BASE_HEX,  VALS(release_reason_values),    0x0,               NULL, HFILL } },
+    { &hf_tei_status,            { "TEI status",                   "dua.tei_status",                FT_UINT32,  BASE_HEX,  VALS(tei_status_values),        0x0,               NULL, HFILL } },
+    { &hf_asp_id,                { "ASP identifier",               "dua.asp_identifier",            FT_UINT32,  BASE_HEX,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_states,                { "States",                       "dua.states",                    FT_BYTES,   BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_parameter_tag,         { "Parameter Tag",                "dua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_values),     0x0,               NULL, HFILL } },
+    { &hf_parameter_length,      { "Parameter length",             "dua.parameter_length",          FT_UINT16,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_parameter_value,       { "Parameter value",              "dua.parameter_value",           FT_BYTES,   BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_parameter_padding,     { "Parameter padding",            "dua.parameter_padding",         FT_BYTES,   BASE_NONE, NULL,                           0x0,               NULL, HFILL } },
+    { &hf_version,               { "Version",                      "dua.version",                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),  0x0,               NULL, HFILL } },
+    { &hf_reserved,              { "Reserved",                     "dua.reserved",                  FT_UINT8,   BASE_HEX,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_message_class,         { "Message class",                "dua.message_class",             FT_UINT8,   BASE_DEC,  VALS(message_class_values),     0x0,               NULL, HFILL } },
+    { &hf_message_type,          { "Message Type",                 "dua.message_type",              FT_UINT8,   BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
+    { &hf_message_length,        { "Message length",               "dua.message_length",            FT_UINT32,  BASE_DEC,  NULL,                           0x0,               NULL, HFILL } },
    };
   /* Setup protocol subtree array */
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-dvmrp.c b/epan/dissectors/packet-dvmrp.c
index ec50351fc3..5ed6a8934a 100644
--- a/epan/dissectors/packet-dvmrp.c
+++ b/epan/dissectors/packet-dvmrp.c
@@ -730,7 +730,7 @@ proto_register_dvmrp(void)
 	static hf_register_info hf[] = {
 		{ &hf_version,
 			{ "DVMRP Version", "dvmrp.version", FT_UINT8, BASE_DEC,
-			  NULL, 0, "DVMRP Version", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_type,
 			{ "Type", "dvmrp.type", FT_UINT8, BASE_HEX,
@@ -746,7 +746,7 @@ proto_register_dvmrp(void)
 
 		{ &hf_checksum_bad,
 			{ "Bad Checksum", "dvmrp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-			  NULL, 0, "Bad DVMRP Checksum", HFILL }},
+			  NULL, 0x0, "Bad DVMRP Checksum", HFILL }},
 
 		{ &hf_commands,
 			{ "Commands", "dvmrp.commands", FT_NONE, BASE_NONE,
@@ -762,7 +762,7 @@ proto_register_dvmrp(void)
 
 		{ &hf_count,
 			{ "Count", "dvmrp.count", FT_UINT8, BASE_HEX,
-			  NULL, 0, "Count", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_netmask,
 			{ "Netmask", "dvmrp.netmask", FT_IPv4, BASE_NONE,
@@ -774,7 +774,7 @@ proto_register_dvmrp(void)
 
 		{&hf_dest_unr,
 			{ "Destination Unreachable", "dvmrp.dest_unreach", FT_BOOLEAN, 8,
-			TFS(&tfs_dest_unreach), 0x01, "Destination Unreachable", HFILL }},
+			TFS(&tfs_dest_unreach), 0x01, NULL, HFILL }},
 
 		{&hf_split_horiz,
 			{ "Split Horizon", "dvmrp.split_horiz", FT_BOOLEAN, 8,
@@ -806,7 +806,7 @@ proto_register_dvmrp(void)
 
 		{&hf_cap_leaf,
 			{ "Leaf", "dvmrp.cap.leaf", FT_BOOLEAN, 8,
-			TFS(&tfs_cap_leaf), DVMRP_V3_CAP_LEAF, "Leaf", HFILL }},
+			TFS(&tfs_cap_leaf), DVMRP_V3_CAP_LEAF, NULL, HFILL }},
 
 		{&hf_cap_prune,
 			{ "Prune", "dvmrp.cap.prune", FT_BOOLEAN, 8,
diff --git a/epan/dissectors/packet-e164.c b/epan/dissectors/packet-e164.c
index 5bb1b98943..dcdbe628c6 100644
--- a/epan/dissectors/packet-e164.c
+++ b/epan/dissectors/packet-e164.c
@@ -592,12 +592,12 @@ proto_register_e164(void)
 		{ &hf_E164_calling_party_number,
 		  { "E.164 Calling party number digits", "e164.calling_party_number.digits",
 		  FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_E164_called_party_number,
 		  { "E.164 Called party number digits", "e164.called_party_number.digits",
 		  FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }}
+			NULL, HFILL }}
 	};
 
 	/*
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index 7857d0e895..a835dfb5e5 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -341,7 +341,7 @@ proto_register_e212(void)
 	{ &hf_E212_mnc,
 		{ "Mobile network code (MNC)","e212.mnc",
 		FT_UINT16, BASE_DEC, NULL, 0x0,          
-		"Mobile network code ", HFILL }
+		"Mobile network code", HFILL }
 	},
 	{ &hf_E212_msin,
       { "Mobile Subscriber Identification Number (MSIN)", "e212.msin",
diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 2d47505154..4edc24d06c 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -295,22 +295,22 @@ proto_register_eapol(void)
   static hf_register_info hf[] = {
 	{ &hf_eapol_version, {
 		"Version", "eapol.version", FT_UINT8, BASE_DEC,
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_eapol_type, {
 		"Type", "eapol.type", FT_UINT8, BASE_DEC,
-		VALS(eapol_type_vals), 0x0, "", HFILL }},
+		VALS(eapol_type_vals), 0x0, NULL, HFILL }},
 	{ &hf_eapol_len, {
 		"Length", "eapol.len", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Length", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_eapol_keydes_type, {
 		"Descriptor Type", "eapol.keydes.type", FT_UINT8, BASE_DEC,
 		VALS(eapol_keydes_type_vals), 0x0, "Key Descriptor Type", HFILL }},
 	{ &hf_eapol_keydes_keylen, {
 		"Key Length", "eapol.keydes.keylen", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Key Length", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_eapol_keydes_replay_counter, {
 		"Replay Counter", "eapol.keydes.replay_counter", FT_UINT64, BASE_DEC,
-		NULL, 0x0, "Replay Counter", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_eapol_keydes_key_iv, {
 		"Key IV", "eapol.keydes.key_iv", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "Key Initialization Vector", HFILL }},
@@ -322,10 +322,10 @@ proto_register_eapol(void)
 		NULL, 0x7F, "Key Index number", HFILL }},
 	{ &hf_eapol_keydes_key_signature, {
 		"Key Signature", "eapol.keydes.key_signature", FT_BYTES, BASE_NONE,
-		NULL, 0x0, "Key Signature", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_eapol_keydes_key, {
 		"Key", "eapol.keydes.key", FT_BYTES, BASE_NONE,
-		NULL, 0x0, "Key", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 
 	{ &hf_eapol_wpa_keydes_keyinfo, {
 		"Key Information", "eapol.keydes.key_info", FT_UINT16,
@@ -354,43 +354,43 @@ proto_register_eapol(void)
 		"eapol.keydes.key_info.install",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_INSTALL_MASK,
-		"Install flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_key_ack, {
 		"Key Ack flag",
 		"eapol.keydes.key_info.key_ack",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_KEY_ACK_MASK,
-		"Key Ack flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_key_mic, {
 		"Key MIC flag",
 		"eapol.keydes.key_info.key_mic",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_KEY_MIC_MASK,
-		"Key MIC flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_secure, {
 		"Secure flag",
 		"eapol.keydes.key_info.secure",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_SECURE_MASK,
-		"Secure flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_error, {
 		"Error flag",
 		"eapol.keydes.key_info.error",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_ERROR_MASK,
-		"Error flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_request, {
 		"Request flag",
 		"eapol.keydes.key_info.request",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_REQUEST_MASK,
-		"Request flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_keyinfo_encr_key_data, {
 		"Encrypted Key Data flag",
 		"eapol.keydes.key_info.encr_key_data",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth),
 		KEY_INFO_ENCR_KEY_DATA_MASK,
-		"Encrypted Key Data flag", HFILL }},
+		NULL, HFILL }},
 	{ &hf_eapol_wpa_keydes_nonce, {
 		"Nonce", "eapol.keydes.nonce", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "WPA Key Nonce", HFILL }},
diff --git a/epan/dissectors/packet-echo.c b/epan/dissectors/packet-echo.c
index 12f06fc780..f715b468ca 100644
--- a/epan/dissectors/packet-echo.c
+++ b/epan/dissectors/packet-echo.c
@@ -92,8 +92,8 @@ void proto_register_echo(void)
   static hf_register_info hf[] = {
     { &hf_echo_data,
       { "Echo data",	"echo.data", 
-	FT_BYTES,	BASE_HEX,	NULL,	0x0,
-      	"Echo data", HFILL }},
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
+      	NULL, HFILL }},
     { &hf_echo_request,
       { "Echo request",	"echo.request", 
 	FT_BOOLEAN,	BASE_NONE,	NULL,	0x0,
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index db19ea9f1c..be02978df6 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -3200,7 +3200,7 @@ void proto_register_edonkey(void) {
     static hf_register_info hf[] = {
         { &hf_edonkey_message,
             { "eDonkey Message", "edonkey.message",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Message", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_protocol,
             { "Protocol", "edonkey.protocol",
                 FT_UINT8, BASE_HEX, VALS(edonkey_protocols), 0, "eDonkey Protocol", HFILL } },
@@ -3212,25 +3212,25 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Message Type", HFILL } },
         { &hf_edonkey_client_hash,
             { "Client Hash", "edonkey.client_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Client Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Client Hash", HFILL } },
         { &hf_edonkey_server_hash,
             { "Server Hash", "edonkey.server_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Server Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Server Hash", HFILL } },
         { &hf_edonkey_file_hash,
             { "File Hash", "edonkey.file_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey File Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Hash", HFILL } },
         { &hf_edonkey_client_id,
             { "Client ID", "edonkey.clientid",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey Client ID", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey Client ID", HFILL } },
         { &hf_edonkey_ip,
             { "IP", "edonkey.ip",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey IP", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey IP", HFILL } },
         { &hf_edonkey_port,
             { "Port", "edonkey.port",
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Port", HFILL } },
         { &hf_edonkey_metatag,
             { "eDonkey Meta Tag", "edonkey.metatag",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Meta Tag", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_metatag_type,
             { "Meta Tag Type", "edonkey.metatag.type",
                 FT_UINT8, BASE_HEX, NULL, 0, "eDonkey Meta Tag Type", HFILL } },
@@ -3245,10 +3245,10 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Meta Tag Name Size", HFILL } },
         { &hf_edonkey_search,
             { "eDonkey Search", "edonkey.search",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Search", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_hash,
             { "Hash", "edonkey.hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey Hash", HFILL } },
         { &hf_edonkey_string,
             { "String", "edonkey.string",
                 FT_STRING, BASE_NONE, NULL, 0, "eDonkey String", HFILL } },
@@ -3260,31 +3260,31 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_DEC, NULL, 0, "eDonkey Part Count", HFILL } },
         { &hf_edonkey_file_status,
             { "File Status", "edonkey.file_status",
-                FT_BYTES, BASE_HEX, NULL, 0, "eDonkey File Status", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eDonkey File Status", HFILL } },
         { &hf_edonkey_directory,
             { "Directory", "edonkey.directory",
                 FT_STRING, BASE_NONE, NULL, 0, "eDonkey Directory", HFILL } },
         { &hf_edonkey_fileinfo,
             { "eDonkey File Info", "edonkey.fileinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey File Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_serverinfo,
             { "eDonkey Server Info", "edonkey.serverinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Server Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_edonkey_clientinfo,
             { "eDonkey Client Info", "edonkey.clientinfo",
-                FT_NONE, BASE_NONE, NULL, 0, "eDonkey Client Info", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_emule_public_key,
             { "Public Key", "edonkey.emule.public_key",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule Public Key", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule Public Key", HFILL } },
         { &hf_emule_signature,
             { "Signature", "edonkey.emule.signature",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule Signature", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule Signature", HFILL } },
         { &hf_emule_aich_partnum,
             { "Part Number", "edonkey.emule.aich_partnum",
                 FT_UINT16, BASE_DEC, NULL, 0, "eMule AICH Part Number", HFILL } },
         { &hf_emule_aich_root_hash,
             { "AICH Root Hash", "edonkey.emule.aich_root_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule AICH Root Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule AICH Root Hash", HFILL } },
         { &hf_emule_aich_hash_entry,
             { "AICH Hash Entry", "emule_aich_hash_entry",
                 FT_NONE, BASE_NONE, NULL, 0, "eMule AICH Hash Entry", HFILL } },
@@ -3293,10 +3293,10 @@ void proto_register_edonkey(void) {
                 FT_UINT16, BASE_HEX, NULL, 0, "eMule AICH Hash ID", HFILL } },
         { &hf_emule_aich_hash,
             { "AICH Hash", "edonkey.emule.aich_hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "eMule AICH Hash", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "eMule AICH Hash", HFILL } },
         { &hf_emule_multipacket_entry,
             { "eMule MultiPacket Entry", "edonkey.emule.multipacket_entry",
-                FT_NONE, BASE_NONE, NULL, 0, "eMule MultiPacket Entry", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_emule_multipacket_opcode,
             { "MultiPacket Opcode", "edonkey.emule.multipacket_opcode",
                 FT_UINT8, BASE_HEX, NULL, 0, "eMule MultiPacket Opcode", HFILL } },
@@ -3311,7 +3311,7 @@ void proto_register_edonkey(void) {
                 FT_NONE, BASE_NONE, NULL, 0, "eMule Compressed Data", HFILL } },
         { &hf_overnet_peer,
             { "Overnet Peer", "edonkey.overnet.peer",
-                FT_NONE, BASE_NONE, NULL, 0, "Overnet Peer", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia,
             { "Kademlia Packet", "edonkey.kademlia",
                 FT_UINT8, BASE_HEX, NULL, 0, "Kademlia Packet Type", HFILL } },
@@ -3320,34 +3320,34 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_DEC_HEX, NULL, 0, "Kademlia Peer Type", HFILL } },
         { &hf_kademlia_peer,
             { "Kademlia Peer", "edonkey.kademlia.peer",
-                FT_NONE, BASE_NONE, NULL, 0, "Kademlia Peer", HFILL } },
+                FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_peer_id,
             { "Peer ID", "edonkey.kademlia.peer.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Peer ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Peer ID", HFILL } },
         { &hf_kademlia_hash,
             { "Kademlia Hash", "edonkey.kademlia.hash",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Hash", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_file_id,
             { "File ID", "edonkey.kademlia.file.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia File ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia File ID", HFILL } },
         { &hf_kademlia_keyword_hash,
             { "Keyword Hash", "edonkey.kademlia.keyword.hash",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Keyword Hash", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Keyword Hash", HFILL } },
         { &hf_kademlia_recipients_id,
             { "Recipient's ID", "edonkey.kademlia.recipients.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Recipient's ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Recipient's ID", HFILL } },
         { &hf_kademlia_sender_id,
             { "Sender ID", "edonkey.kademlia.sender.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Sender ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Sender ID", HFILL } },
         { &hf_kademlia_target_id,
             { "Target ID", "edonkey.kademlia.target.id",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia Target ID", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia Target ID", HFILL } },
         { &hf_kademlia_distance,
             { "XOR Distance", "edonkey.kademlia.distance",
-                FT_STRING, BASE_HEX, NULL, 0, "Kademlia XOR Distance", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "Kademlia XOR Distance", HFILL } },
         { &hf_kademlia_version,
             { "Kad Version", "edonkey.kademlia.version",
-                FT_UINT8, BASE_DEC_HEX, NULL, 0, "Kad Version", HFILL } },
+                FT_UINT8, BASE_DEC_HEX, NULL, 0, NULL, HFILL } },
         { &hf_kademlia_tag_float,
             { "Tag Value (Float)", "edonkey.kademlia.tag.value.float",
                 FT_FLOAT, BASE_NONE, NULL, 0, "Float Tag Value", HFILL } },
@@ -3359,7 +3359,7 @@ void proto_register_edonkey(void) {
                 FT_UINT32, BASE_DEC_HEX, NULL, 0, "UINT32 Tag Value", HFILL } },
         { &hf_kademlia_tag_ipv4,
             { "Tag Value (IPv4)", "edonkey.kademlia.tag.value.ipv4",
-                FT_IPv4, BASE_DEC, NULL, 0, "UINT32 Tag Value (IPv4)", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "UINT32 Tag Value (IPv4)", HFILL } },
         { &hf_kademlia_tag_uint16,
             { "Tag Value (UINT16)", "edonkey.kademlia.tag.value.uint16",
                 FT_UINT16, BASE_DEC_HEX, NULL, 0, "UINT16 Tag Value", HFILL } },
@@ -3368,19 +3368,19 @@ void proto_register_edonkey(void) {
                 FT_UINT8, BASE_DEC_HEX, NULL, 0, "UINT8 Tag Value", HFILL } },
         { &hf_kademlia_tag_hash,
             { "Tag Value (HASH)", "edonkey.kademlia.tag.value.hash",
-                FT_BYTES, BASE_HEX, NULL, 0, "HASH Tag Value", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "HASH Tag Value", HFILL } },
         { &hf_kademlia_tag_string,
             { "Tag Value (String)", "edonkey.kademlia.tag.value.string",
-                FT_STRING, BASE_HEX, NULL, 0, "String Tag Value", HFILL } },
+                FT_STRING, BASE_NONE, NULL, 0, "String Tag Value", HFILL } },
         { &hf_kademlia_tag_bsob,
             { "Tag Value (BSOB)", "edonkey.kademlia.tag.value.bsob",
-                FT_BYTES, BASE_HEX, NULL, 0, "BSOB Tag Value", HFILL } },
+                FT_BYTES, BASE_NONE, NULL, 0, "BSOB Tag Value", HFILL } },
         { &hf_kademlia_udp_port,
             { "UDP Port", "edonkey.kademlia.udp_port",
                 FT_UINT16, BASE_DEC, NULL, 0, "Kademlia UDP Port", HFILL } },
         { &hf_kademlia_ip,
             { "IP", "edonkey.kademlia.ip",
-                FT_IPv4, BASE_DEC, NULL, 0, "eDonkey IP", HFILL } },
+                FT_IPv4, BASE_NONE, NULL, 0, "eDonkey IP", HFILL } },
         { &hf_kademlia_tcp_port,
             { "TCP Port", "edonkey.kademlia.tcp_port",
                 FT_UINT16, BASE_DEC, NULL, 0, "Kademlia TCP Port", HFILL } },
diff --git a/epan/dissectors/packet-egd.c b/epan/dissectors/packet-egd.c
index ee861f171f..e4f238c306 100644
--- a/epan/dissectors/packet-egd.c
+++ b/epan/dissectors/packet-egd.c
@@ -188,7 +188,7 @@ void proto_register_egd(void)
         { "ProducerID", "egd.pid",
           FT_IPv4, BASE_NONE,
           NULL, 0x0,
-          "", HFILL }
+          NULL, HFILL }
       },
       { &hf_egd_exid,
         { "ExchangeID", "egd.exid",
@@ -198,7 +198,7 @@ void proto_register_egd(void)
       },
       { &hf_egd_time,
         { "Timestamp", "egd.time",
-          FT_ABSOLUTE_TIME, BASE_DEC,
+          FT_ABSOLUTE_TIME, BASE_NONE,
           NULL, 0x0,
           NULL, HFILL }
       },
@@ -212,7 +212,7 @@ void proto_register_egd(void)
         { "Status", "egd.stat",
           FT_UINT32, BASE_DEC,
           VALS(egd_stat_vals), 0x0,
-          "Status", HFILL }
+          NULL, HFILL }
       },
       { &hf_egd_csig,
         { "ConfigSignature", "egd.csig",
diff --git a/epan/dissectors/packet-eigrp.c b/epan/dissectors/packet-eigrp.c
index b6b1be5263..0953e14067 100644
--- a/epan/dissectors/packet-eigrp.c
+++ b/epan/dissectors/packet-eigrp.c
@@ -481,12 +481,12 @@ proto_register_eigrp(void)
      "Opcode number", HFILL }
      },
    { &hf_eigrp_as,
-    { "Autonomous System  ", "eigrp.as",
+    { "Autonomous System", "eigrp.as",
       FT_UINT16, BASE_DEC, NULL, 0x0 ,
      "Autonomous System number", HFILL }
     },
    { &hf_eigrp_tlv,
-    { "Entry  ",           "eigrp.tlv",
+    { "Entry",           "eigrp.tlv",
       FT_UINT16, BASE_DEC, NULL, 0x0 ,
      "Type/Length/Value", HFILL }
     },
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 09e0beb31a..31ce1ce1a9 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -771,7 +771,7 @@ proto_register_enip(void)
 		},
 		{ &hf_enip_sendercontex,
 			{ "Sender Context", "enip.context",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Information pertinent to the sender", HFILL }
 		},
 		{ &hf_enip_options,
@@ -814,12 +814,12 @@ proto_register_enip(void)
 		},
       { &hf_enip_lir_sinaddr,
 			{ "sin_addr", "enip.lir.sa.sinaddr",
-			FT_IPv4, BASE_HEX, NULL, 0,
+			FT_IPv4, BASE_NONE, NULL, 0,
 			"ListIdentity Reply: Socket Address.Sin Addr", HFILL }
 		},
       { &hf_enip_lir_sinzero,
 			{ "sin_zero", "enip.lir.sa.sinzero",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"ListIdentity Reply: Socket Address.Sin Zero", HFILL }
 		},
 		{ &hf_enip_lir_vendor,
diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c
index aabd9e62ae..1f4bd329ce 100644
--- a/epan/dissectors/packet-enrp.c
+++ b/epan/dissectors/packet-enrp.c
@@ -1020,57 +1020,57 @@ proto_register_enrp(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,           { "Type",                        "enrp.message_type",                             FT_UINT8,   BASE_DEC,  VALS(message_type_values),         0x0,                        "", HFILL } },
-    { &hf_message_flags,          { "Flags",                       "enrp.message_flags",                            FT_UINT8,   BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_message_length,         { "Length",                      "enrp.message_length",                           FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_message_value,          { "Value",                       "enrp.message_value",                            FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_cause_code,             { "Cause Code",                  "enrp.cause_code",                               FT_UINT16,  BASE_HEX,  VALS(cause_code_values),           0x0,                        "", HFILL } },
-    { &hf_cause_length,           { "Cause Length",                "enrp.cause_length",                             FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_cause_info,             { "Cause Info",                  "enrp.cause_info",                               FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_cause_padding,          { "Padding",                     "enrp.cause_padding",                            FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_parameter_type,         { "Parameter Type",              "enrp.parameter_type",                           FT_UINT16,  BASE_HEX,  VALS(parameter_type_values),       0x0,                        "", HFILL } },
-    { &hf_parameter_length,       { "Parameter Length",            "enrp.parameter_length",                         FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_parameter_value,        { "Parameter Value",             "enrp.parameter_value",                          FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_parameter_padding,      { "Padding",                     "enrp.parameter_padding",                        FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_parameter_ipv4_address, { "IP Version 4 Address",        "enrp.ipv4_address",                             FT_IPv4,    BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_parameter_ipv6_address, { "IP Version 6 Address",        "enrp.ipv6_address",                             FT_IPv6,    BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_dccp_port,              { "Port",                        "enrp.dccp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_dccp_reserved,          { "Reserved",                    "enrp.dccp_transport_reserved",                  FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_dccp_service_code,      { "Service Code",                "enrp.dccp_transport_service_code",              FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_sctp_port,              { "Port",                        "enrp.sctp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_transport_use,          { "Transport Use",               "enrp.transport_use",                            FT_UINT16,  BASE_DEC,  VALS(transport_use_values),        0x0,                        "", HFILL } },
-    { &hf_tcp_port,               { "Port",                        "enrp.tcp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_udp_port,               { "Port",                        "enrp.udp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_udp_reserved,           { "Reserved",                    "enrp.udp_transport_reserved",                   FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_udp_lite_port,          { "Port",                        "enrp.udp_lite_transport_port",                  FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_udp_lite_reserved,      { "Reserved",                    "enrp.udp_lite_transport_reserved",              FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_type,            { "Policy Type",                 "enrp.pool_member_selection_policy_type",        FT_UINT32,  BASE_HEX,  VALS(policy_type_values),          0x0,                        "", HFILL } },
-    { &hf_policy_weight,          { "Policy Weight",               "enrp.pool_member_selection_policy_weight",      FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_priority,        { "Policy Priority",             "enrp.pool_member_selection_policy_priority",    FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_load,            { "Policy Load",                 "enrp.pool_member_selection_policy_load",        FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_degradation,     { "Policy Degradation",          "enrp.pool_member_selection_policy_degradation", FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_loaddpf,         { "Policy Load DPF",             "enrp.pool_member_selection_policy_load_dpf",    FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_weightdpf,       { "Policy Weight DPF",           "enrp.pool_member_selection_policy_weight_dpf",  FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_distance,        { "Policy Distance",             "enrp.pool_member_selection_policy_distance",    FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_policy_value,           { "Policy Value",                "enrp.pool_member_selection_policy_value",       FT_BYTES,   BASE_NONE, NULL,                              0x0,                        "", HFILL } },
-    { &hf_pool_handle,            { "Pool Handle",                 "enrp.pool_handle_pool_handle",                  FT_BYTES,   BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_pe_pe_identifier,       { "PE Identifier",               "enrp.pool_element_pe_identifier",               FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_home_enrp_id,           { "Home ENRP Server Identifier", "enrp.pool_element_home_enrp_server_identifier", FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_reg_life,               { "Registration Life",           "enrp.pool_element_registration_life",           FT_INT32,   BASE_DEC,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_server_identifier,      { "Server Identifier",           "enrp.server_information_server_identifier",     FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_cookie,                 { "Cookie",                      "enrp.cookie",                                   FT_BYTES,   BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_pe_identifier,          { "PE Identifier",               "enrp.pe_identifier",                            FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_pe_checksum,            { "PE Checksum",                 "enrp.pe_checksum",                              FT_UINT16,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_sender_servers_id,      { "Sender Server's ID",          "enrp.sender_servers_id",                        FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_receiver_servers_id,    { "Receiver Server's ID",        "enrp.receiver_servers_id",                      FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_target_servers_id,      { "Target Server's ID",          "enrp.target_servers_id",                        FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_update_action,          { "Update Action",               "enrp.update_action",                            FT_UINT16,  BASE_DEC,  VALS(update_action_values),        0x0,                        "", HFILL } },
-    { &hf_pmu_reserved,           { "Reserved",                    "enrp.reserved",                                 FT_UINT16,  BASE_HEX,  NULL,                              0x0,                        "", HFILL } },
-    { &hf_reply_required_bit,     { "R Bit",                       "enrp.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reply_required_bit_value),    REPLY_REQUIRED_BIT_MASK,    "", HFILL } },
-    { &hf_own_children_only_bit,  { "W Bit",                       "enrp.w_bit",                                    FT_BOOLEAN, 8,         TFS(&own_children_only_bit_value), OWN_CHILDREN_ONLY_BIT_MASK, "", HFILL } },
-    { &hf_more_to_send_bit,       { "M Bit",                       "enrp.m_bit",                                    FT_BOOLEAN, 8,         TFS(&more_to_send_bit_value),      MORE_TO_SEND_BIT_MASK,      "", HFILL } },
-    { &hf_reject_bit,             { "R Bit",                       "enrp.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reject_bit_value),            REJECT_BIT_MASK,            "", HFILL } },
-    { &hf_tos_bit,                { "T Bit",                       "enrp.t_bit",                                    FT_BOOLEAN, 8,         TFS(&tos_bit_value),               TOS_BIT_MASK,               "", HFILL } },
+    { &hf_message_type,           { "Type",                        "enrp.message_type",                             FT_UINT8,   BASE_DEC,  VALS(message_type_values),         0x0,                        NULL, HFILL } },
+    { &hf_message_flags,          { "Flags",                       "enrp.message_flags",                            FT_UINT8,   BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_message_length,         { "Length",                      "enrp.message_length",                           FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_message_value,          { "Value",                       "enrp.message_value",                            FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_cause_code,             { "Cause Code",                  "enrp.cause_code",                               FT_UINT16,  BASE_HEX,  VALS(cause_code_values),           0x0,                        NULL, HFILL } },
+    { &hf_cause_length,           { "Cause Length",                "enrp.cause_length",                             FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_cause_info,             { "Cause Info",                  "enrp.cause_info",                               FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_cause_padding,          { "Padding",                     "enrp.cause_padding",                            FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_parameter_type,         { "Parameter Type",              "enrp.parameter_type",                           FT_UINT16,  BASE_HEX,  VALS(parameter_type_values),       0x0,                        NULL, HFILL } },
+    { &hf_parameter_length,       { "Parameter Length",            "enrp.parameter_length",                         FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_parameter_value,        { "Parameter Value",             "enrp.parameter_value",                          FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_parameter_padding,      { "Padding",                     "enrp.parameter_padding",                        FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_parameter_ipv4_address, { "IP Version 4 Address",        "enrp.ipv4_address",                             FT_IPv4,    BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_parameter_ipv6_address, { "IP Version 6 Address",        "enrp.ipv6_address",                             FT_IPv6,    BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_dccp_port,              { "Port",                        "enrp.dccp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_dccp_reserved,          { "Reserved",                    "enrp.dccp_transport_reserved",                  FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_dccp_service_code,      { "Service Code",                "enrp.dccp_transport_service_code",              FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_sctp_port,              { "Port",                        "enrp.sctp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_transport_use,          { "Transport Use",               "enrp.transport_use",                            FT_UINT16,  BASE_DEC,  VALS(transport_use_values),        0x0,                        NULL, HFILL } },
+    { &hf_tcp_port,               { "Port",                        "enrp.tcp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_udp_port,               { "Port",                        "enrp.udp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_udp_reserved,           { "Reserved",                    "enrp.udp_transport_reserved",                   FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_udp_lite_port,          { "Port",                        "enrp.udp_lite_transport_port",                  FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_udp_lite_reserved,      { "Reserved",                    "enrp.udp_lite_transport_reserved",              FT_UINT16,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_type,            { "Policy Type",                 "enrp.pool_member_selection_policy_type",        FT_UINT32,  BASE_HEX,  VALS(policy_type_values),          0x0,                        NULL, HFILL } },
+    { &hf_policy_weight,          { "Policy Weight",               "enrp.pool_member_selection_policy_weight",      FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_priority,        { "Policy Priority",             "enrp.pool_member_selection_policy_priority",    FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_load,            { "Policy Load",                 "enrp.pool_member_selection_policy_load",        FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_degradation,     { "Policy Degradation",          "enrp.pool_member_selection_policy_degradation", FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_loaddpf,         { "Policy Load DPF",             "enrp.pool_member_selection_policy_load_dpf",    FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_weightdpf,       { "Policy Weight DPF",           "enrp.pool_member_selection_policy_weight_dpf",  FT_DOUBLE,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_distance,        { "Policy Distance",             "enrp.pool_member_selection_policy_distance",    FT_UINT32,  BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_policy_value,           { "Policy Value",                "enrp.pool_member_selection_policy_value",       FT_BYTES,   BASE_NONE, NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_pool_handle,            { "Pool Handle",                 "enrp.pool_handle_pool_handle",                  FT_BYTES,   BASE_NONE,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_pe_pe_identifier,       { "PE Identifier",               "enrp.pool_element_pe_identifier",               FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_home_enrp_id,           { "Home ENRP Server Identifier", "enrp.pool_element_home_enrp_server_identifier", FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_reg_life,               { "Registration Life",           "enrp.pool_element_registration_life",           FT_INT32,   BASE_DEC,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_server_identifier,      { "Server Identifier",           "enrp.server_information_server_identifier",     FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_cookie,                 { "Cookie",                      "enrp.cookie",                                   FT_BYTES,   BASE_NONE,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_pe_identifier,          { "PE Identifier",               "enrp.pe_identifier",                            FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_pe_checksum,            { "PE Checksum",                 "enrp.pe_checksum",                              FT_UINT16,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_sender_servers_id,      { "Sender Server's ID",          "enrp.sender_servers_id",                        FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_receiver_servers_id,    { "Receiver Server's ID",        "enrp.receiver_servers_id",                      FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_target_servers_id,      { "Target Server's ID",          "enrp.target_servers_id",                        FT_UINT32,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_update_action,          { "Update Action",               "enrp.update_action",                            FT_UINT16,  BASE_DEC,  VALS(update_action_values),        0x0,                        NULL, HFILL } },
+    { &hf_pmu_reserved,           { "Reserved",                    "enrp.reserved",                                 FT_UINT16,  BASE_HEX,  NULL,                              0x0,                        NULL, HFILL } },
+    { &hf_reply_required_bit,     { "R Bit",                       "enrp.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reply_required_bit_value),    REPLY_REQUIRED_BIT_MASK,    NULL, HFILL } },
+    { &hf_own_children_only_bit,  { "W Bit",                       "enrp.w_bit",                                    FT_BOOLEAN, 8,         TFS(&own_children_only_bit_value), OWN_CHILDREN_ONLY_BIT_MASK, NULL, HFILL } },
+    { &hf_more_to_send_bit,       { "M Bit",                       "enrp.m_bit",                                    FT_BOOLEAN, 8,         TFS(&more_to_send_bit_value),      MORE_TO_SEND_BIT_MASK,      NULL, HFILL } },
+    { &hf_reject_bit,             { "R Bit",                       "enrp.r_bit",                                    FT_BOOLEAN, 8,         TFS(&reject_bit_value),            REJECT_BIT_MASK,            NULL, HFILL } },
+    { &hf_tos_bit,                { "T Bit",                       "enrp.t_bit",                                    FT_BOOLEAN, 8,         TFS(&tos_bit_value),               TOS_BIT_MASK,               NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-enttec.c b/epan/dissectors/packet-enttec.c
index 67d2b70331..5cf8c851f7 100644
--- a/epan/dissectors/packet-enttec.c
+++ b/epan/dissectors/packet-enttec.c
@@ -409,71 +409,71 @@ proto_register_enttec(void)
 		{ &hf_enttec_head,
 			{ "Head", "enttec.head",
 			  FT_UINT32, BASE_HEX, VALS(enttec_head_vals), 0x0,
-			  "Head", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_mac,
 			{ "MAC", "enttec.poll_reply.mac",
 			  FT_ETHER, BASE_HEX, NULL, 0x0,
-			  "MAC", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_node_type,
 			{ "Node Type", "enttec.poll_reply.node_type",
 			  FT_UINT16, BASE_HEX, NULL, 0x0,
-			  "Node Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_version,
 			{ "Version", "enttec.poll_reply.version",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Version", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_switch,
 			{ "Switch settings", "enttec.poll_reply.switch_settings",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "Switch settings", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_name,
 			{ "Name", "enttec.poll_reply.name",
-			  FT_STRING, BASE_DEC, NULL, 0x0,
-			  "Name", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_option,
 			{ "Option Field", "enttec.poll_reply.option_field",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "Option Field", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_tos,
 			{ "TOS", "enttec.poll_reply.tos",
 			  FT_UINT8, BASE_HEX, NULL, 0x0,
-			  "TOS", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_reply_ttl,
 			{ "TTL", "enttec.poll_reply.ttl",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "TTL", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_universe,
 			{ "Universe", "enttec.dmx_data.universe",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Universe", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_start_code,
 			{ "Start Code", "enttec.dmx_data.start_code",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Start Code", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_type,
 			{ "Data Type", "enttec.dmx_data.type",
 			  FT_UINT8, BASE_HEX, VALS(enttec_data_type_vals), 0x0,
-			  "Data Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_size,
 			{ "Data Size", "enttec.dmx_data.size",
 			  FT_UINT16, BASE_DEC, NULL, 0x0,
-			  "Data Size", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_data,
 			{ "DMX Data", "enttec.dmx_data.data",
-			  FT_NONE, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_NONE, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_data_filter,
 			{ "DMX Data", "enttec.dmx_data.data_filter",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_dmx_data_dmx_data,
 			{ "DMX Data", "enttec.dmx_data.dmx_data",
-			  FT_NONE, BASE_DEC, NULL, 0x0,
-			  "DMX Data", HFILL } },
+			  FT_NONE, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_enttec_poll_type,
 			{ "Reply Type", "enttec.poll.reply_type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Reply Type", HFILL } }
+			  NULL, HFILL } }
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c
index 597967f987..f326d877ba 100644
--- a/epan/dissectors/packet-epl.c
+++ b/epan/dissectors/packet-epl.c
@@ -1329,160 +1329,160 @@ proto_register_epl(void)
 static hf_register_info hf[] = {
 
 /* Common data fields (same for all message types) */
-{ &hf_epl_mtyp,         { "MessageType",                        "epl.mtyp",             FT_UINT8,   BASE_DEC, VALS(mtyp_vals),      0x7F, "", HFILL }},
-{ &hf_epl_dest,         { "Destination",                        "epl.dest",             FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_src,          { "Source",                             "epl.src",              FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_mtyp,         { "MessageType",                        "epl.mtyp",             FT_UINT8,   BASE_DEC, VALS(mtyp_vals),      0x7F, NULL, HFILL }},
+{ &hf_epl_dest,         { "Destination",                        "epl.dest",             FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_src,          { "Source",                             "epl.src",              FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
 
 /* SoC data fields*/
-{ &hf_epl_soc_mc,       { "MC (Multiplexed Cycle Completed)",   "epl.soc.mc",           FT_BOOLEAN,   8, NULL,                 EPL_SOC_MC_MASK, "", HFILL }},
-{ &hf_epl_soc_ps,       { "PS (Prescaled Slot)",                "epl.soc.ps",           FT_BOOLEAN,   8, NULL,                 EPL_SOC_PS_MASK, "", HFILL }},
-{ &hf_epl_soc_nettime,  { "NetTime",                            "epl.soc.nettime",      FT_ABSOLUTE_TIME,   BASE_DEC, NULL,                 0x0,  "", HFILL }},
-{ &hf_epl_soc_relativetime,{ "RelativeTime",                    "epl.soc.relativetime", FT_UINT64,  BASE_DEC, NULL,                 0x0,  "", HFILL }},
+{ &hf_epl_soc_mc,       { "MC (Multiplexed Cycle Completed)",   "epl.soc.mc",           FT_BOOLEAN,   8, NULL,                 EPL_SOC_MC_MASK, NULL, HFILL }},
+{ &hf_epl_soc_ps,       { "PS (Prescaled Slot)",                "epl.soc.ps",           FT_BOOLEAN,   8, NULL,                 EPL_SOC_PS_MASK, NULL, HFILL }},
+{ &hf_epl_soc_nettime,  { "NetTime",                            "epl.soc.nettime",      FT_ABSOLUTE_TIME,   BASE_NONE, NULL,                 0x0,  NULL, HFILL }},
+{ &hf_epl_soc_relativetime,{ "RelativeTime",                    "epl.soc.relativetime", FT_UINT64,  BASE_DEC, NULL,                 0x0,  NULL, HFILL }},
 
 /* PReq data fields*/
-{ &hf_epl_preq_ms,      { "MS (Multiplexed Slot)",              "epl.preq.ms",          FT_BOOLEAN,   8, NULL,                 0x20, "", HFILL }},
-{ &hf_epl_preq_ea,      { "EA (Exception Acknowledge)",         "epl.preq.ea",          FT_BOOLEAN,   8, NULL,                 0x04, "", HFILL }},
-{ &hf_epl_preq_rd,      { "RD (Ready)",                         "epl.preq.rd",          FT_BOOLEAN,   8, NULL,                 EPL_PDO_RD_MASK, "", HFILL }},
-{ &hf_epl_preq_pdov,    { "PDOVersion",                         "epl.preq.pdov",        FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_preq_size,    { "Size",                               "epl.preq.size",        FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_preq_pl,      { "Payload",                            "epl.preq.pl",          FT_BYTES,   BASE_HEX, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_preq_ms,      { "MS (Multiplexed Slot)",              "epl.preq.ms",          FT_BOOLEAN,   8, NULL,                 0x20, NULL, HFILL }},
+{ &hf_epl_preq_ea,      { "EA (Exception Acknowledge)",         "epl.preq.ea",          FT_BOOLEAN,   8, NULL,                 0x04, NULL, HFILL }},
+{ &hf_epl_preq_rd,      { "RD (Ready)",                         "epl.preq.rd",          FT_BOOLEAN,   8, NULL,                 EPL_PDO_RD_MASK, NULL, HFILL }},
+{ &hf_epl_preq_pdov,    { "PDOVersion",                         "epl.preq.pdov",        FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_preq_size,    { "Size",                               "epl.preq.size",        FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_preq_pl,      { "Payload",                            "epl.preq.pl",          FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 /* PRes data fields*/
-{ &hf_epl_pres_stat_ms, { "NMTStatus",                          "epl.pres.stat",        FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, "", HFILL }},
-{ &hf_epl_pres_stat_cs, { "NMTStatus",                          "epl.pres.stat",        FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, "", HFILL }},
-{ &hf_epl_pres_ms,      { "MS (Multiplexed Slot)",              "epl.pres.ms",          FT_BOOLEAN,   8, NULL,                 0x20, "", HFILL }},
-{ &hf_epl_pres_en,      { "EN (Exception New)",                 "epl.pres.en",          FT_BOOLEAN,   8, NULL,                 0x10, "", HFILL }},
-{ &hf_epl_pres_rd,      { "RD (Ready)",                         "epl.pres.rd",          FT_BOOLEAN,   8, NULL,                 EPL_PDO_RD_MASK, "", HFILL }},
-{ &hf_epl_pres_pr,      { "PR (Priority)",                      "epl.pres.pr",          FT_UINT8,   BASE_DEC, VALS(epl_pr_vals),    0x38, "", HFILL }},
-{ &hf_epl_pres_rs,      { "RS (RequestToSend)",                 "epl.pres.rs",          FT_UINT8,   BASE_DEC, NULL,                 0x07, "", HFILL }},
-{ &hf_epl_pres_pdov,    { "PDOVersion",                         "epl.pres.pdov",        FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_pres_size,    { "Size",                               "epl.pres.size",        FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_pres_pl,      { "Payload",                            "epl.pres.pl",          FT_BYTES,   BASE_HEX, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_pres_stat_ms, { "NMTStatus",                          "epl.pres.stat",        FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, NULL, HFILL }},
+{ &hf_epl_pres_stat_cs, { "NMTStatus",                          "epl.pres.stat",        FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, NULL, HFILL }},
+{ &hf_epl_pres_ms,      { "MS (Multiplexed Slot)",              "epl.pres.ms",          FT_BOOLEAN,   8, NULL,                 0x20, NULL, HFILL }},
+{ &hf_epl_pres_en,      { "EN (Exception New)",                 "epl.pres.en",          FT_BOOLEAN,   8, NULL,                 0x10, NULL, HFILL }},
+{ &hf_epl_pres_rd,      { "RD (Ready)",                         "epl.pres.rd",          FT_BOOLEAN,   8, NULL,                 EPL_PDO_RD_MASK, NULL, HFILL }},
+{ &hf_epl_pres_pr,      { "PR (Priority)",                      "epl.pres.pr",          FT_UINT8,   BASE_DEC, VALS(epl_pr_vals),    0x38, NULL, HFILL }},
+{ &hf_epl_pres_rs,      { "RS (RequestToSend)",                 "epl.pres.rs",          FT_UINT8,   BASE_DEC, NULL,                 0x07, NULL, HFILL }},
+{ &hf_epl_pres_pdov,    { "PDOVersion",                         "epl.pres.pdov",        FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_pres_size,    { "Size",                               "epl.pres.size",        FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_pres_pl,      { "Payload",                            "epl.pres.pl",          FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 /* SoA data fields*/
-{ &hf_epl_soa_stat_ms,  { "NMTStatus",                          "epl.soa.stat",         FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, "", HFILL }},
-{ &hf_epl_soa_stat_cs,  { "NMTStatus",                          "epl.soa.stat",         FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, "", HFILL }},
-{ &hf_epl_soa_ea,       { "EA (Exception Acknowledge)",         "epl.soa.ea",           FT_BOOLEAN,        8, NULL,                 0x04, "", HFILL }},
-{ &hf_epl_soa_er,       { "ER (Exception Reset)",               "epl.soa.er",           FT_BOOLEAN,        8, NULL,                 0x02, "", HFILL }},
-{ &hf_epl_soa_svid,     { "RequestedServiceID",                 "epl.soa.svid",         FT_UINT8,   BASE_DEC, VALS(soa_svid_vals),  0x00, "", HFILL }},
-{ &hf_epl_soa_svtg,     { "RequestedServiceTarget",             "epl.soa.svtg",         FT_UINT8,   BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_soa_eplv,     { "EPLVersion",                         "epl.soa.eplv",         FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_soa_stat_ms,  { "NMTStatus",                          "epl.soa.stat",         FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, NULL, HFILL }},
+{ &hf_epl_soa_stat_cs,  { "NMTStatus",                          "epl.soa.stat",         FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, NULL, HFILL }},
+{ &hf_epl_soa_ea,       { "EA (Exception Acknowledge)",         "epl.soa.ea",           FT_BOOLEAN,        8, NULL,                 0x04, NULL, HFILL }},
+{ &hf_epl_soa_er,       { "ER (Exception Reset)",               "epl.soa.er",           FT_BOOLEAN,        8, NULL,                 0x02, NULL, HFILL }},
+{ &hf_epl_soa_svid,     { "RequestedServiceID",                 "epl.soa.svid",         FT_UINT8,   BASE_DEC, VALS(soa_svid_vals),  0x00, NULL, HFILL }},
+{ &hf_epl_soa_svtg,     { "RequestedServiceTarget",             "epl.soa.svtg",         FT_UINT8,   BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_soa_eplv,     { "EPLVersion",                         "epl.soa.eplv",         FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 /* ASnd header */
-{ &hf_epl_asnd_svid,    { "ServiceID",                          "epl.asnd.svid",    FT_UINT8, BASE_DEC, VALS(asnd_svid_vals),   0x00,"", HFILL }},
-{ &hf_epl_asnd_data,    { "Data",                               "epl.asnd.data",    FT_BYTES, BASE_HEX, NULL,                   0x00,"", HFILL }},
+{ &hf_epl_asnd_svid,    { "ServiceID",                          "epl.asnd.svid",    FT_UINT8, BASE_DEC, VALS(asnd_svid_vals),   0x00,NULL, HFILL }},
+{ &hf_epl_asnd_data,    { "Data",                               "epl.asnd.data",    FT_BYTES, BASE_NONE, NULL,                   0x00,NULL, HFILL }},
 
 /* ASnd-->IdentResponse */
-{ &hf_epl_asnd_identresponse_en,      { "EN (Exception New)",       "epl.asnd.ires.en",             FT_BOOLEAN,        8, NULL,                 0x10, "", HFILL }},
-{ &hf_epl_asnd_identresponse_ec,      { "EC (Exception Clear)",     "epl.asnd.ires.ec",             FT_BOOLEAN,        8, NULL,                 0x08, "", HFILL }},
-{ &hf_epl_asnd_identresponse_pr,      { "PR (Priority)",            "epl.asnd.ires.pr",             FT_UINT8,   BASE_DEC, VALS(epl_pr_vals),    0x38, "", HFILL }},
-{ &hf_epl_asnd_identresponse_rs,      { "RS (RequestToSend)",       "epl.asnd.ires.rs",             FT_UINT8,   BASE_DEC, NULL,                 0x07, "", HFILL }},
-{ &hf_epl_asnd_identresponse_stat_ms, { "NMTStatus",                "epl.asnd.ires.state",          FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_stat_cs, { "NMTStatus",                "epl.asnd.ires.state",          FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_ever,    { "EPLVersion",               "epl.asnd.ires.eplver",         FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat,    { "FeatureFlags",             "epl.asnd.ires.features",       FT_UINT32,  BASE_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit0,   { "Isochronous",              "epl.asnd.ires.features.bit0",  FT_BOOLEAN,  32, NULL,           0x0001, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit1,   { "SDO by UDP/IP",            "epl.asnd.ires.features.bit1",  FT_BOOLEAN,  32, NULL,           0x0002, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit2,   { "SDO by ASnd",              "epl.asnd.ires.features.bit2",  FT_BOOLEAN,  32, NULL,           0x0004, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit3,   { "SDO by PDO",               "epl.asnd.ires.features.bit3",  FT_BOOLEAN,  32, NULL,           0x0008, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit4,   { "NMT Info Services",        "epl.asnd.ires.features.bit4",  FT_BOOLEAN,  32, NULL,           0x0010, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit5,   { "Ext. NMT State Commands",  "epl.asnd.ires.features.bit5",  FT_BOOLEAN,  32, NULL,           0x0020, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit6,   { "Dynamic PDO Mapping",      "epl.asnd.ires.features.bit6",  FT_BOOLEAN,  32, NULL,           0x0040, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit7,   { "NMT Service by UDP/IP",    "epl.asnd.ires.features.bit7",  FT_BOOLEAN,  32, NULL,           0x0080, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit8,   { "Configuration Manager",    "epl.asnd.ires.features.bit8",  FT_BOOLEAN,  32, NULL,           0x0100, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bit9,   { "Multiplexed Access",       "epl.asnd.ires.features.bit9",  FT_BOOLEAN,  32, NULL,           0x0200, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bitA,   { "NodeID setup by SW",       "epl.asnd.ires.features.bitA",  FT_BOOLEAN,  32, NULL,           0x0400, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bitB,   { "MN Basic Ethernet Mode",   "epl.asnd.ires.features.bitB",  FT_BOOLEAN,  32, NULL,           0x0800, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bitC,   { "Routing Type 1 Support",   "epl.asnd.ires.features.bitC",  FT_BOOLEAN,  32, NULL,           0x1000, "", HFILL }},
-{ &hf_epl_asnd_identresponse_feat_bitD,   { "Routing Type 2 Support",   "epl.asnd.ires.features.bitD",  FT_BOOLEAN,  32, NULL,           0x2000, "", HFILL }},
-{ &hf_epl_asnd_identresponse_mtu,     { "MTU",                      "epl.asnd.ires.mtu",            FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_pis,     { "PollInSize",               "epl.asnd.ires.pollinsize",     FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_pos,     { "PollOutSize",              "epl.asnd.ires.polloutsizes",   FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_rst,     { "ResponseTime",             "epl.asnd.ires.resptime",       FT_UINT32,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_dt,      { "DeviceType",               "epl.asnd.ires.devicetype",     FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_profile, { "Profile",                  "epl.asnd.ires.profile",        FT_UINT16,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_vid,     { "VendorId",                 "epl.asnd.ires.vendorid",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_productcode,{ "ProductCode",           "epl.asnd.ires.productcode",    FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_rno,     { "RevisionNumber",           "epl.asnd.ires.revisionno",     FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_sno,     { "SerialNumber",             "epl.asnd.ires.serialno",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_vex1,    { "VendorSpecificExtension1", "epl.asnd.ires.vendorext1",     FT_UINT64,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_vcd,     { "VerifyConfigurationDate",  "epl.asnd.ires.confdate",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_vct,     { "VerifyConfigurationTime",  "epl.asnd.ires.conftime",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_ad,      { "applicationSwDate",        "epl.asnd.ires.appswdate",      FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_at,      { "applicationSwTime",        "epl.asnd.ires.appswtime",      FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_ipa,     { "IPAddress",                "epl.asnd.ires.ip",             FT_IPv4,    BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_snm,     { "SubnetMask",               "epl.asnd.ires.subnet",         FT_IPv4,    BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_gtw,     { "DefaultGateway",           "epl.asnd.ires.gateway",        FT_IPv4,    BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_hn,      { "HostName",                 "epl.asnd.ires.hostname",       FT_STRING,  BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_identresponse_vex2,    { "VendorSpecificExtension2", "epl.asnd.ires.vendorext2",     FT_BYTES,   BASE_DEC, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_asnd_identresponse_en,      { "EN (Exception New)",       "epl.asnd.ires.en",             FT_BOOLEAN,        8, NULL,                 0x10, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_ec,      { "EC (Exception Clear)",     "epl.asnd.ires.ec",             FT_BOOLEAN,        8, NULL,                 0x08, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_pr,      { "PR (Priority)",            "epl.asnd.ires.pr",             FT_UINT8,   BASE_DEC, VALS(epl_pr_vals),    0x38, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_rs,      { "RS (RequestToSend)",       "epl.asnd.ires.rs",             FT_UINT8,   BASE_DEC, NULL,                 0x07, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_stat_ms, { "NMTStatus",                "epl.asnd.ires.state",          FT_UINT8,   BASE_HEX, VALS(epl_nmt_ms_vals),0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_stat_cs, { "NMTStatus",                "epl.asnd.ires.state",          FT_UINT8,   BASE_HEX, VALS(epl_nmt_cs_vals),0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_ever,    { "EPLVersion",               "epl.asnd.ires.eplver",         FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat,    { "FeatureFlags",             "epl.asnd.ires.features",       FT_UINT32,  BASE_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit0,   { "Isochronous",              "epl.asnd.ires.features.bit0",  FT_BOOLEAN,  32, NULL,           0x0001, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit1,   { "SDO by UDP/IP",            "epl.asnd.ires.features.bit1",  FT_BOOLEAN,  32, NULL,           0x0002, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit2,   { "SDO by ASnd",              "epl.asnd.ires.features.bit2",  FT_BOOLEAN,  32, NULL,           0x0004, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit3,   { "SDO by PDO",               "epl.asnd.ires.features.bit3",  FT_BOOLEAN,  32, NULL,           0x0008, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit4,   { "NMT Info Services",        "epl.asnd.ires.features.bit4",  FT_BOOLEAN,  32, NULL,           0x0010, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit5,   { "Ext. NMT State Commands",  "epl.asnd.ires.features.bit5",  FT_BOOLEAN,  32, NULL,           0x0020, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit6,   { "Dynamic PDO Mapping",      "epl.asnd.ires.features.bit6",  FT_BOOLEAN,  32, NULL,           0x0040, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit7,   { "NMT Service by UDP/IP",    "epl.asnd.ires.features.bit7",  FT_BOOLEAN,  32, NULL,           0x0080, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit8,   { "Configuration Manager",    "epl.asnd.ires.features.bit8",  FT_BOOLEAN,  32, NULL,           0x0100, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bit9,   { "Multiplexed Access",       "epl.asnd.ires.features.bit9",  FT_BOOLEAN,  32, NULL,           0x0200, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bitA,   { "NodeID setup by SW",       "epl.asnd.ires.features.bitA",  FT_BOOLEAN,  32, NULL,           0x0400, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bitB,   { "MN Basic Ethernet Mode",   "epl.asnd.ires.features.bitB",  FT_BOOLEAN,  32, NULL,           0x0800, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bitC,   { "Routing Type 1 Support",   "epl.asnd.ires.features.bitC",  FT_BOOLEAN,  32, NULL,           0x1000, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_feat_bitD,   { "Routing Type 2 Support",   "epl.asnd.ires.features.bitD",  FT_BOOLEAN,  32, NULL,           0x2000, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_mtu,     { "MTU",                      "epl.asnd.ires.mtu",            FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_pis,     { "PollInSize",               "epl.asnd.ires.pollinsize",     FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_pos,     { "PollOutSize",              "epl.asnd.ires.polloutsizes",   FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_rst,     { "ResponseTime",             "epl.asnd.ires.resptime",       FT_UINT32,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_dt,      { "DeviceType",               "epl.asnd.ires.devicetype",     FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_profile, { "Profile",                  "epl.asnd.ires.profile",        FT_UINT16,  BASE_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_vid,     { "VendorId",                 "epl.asnd.ires.vendorid",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_productcode,{ "ProductCode",           "epl.asnd.ires.productcode",    FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_rno,     { "RevisionNumber",           "epl.asnd.ires.revisionno",     FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_sno,     { "SerialNumber",             "epl.asnd.ires.serialno",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_vex1,    { "VendorSpecificExtension1", "epl.asnd.ires.vendorext1",     FT_UINT64,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_vcd,     { "VerifyConfigurationDate",  "epl.asnd.ires.confdate",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_vct,     { "VerifyConfigurationTime",  "epl.asnd.ires.conftime",       FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_ad,      { "applicationSwDate",        "epl.asnd.ires.appswdate",      FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_at,      { "applicationSwTime",        "epl.asnd.ires.appswtime",      FT_UINT32,  BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_ipa,     { "IPAddress",                "epl.asnd.ires.ip",             FT_IPv4,    BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_snm,     { "SubnetMask",               "epl.asnd.ires.subnet",         FT_IPv4,    BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_gtw,     { "DefaultGateway",           "epl.asnd.ires.gateway",        FT_IPv4,    BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_hn,      { "HostName",                 "epl.asnd.ires.hostname",       FT_STRING,  BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_identresponse_vex2,    { "VendorSpecificExtension2", "epl.asnd.ires.vendorext2",     FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 
 /* ASnd-->StatusResponse */
-{ &hf_epl_asnd_statusresponse_en,                               { "EN (Exception New)",         "epl.asnd.sres.en",                     FT_BOOLEAN,      8, NULL,                   0x10, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_ec,                               { "EC (Exception Clear)",       "epl.asnd.sres.ec",                     FT_BOOLEAN,      8, NULL,                   0x08, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_pr,                               { "PR (Priority)",              "epl.asnd.sres.pr",                     FT_UINT8, BASE_DEC, VALS(epl_pr_vals),      0x38, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_rs,                               { "RS (RequestToSend)",         "epl.asnd.sres.rs",                     FT_UINT8, BASE_DEC, NULL,                   0x07, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_stat_ms,                          { "NMTStatus",                  "epl.asnd.sres.stat",                   FT_UINT8, BASE_HEX, VALS(epl_nmt_ms_vals),  0x00, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_stat_cs,                          { "NMTStatus",                  "epl.asnd.sres.stat",                   FT_UINT8, BASE_HEX, VALS(epl_nmt_cs_vals),  0x00, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb,                              { "StaticErrorBitField",        "epl.asnd.sres.seb",                    FT_BYTES, BASE_HEX, NULL,                   0x00, "", HFILL }},
+{ &hf_epl_asnd_statusresponse_en,                               { "EN (Exception New)",         "epl.asnd.sres.en",                     FT_BOOLEAN,      8, NULL,                   0x10, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_ec,                               { "EC (Exception Clear)",       "epl.asnd.sres.ec",                     FT_BOOLEAN,      8, NULL,                   0x08, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_pr,                               { "PR (Priority)",              "epl.asnd.sres.pr",                     FT_UINT8, BASE_DEC, VALS(epl_pr_vals),      0x38, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_rs,                               { "RS (RequestToSend)",         "epl.asnd.sres.rs",                     FT_UINT8, BASE_DEC, NULL,                   0x07, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_stat_ms,                          { "NMTStatus",                  "epl.asnd.sres.stat",                   FT_UINT8, BASE_HEX, VALS(epl_nmt_ms_vals),  0x00, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_stat_cs,                          { "NMTStatus",                  "epl.asnd.sres.stat",                   FT_UINT8, BASE_HEX, VALS(epl_nmt_cs_vals),  0x00, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb,                              { "StaticErrorBitField",        "epl.asnd.sres.seb",                    FT_BYTES, BASE_NONE, NULL,                   0x00, NULL, HFILL }},
 
 /*StaticErrorBitField */
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0,    { "Generic error",              "epl.asnd.res.seb.bit0",                FT_UINT8, BASE_DEC, NULL, 0x01, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1,    { "Current",                    "epl.asnd.res.seb.bit1",                FT_UINT8, BASE_DEC, NULL, 0x02, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2,    { "Voltage",                    "epl.asnd.res.seb.bit2",                FT_UINT8, BASE_DEC, NULL, 0x04, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3,    { "Temperature",                "epl.asnd.res.seb.bit3",                FT_UINT8, BASE_DEC, NULL, 0x08, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4,    { "Communication error",        "epl.asnd.res.seb.bit4",                FT_UINT8, BASE_DEC, NULL, 0x10, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5,    { "Device profile specific",    "epl.asnd.res.seb.bit5",                FT_UINT8, BASE_DEC, NULL, 0x20, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7,    { "Manufacturer specific",      "epl.asnd.res.seb.bit7",                FT_UINT8, BASE_DEC, NULL, 0x80, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_seb_devicespecific_err,           { "Device profile specific",    "epl.asnd.res.seb.devicespecific_err",FT_BYTES, BASE_DEC,NULL, 0x00, "", HFILL }},
-
-{ &hf_epl_asnd_statusresponse_el,                               { "ErrorCodesList",             "epl.asnd.sres.el",                     FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry,                         { "Entry",                      "epl.asnd.sres.el.entry",               FT_BYTES, BASE_DEC, NULL, 0x00, "", HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit0,    { "Generic error",              "epl.asnd.res.seb.bit0",                FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit1,    { "Current",                    "epl.asnd.res.seb.bit1",                FT_UINT8, BASE_DEC, NULL, 0x02, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit2,    { "Voltage",                    "epl.asnd.res.seb.bit2",                FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit3,    { "Temperature",                "epl.asnd.res.seb.bit3",                FT_UINT8, BASE_DEC, NULL, 0x08, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit4,    { "Communication error",        "epl.asnd.res.seb.bit4",                FT_UINT8, BASE_DEC, NULL, 0x10, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit5,    { "Device profile specific",    "epl.asnd.res.seb.bit5",                FT_UINT8, BASE_DEC, NULL, 0x20, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_err_errorregister_u8_bit7,    { "Manufacturer specific",      "epl.asnd.res.seb.bit7",                FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_seb_devicespecific_err,           { "Device profile specific",    "epl.asnd.res.seb.devicespecific_err",FT_BYTES, BASE_NONE,NULL, 0x00, NULL, HFILL }},
+
+{ &hf_epl_asnd_statusresponse_el,                               { "ErrorCodesList",             "epl.asnd.sres.el",                     FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry,                         { "Entry",                      "epl.asnd.sres.el.entry",               FT_BYTES, BASE_NONE, NULL, 0x00, NULL, HFILL }},
 
 /*List of Errors/Events*/
-{ &hf_epl_asnd_statusresponse_el_entry_type,                    { "Entry Type",                 "epl.asnd.sres.el.entry.type",          FT_UINT16, BASE_HEX, NULL, 0x00,    "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_type_profile,            { "Profile",                    "epl.asnd.sres.el.entry.type.profile",  FT_UINT16, BASE_DEC, NULL, 0x0FFF,  "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_type_mode,               { "Mode",                       "epl.asnd.sres.el.entry.type.mode",     FT_UINT16, BASE_DEC, NULL, 0x3000,  "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_type_bit14,              { "Bit14",                      "epl.asnd.sres.el.entry.type.bit14",    FT_UINT16, BASE_DEC, NULL, 0x4000,  "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_type_bit15,              { "Bit15",                      "epl.asnd.sres.el.entry.type.bit15",    FT_UINT16, BASE_DEC, NULL, 0x8000,  "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_code,                    { "Error Code",                 "epl.asnd.sres.el.entry.code",          FT_UINT16, BASE_DEC, NULL, 0x00,    "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_time,                    { "Time Stamp",                 "epl.asnd.sres.el.entry.time",          FT_UINT64, BASE_DEC, NULL, 0x00,    "", HFILL }},
-{ &hf_epl_asnd_statusresponse_el_entry_add,                     { "Additional Information",     "epl.asnd.sres.el.entry.add",           FT_UINT64, BASE_DEC, NULL, 0x00,    "", HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_type,                    { "Entry Type",                 "epl.asnd.sres.el.entry.type",          FT_UINT16, BASE_HEX, NULL, 0x00,    NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_type_profile,            { "Profile",                    "epl.asnd.sres.el.entry.type.profile",  FT_UINT16, BASE_DEC, NULL, 0x0FFF,  NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_type_mode,               { "Mode",                       "epl.asnd.sres.el.entry.type.mode",     FT_UINT16, BASE_DEC, NULL, 0x3000,  NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_type_bit14,              { "Bit14",                      "epl.asnd.sres.el.entry.type.bit14",    FT_UINT16, BASE_DEC, NULL, 0x4000,  NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_type_bit15,              { "Bit15",                      "epl.asnd.sres.el.entry.type.bit15",    FT_UINT16, BASE_DEC, NULL, 0x8000,  NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_code,                    { "Error Code",                 "epl.asnd.sres.el.entry.code",          FT_UINT16, BASE_DEC, NULL, 0x00,    NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_time,                    { "Time Stamp",                 "epl.asnd.sres.el.entry.time",          FT_UINT64, BASE_DEC, NULL, 0x00,    NULL, HFILL }},
+{ &hf_epl_asnd_statusresponse_el_entry_add,                     { "Additional Information",     "epl.asnd.sres.el.entry.add",           FT_UINT64, BASE_DEC, NULL, 0x00,    NULL, HFILL }},
 
 
 /* ASnd-->NMTRequest */
-{ &hf_epl_asnd_nmtrequest_rcid,                     { "NMTRequestedCommandID",      "epl.asnd.nmtrequest.rcid",                     FT_UINT8,   BASE_HEX_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_nmtrequest_rct,                      { "NMTRequestedCommandTarget",  "epl.asnd.nmtrequest.rct",                      FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_nmtrequest_rcd,                      { "NMTRequestedCommandData",    "epl.asnd.nmtrequest.rcd",                      FT_BYTES,   BASE_DEC, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_asnd_nmtrequest_rcid,                     { "NMTRequestedCommandID",      "epl.asnd.nmtrequest.rcid",                     FT_UINT8,   BASE_HEX_DEC, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_nmtrequest_rct,                      { "NMTRequestedCommandTarget",  "epl.asnd.nmtrequest.rct",                      FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_nmtrequest_rcd,                      { "NMTRequestedCommandData",    "epl.asnd.nmtrequest.rcd",                      FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 /* ASnd-->NMTCommand */
-{ &hf_epl_asnd_nmtcommand_cid,                      { "NMTCommandId",               "epl.asnd.nmtcommand.cid",                      FT_UINT8,   BASE_HEX_DEC, VALS(asnd_cid_vals),  0x00, "", HFILL }},
-{ &hf_epl_asnd_nmtcommand_cdat,                     { "NMTCommandData",             "epl.asnd.nmtcommand.cdat",                     FT_BYTES,   BASE_DEC, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_asnd_nmtcommand_cid,                      { "NMTCommandId",               "epl.asnd.nmtcommand.cid",                      FT_UINT8,   BASE_HEX_DEC, VALS(asnd_cid_vals),  0x00, NULL, HFILL }},
+{ &hf_epl_asnd_nmtcommand_cdat,                     { "NMTCommandData",             "epl.asnd.nmtcommand.cdat",                     FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
-{ &hf_epl_asnd_nmtcommand_nmtnethostnameset_hn,     { "HostName",                   "epl.asnd.nmtcommand.nmtnethostnameset.hn",     FT_BYTES,   BASE_DEC, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_nmtcommand_nmtflusharpentry_nid,     { "NodeID",                     "epl.asnd.nmtcommand.nmtflusharpentry.nid",     FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, "", HFILL }},
-{ &hf_epl_asnd_nmtcommand_nmtpublishtime_dt,        { "DateTime",                   "epl.asnd.nmtcommand.nmtpublishtime.dt",        FT_BYTES,   BASE_DEC, NULL,                 0x00, "", HFILL }},
+{ &hf_epl_asnd_nmtcommand_nmtnethostnameset_hn,     { "HostName",                   "epl.asnd.nmtcommand.nmtnethostnameset.hn",     FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_nmtcommand_nmtflusharpentry_nid,     { "NodeID",                     "epl.asnd.nmtcommand.nmtflusharpentry.nid",     FT_UINT8,   BASE_DEC_HEX, NULL,                 0x00, NULL, HFILL }},
+{ &hf_epl_asnd_nmtcommand_nmtpublishtime_dt,        { "DateTime",                   "epl.asnd.nmtcommand.nmtpublishtime.dt",        FT_BYTES,   BASE_NONE, NULL,                 0x00, NULL, HFILL }},
 
 /* ASnd-->SDO */
-{ &hf_epl_asnd_sdo_seq_receive_sequence_number, { "ReceiveSequenceNumber",          "epl.asnd.sdo.seq.receive.sequence.number", FT_UINT8,   BASE_DEC, NULL,                             0xfc, "", HFILL }},
-{ &hf_epl_asnd_sdo_seq_receive_con,             { "ReceiveCon",                     "epl.asnd.sdo.seq.receive.con",             FT_UINT8,   BASE_DEC, VALS(epl_sdo_receive_con_vals),   0x03, "", HFILL }},
-{ &hf_epl_asnd_sdo_seq_send_sequence_number,    { "SendSequenceNumber",             "epl.asnd.sdo.seq.send.sequence.number",    FT_UINT8,   BASE_DEC, NULL,                             0xfc, "", HFILL }},
-{ &hf_epl_asnd_sdo_seq_send_con,                { "SendCon",                        "epl.asnd.sdo.seq.send.con",                FT_UINT8,   BASE_DEC, VALS(epl_sdo_send_con_vals),      0x03, "", HFILL }},
-
-{ &hf_epl_asnd_sdo_cmd_transaction_id,          { "SDO Transaction ID",             "epl.asnd.sdo.cmd.transaction.id",          FT_UINT8,   BASE_DEC, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_response,                { "SDO Response",                   "epl.asnd.sdo.cmd.response",                FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_response),  0x80, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_abort,                   { "SDO Abort",                      "epl.asnd.sdo.cmd.abort",                   FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_abort),     0x40, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_segmentation,            { "SDO Segmentation",               "epl.asnd.sdo.cmd.segmentation",            FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_segmentation), 0x30, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_command_id,              { "SDO Command ID",                 "epl.asnd.sdo.cmd.command.id",              FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_commands),      0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_segment_size,            { "SDO Segment size",               "epl.asnd.sdo.cmd.segment.size",            FT_UINT8,   BASE_DEC, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_data_size,               { "SDO Data size",                  "epl.asnd.sdo.cmd.data.size",               FT_UINT8,   BASE_DEC, NULL,                             0x00, "", HFILL } },
-{ &hf_epl_asnd_sdo_cmd_abort_code,              { "SDO Transfer Abort",             "epl.asnd.sdo.cmd.abort.code",              FT_UINT8,   BASE_HEX, VALS(sdo_cmd_abort_code),         0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_write_by_index_index,    { "SDO Write by Index, Index",      "epl.asnd.sdo.cmd.write.by.index.index",    FT_UINT16,  BASE_HEX, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_write_by_index_subindex, { "SDO Write by Index, SubIndex",   "epl.asnd.sdo.cmd.write.by.index.subindex", FT_UINT8,   BASE_HEX, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_read_by_index_index,     { "SDO Read by Index, Index",       "epl.asnd.sdo.cmd.read.by.index.index",     FT_UINT16,  BASE_HEX, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_read_by_index_subindex,  { "SDO Read by Index, SubIndex",    "epl.asnd.sdo.cmd.read.by.index.subindex",  FT_UINT8,   BASE_HEX, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_write_by_index_data,     { "Payload",                        "epl.asnd.sdo.cmd.write.by.index.data",     FT_BYTES,   BASE_HEX, NULL,                             0x00, "", HFILL }},
-{ &hf_epl_asnd_sdo_cmd_read_by_index_data,      { "Payload",                        "epl.asnd.sdo.cmd.read.by.index.data",      FT_BYTES,   BASE_HEX, NULL,                             0x00, "", HFILL }},
+{ &hf_epl_asnd_sdo_seq_receive_sequence_number, { "ReceiveSequenceNumber",          "epl.asnd.sdo.seq.receive.sequence.number", FT_UINT8,   BASE_DEC, NULL,                             0xfc, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_seq_receive_con,             { "ReceiveCon",                     "epl.asnd.sdo.seq.receive.con",             FT_UINT8,   BASE_DEC, VALS(epl_sdo_receive_con_vals),   0x03, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_seq_send_sequence_number,    { "SendSequenceNumber",             "epl.asnd.sdo.seq.send.sequence.number",    FT_UINT8,   BASE_DEC, NULL,                             0xfc, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_seq_send_con,                { "SendCon",                        "epl.asnd.sdo.seq.send.con",                FT_UINT8,   BASE_DEC, VALS(epl_sdo_send_con_vals),      0x03, NULL, HFILL }},
+
+{ &hf_epl_asnd_sdo_cmd_transaction_id,          { "SDO Transaction ID",             "epl.asnd.sdo.cmd.transaction.id",          FT_UINT8,   BASE_DEC, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_response,                { "SDO Response",                   "epl.asnd.sdo.cmd.response",                FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_response),  0x80, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_abort,                   { "SDO Abort",                      "epl.asnd.sdo.cmd.abort",                   FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_abort),     0x40, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_segmentation,            { "SDO Segmentation",               "epl.asnd.sdo.cmd.segmentation",            FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_cmd_segmentation), 0x30, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_command_id,              { "SDO Command ID",                 "epl.asnd.sdo.cmd.command.id",              FT_UINT8,   BASE_DEC, VALS(epl_sdo_asnd_commands),      0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_segment_size,            { "SDO Segment size",               "epl.asnd.sdo.cmd.segment.size",            FT_UINT8,   BASE_DEC, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_data_size,               { "SDO Data size",                  "epl.asnd.sdo.cmd.data.size",               FT_UINT8,   BASE_DEC, NULL,                             0x00, NULL, HFILL } },
+{ &hf_epl_asnd_sdo_cmd_abort_code,              { "SDO Transfer Abort",             "epl.asnd.sdo.cmd.abort.code",              FT_UINT8,   BASE_HEX, VALS(sdo_cmd_abort_code),         0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_write_by_index_index,    { "SDO Write by Index, Index",      "epl.asnd.sdo.cmd.write.by.index.index",    FT_UINT16,  BASE_HEX, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_write_by_index_subindex, { "SDO Write by Index, SubIndex",   "epl.asnd.sdo.cmd.write.by.index.subindex", FT_UINT8,   BASE_HEX, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_read_by_index_index,     { "SDO Read by Index, Index",       "epl.asnd.sdo.cmd.read.by.index.index",     FT_UINT16,  BASE_HEX, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_read_by_index_subindex,  { "SDO Read by Index, SubIndex",    "epl.asnd.sdo.cmd.read.by.index.subindex",  FT_UINT8,   BASE_HEX, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_write_by_index_data,     { "Payload",                        "epl.asnd.sdo.cmd.write.by.index.data",     FT_BYTES,   BASE_NONE, NULL,                             0x00, NULL, HFILL }},
+{ &hf_epl_asnd_sdo_cmd_read_by_index_data,      { "Payload",                        "epl.asnd.sdo.cmd.read.by.index.data",      FT_BYTES,   BASE_NONE, NULL,                             0x00, NULL, HFILL }},
 };
 
 
diff --git a/epan/dissectors/packet-epl_v1.c b/epan/dissectors/packet-epl_v1.c
index f7523b167f..c58445166a 100644
--- a/epan/dissectors/packet-epl_v1.c
+++ b/epan/dissectors/packet-epl_v1.c
@@ -373,174 +373,174 @@ proto_register_epl_v1(void)
         { &hf_epl_v1_service,
             { "Service",           "epl_v1.service",
             FT_UINT8, BASE_DEC, VALS(service_vals), 0x7F,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_dest,
             { "Destination",           "epl_v1.dest",
             FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_src,
             { "Source",           "epl_v1.src",
             FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         /* SoC data fields*/
         { &hf_epl_v1_soc_ms,
             { "MS (Multiplexed Slot)", "epl_v1.soc.ms",
             FT_UINT8, BASE_DEC, NULL, 0x80,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_soc_ps,
             { "PS (Prescaled Slot)",           "epl_v1.soc.ps",
             FT_UINT8, BASE_DEC, NULL, 0x40,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_soc_net_command,
             { "Net Command",           "epl_v1.soc.netcommand",
             FT_UINT16, BASE_DEC, VALS(soc_net_command_vals), 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_soc_net_time,
             { "Net Time",           "epl_v1.soc.nettime",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_soc_powerlink_cycle_time,
             { "Cycle Time",           "epl_v1.soc.cycletime",
             FT_UINT32, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_soc_net_command_parameter,
             { "Net Command Parameter",           "epl_v1.soc.netcommand.parameter",
-            FT_BYTES, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            FT_BYTES, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }
         },
         /* PReq data fields*/
         { &hf_epl_v1_preq_ms,
             { "MS (Multiplexed Slot)", "epl_v1.preq.ms",
             FT_UINT8, BASE_DEC, NULL, 0x20,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_preq_rd,
             { "RD (Ready)",           "epl_v1.preq.rd",
             FT_UINT8, BASE_DEC, NULL, 0x01,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_preq_poll_size_out,
             { "Poll Size OUT",           "epl_v1.preq.pollsize",
             FT_UINT16, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_preq_out_data,
             { "OUT Data",           "epl_v1.preq.data",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
-            "", HFILL }
+            FT_BYTES, BASE_NONE, NULL, 0x00,
+            NULL, HFILL }
         },
         /* PRes data fields*/
         { &hf_epl_v1_pres_ms,
             { "MS (Multiplexed)",   "epl_v1.pres.ms",
             FT_UINT8, BASE_DEC, NULL, 0x20,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_ex,
             { "EX (Exception)",     "epl_v1.pres.ex",
             FT_UINT8, BASE_DEC, NULL, 0x10,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_rs,
             { "RS (Request to Send)",  "epl_v1.pres.rs",
             FT_UINT8, BASE_DEC, NULL, 0x08,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_wa,
             { "WA (Warning)",  "epl_v1.pres.wa",
             FT_UINT8, BASE_DEC, NULL, 0x04,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_er,
             { "ER (Error)",    "epl_v1.pres.er",
             FT_UINT8, BASE_DEC, NULL, 0x02,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_rd,
             { "RD (Ready)",    "epl_v1.pres.rd",
             FT_UINT8, BASE_DEC, NULL, 0x01,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_poll_size_in,
             { "Poll Size IN",           "epl_v1.pres.pollsize",
             FT_UINT16, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_pres_in_data,
             { "IN Data",           "epl_v1.pres.data",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
-            "", HFILL }
+            FT_BYTES, BASE_NONE, NULL, 0x00,
+            NULL, HFILL }
         },
         /* EoC data fields*/
         { &hf_epl_v1_eoc_net_command,
             { "Net Command",           "epl_v1.eoc.netcommand",
             FT_UINT16, BASE_DEC, VALS(eoc_net_command_vals), 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_eoc_net_command_parameter,
             { "Net Command Parameter",           "epl_v1.soa.netcommand.parameter",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
-            "", HFILL }
+            FT_BYTES, BASE_NONE, NULL, 0x00,
+            NULL, HFILL }
         },
         /* AInv data fields*/
         { &hf_epl_v1_ainv_channel,
             { "Channel",           "epl_v1.ainv.channel",
             FT_UINT8, BASE_DEC, VALS(ainv_channel_number_vals), 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         /* ASnd data fields*/
         { &hf_epl_v1_asnd_channel,
             { "Channel",           "epl_v1.asnd.channel",
             FT_UINT8, BASE_DEC, VALS(asnd_channel_number_vals), 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_size,
             { "Size",           "epl_v1.asnd.size",
             FT_UINT16, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_data,
             { "Data",           "epl_v1.asnd.data",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
-            "", HFILL }
+            FT_BYTES, BASE_NONE, NULL, 0x00,
+            NULL, HFILL }
         },
 
         { &hf_epl_v1_asnd_node_id,
             { "NodeID",           "epl_v1.asnd.node_id",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_hardware_revision,
             { "Hardware Revision",           "epl_v1.asnd.hardware.revision",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_firmware_version,
             { "Firmware Version",           "epl_v1.asnd.firmware.version",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_device_variant,
             { "Device Variant",           "epl_v1.asnd.device.variant",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_poll_in_size,
             { "Poll IN Size",           "epl_v1.asnd.poll.in.size",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_epl_v1_asnd_poll_out_size,
             { "Poll OUT Size",           "epl_v1.asnd.poll.out.size",
             FT_UINT32, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
     };
 
diff --git a/epan/dissectors/packet-epmd.c b/epan/dissectors/packet-epmd.c
index f5ad02d769..1e705c406b 100644
--- a/epan/dissectors/packet-epmd.c
+++ b/epan/dissectors/packet-epmd.c
@@ -264,42 +264,42 @@ proto_register_epmd(void)
 	{ &hf_epmd_result,
 	    { "Result", "epmd.result",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Result", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_tcp_port,
 	    { "TCP Port", "epmd.tcp_port",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"TCP Port", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_creation,
 	    { "Creation", "epmd.creation",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Creation", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_dist_high,
 	    { "Dist High", "epmd.dist_high",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Dist High", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_dist_low,
 	    { "Dist Low", "epmd.dist_low",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Dist Low", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_name_len,
 	    { "Name Length", "epmd.name_len",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Name Length", HFILL }},
+		NULL, HFILL }},
 	{ &hf_epmd_name,
 	    { "Name", "epmd.name",
-		FT_STRING, BASE_DEC, NULL, 0x0,
-		"Name", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 	{ &hf_epmd_elen,
 	    { "Elen", "epmd.elen",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
 		"Extra Length", HFILL }},
 	{ &hf_epmd_edata,
 	    { "Edata", "epmd.edata",
-		FT_BYTES, BASE_DEC, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
 		"Extra Data", HFILL }},
 	{ &hf_epmd_names,
 	    { "Names", "epmd.names",
-		FT_BYTES, BASE_DEC, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
 		"List of names", HFILL }}
     };
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-erf.c b/epan/dissectors/packet-erf.c
index 1a93966388..16e5030cce 100644
--- a/epan/dissectors/packet-erf.c
+++ b/epan/dissectors/packet-erf.c
@@ -1046,120 +1046,120 @@ proto_register_erf(void)
 
   static hf_register_info hf[] = {
     /* ERF Header */ 
-    { &hf_erf_ts, { "Timestamp", "erf.ts", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL } },
-    { &hf_erf_types, { "types", "erf.types", FT_UINT8, BASE_DEC,  NULL, 0xFF, "", HFILL } },
-    { &hf_erf_type, { "type", "erf.types.type", FT_UINT8, BASE_DEC,  VALS(erf_type_vals), 0x7F, "", HFILL } },
-    { &hf_erf_ehdr, { "Extension header present", "erf.types.ext_header", FT_UINT8, BASE_DEC,  NULL, 0x80, "", HFILL } },
-    { &hf_erf_flags,{ "flags", "erf.flags", FT_UINT8, BASE_DEC, NULL, 0xFF, "", HFILL } },
-    { &hf_erf_flags_cap,{ "capture interface", "erf.flags.cap", FT_UINT8, BASE_DEC, NULL, 0x03, "", HFILL } },
-    { &hf_erf_flags_vlen,{ "varying record length", "erf.flags.vlen", FT_UINT8, BASE_DEC, NULL, 0x04, "", HFILL } },
-    { &hf_erf_flags_trunc,{ "truncated", "erf.flags.trunc", FT_UINT8, BASE_DEC, NULL, 0x08, "", HFILL } },
-    { &hf_erf_flags_rxe,{ "rx error", "erf.flags.rxe", FT_UINT8, BASE_DEC, NULL, 0x10, "", HFILL } },
-    { &hf_erf_flags_dse,{ "ds error", "erf.flags.dse", FT_UINT8, BASE_DEC, NULL, 0x20, "", HFILL } },
-    { &hf_erf_flags_res,{ "reserved", "erf.flags.res", FT_UINT8, BASE_DEC, NULL, 0xC0, "", HFILL } },
-    { &hf_erf_rlen, { "record length", "erf.rlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_lctr, { "loss counter", "erf.lctr", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_wlen, { "wire length", "erf.wlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-
-		{ &hf_erf_ehdr_t, { "Extension Type", "erf.ehdr.types", FT_UINT8, BASE_DEC,  VALS(ehdr_type_vals), 0x0, "", HFILL } },
+    { &hf_erf_ts, { "Timestamp", "erf.ts", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_types, { "types", "erf.types", FT_UINT8, BASE_DEC,  NULL, 0xFF, NULL, HFILL } },
+    { &hf_erf_type, { "type", "erf.types.type", FT_UINT8, BASE_DEC,  VALS(erf_type_vals), 0x7F, NULL, HFILL } },
+    { &hf_erf_ehdr, { "Extension header present", "erf.types.ext_header", FT_UINT8, BASE_DEC,  NULL, 0x80, NULL, HFILL } },
+    { &hf_erf_flags,{ "flags", "erf.flags", FT_UINT8, BASE_DEC, NULL, 0xFF, NULL, HFILL } },
+    { &hf_erf_flags_cap,{ "capture interface", "erf.flags.cap", FT_UINT8, BASE_DEC, NULL, 0x03, NULL, HFILL } },
+    { &hf_erf_flags_vlen,{ "varying record length", "erf.flags.vlen", FT_UINT8, BASE_DEC, NULL, 0x04, NULL, HFILL } },
+    { &hf_erf_flags_trunc,{ "truncated", "erf.flags.trunc", FT_UINT8, BASE_DEC, NULL, 0x08, NULL, HFILL } },
+    { &hf_erf_flags_rxe,{ "rx error", "erf.flags.rxe", FT_UINT8, BASE_DEC, NULL, 0x10, NULL, HFILL } },
+    { &hf_erf_flags_dse,{ "ds error", "erf.flags.dse", FT_UINT8, BASE_DEC, NULL, 0x20, NULL, HFILL } },
+    { &hf_erf_flags_res,{ "reserved", "erf.flags.res", FT_UINT8, BASE_DEC, NULL, 0xC0, NULL, HFILL } },
+    { &hf_erf_rlen, { "record length", "erf.rlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_lctr, { "loss counter", "erf.lctr", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_wlen, { "wire length", "erf.wlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+
+		{ &hf_erf_ehdr_t, { "Extension Type", "erf.ehdr.types", FT_UINT8, BASE_DEC,  VALS(ehdr_type_vals), 0x0, NULL, HFILL } },
 
     /* Intercept ID Extension Header */
-    { &hf_erf_ehdr_int_res1, { "Reserved", "erf.ehdr.int.res1", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_ehdr_int_id, { "Intercept ID", "erf.ehdr.int.intid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_ehdr_int_res2, { "Reserved", "erf.ehdr.int.res2", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } },
+    { &hf_erf_ehdr_int_res1, { "Reserved", "erf.ehdr.int.res1", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_int_id, { "Intercept ID", "erf.ehdr.int.intid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_int_res2, { "Reserved", "erf.ehdr.int.res2", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
 
     /* Raw Link Extension Header */
-    { &hf_erf_ehdr_raw_link_res, { "Reserved", "erf.ehdr.raw.res", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL } },
-    { &hf_erf_ehdr_raw_link_seqnum, { "Sequence number", "erf.ehdr.raw.seqnum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_ehdr_raw_link_rate, { "Rate", "erf.ehdr.raw.rate", FT_UINT8, BASE_DEC, VALS(raw_link_rates), 0x0, "", HFILL } },
-    { &hf_erf_ehdr_raw_link_type, { "Link Type", "erf.ehdr.raw.link_type", FT_UINT8, BASE_DEC, VALS(raw_link_types), 0x0, "", HFILL } },
+    { &hf_erf_ehdr_raw_link_res, { "Reserved", "erf.ehdr.raw.res", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_raw_link_seqnum, { "Sequence number", "erf.ehdr.raw.seqnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_raw_link_rate, { "Rate", "erf.ehdr.raw.rate", FT_UINT8, BASE_DEC, VALS(raw_link_rates), 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_raw_link_type, { "Link Type", "erf.ehdr.raw.link_type", FT_UINT8, BASE_DEC, VALS(raw_link_types), 0x0, NULL, HFILL } },
 
     /* Classification Extension Header */
-    { &hf_erf_ehdr_class_flags, { "Flags", "erf.ehdr.class.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_sh, { "Search hit", "erf.ehdr.class.flags.sh", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_SH_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_shm, { "Multiple search hits", "erf.ehdr.class.flags.shm", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_SHM_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_res1, { "Reserved", "erf.ehdr.class.flags.res1", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_RES1_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_user, { "User classification", "erf.ehdr.class.flags.user", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_USER_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_res2, { "Reserved", "erf.ehdr.class.flags.res2", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_RES2_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_drop, { "Drop Steering Bit", "erf.ehdr.class.flags.drop", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_DROP_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_flags_str, { "Stream Steering Bits", "erf.ehdr.class.flags.str", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_STER_MASK, "", HFILL } },
-    { &hf_erf_ehdr_class_seqnum, { "Sequence number", "erf.ehdr.class.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } },
+    { &hf_erf_ehdr_class_flags, { "Flags", "erf.ehdr.class.flags", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_sh, { "Search hit", "erf.ehdr.class.flags.sh", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_SH_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_shm, { "Multiple search hits", "erf.ehdr.class.flags.shm", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_SHM_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_res1, { "Reserved", "erf.ehdr.class.flags.res1", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_user, { "User classification", "erf.ehdr.class.flags.user", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_USER_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_res2, { "Reserved", "erf.ehdr.class.flags.res2", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_drop, { "Drop Steering Bit", "erf.ehdr.class.flags.drop", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_DROP_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_flags_str, { "Stream Steering Bits", "erf.ehdr.class.flags.str", FT_UINT32, BASE_DEC, NULL, EHDR_CLASS_STER_MASK, NULL, HFILL } },
+    { &hf_erf_ehdr_class_seqnum, { "Sequence number", "erf.ehdr.class.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
 
 		/* Unknown Extension Header */
-		{ &hf_erf_ehdr_unk, { "Data", "erf.ehdr.unknown.data", FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL } },
+		{ &hf_erf_ehdr_unk, { "Data", "erf.ehdr.unknown.data", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL } },
 
     /* MC HDLC Header */
-    { &hf_erf_mc_hdlc_cn,   { "connection number", "erf.mchdlc.cn", FT_UINT16, BASE_DEC, NULL, MC_HDLC_CN_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_res1, { "reserved", "erf.mchdlc.res1", FT_UINT16, BASE_DEC, NULL, MC_HDLC_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_res2, { "reserved", "erf.mchdlc.res2", FT_UINT8, BASE_DEC, NULL, MC_HDLC_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_fcse, { "FCS error", "erf.mchdlc.fcse", FT_UINT8, BASE_DEC, NULL, MC_HDLC_FCSE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_sre,  { "Short record error", "erf.mchdlc.sre", FT_UINT8, BASE_DEC, NULL, MC_HDLC_SRE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_lre,  { "Long record error", "erf.mchdlc.lre", FT_UINT8, BASE_DEC, NULL, MC_HDLC_LRE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_afe,  { "Aborted frame error", "erf.mchdlc.afe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_AFE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_oe,   { "Octet error", "erf.mchdlc.oe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_OE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_lbe,  { "Lost byte error", "erf.mchdlc.lbe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_LBE_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_first, { "First record", "erf.mchdlc.first", FT_UINT8, BASE_DEC, NULL, MC_HDLC_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_hdlc_res3, { "reserved", "erf.mchdlc.res3", FT_UINT8, BASE_DEC, NULL, MC_HDLC_RES3_MASK, "", HFILL } },
+    { &hf_erf_mc_hdlc_cn,   { "connection number", "erf.mchdlc.cn", FT_UINT16, BASE_DEC, NULL, MC_HDLC_CN_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_res1, { "reserved", "erf.mchdlc.res1", FT_UINT16, BASE_DEC, NULL, MC_HDLC_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_res2, { "reserved", "erf.mchdlc.res2", FT_UINT8, BASE_DEC, NULL, MC_HDLC_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_fcse, { "FCS error", "erf.mchdlc.fcse", FT_UINT8, BASE_DEC, NULL, MC_HDLC_FCSE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_sre,  { "Short record error", "erf.mchdlc.sre", FT_UINT8, BASE_DEC, NULL, MC_HDLC_SRE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_lre,  { "Long record error", "erf.mchdlc.lre", FT_UINT8, BASE_DEC, NULL, MC_HDLC_LRE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_afe,  { "Aborted frame error", "erf.mchdlc.afe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_AFE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_oe,   { "Octet error", "erf.mchdlc.oe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_OE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_lbe,  { "Lost byte error", "erf.mchdlc.lbe", FT_UINT8, BASE_DEC, NULL, MC_HDLC_LBE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_first, { "First record", "erf.mchdlc.first", FT_UINT8, BASE_DEC, NULL, MC_HDLC_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_hdlc_res3, { "reserved", "erf.mchdlc.res3", FT_UINT8, BASE_DEC, NULL, MC_HDLC_RES3_MASK, NULL, HFILL } },
 
     /* MC RAW Header */
-    { &hf_erf_mc_raw_int,   { "physical interface", "erf.mcraw.int", FT_UINT8, BASE_DEC, NULL, MC_RAW_INT_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_res1, { "reserved", "erf.mcraw.res1", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_res2, { "reserved", "erf.mcraw.res2", FT_UINT16, BASE_DEC, NULL, MC_RAW_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_res3, { "reserved", "erf.mcraw.res3", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES3_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_sre,  { "Short record error", "erf.mcraw.sre", FT_UINT8, BASE_DEC, NULL, MC_RAW_SRE_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_lre,  { "Long record error", "erf.mcraw.lre", FT_UINT8, BASE_DEC, NULL, MC_RAW_LRE_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_res4,  { "reserved", "erf.mcraw.res4", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES4_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_lbe,  { "Lost byte error", "erf.mcraw.lbe", FT_UINT8, BASE_DEC, NULL, MC_RAW_LBE_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_first, { "First record", "erf.mcraw.first", FT_UINT8, BASE_DEC, NULL, MC_RAW_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_raw_res5, { "reserved", "erf.mcraw.res5", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES5_MASK, "", HFILL } },
+    { &hf_erf_mc_raw_int,   { "physical interface", "erf.mcraw.int", FT_UINT8, BASE_DEC, NULL, MC_RAW_INT_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_res1, { "reserved", "erf.mcraw.res1", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_res2, { "reserved", "erf.mcraw.res2", FT_UINT16, BASE_DEC, NULL, MC_RAW_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_res3, { "reserved", "erf.mcraw.res3", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES3_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_sre,  { "Short record error", "erf.mcraw.sre", FT_UINT8, BASE_DEC, NULL, MC_RAW_SRE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_lre,  { "Long record error", "erf.mcraw.lre", FT_UINT8, BASE_DEC, NULL, MC_RAW_LRE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_res4,  { "reserved", "erf.mcraw.res4", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES4_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_lbe,  { "Lost byte error", "erf.mcraw.lbe", FT_UINT8, BASE_DEC, NULL, MC_RAW_LBE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_first, { "First record", "erf.mcraw.first", FT_UINT8, BASE_DEC, NULL, MC_RAW_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_raw_res5, { "reserved", "erf.mcraw.res5", FT_UINT8, BASE_DEC, NULL, MC_RAW_RES5_MASK, NULL, HFILL } },
 
     /* MC ATM Header */
-    { &hf_erf_mc_atm_cn,   { "connection number", "erf.mcatm.cn", FT_UINT16, BASE_DEC, NULL, MC_ATM_CN_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_res1, { "reserved", "erf.mcatm.res1", FT_UINT16, BASE_DEC, NULL, MC_ATM_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_mul,  { "multiplexed", "erf.mcatm.mul", FT_UINT16, BASE_DEC, NULL, MC_ATM_MUL_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_port, { "physical port", "erf.mcatm.port", FT_UINT8, BASE_DEC, NULL, MC_ATM_PORT_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_res2, { "reserved", "erf.mcatm.res2", FT_UINT8, BASE_DEC, NULL, MC_ATM_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_lbe,  { "Lost Byte Error", "erf.mcatm.lbe", FT_UINT8, BASE_DEC, NULL, MC_ATM_LBE_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_hec,  { "HEC corrected", "erf.mcatm.hec", FT_UINT8, BASE_DEC, NULL, MC_ATM_HEC_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_crc10, { "OAM Cell CRC10 Error (not implemented)", "erf.mcatm.crc10", FT_UINT8, BASE_DEC, NULL, MC_ATM_CRC10_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_oamcell,  { "OAM Cell", "erf.mcatm.oamcell", FT_UINT8, BASE_DEC, NULL, MC_ATM_OAMCELL_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_first, { "First record", "erf.mcatm.first", FT_UINT8, BASE_DEC, NULL, MC_ATM_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_atm_res3, { "reserved", "erf.mcatm.res3", FT_UINT8, BASE_DEC, NULL, MC_ATM_RES3_MASK, "", HFILL } },
+    { &hf_erf_mc_atm_cn,   { "connection number", "erf.mcatm.cn", FT_UINT16, BASE_DEC, NULL, MC_ATM_CN_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_res1, { "reserved", "erf.mcatm.res1", FT_UINT16, BASE_DEC, NULL, MC_ATM_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_mul,  { "multiplexed", "erf.mcatm.mul", FT_UINT16, BASE_DEC, NULL, MC_ATM_MUL_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_port, { "physical port", "erf.mcatm.port", FT_UINT8, BASE_DEC, NULL, MC_ATM_PORT_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_res2, { "reserved", "erf.mcatm.res2", FT_UINT8, BASE_DEC, NULL, MC_ATM_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_lbe,  { "Lost Byte Error", "erf.mcatm.lbe", FT_UINT8, BASE_DEC, NULL, MC_ATM_LBE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_hec,  { "HEC corrected", "erf.mcatm.hec", FT_UINT8, BASE_DEC, NULL, MC_ATM_HEC_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_crc10, { "OAM Cell CRC10 Error (not implemented)", "erf.mcatm.crc10", FT_UINT8, BASE_DEC, NULL, MC_ATM_CRC10_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_oamcell,  { "OAM Cell", "erf.mcatm.oamcell", FT_UINT8, BASE_DEC, NULL, MC_ATM_OAMCELL_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_first, { "First record", "erf.mcatm.first", FT_UINT8, BASE_DEC, NULL, MC_ATM_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_atm_res3, { "reserved", "erf.mcatm.res3", FT_UINT8, BASE_DEC, NULL, MC_ATM_RES3_MASK, NULL, HFILL } },
 
     /* MC RAW Link Header */
-    { &hf_erf_mc_rawl_cn,   { "connection number", "erf.mcrawl.cn", FT_UINT8, BASE_DEC, NULL, MC_RAWL_CN_MASK, "", HFILL } },
-    { &hf_erf_mc_rawl_res1, { "reserved", "erf.mcrawl.res1", FT_UINT16, BASE_DEC, NULL, MC_RAWL_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_rawl_res2,  { "reserved", "erf.mcrawl.res2", FT_UINT8, BASE_DEC, NULL, MC_RAWL_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_rawl_lbe,  { "Lost byte error", "erf.mcrawl.lbe", FT_UINT8, BASE_DEC, NULL, MC_RAWL_LBE_MASK, "", HFILL } },
-    { &hf_erf_mc_rawl_first, { "First record", "erf.mcrawl.first", FT_UINT8, BASE_DEC, NULL, MC_RAWL_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_rawl_res3, { "reserved", "erf.mcrawl.res5", FT_UINT8, BASE_DEC, NULL, MC_RAWL_RES3_MASK, "", HFILL } },
+    { &hf_erf_mc_rawl_cn,   { "connection number", "erf.mcrawl.cn", FT_UINT8, BASE_DEC, NULL, MC_RAWL_CN_MASK, NULL, HFILL } },
+    { &hf_erf_mc_rawl_res1, { "reserved", "erf.mcrawl.res1", FT_UINT16, BASE_DEC, NULL, MC_RAWL_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_rawl_res2,  { "reserved", "erf.mcrawl.res2", FT_UINT8, BASE_DEC, NULL, MC_RAWL_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_rawl_lbe,  { "Lost byte error", "erf.mcrawl.lbe", FT_UINT8, BASE_DEC, NULL, MC_RAWL_LBE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_rawl_first, { "First record", "erf.mcrawl.first", FT_UINT8, BASE_DEC, NULL, MC_RAWL_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_rawl_res3, { "reserved", "erf.mcrawl.res5", FT_UINT8, BASE_DEC, NULL, MC_RAWL_RES3_MASK, NULL, HFILL } },
 
     /* MC AAL5 Header */
-    { &hf_erf_mc_aal5_cn,   { "connection number", "erf.mcaal5.cn", FT_UINT16, BASE_DEC, NULL, MC_AAL5_CN_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_res1, { "reserved", "erf.mcaal5.res1", FT_UINT16, BASE_DEC, NULL, MC_AAL5_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_port, { "physical port", "erf.mcaal5.port", FT_UINT8, BASE_DEC, NULL, MC_AAL5_PORT_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_crcck, { "CRC checked", "erf.mcaal5.crcck", FT_UINT8, BASE_DEC, NULL, MC_AAL5_CRCCK_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_crce,  { "CRC error", "erf.mcaal5.crce", FT_UINT8, BASE_DEC, NULL, MC_AAL5_CRCE_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_lenck,  { "Length checked", "erf.mcaal5.lenck", FT_UINT8, BASE_DEC, NULL, MC_AAL5_LENCK_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_lene, { "Length error", "erf.mcaal5.lene", FT_UINT8, BASE_DEC, NULL, MC_AAL5_LENE_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_res2,  { "reserved", "erf.mcaal5.res2", FT_UINT8, BASE_DEC, NULL, MC_AAL5_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_first, { "First record", "erf.mcaal5.first", FT_UINT8, BASE_DEC, NULL, MC_AAL5_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_aal5_res3, { "reserved", "erf.mcaal5.res3", FT_UINT8, BASE_DEC, NULL, MC_AAL5_RES3_MASK, "", HFILL } },
+    { &hf_erf_mc_aal5_cn,   { "connection number", "erf.mcaal5.cn", FT_UINT16, BASE_DEC, NULL, MC_AAL5_CN_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_res1, { "reserved", "erf.mcaal5.res1", FT_UINT16, BASE_DEC, NULL, MC_AAL5_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_port, { "physical port", "erf.mcaal5.port", FT_UINT8, BASE_DEC, NULL, MC_AAL5_PORT_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_crcck, { "CRC checked", "erf.mcaal5.crcck", FT_UINT8, BASE_DEC, NULL, MC_AAL5_CRCCK_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_crce,  { "CRC error", "erf.mcaal5.crce", FT_UINT8, BASE_DEC, NULL, MC_AAL5_CRCE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_lenck,  { "Length checked", "erf.mcaal5.lenck", FT_UINT8, BASE_DEC, NULL, MC_AAL5_LENCK_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_lene, { "Length error", "erf.mcaal5.lene", FT_UINT8, BASE_DEC, NULL, MC_AAL5_LENE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_res2,  { "reserved", "erf.mcaal5.res2", FT_UINT8, BASE_DEC, NULL, MC_AAL5_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_first, { "First record", "erf.mcaal5.first", FT_UINT8, BASE_DEC, NULL, MC_AAL5_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal5_res3, { "reserved", "erf.mcaal5.res3", FT_UINT8, BASE_DEC, NULL, MC_AAL5_RES3_MASK, NULL, HFILL } },
 
     /* MC AAL2 Header */
-    { &hf_erf_mc_aal2_cn,   { "connection number", "erf.mcaal2.cn", FT_UINT16, BASE_DEC, NULL, MC_AAL2_CN_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_res1, { "reserved for extra connection", "erf.mcaal2.res1", FT_UINT16, BASE_DEC, NULL, MC_AAL2_RES1_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_res2,  { "reserved for type", "erf.mcaal2.mul", FT_UINT16, BASE_DEC, NULL, MC_AAL2_RES2_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_port, { "physical port", "erf.mcaal2.port", FT_UINT8, BASE_DEC, NULL, MC_AAL2_PORT_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_res3, { "reserved", "erf.mcaal2.res2", FT_UINT8, BASE_DEC, NULL, MC_AAL2_RES3_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_first,  { "first cell received", "erf.mcaal2.lbe", FT_UINT8, BASE_DEC, NULL, MC_AAL2_FIRST_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_maale,  { "MAAL error", "erf.mcaal2.hec", FT_UINT8, BASE_DEC, NULL, MC_AAL2_MAALE_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_lene, { "Length error", "erf.mcaal2.crc10", FT_UINT8, BASE_DEC, NULL, MC_AAL2_LENE_MASK, "", HFILL } },
-    { &hf_erf_mc_aal2_cid, { "Channel Identification Number", "erf.mcaal2.cid", FT_UINT8, BASE_DEC, NULL, MC_AAL2_CID_MASK, "", HFILL } },
+    { &hf_erf_mc_aal2_cn,   { "connection number", "erf.mcaal2.cn", FT_UINT16, BASE_DEC, NULL, MC_AAL2_CN_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_res1, { "reserved for extra connection", "erf.mcaal2.res1", FT_UINT16, BASE_DEC, NULL, MC_AAL2_RES1_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_res2,  { "reserved for type", "erf.mcaal2.mul", FT_UINT16, BASE_DEC, NULL, MC_AAL2_RES2_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_port, { "physical port", "erf.mcaal2.port", FT_UINT8, BASE_DEC, NULL, MC_AAL2_PORT_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_res3, { "reserved", "erf.mcaal2.res2", FT_UINT8, BASE_DEC, NULL, MC_AAL2_RES3_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_first,  { "first cell received", "erf.mcaal2.lbe", FT_UINT8, BASE_DEC, NULL, MC_AAL2_FIRST_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_maale,  { "MAAL error", "erf.mcaal2.hec", FT_UINT8, BASE_DEC, NULL, MC_AAL2_MAALE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_lene, { "Length error", "erf.mcaal2.crc10", FT_UINT8, BASE_DEC, NULL, MC_AAL2_LENE_MASK, NULL, HFILL } },
+    { &hf_erf_mc_aal2_cid, { "Channel Identification Number", "erf.mcaal2.cid", FT_UINT8, BASE_DEC, NULL, MC_AAL2_CID_MASK, NULL, HFILL } },
 
     /* ETH Header */
-    { &hf_erf_eth_off,   { "offset", "erf.eth.off", FT_UINT8, BASE_DEC, NULL, ETH_OFF_MASK, "", HFILL } },
-    { &hf_erf_eth_res1,   { "reserved", "erf.eth.res1", FT_UINT8, BASE_DEC, NULL, ETH_RES1_MASK, "", HFILL } },
+    { &hf_erf_eth_off,   { "offset", "erf.eth.off", FT_UINT8, BASE_DEC, NULL, ETH_OFF_MASK, NULL, HFILL } },
+    { &hf_erf_eth_res1,   { "reserved", "erf.eth.res1", FT_UINT8, BASE_DEC, NULL, ETH_RES1_MASK, NULL, HFILL } },
 
   };
 
diff --git a/epan/dissectors/packet-esis.c b/epan/dissectors/packet-esis.c
index 10eff8fa9c..7ee8a2a2b3 100644
--- a/epan/dissectors/packet-esis.c
+++ b/epan/dissectors/packet-esis.c
@@ -412,20 +412,20 @@ proto_register_esis(void) {
   static hf_register_info hf[] = {
     { &hf_esis_nlpi,
       { "Network Layer Protocol Identifier", "esis.nlpi",
-        FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }},
+        FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, NULL, HFILL }},
     { &hf_esis_length,
-      { "PDU Length    ", "esis.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "PDU Length", "esis.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_esis_version,
-      { "Version (==1) ", "esis.ver",    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Version (==1)", "esis.ver",    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_esis_reserved,
-      { "Reserved(==0) ", "esis.res",    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Reserved(==0)", "esis.res",    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_esis_type,
-      { "PDU Type      ", "esis.type",   FT_UINT8, BASE_DEC, VALS(esis_vals),
-         0xff, "", HFILL }},
+      { "PDU Type", "esis.type",   FT_UINT8, BASE_DEC, VALS(esis_vals),
+         0xff, NULL, HFILL }},
     { &hf_esis_holdtime,
-      { "Holding Time  ", "esis.htime",  FT_UINT16, BASE_DEC, NULL, 0x0, " s", HFILL }},
+      { "Holding Time", "esis.htime",  FT_UINT16, BASE_DEC, NULL, 0x0, "s", HFILL }},
     { &hf_esis_checksum,
-      { "Checksum      ", "esis.chksum", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }}
+      { "Checksum", "esis.chksum", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }}
   };
   /*
    *
diff --git a/epan/dissectors/packet-ess.c b/epan/dissectors/packet-ess.c
index 167692f37e..61e76c584d 100644
--- a/epan/dissectors/packet-ess.c
+++ b/epan/dissectors/packet-ess.c
@@ -869,7 +869,7 @@ void proto_register_ess(void) {
         "ess.ReceiptRequest", HFILL }},
     { &hf_ess_ContentIdentifier_PDU,
       { "ContentIdentifier", "ess.ContentIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.ContentIdentifier", HFILL }},
     { &hf_ess_Receipt_PDU,
       { "Receipt", "ess.Receipt",
@@ -881,7 +881,7 @@ void proto_register_ess(void) {
         "ess.ContentHints", HFILL }},
     { &hf_ess_MsgSigDigest_PDU,
       { "MsgSigDigest", "ess.MsgSigDigest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.MsgSigDigest", HFILL }},
     { &hf_ess_ContentReference_PDU,
       { "ContentReference", "ess.ContentReference",
@@ -921,7 +921,7 @@ void proto_register_ess(void) {
         "ess.SigningCertificate", HFILL }},
     { &hf_ess_signedContentIdentifier,
       { "signedContentIdentifier", "ess.signedContentIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.ContentIdentifier", HFILL }},
     { &hf_ess_receiptsFrom,
       { "receiptsFrom", "ess.receiptsFrom",
@@ -957,7 +957,7 @@ void proto_register_ess(void) {
         "cms.ContentType", HFILL }},
     { &hf_ess_originatorSignatureValue,
       { "originatorSignatureValue", "ess.originatorSignatureValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.OCTET_STRING", HFILL }},
     { &hf_ess_contentDescription,
       { "contentDescription", "ess.contentDescription",
@@ -1005,7 +1005,7 @@ void proto_register_ess(void) {
         "ess.OBJECT_IDENTIFIER", HFILL }},
     { &hf_ess_attributeFlags,
       { "attributeFlags", "ess.attributeFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.BIT_STRING", HFILL }},
     { &hf_ess_attributeList,
       { "attributeList", "ess.attributeList",
@@ -1021,7 +1021,7 @@ void proto_register_ess(void) {
         "ess.FreeFormField", HFILL }},
     { &hf_ess_bitSetAttributes,
       { "bitSetAttributes", "ess.bitSetAttributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.BIT_STRING", HFILL }},
     { &hf_ess_securityAttributes,
       { "securityAttributes", "ess.securityAttributes",
@@ -1057,7 +1057,7 @@ void proto_register_ess(void) {
         "cms.IssuerAndSerialNumber", HFILL }},
     { &hf_ess_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "ess.subjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.SubjectKeyIdentifier", HFILL }},
     { &hf_ess_none,
       { "none", "ess.none",
@@ -1097,7 +1097,7 @@ void proto_register_ess(void) {
         "x509ce.PolicyInformation", HFILL }},
     { &hf_ess_certHash,
       { "certHash", "ess.certHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ess.Hash", HFILL }},
     { &hf_ess_issuerSerial,
       { "issuerSerial", "ess.issuerSerial",
diff --git a/epan/dissectors/packet-eth.c b/epan/dissectors/packet-eth.c
index a5fb1f6a19..d3afa4498b 100644
--- a/epan/dissectors/packet-eth.c
+++ b/epan/dissectors/packet-eth.c
@@ -541,12 +541,12 @@ proto_register_eth(void)
 
 		{ &hf_eth_len,
 		{ "Length",		"eth.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		/* registered here but handled in packet-ethertype.c */
 		{ &hf_eth_type,
 		{ "Type",		"eth.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_eth_addr,
 		{ "Address", "eth.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
 			"Source or Destination Hardware Address", HFILL }},
diff --git a/epan/dissectors/packet-etheric.c b/epan/dissectors/packet-etheric.c
index 57d15cf235..c7d39b2294 100644
--- a/epan/dissectors/packet-etheric.c
+++ b/epan/dissectors/packet-etheric.c
@@ -1055,118 +1055,118 @@ proto_register_etheric(void)
 		{ &hf_etheric_parameter_type,
 			{ "Parameter Type",  "etheric.parameter_type",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_forw_call_isdn_access_indicator,
 			{ "ISDN access indicator",  "etheric.forw_call_isdn_access_indicator",
 			FT_BOOLEAN, 16, TFS(&isup_ISDN_originating_access_ind_value), 0x01,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_calling_partys_category,
 			{ "Calling Party's category",  "etheric.calling_partys_category",
 			FT_UINT8, BASE_HEX, VALS(etheric_calling_partys_category_value), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_mandatory_variable_parameter_pointer,
 			{ "Pointer to Parameter",  "etheric.mandatory_variable_parameter_pointer",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_pointer_to_start_of_optional_part,
 			{ "Pointer to optional parameter part",  "etheric.optional_parameter_part_pointer",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_parameter_length,
 			{ "Parameter Length",  "etheric.parameter_length",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_transmission_medium_requirement,
 			{ "Transmission medium requirement",  "etheric.transmission_medium_requirement",
 			FT_UINT8, BASE_DEC, VALS(isup_transmission_medium_requirement_value), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_odd_even_indicator,
 			{ "Odd/even indicator",  "etheric.isdn_odd_even_indicator",
 			FT_BOOLEAN, 8, TFS(&isup_odd_even_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_called_party_nature_of_address_indicator,
 			{ "Nature of address indicator",  "etheric.called_party_nature_of_address_indicator",
 			FT_UINT8, BASE_DEC, VALS(isup_called_party_nature_of_address_ind_value), 0x3f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_calling_party_nature_of_address_indicator,
 			{ "Nature of address indicator",  "etheric.calling_party_nature_of_address_indicator",
 			FT_UINT8, BASE_DEC, VALS(etheric_location_number_nature_of_address_ind_value), 0x7f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 
 		{ &hf_etheric_ni_indicator,
 			{ "NI indicator",  "etheric.ni_indicator",
 			FT_BOOLEAN, 8, TFS(&isup_NI_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_inn_indicator,
 			{ "INN indicator",  "etheric.inn_indicator",
 			FT_BOOLEAN, 8, TFS(&isup_INN_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_numbering_plan_indicator,
 			{ "Numbering plan indicator",  "etheric.numbering_plan_indicator",
 			FT_UINT8, BASE_DEC, VALS(isup_numbering_plan_ind_value), 0x70,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_address_presentation_restricted_indicator,
 			{ "Address presentation restricted indicator",  "etheric.address_presentation_restricted_indicator",
 			FT_UINT8, BASE_DEC, VALS(isup_address_presentation_restricted_ind_value), 0x0c,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_screening_indicator,
 			{ "Screening indicator",  "etheric.screening_indicator",
 			FT_UINT8, BASE_DEC, VALS(isup_screening_ind_value), 0x03,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_called_party_odd_address_signal_digit,
 			{ "Address signal digit",  "etheric.called_party_odd_address_signal_digit",
 			FT_UINT8, BASE_DEC, VALS(isup_called_party_address_digit_value), 0x0F,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_calling_party_odd_address_signal_digit,
 			{ "Address signal digit",  "etheric.calling_party_odd_address_signal_digit",
 			FT_UINT8, BASE_DEC, VALS(isup_calling_party_address_digit_value), 0x0F,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_called_party_even_address_signal_digit,
 			{ "Address signal digit",  "etheric.called_party_even_address_signal_digit",
 			FT_UINT8, BASE_DEC, VALS(isup_called_party_address_digit_value), 0xF0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_calling_party_even_address_signal_digit,
 			{ "Address signal digit",  "etheric.calling_party_even_address_signal_digit",
 			FT_UINT8, BASE_DEC, VALS(isup_calling_party_address_digit_value), 0xF0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_inband_information_ind,
 			{ "In-band information indicator",  "etheric.inband_information_ind",
 			FT_BOOLEAN, 8, TFS(&isup_inband_information_ind_value), 0x01,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_cause_indicator,
 			{ "Cause indicator",  "etheric.cause_indicator",
 			FT_UINT8, BASE_DEC, VALS(q850_cause_code_vals), 0x7f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_event_ind,
 			{ "Event indicator",  "etheric.event_ind",
 			  FT_UINT8, 8, VALS(isup_event_ind_value), 0x7f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_etheric_event_presentation_restricted_ind,
 			{ "Event presentation restricted indicator",  "etheric.event_presentatiation_restr_ind",
 			FT_BOOLEAN, 8, TFS(&isup_event_presentation_restricted_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 
 	};
diff --git a/epan/dissectors/packet-etherip.c b/epan/dissectors/packet-etherip.c
index 9d75436be3..846039bacf 100644
--- a/epan/dissectors/packet-etherip.c
+++ b/epan/dissectors/packet-etherip.c
@@ -101,7 +101,7 @@ proto_register_etherip(void)
   static hf_register_info hf_etherip[] = {
     { &hf_etherip_ver,
       { "Version",	"etherip.ver",	FT_UINT8,	BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_etherip,
diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c
index 87fe2572bb..869e288991 100644
--- a/epan/dissectors/packet-extreme.c
+++ b/epan/dissectors/packet-extreme.c
@@ -1120,52 +1120,52 @@ proto_register_edp(void)
 	/* EDP header */
 		{ &hf_edp_version,
 		{ "Version",	"edp.version", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_reserved,
 		{ "Reserved",	"edp.reserved", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_length,
 		{ "Data length",	"edp.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_checksum,
 		{ "EDP checksum",	"edp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_edp_checksum_good,
 		{ "Good",	"edp.checksum_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"True: checksum matches packet content; False: doesn't match content or not checked", HFILL }},
 
 		{ &hf_edp_checksum_bad,
-		{ "Bad ",	"edp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+		{ "Bad",	"edp.checksum_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"True: checksum doesn't match packet content; False: matches content or not checked", HFILL }},
 
 		{ &hf_edp_seqno,
 		{ "Sequence number",	"edp.seqno", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_midtype,
 		{ "Machine ID type",	"edp.midtype", FT_UINT16, BASE_DEC, VALS(edp_midtype_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_midmac,
 		{ "Machine MAC",	"edp.midmac", FT_ETHER, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* TLV header */
 		{ &hf_edp_tlv_marker,
 		{ "TLV Marker",	"edp.tlv.marker", FT_UINT8, BASE_HEX, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_tlv_type,
 		{ "TLV type",	"edp.tlv.type", FT_UINT8, BASE_DEC, VALS(edp_type_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_tlv_length,
 		{ "TLV length",	"edp.tlv.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* Display element */
 		{ &hf_edp_display,
@@ -1195,7 +1195,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_info_reserved,
 		{ "Reserved",	"edp.info.reserved", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_info_version,
 		{ "Version",	"edp.info.version", FT_UINT32, BASE_HEX, NULL,
@@ -1228,7 +1228,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_vlan_flags,
 		{ "Flags",	"edp.vlan.flags", FT_UINT8, BASE_HEX, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_vlan_flags_ip,
 		{ "Flags-IP",	"edp.vlan.flags.ip", FT_BOOLEAN, 8, TFS(&flags_set_truth),
@@ -1236,23 +1236,23 @@ proto_register_edp(void)
 
 		{ &hf_edp_vlan_flags_reserved,
 		{ "Flags-reserved",	"edp.vlan.flags.reserved", FT_UINT8, BASE_HEX, NULL,
-			0x7e, "", HFILL }},
+			0x7e, NULL, HFILL }},
 
 		{ &hf_edp_vlan_flags_unknown,
 		{ "Flags-Unknown",	"edp.vlan.flags.unknown", FT_BOOLEAN, 8, TFS(&flags_set_truth),
-			0x01, "", HFILL }},
+			0x01, NULL, HFILL }},
 
 		{ &hf_edp_vlan_reserved1,
 		{ "Reserved1",	"edp.vlan.reserved1", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_vlan_id,
 		{ "Vlan ID",	"edp.vlan.id", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_vlan_reserved2,
 		{ "Reserved2",	"edp.vlan.reserved2", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_vlan_ip,
 		{ "IP addr",	"edp.vlan.ip", FT_IPv4, BASE_NONE, NULL,
@@ -1269,19 +1269,19 @@ proto_register_edp(void)
 
 		{ &hf_edp_esrp_proto,
 		{ "Protocol",	"edp.esrp.proto", FT_UINT8, BASE_DEC, VALS(esrp_proto_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esrp_group,
 		{ "Group",	"edp.esrp.group", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esrp_prio,
 		{ "Prio",	"edp.esrp.prio", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esrp_state,
 		{ "State",	"edp.esrp.state", FT_UINT16, BASE_DEC, VALS(esrp_state_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esrp_ports,
 		{ "Ports",	"edp.esrp.ports", FT_UINT16, BASE_DEC, NULL,
@@ -1301,7 +1301,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_esrp_reserved,
 		{ "Reserved",	"edp.esrp.reserved", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* EAPS element */
 		{ &hf_edp_eaps,
@@ -1310,11 +1310,11 @@ proto_register_edp(void)
 
 		{ &hf_edp_eaps_ver,
 		{ "Version",	"edp.eaps.ver", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_eaps_type,
 		{ "Type",	"edp.eaps.type", FT_UINT8, BASE_DEC, VALS(eaps_type_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_eaps_ctrlvlanid,
 		{ "Vlan ID",	"edp.eaps.vlanid", FT_UINT16, BASE_DEC, NULL,
@@ -1322,7 +1322,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_eaps_reserved0,
 		{ "Reserved0",	"edp.eaps.reserved0", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_eaps_sysmac,
 		{ "Sys MAC",	"edp.eaps.sysmac", FT_ETHER, BASE_NONE, NULL,
@@ -1338,11 +1338,11 @@ proto_register_edp(void)
 
 		{ &hf_edp_eaps_state,
 		{ "State",	"edp.eaps.state", FT_UINT8, BASE_DEC, VALS(eaps_state_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_eaps_reserved1,
 		{ "Reserved1",	"edp.eaps.reserved1", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_eaps_helloseq,
 		{ "Helloseq",	"edp.eaps.helloseq", FT_UINT16, BASE_DEC, NULL,
@@ -1350,7 +1350,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_eaps_reserved2,
 		{ "Reserved2",	"edp.eaps.reserved2", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* ESL element (EAPS shared link) */
 		{ &hf_edp_esl,
@@ -1359,11 +1359,11 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_ver,
 		{ "Version",	"edp.esl.ver", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_type,
 		{ "Type",	"edp.esl.type", FT_UINT8, BASE_DEC, VALS(esl_type_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_ctrlvlanid,
 		{ "Vlan ID",	"edp.esl.vlanid", FT_UINT16, BASE_DEC, NULL,
@@ -1371,7 +1371,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_reserved0,
 		{ "Reserved0",	"edp.esl.reserved0", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_sysmac,
 		{ "Sys MAC",	"edp.esl.sysmac", FT_ETHER, BASE_NONE, NULL,
@@ -1379,15 +1379,15 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_reserved1,
 		{ "Reserved1",	"edp.esl.reserved1", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_state,
 		{ "State",	"edp.esl.state", FT_UINT8, BASE_DEC, VALS(esl_state_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_linkrole,
 		{ "Role",	"edp.esl.role", FT_UINT8, BASE_DEC, VALS(esl_role_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_linkid1,
 		{ "Link ID 1",	"edp.esl.linkid1", FT_UINT16, BASE_DEC, NULL,
@@ -1403,7 +1403,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_reserved4,
 		{ "Reserved4",	"edp.esl.reserved4", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_linkid2,
 		{ "Link ID 2",	"edp.esl.linkid2", FT_UINT16, BASE_DEC, NULL,
@@ -1411,7 +1411,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_reserved5,
 		{ "Reserved5",	"edp.esl.reserved5", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_esl_numlinks,
 		{ "Num Shared Links",	"edp.esl.numlinks", FT_UINT16, BASE_DEC, NULL,
@@ -1423,7 +1423,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_esl_rest,
 		{ "Rest",	"edp.esl.rest", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* ELSM element */
 		{ &hf_edp_elsm,
@@ -1432,15 +1432,15 @@ proto_register_edp(void)
 
 		{ &hf_edp_elsm_type,
 		{ "Type",	"edp.elsm.type", FT_UINT8, BASE_DEC, VALS(elsm_type_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_elsm_subtype,
 		{ "Subtype",	"edp.elsm.unknown", FT_UINT8, BASE_DEC, VALS(elsm_subtype_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_edp_elsm_magic,
 		{ "Magic",	"edp.elsm.unknown", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* ELRP element */
 		{ &hf_edp_elrp,
@@ -1449,7 +1449,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_elrp_unknown,
 		{ "Unknown",	"edp.elrp.unknown", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* Unknown element */
 		{ &hf_edp_unknown,
@@ -1458,7 +1458,7 @@ proto_register_edp(void)
 
 		{ &hf_edp_unknown_data,
 		{ "Unknown",	"edp.unknown.data", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* Null element */
 		{ &hf_edp_null,
diff --git a/epan/dissectors/packet-fc.c b/epan/dissectors/packet-fc.c
index 31e12400e7..e004b38335 100644
--- a/epan/dissectors/packet-fc.c
+++ b/epan/dissectors/packet-fc.c
@@ -1214,32 +1214,32 @@ proto_register_fc(void)
     static hf_register_info hf[] = {
         { &hf_fc_rctl,
           { "R_CTL", "fc.r_ctl", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "R_CTL", HFILL }},
+            NULL, HFILL }},
         { &hf_fc_ftype,
           {"Frame type", "fc.ftype", FT_UINT8, BASE_HEX, VALS(fc_ftype_vals),
            0x0, "Derived Type", HFILL}},
         { &hf_fc_did,
-          { "Dest Addr", "fc.d_id", FT_STRING, BASE_HEX, NULL, 0x0,
+          { "Dest Addr", "fc.d_id", FT_STRING, BASE_NONE, NULL, 0x0,
             "Destination Address", HFILL}},
         { &hf_fc_csctl,
           {"CS_CTL", "fc.cs_ctl", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "CS_CTL", HFILL}},
+           NULL, HFILL}},
         { &hf_fc_sid,
-          {"Src Addr", "fc.s_id", FT_STRING, BASE_HEX, NULL, 0x0,
+          {"Src Addr", "fc.s_id", FT_STRING, BASE_NONE, NULL, 0x0,
            "Source Address", HFILL}},
         { &hf_fc_id,
-          {"Addr", "fc.id", FT_STRING, BASE_HEX, NULL, 0x0,
+          {"Addr", "fc.id", FT_STRING, BASE_NONE, NULL, 0x0,
            "Source or Destination Address", HFILL}},
         { &hf_fc_type,
           {"Type", "fc.type", FT_UINT8, BASE_HEX, VALS (fc_fc4_val), 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fc_fctl,
-          {"F_CTL", "fc.f_ctl", FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"F_CTL", "fc.f_ctl", FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fc_seqid,
           {"SEQ_ID", "fc.seq_id", FT_UINT8, BASE_HEX, NULL, 0x0,
            "Sequence ID", HFILL}},
         { &hf_fc_dfctl,
-          {"DF_CTL", "fc.df_ctl", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"DF_CTL", "fc.df_ctl", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fc_seqcnt,
           {"SEQ_CNT", "fc.seq_cnt", FT_UINT16, BASE_DEC, NULL, 0x0,
            "Sequence Count", HFILL}},
@@ -1250,45 +1250,45 @@ proto_register_fc(void)
           {"RX_ID", "fc.rx_id", FT_UINT16, BASE_HEX, NULL, 0x0, "Receiver ID",
            HFILL}},
         { &hf_fc_param,
-          {"Parameter", "fc.parameter", FT_UINT32, BASE_HEX, NULL, 0x0, "Parameter",
+          {"Parameter", "fc.parameter", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
 
         { &hf_fc_reassembled,
           {"Reassembled Frame", "fc.reassembled", FT_BOOLEAN, BASE_NONE, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fc_nh_da,
-          {"Network DA", "fc.nethdr.da", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Network DA", "fc.nethdr.da", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fc_nh_sa,
-          {"Network SA", "fc.nethdr.sa", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Network SA", "fc.nethdr.sa", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
 
         /* Basic Link Svc field definitions */
         { &hf_fc_bls_seqid_vld,
           {"SEQID Valid", "fc.bls_seqidvld", FT_UINT8, BASE_HEX,
-           VALS (fc_bls_seqid_val), 0x0, "", HFILL}},
+           VALS (fc_bls_seqid_val), 0x0, NULL, HFILL}},
         { &hf_fc_bls_lastvld_seqid,
           {"Last Valid SEQID", "fc.bls_lastseqid", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fc_bls_oxid,
-          {"OXID", "fc.bls_oxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"OXID", "fc.bls_oxid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fc_bls_rxid,
-          {"RXID", "fc.bls_rxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"RXID", "fc.bls_rxid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fc_bls_lowseqcnt,
-          {"Low SEQCNT", "fc.bls_lseqcnt", FT_UINT16, BASE_HEX, NULL, 0x0, "",
+          {"Low SEQCNT", "fc.bls_lseqcnt", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fc_bls_hiseqcnt,
-          {"High SEQCNT", "fc.bls_hseqcnt", FT_UINT16, BASE_HEX, NULL, 0x0, "",
+          {"High SEQCNT", "fc.bls_hseqcnt", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fc_bls_rjtcode,
           {"Reason", "fc.bls_reason", FT_UINT8, BASE_HEX, VALS(fc_bls_barjt_val),
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fc_bls_rjtdetail,
           {"Reason Explanation", "fc.bls_rjtdetail", FT_UINT8, BASE_HEX,
-           VALS (fc_bls_barjt_det_val), 0x0, "", HFILL}},
+           VALS (fc_bls_barjt_det_val), 0x0, NULL, HFILL}},
         { &hf_fc_bls_vendor,
           {"Vendor Unique Reason", "fc.bls_vnduniq", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fc_fctl_exchange_responder,
           {"ExgRpd", "fc.fctl.exchange_responder", FT_BOOLEAN, 24, TFS(&tfs_fc_fctl_exchange_responder),
            FC_FCTL_EXCHANGE_RESPONDER, "Exchange Responder?", HFILL}},
@@ -1342,10 +1342,10 @@ proto_register_fc(void)
            0, "Relative offset of data", HFILL}},
         { &hf_fc_vft,
           {"VFT Header", "fc.vft", FT_UINT16, BASE_DEC, NULL,
-           0, "VFT Header", HFILL}},
+           0, NULL, HFILL}},
         { &hf_fc_vft_rctl,
           {"R_CTL", "fc.vft.rctl", FT_UINT8, BASE_HEX, NULL,
-           0, "R_CTL", HFILL}},
+           0, NULL, HFILL}},
         { &hf_fc_vft_ver,
           {"Version", "fc.vft.ver", FT_UINT8, BASE_DEC, NULL,
            0, "Version of VFT header", HFILL}},
diff --git a/epan/dissectors/packet-fcct.c b/epan/dissectors/packet-fcct.c
index a37251bad5..3c60730ad6 100644
--- a/epan/dissectors/packet-fcct.c
+++ b/epan/dissectors/packet-fcct.c
@@ -243,37 +243,37 @@ proto_register_fcct(void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_fcct_revision,
-          {"Revision", "fcct.revision", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"Revision", "fcct.revision", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcct_inid,
-          {"IN_ID", "fcct.in_id", FT_STRING, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"IN_ID", "fcct.in_id", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcct_gstype,
           {"GS Type", "fcct.gstype", FT_UINT8, BASE_HEX, VALS(fc_ct_gstype_vals),
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcct_gssubtype,
           {"GS Subtype", "fcct.gssubtype", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcct_server,
           {"Server", "fcct.server", FT_UINT8, BASE_HEX,
            VALS (fc_ct_gsserver_vals), 0x0,
            "Derived from GS Type & Subtype fields", HFILL}},
         { &hf_fcct_options,
-          {"Options", "fcct.options", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Options", "fcct.options", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcct_ext_said,
-          {"Auth SAID", "fcct.ext_said", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+          {"Auth SAID", "fcct.ext_said", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcct_ext_tid,
-          {"Transaction ID", "fcct.ext_tid", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+          {"Transaction ID", "fcct.ext_tid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcct_ext_reqname,
-          {"Requestor Port Name", "fcct.ext_reqnm", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Requestor Port Name", "fcct.ext_reqnm", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcct_ext_tstamp,
-          {"Timestamp", "fcct.ext_tstamp", FT_BYTES, BASE_HEX, NULL, 0x0, "",
+          {"Timestamp", "fcct.ext_tstamp", FT_BYTES, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcct_ext_authblk,
-          {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Auth Hash Blk", "fcct.ext_authblk", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 6815288c76..7ea2b44142 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -1801,196 +1801,196 @@ proto_register_fcdns (void)
     static hf_register_info hf[] = {
         { &hf_fcdns_gssubtype,
           {"GS_Subtype", "fcdns.gssubtype", FT_UINT8, BASE_HEX,
-           VALS (fc_dns_subtype_val), 0x0, "", HFILL}},
+           VALS (fc_dns_subtype_val), 0x0, NULL, HFILL}},
         {&hf_fcdns_opcode,
          {"Opcode", "fcdns.opcode", FT_UINT16, BASE_HEX, VALS (fc_dns_opcode_val),
-          0x0, "", HFILL}},
+          0x0, NULL, HFILL}},
         { &hf_fcdns_req_portid,
-          {"Port Identifier", "fcdns.req.portid", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Port Identifier", "fcdns.req.portid", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcdns_rply_pname,
-          {"Port Name", "fcdns.rply.pname", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Port Name", "fcdns.rply.pname", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcdns_rply_nname,
-          {"Node Name", "fcdns.rply.nname", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Node Name", "fcdns.rply.nname", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcdns_rply_snamelen,
           {"Symbolic Node Name Length", "fcdns.rply.snamelen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_rply_sname,
-          {"Symbolic Node Name", "fcdns.rply.sname", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Symbolic Node Name", "fcdns.rply.sname", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_rply_ptype,
           {"Port Type", "fcdns.rply.porttype", FT_UINT8, BASE_HEX,
-           VALS (fc_dns_port_type_val), 0x0, "", HFILL}},
+           VALS (fc_dns_port_type_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_rply_fpname,
-          {"Fabric Port Name", "fcdns.rply.fpname", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Fabric Port Name", "fcdns.rply.fpname", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_pname,
-          {"Port Name", "fcdns.req.portname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Port Name", "fcdns.req.portname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcdns_rply_portid,
-          {"Port Identifier", "fcdns.rply.portid", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Port Identifier", "fcdns.rply.portid", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_nname,
-          {"Node Name", "fcdns.req.nname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Node Name", "fcdns.req.nname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcdns_req_domainscope,
           {"Domain ID Scope", "fcdns.req.domainid", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_areascope,
           {"Area ID Scope", "fcdns.req.areaid", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_fc4type,
           {"FC-4 Type", "fcdns.req.fc4type", FT_UINT8, BASE_HEX,
-           VALS (fc_fc4_val), 0x0, "", HFILL}},
+           VALS (fc_fc4_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_req_ptype,
           {"Port Type", "fcdns.req.porttype", FT_UINT8, BASE_HEX,
-           VALS (fc_dns_port_type_val), 0x0, "", HFILL}},
+           VALS (fc_dns_port_type_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_req_ip,
-          {"IP Address", "fcdns.req.ip", FT_IPv6, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+          {"IP Address", "fcdns.req.ip", FT_IPv6, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcdns_rply_fc4type,
           {"FC-4 Descriptor Type", "fcdns.rply.fc4type", FT_UINT8, BASE_HEX,
-           VALS (fc_fc4_val), 0x0, "", HFILL}},
+           VALS (fc_fc4_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_req_snamelen,
           {"Symbolic Name Length", "fcdns.req.snamelen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_req_sname,
-          {"Symbolic Port Name", "fcdns.req.sname", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Symbolic Port Name", "fcdns.req.sname", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_rply_spnamelen,
           {"Symbolic Port Name Length", "fcdns.rply.spnamelen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         {&hf_fcdns_rply_spname,
-         {"Symbolic Port Name", "fcdns.rply.spname", FT_STRING, BASE_HEX, NULL,
-          0x0, "", HFILL}},
+         {"Symbolic Port Name", "fcdns.rply.spname", FT_STRING, BASE_NONE, NULL,
+          0x0, NULL, HFILL}},
         { &hf_fcdns_rply_ipa,
-          {"Initial Process Associator", "fcdns.rply.ipa", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Initial Process Associator", "fcdns.rply.ipa", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_rply_ipnode,
-          {"Node IP Address", "fcdns.rply.ipnode", FT_IPv6, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+          {"Node IP Address", "fcdns.rply.ipnode", FT_IPv6, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_rply_ipport,
-          {"Port IP Address", "fcdns.rply.ipport", FT_IPv6, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+          {"Port IP Address", "fcdns.rply.ipport", FT_IPv6, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_rply_fc4desclen,
           {"FC-4 Descriptor Length", "fcdns.rply.fc4desclen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_rply_fc4desc,
-          {"FC-4 Descriptor", "fcdns.rply.fc4desc", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"FC-4 Descriptor", "fcdns.rply.fc4desc", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_rply_hrdaddr,
-          {"Hard Address", "fcdns.rply.hrdaddr", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Hard Address", "fcdns.rply.hrdaddr", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_fdesclen,
           {"FC-4 Descriptor Length", "fcdns.req.fc4desclen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_req_fdesc,
-          {"FC-4 Descriptor", "fcdns.req.fc4desc", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"FC-4 Descriptor", "fcdns.req.fc4desc", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_req_spnamelen,
           {"Symbolic Port Name Length", "fcdns.req.spnamelen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_req_spname,
-          {"Symbolic Port Name", "fcdns.req.spname", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Symbolic Port Name", "fcdns.req.spname", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_reason,
           {"Reason Code", "fcdns.rply.reason", FT_UINT8, BASE_HEX,
-           VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}},
+           VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL}},
         { &hf_fcdns_rjtdetail,
           {"Reason Code Explanantion", "fcdns.rply.reasondet", FT_UINT8,
-           BASE_HEX, VALS (fc_dns_rjt_det_code_val), 0x0, "", HFILL}},
+           BASE_HEX, VALS (fc_dns_rjt_det_code_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_vendor,
           {"Vendor Unique Reject Code", "fcdns.rply.vendor", FT_UINT8,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_zone_mbrtype,
           {"Zone Member Type", "fcdns.zone.mbrtype", FT_UINT8, BASE_HEX,
-           VALS (fc_swils_zonembr_type_val), 0x0, "", HFILL}},
+           VALS (fc_swils_zonembr_type_val), 0x0, NULL, HFILL}},
         { &hf_fcdns_zone_mbrid,
-          {"Member Identifier", "fcdns.zone.mbrid", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Member Identifier", "fcdns.zone.mbrid", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcdns_zonenm,
-          {"Zone Name", "fcdns.zonename", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Zone Name", "fcdns.zonename", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcdns_portip,
-          {"Port IP Address", "fcdns.portip", FT_IPv4, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+          {"Port IP Address", "fcdns.portip", FT_IPv4, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcdns_sw2_objfmt,
           {"Name Entry Object Format", "fcdns.entry.objfmt", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_num_fc4desc,
           {"Number of FC4 Descriptors Registered", "fcdns.entry.numfc4desc",
-           FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+           FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_rply_ownerid,
-          {"Owner Id", "fcdns.rply.ownerid", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Owner Id", "fcdns.rply.ownerid", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcdns_maxres_size,
           {"Maximum/Residual Size", "fcdns.maxres_size", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_reply_cos,
           {"Class of Service Supported", "fcdns.reply.cos", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_req_cos,
           {"Requested Class of Service", "fcdns.req.class", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_cos_f,
           {"F", "fcdns.cos.f", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_f), 0x01, "", HFILL}},
+           TFS(&tfs_fcdns_cos_f), 0x01, NULL, HFILL}},
         { &hf_fcdns_cos_1,
           {"1", "fcdns.cos.1", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_1), 0x02, "", HFILL}},
+           TFS(&tfs_fcdns_cos_1), 0x02, NULL, HFILL}},
         { &hf_fcdns_cos_2,
           {"2", "fcdns.cos.2", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_2), 0x04, "", HFILL}},
+           TFS(&tfs_fcdns_cos_2), 0x04, NULL, HFILL}},
         { &hf_fcdns_cos_3,
           {"3", "fcdns.cos.3", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_3), 0x08, "", HFILL}},
+           TFS(&tfs_fcdns_cos_3), 0x08, NULL, HFILL}},
         { &hf_fcdns_cos_4,
           {"4", "fcdns.cos.4", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_4), 0x10, "", HFILL}},
+           TFS(&tfs_fcdns_cos_4), 0x10, NULL, HFILL}},
         { &hf_fcdns_cos_6,
           {"6", "fcdns.cos.6", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_cos_6), 0x40, "", HFILL}},
+           TFS(&tfs_fcdns_cos_6), 0x40, NULL, HFILL}},
         { &hf_fcdns_fc4type_llcsnap,
           {"LLC/SNAP", "fcdns.fc4types.llc_snap", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_llcsnap), 0x0010, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_llcsnap), 0x0010, NULL, HFILL}},
         { &hf_fcdns_fc4type_ip,
           {"IP", "fcdns.fc4types.ip", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_ip), 0x0020, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_ip), 0x0020, NULL, HFILL}},
         { &hf_fcdns_fc4type_fcp,
           {"FCP", "fcdns.fc4types.fcp", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_fcp), 0x0100, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_fcp), 0x0100, NULL, HFILL}},
         { &hf_fcdns_fc4type_swils,
           {"SW_ILS", "fcdns.fc4types.swils", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_swils), 0x0010, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_swils), 0x0010, NULL, HFILL}},
         { &hf_fcdns_fc4type_snmp,
           {"SNMP", "fcdns.fc4types.snmp", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_snmp), 0x0004, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_snmp), 0x0004, NULL, HFILL}},
         { &hf_fcdns_fc4type_gs3,
           {"GS3", "fcdns.fc4types.gs3", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_gs3), 0x0001, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_gs3), 0x0001, NULL, HFILL}},
         { &hf_fcdns_fc4type_vi,
           {"VI", "fcdns.fc4types.vi", FT_BOOLEAN, 32,
-           TFS(&tfs_fcdns_fc4type_vi), 0x0001, "", HFILL}},
+           TFS(&tfs_fcdns_fc4type_vi), 0x0001, NULL, HFILL}},
         { &hf_fcdns_rply_gft,
-          {"FC-4 Types Supported", "fcdns.rply.fc4type", FT_NONE, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"FC-4 Types Supported", "fcdns.rply.fc4type", FT_NONE, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_req_fc4types,
-          {"FC-4 Types Supported", "fcdns.req.fc4types", FT_NONE, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"FC-4 Types Supported", "fcdns.req.fc4types", FT_NONE, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_fc4type,
-          {"FC-4 Types", "fcdns.req.fc4type", FT_NONE, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"FC-4 Types", "fcdns.req.fc4type", FT_NONE, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_fc4features,
           {"FC-4 Feature Bits", "fcdns.fc4features", FT_UINT8,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcdns_fc4features_i,
           {"I", "fcdns.fc4features.i", FT_BOOLEAN, 8,
-           TFS(&tfs_fcdns_fc4features_i), 0x02, "", HFILL}},
+           TFS(&tfs_fcdns_fc4features_i), 0x02, NULL, HFILL}},
         { &hf_fcdns_fc4features_t,
           {"T", "fcdns.fc4features.t", FT_BOOLEAN, 8,
-           TFS(&tfs_fcdns_fc4features_t), 0x01, "", HFILL}},
+           TFS(&tfs_fcdns_fc4features_t), 0x01, NULL, HFILL}},
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-fcels.c b/epan/dissectors/packet-fcels.c
index 62a69ae777..1a24dd2270 100644
--- a/epan/dissectors/packet-fcels.c
+++ b/epan/dissectors/packet-fcels.c
@@ -2172,201 +2172,201 @@ proto_register_fcels (void)
     static hf_register_info hf[] = {
         { &hf_fcels_opcode,
           {"Cmd Code", "fcels.opcode", FT_UINT8, BASE_HEX,
-           VALS (fc_els_proto_val), 0x0, "", HFILL}},
+           VALS (fc_els_proto_val), 0x0, NULL, HFILL}},
         { &hf_fcels_rjtcode,
           {"Reason Code", "fcels.rjt.reason", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rjt_val), 0x0, "", HFILL}},
+           VALS (fc_els_rjt_val), 0x0, NULL, HFILL}},
         { &hf_fcels_rjtdetcode,
           {"Reason Explanation", "fcels.rjt.detail", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rjt_det_val), 0x0, "", HFILL}},
+           VALS (fc_els_rjt_det_val), 0x0, NULL, HFILL}},
         { &hf_fcels_vnduniq,
           {"Vendor Unique", "fcels.rjt.vnduniq", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_b2b,
-          {"B2B Credit", "fcels.logi.b2b", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+          {"B2B Credit", "fcels.logi.b2b", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_cmnfeatures,
           {"Common Svc Parameters", "fcels.logi.cmnfeatures", FT_UINT16, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_bbscnum,
-          {"BB_SC Number", "fcels.logi.bbscnum", FT_UINT8, BASE_DEC, NULL, 0xF0, "",
+          {"BB_SC Number", "fcels.logi.bbscnum", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL,
            HFILL}},
         { &hf_fcels_rcvsize,
-          {"Receive Size", "fcels.logi.rcvsize", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "",
+          {"Receive Size", "fcels.logi.rcvsize", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL,
            HFILL}},
         { &hf_fcels_maxconseq,
           {"Max Concurrent Seq", "fcels.logi.maxconseq", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_reloffset,
           {"Relative Offset By Info Cat", "fcels.logi.reloff", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_edtov,
-          {"E_D_TOV", "fcels.edtov", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"E_D_TOV", "fcels.edtov", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_npname,
-          {"N_Port Port_Name", "fcels.npname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"N_Port Port_Name", "fcels.npname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_fnname,
-          {"Fabric/Node Name", "fcels.fnname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Fabric/Node Name", "fcels.fnname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cls1param,
-          {"Class 1 Svc Param", "fcels.logi.cls1param", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Class 1 Svc Param", "fcels.logi.cls1param", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cls2param,
-          {"Class 2 Svc Param", "fcels.logi.cls2param", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Class 2 Svc Param", "fcels.logi.cls2param", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cls3param,
-          {"Class 3 Svc Param", "fcels.logi.cls3param", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Class 3 Svc Param", "fcels.logi.cls3param", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cls4param,
-          {"Class 4 Svc Param", "fcels.logi.cls4param", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Class 4 Svc Param", "fcels.logi.cls4param", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_vendorvers,
-          {"Vendor Version", "fcels.logi.vendvers", FT_BYTES, BASE_HEX, NULL, 0x0, "",
+          {"Vendor Version", "fcels.logi.vendvers", FT_BYTES, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_svcavail,
-          {"Services Availability", "fcels.logi.svcavail", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Services Availability", "fcels.logi.svcavail", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcels_clsflags,
-          {"Service Options", "fcels.logi.clsflags", FT_UINT16, BASE_HEX, NULL, 0x0, "",
+          {"Service Options", "fcels.logi.clsflags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_clsrcvsize,
           {"Class Recv Size", "fcels.logi.clsrcvsize", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_conseq,
           {"Total Concurrent Seq", "fcels.logi.totconseq", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_e2e,
-          {"End2End Credit", "fcels.logi.e2e", FT_UINT16, BASE_DEC, NULL, 0x0, "",
+          {"End2End Credit", "fcels.logi.e2e", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_openseq,
           {"Open Seq Per Exchg", "fcels.logi.openseq", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcels_nportid,
-          {"Originator S_ID", "fcels.portid", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Originator S_ID", "fcels.portid", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_oxid,
-          {"OXID", "fcels.oxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"OXID", "fcels.oxid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rxid,
-          {"RXID", "fcels.rxid", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"RXID", "fcels.rxid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_recovqual,
           {"Recovery Qualifier", "fcels.rcovqual", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_fabricaddr,
-          {"Fabric Address", "fcels.faddr", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Fabric Address", "fcels.faddr", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_fabricpname,
-          {"Fabric Port Name", "fcels.fpname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Fabric Port Name", "fcels.fpname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_failedrcvr,
           {"Failed Receiver AL_PA", "fcels.faildrcvr", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_flacompliance,
           {"FC-FLA Compliance", "fcels.flacompliance", FT_UINT8, BASE_HEX,
-           VALS (fc_els_flacompliance_val), 0x0, "", HFILL}},
+           VALS (fc_els_flacompliance_val), 0x0, NULL, HFILL}},
         { &hf_fcels_loopstate,
           {"Loop State", "fcels.loopstate", FT_UINT8, BASE_HEX,
-           VALS (fc_els_loopstate_val), 0x0, "", HFILL}},
+           VALS (fc_els_loopstate_val), 0x0, NULL, HFILL}},
         { &hf_fcels_publicloop_bmap,
-          {"Public Loop Device Bitmap", "fcels.pubdev_bmap", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Public Loop Device Bitmap", "fcels.pubdev_bmap", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_pvtloop_bmap,
           {"Private Loop Device Bitmap", "fcels.pvtdev_bmap", FT_BYTES,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_alpa_map,
-          {"AL_PA Map", "fcels.alpa", FT_BYTES, BASE_HEX, NULL, 0x0, "",
+          {"AL_PA Map", "fcels.alpa", FT_BYTES, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_scrregn,
           {"Registration Function", "fcels.scr.regn", FT_UINT8, BASE_HEX,
-           VALS (fc_els_scr_reg_val), 0x0, "", HFILL}},
+           VALS (fc_els_scr_reg_val), 0x0, NULL, HFILL}},
         { &hf_fcels_farp_matchcodept,
           {"Match Address Code Points", "fcels.matchcp", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_farp_respaction,
           {"Responder Action", "fcels.respaction", FT_UINT8, BASE_HEX, 
-           VALS (fc_els_farp_respaction_val), 0x0, "", HFILL}},
+           VALS (fc_els_farp_respaction_val), 0x0, NULL, HFILL}},
         { &hf_fcels_resportid,
-          {"Responding Port ID", "fcels.resportid", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Responding Port ID", "fcels.resportid", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_respname,
-          {"Responding Port Name", "fcels.respname", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Responding Port Name", "fcels.respname", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_respnname,
-          {"Responding Node Name", "fcels.respnname", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Responding Node Name", "fcels.respnname", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_reqipaddr,
-          {"Requesting IP Address", "fcels.reqipaddr", FT_IPv6, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+          {"Requesting IP Address", "fcels.reqipaddr", FT_IPv6, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_respipaddr,
-          {"Responding IP Address", "fcels.respipaddr", FT_IPv6, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+          {"Responding IP Address", "fcels.respipaddr", FT_IPv6, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_hardaddr,
-          {"Hard Address of Originator", "fcels.hrdaddr", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Hard Address of Originator", "fcels.hrdaddr", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rps_flag,
-          {"Flag", "fcels.flag", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"Flag", "fcels.flag", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rps_portnum,
           {"Physical Port Number", "fcels.portnum", FT_UINT32, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_rps_portstatus,
           {"Port Status", "fcels.portstatus", FT_UINT16, BASE_HEX,
-           VALS(fc_els_portstatus_val), 0x0, "", HFILL}},
+           VALS(fc_els_portstatus_val), 0x0, NULL, HFILL}},
         { &hf_fcels_rnft_fc4type,
           {"FC-4 Type", "fcels.rnft.fc4type", FT_UINT8, BASE_HEX,
-           VALS (fc_fc4_val), 0x0, "", HFILL}},
+           VALS (fc_fc4_val), 0x0, NULL, HFILL}},
         { &hf_fcels_rscn_evqual,
           {"Event Qualifier", "fcels.rscn.evqual", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rscn_evqual_val), 0x3C, "", HFILL}},
+           VALS (fc_els_rscn_evqual_val), 0x3C, NULL, HFILL}},
         { &hf_fcels_rscn_addrfmt,
           {"Address Format", "fcels.rscn.addrfmt", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rscn_addrfmt_val), 0x03, "", HFILL}},
+           VALS (fc_els_rscn_addrfmt_val), 0x03, NULL, HFILL}},
         { &hf_fcels_rscn_domain,
           {"Affected Domain", "fcels.rscn.domain", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rscn_area,
           {"Affected Area", "fcels.rscn.area", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rscn_port,
           {"Affected Port", "fcels.rscn.port", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_nodeidfmt,
           {"Node Identification Format", "fcels.rnid.nodeidfmt", FT_UINT8,
-           BASE_HEX, VALS (fc_els_nodeid_val), 0x0, "", HFILL}},
+           BASE_HEX, VALS (fc_els_nodeid_val), 0x0, NULL, HFILL}},
         { &hf_fcels_spidlen,
           {"Specific Id Length", "fcels.rnid.spidlen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_vendoruniq,
-          {"Vendor Unique", "fcels.rnid.vendoruniq", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Vendor Unique", "fcels.rnid.vendoruniq", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcels_vendorsp,
           {"Vendor Specific", "fcels.rnid.vendorsp", FT_UINT16, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcels_asstype,
           {"Associated Type", "fcels.rnid.asstype", FT_UINT32, BASE_HEX, 
-           VALS (fc_els_rnid_asstype_val), 0x0, "", HFILL}},
+           VALS (fc_els_rnid_asstype_val), 0x0, NULL, HFILL}},
         { &hf_fcels_physport,
           {"Physical Port Number", "fcels.rnid.physport", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_attnodes,
           {"Number of Attached Nodes", "fcels.rnid.attnodes", FT_UINT32,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_nodemgmt,
           {"Node Management", "fcels.rnid.nodemgmt", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rnid_mgmt_val), 0x0, "", HFILL}},
+           VALS (fc_els_rnid_mgmt_val), 0x0, NULL, HFILL}},
         { &hf_fcels_ipvers,
           {"IP Version", "fcels.rnid.ipvers", FT_UINT8, BASE_HEX,
-           VALS (fc_els_rnid_ipvers_val), 0x0, "", HFILL}},
+           VALS (fc_els_rnid_ipvers_val), 0x0, NULL, HFILL}},
         { &hf_fcels_tcpport,
           {"TCP/UDP Port Number", "fcels.rnid.tcpport", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_ip,
-          {"IP Address", "fcels.rnid.ip", FT_IPv6, BASE_HEX, NULL, 0x0, "",
+          {"IP Address", "fcels.rnid.ip", FT_IPv6, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_cbind_liveness,
           {"Liveness Test Interval", "fcels.cbind.liveness", FT_UINT16, BASE_DEC,
            NULL, 0x0, "Liveness Test Interval in seconds", HFILL}},
         { &hf_fcels_cbind_addr_mode,
           {"Addressing Mode", "fcels.cbind.addr_mode", FT_UINT8, BASE_HEX,
-           VALS(cbind_addr_mode_vals), 0x0, "Addressing Mode", HFILL}},
+           VALS(cbind_addr_mode_vals), 0x0, NULL, HFILL}},
         { &hf_fcels_cbind_ifcp_version,
           {"iFCP version", "fcels.cbind.ifcp_version", FT_UINT8, BASE_DEC,
            NULL, 0x0, "Version of iFCP protocol", HFILL}},
@@ -2374,11 +2374,11 @@ proto_register_fcels (void)
           {"UserInfo", "fcels.cbind.userinfo", FT_UINT32, BASE_HEX,
            NULL, 0x0, "Userinfo token", HFILL}},
         { &hf_fcels_cbind_snpname,
-          {"Source N_Port Port_Name", "fcels.cbind.snpname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Source N_Port Port_Name", "fcels.cbind.snpname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cbind_dnpname,
-          {"Destination N_Port Port_Name", "fcels.cbind.dnpname", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Destination N_Port Port_Name", "fcels.cbind.dnpname", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcels_cbind_status,
           {"Status", "fcels.cbind.status", FT_UINT16, BASE_DEC,
            VALS(cbind_status_vals), 0x0, "Cbind status", HFILL}},
@@ -2390,157 +2390,157 @@ proto_register_fcels (void)
            VALS(unbind_status_vals), 0x0, "Unbind status", HFILL}},
         { &hf_fcels_cmn_cios,
           {"Cont. Incr. Offset Supported", "fcels.cmn.cios", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_cios), 0x8000, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_cios), 0x8000, NULL, HFILL}},
         { &hf_fcels_cmn_rro,
           {"RRO Supported", "fcels.cmn.rro", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_rro), 0x4000, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_rro), 0x4000, NULL, HFILL}},
         { &hf_fcels_cmn_vvv,
           {"Valid Vendor Version", "fcels.cmn.vvv", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_vvv), 0x2000, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_vvv), 0x2000, NULL, HFILL}},
         { &hf_fcels_cmn_b2b,
           {"B2B Credit Mgmt", "fcels.cmn.bbb", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_b2b), 0x0800, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_b2b), 0x0800, NULL, HFILL}},
         { &hf_fcels_cmn_e_d_tov,
           {"E_D_TOV", "fcels.cmn.e_d_tov", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_e_d_tov), 0x0400, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_e_d_tov), 0x0400, NULL, HFILL}},
         { &hf_fcels_cmn_simplex,
           {"Simplex", "fcels.cmn.simplex", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_simplex), 0x0040, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_simplex), 0x0040, NULL, HFILL}},
         { &hf_fcels_cmn_multicast,
           {"Multicast", "fcels.cmn.multicast", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_multicast), 0x0200, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_multicast), 0x0200, NULL, HFILL}},
         { &hf_fcels_cmn_broadcast,
           {"Broadcast", "fcels.cmn.broadcast", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_broadcast), 0x0100, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_broadcast), 0x0100, NULL, HFILL}},
         { &hf_fcels_cmn_security,
           {"Security", "fcels.cmn.security", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_security), 0x0020, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_security), 0x0020, NULL, HFILL}},
         { &hf_fcels_cmn_clk,
           {"Clk Sync", "fcels.cmn.clk", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_clk), 0x0010, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_clk), 0x0010, NULL, HFILL}},
         { &hf_fcels_cmn_dhd,
           {"DHD Capable", "fcels.cmn.dhd", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_dhd), 0x0004, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_dhd), 0x0004, NULL, HFILL}},
         { &hf_fcels_cmn_seqcnt,
           {"SEQCNT", "fcels.cmn.seqcnt", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_seqcnt), 0x0002, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_seqcnt), 0x0002, NULL, HFILL}},
         { &hf_fcels_cmn_payload,
           {"Payload Len", "fcels.cmn.payload", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cmn_payload), 0x0001, "", HFILL}},
+           TFS(&tfs_fc_fcels_cmn_payload), 0x0001, NULL, HFILL}},
         { &hf_fcels_cls_cns,
           {"Class Supported", "fcels.cls.cns", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cls_cns), 0x8000, "", HFILL}},
+           TFS(&tfs_fc_fcels_cls_cns), 0x8000, NULL, HFILL}},
         { &hf_fcels_cls_sdr,
           {"Delivery Mode", "fcels.cls.sdr", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cls_sdr), 0x0800, "", HFILL}},
+           TFS(&tfs_fc_fcels_cls_sdr), 0x0800, NULL, HFILL}},
         { &hf_fcels_cls_prio,
           {"Priority", "fcels.cls.prio", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cls_prio), 0x0080, "", HFILL}},
+           TFS(&tfs_fc_fcels_cls_prio), 0x0080, NULL, HFILL}},
         { &hf_fcels_cls_nzctl,
           {"Non-zero CS_CTL", "fcels.cls.nzctl", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_cls_nzctl), 0x0040, "", HFILL}},
+           TFS(&tfs_fc_fcels_cls_nzctl), 0x0040, NULL, HFILL}},
         { &hf_fcels_initctl,
           {"Initiator Ctl", "fcels.logi.initctl", FT_UINT16, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_initctl_initial_pa,
           {"Initial P_A", "fcels.logi.initctl.initial_pa", FT_UINT16, BASE_HEX,
-           VALS(initial_pa_vals), 0x3000, "", HFILL}},
+           VALS(initial_pa_vals), 0x3000, NULL, HFILL}},
         { &hf_fcels_initctl_ack0,
           {"ACK0 Capable", "fcels.logi.initctl.ack0", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_initctl_ack0), 0x0800, "", HFILL}},
+           TFS(&tfs_fc_fcels_initctl_ack0), 0x0800, NULL, HFILL}},
         { &hf_fcels_initctl_ackgaa,
           {"ACK GAA", "fcels.logi.initctl.ackgaa", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_initctl_ackgaa), 0x0200, "", HFILL}},
+           TFS(&tfs_fc_fcels_initctl_ackgaa), 0x0200, NULL, HFILL}},
         { &hf_fcels_initctl_sync,
           {"Clock Sync", "fcels.logi.initctl.sync", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_initctl_sync), 0x0010, "", HFILL}},
+           TFS(&tfs_fc_fcels_initctl_sync), 0x0010, NULL, HFILL}},
         { &hf_fcels_rcptctl,
           {"Recipient Ctl", "fcels.logi.rcptctl", FT_UINT16, BASE_HEX, 
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcels_rcptctl_ack0,
           {"ACK0", "fcels.logi.rcptctl.ack", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_rcptctl_ack0), 0x8000, "", HFILL}},
+           TFS(&tfs_fc_fcels_rcptctl_ack0), 0x8000, NULL, HFILL}},
         { &hf_fcels_rcptctl_interlock,
           {"X_ID Interlock", "fcels.logi.rcptctl.interlock", FT_BOOLEAN, 16, 
-           TFS(&tfs_fc_fcels_rcptctl_interlock), 0x2000, "", HFILL}},
+           TFS(&tfs_fc_fcels_rcptctl_interlock), 0x2000, NULL, HFILL}},
         { &hf_fcels_rcptctl_policy,
           {"Policy", "fcels.logi.rcptctl.policy", FT_UINT16, BASE_HEX,
-           VALS(rcptctl_policy_vals), 0x1800, "", HFILL}},
+           VALS(rcptctl_policy_vals), 0x1800, NULL, HFILL}},
         { &hf_fcels_rcptctl_category,
           {"Category", "fcels.logi.rcptctl.category", FT_UINT16, BASE_HEX,
-           VALS(rcptctl_category_vals), 0x0030, "", HFILL}},
+           VALS(rcptctl_category_vals), 0x0030, NULL, HFILL}},
         { &hf_fcels_rcptctl_sync,
           {"Clock Sync", "fcels.logi.rcptctl.sync", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_rcptctl_sync), 0x0008, "", HFILL}},
+           TFS(&tfs_fc_fcels_rcptctl_sync), 0x0008, NULL, HFILL}},
         { &hf_fcels_fcpflags,
-          {"FCP Flags", "fcels.fcpflags", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+          {"FCP Flags", "fcels.fcpflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_fcpflags_trireq,
           {"Task Retry Ident", "fcels.fcpflags.trireq", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_trireq), 1 << 9, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_trireq), 1 << 9, NULL, HFILL}},
         { &hf_fcels_fcpflags_trirep,
           {"Task Retry Ident", "fcels.fcpflags.trirep", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_trirep), 1 << 9, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_trirep), 1 << 9, NULL, HFILL}},
         { &hf_fcels_fcpflags_retry,
           {"Retry", "fcels.fcpflags.retry", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_retry), 1 << 8, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_retry), 1 << 8, NULL, HFILL}},
         { &hf_fcels_fcpflags_ccomp,
           {"Comp", "fcels.fcpflags.ccomp", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_ccomp), 0x0080, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_ccomp), 0x0080, NULL, HFILL}},
         { &hf_fcels_fcpflags_datao,
           {"Data Overlay", "fcels.fcpflags.datao", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_datao), 0x0040, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_datao), 0x0040, NULL, HFILL}},
         { &hf_fcels_fcpflags_initiator,
           {"Initiator", "fcels.fcpflags.initiator", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_initiator), 0x0020, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_initiator), 0x0020, NULL, HFILL}},
         { &hf_fcels_fcpflags_target,
           {"Target", "fcels.fcpflags.target", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_target), 0x0010, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_target), 0x0010, NULL, HFILL}},
         { &hf_fcels_fcpflags_rdxr,
           {"Rd Xfer_Rdy Dis", "fcels.fcpflags.rdxr", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_rdxr), 0x0002, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_rdxr), 0x0002, NULL, HFILL}},
         { &hf_fcels_fcpflags_wrxr,
           {"Wr Xfer_Rdy Dis", "fcels.fcpflags.wrxr", FT_BOOLEAN, 32,
-           TFS(&tfs_fc_fcels_fcpflags_wrxr), 0x0001, "", HFILL}},
+           TFS(&tfs_fc_fcels_fcpflags_wrxr), 0x0001, NULL, HFILL}},
         { &hf_fcels_prliloflags,
-          {"PRLILO Flags", "fcels.prliloflags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"PRLILO Flags", "fcels.prliloflags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_tprloflags_opav,
           {"3rd Party Orig PA Valid", "fcels.tprloflags.opav", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_tprloflags_opav), 0x80, "", HFILL}},
+           TFS(&tfs_fc_fcels_tprloflags_opav), 0x80, NULL, HFILL}},
         { &hf_fcels_tprloflags_rpav,
           {"Resp PA Valid", "fcels.tprloflags.rpav", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_tprloflags_rpav), 0x40, "", HFILL}},
+           TFS(&tfs_fc_fcels_tprloflags_rpav), 0x40, NULL, HFILL}},
         { &hf_fcels_tprloflags_npv,
           {"3rd Party N_Port Valid", "fcels.tprloflags.npv", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_tprloflags_npv), 0x20, "", HFILL}},
+           TFS(&tfs_fc_fcels_tprloflags_npv), 0x20, NULL, HFILL}},
         { &hf_fcels_tprloflags_gprlo,
           {"Global PRLO", "fcels.tprloflags.gprlo", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_tprloflags_gprlo), 0x10, "", HFILL}},
+           TFS(&tfs_fc_fcels_tprloflags_gprlo), 0x10, NULL, HFILL}},
         { &hf_fcels_speedflags,
-          {"Port Speed Capabilities", "fcels.speedflags", FT_UINT16, BASE_HEX, NULL, 0x0, "",
+          {"Port Speed Capabilities", "fcels.speedflags", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcels_speedflags_1gb,
           {"1Gb Support", "fcels.speedflags.1gb", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_speedflags_1gb), 0x8000, "", HFILL}},
+           TFS(&tfs_fc_fcels_speedflags_1gb), 0x8000, NULL, HFILL}},
         { &hf_fcels_speedflags_2gb,
           {"2Gb Support", "fcels.speedflags.2gb", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_speedflags_2gb), 0x4000, "", HFILL}},
+           TFS(&tfs_fc_fcels_speedflags_2gb), 0x4000, NULL, HFILL}},
         { &hf_fcels_speedflags_4gb,
           {"4Gb Support", "fcels.speedflags.4gb", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_speedflags_4gb), 0x2000, "", HFILL}},
+           TFS(&tfs_fc_fcels_speedflags_4gb), 0x2000, NULL, HFILL}},
         { &hf_fcels_speedflags_10gb,
           {"10Gb Support", "fcels.speedflags.10gb", FT_BOOLEAN, 16,
-           TFS(&tfs_fc_fcels_speedflags_10gb), 0x1000, "", HFILL}},
+           TFS(&tfs_fc_fcels_speedflags_10gb), 0x1000, NULL, HFILL}},
         { &hf_fcels_prliloflags_opav,
           {"Orig PA Valid", "fcels.prliloflags.opav", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_prliloflags_opav), 0x80, "", HFILL}},
+           TFS(&tfs_fc_fcels_prliloflags_opav), 0x80, NULL, HFILL}},
         { &hf_fcels_prliloflags_ipe,
           {"Image Pair Estd", "fcels.prliloflags.ipe", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_prliloflags_ipe), 0x20, "", HFILL}},
+           TFS(&tfs_fc_fcels_prliloflags_ipe), 0x20, NULL, HFILL}},
         { &hf_fcels_prliloflags_eip,
           {"Est Image Pair", "fcels.prliloflags.eip", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcels_prliloflags_eip), 0x20, "", HFILL}},
+           TFS(&tfs_fc_fcels_prliloflags_eip), 0x20, NULL, HFILL}},
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 5810a3aa34..52a7bff750 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -1022,97 +1022,97 @@ proto_register_fcfcs (void)
     static hf_register_info hf[] = {
         { &hf_fcs_opcode,
           {"Opcode", "fcs.opcode", FT_UINT16, BASE_HEX,
-           VALS (fc_fcs_opcode_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_opcode_val), 0x0, NULL, HFILL}},
         { &hf_fcs_iename,
-          {"Interconnect Element Name", "fcs.ie.name", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Interconnect Element Name", "fcs.ie.name", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_ietype,
           {"Interconnect Element Type", "fcs.ie.type", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_ietype_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_ietype_val), 0x0, NULL, HFILL}},
         { &hf_fcs_iedomainid,
           {"Interconnect Element Domain ID", "fcs.ie.domainid", FT_UINT8,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_mgmtid,
           {"Interconnect Element Mgmt. ID", "fcs.ie.mgmtid", FT_STRING,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_fabricname,
           {"Interconnect Element Fabric Name", "fcs.ie.fname", FT_STRING,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_mgmtaddr,
           {"Interconnect Element Mgmt. Address", "fcs.ie.mgmtaddr", FT_STRING,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_lname,
           {"Interconnect Element Logical Name", "fcs.ie.logname", FT_STRING,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_vendorname,
-          {"Vendor Name", "fcs.vendorname", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Vendor Name", "fcs.vendorname", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcs_modelname,
-          {"Model Name/Number", "fcs.modelname", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Model Name/Number", "fcs.modelname", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcs_portname,
-          {"Port Name", "fcs.port.name", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Port Name", "fcs.port.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcs_portmodtype,
           {"Port Module Type", "fcs.port.moduletype", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_port_modtype_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_port_modtype_val), 0x0, NULL, HFILL}},
         { &hf_fcs_porttxtype,
           {"Port TX Type", "fcs.port.txtype", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_port_txtype_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_port_txtype_val), 0x0, NULL, HFILL}},
         { &hf_fcs_porttype,
           {"Port Type", "fcs.port.type", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_port_type_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_port_type_val), 0x0, NULL, HFILL}},
         { &hf_fcs_physportnum,
-          {"Physical Port Number", "fcs.port.physportnum", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Physical Port Number", "fcs.port.physportnum", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_portflags,
           {"Port Flags", "fcs.port.flags", FT_BOOLEAN, BASE_NONE,
-           TFS (&fc_fcs_portflags_tfs), 0x0, "", HFILL}},
+           TFS (&fc_fcs_portflags_tfs), 0x0, NULL, HFILL}},
         { &hf_fcs_portstate,
           {"Port State", "fcs.port.state", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_port_state_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_port_state_val), 0x0, NULL, HFILL}},
         { &hf_fcs_platformname,
-          {"Platform Name", "fcs.platform.name", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Platform Name", "fcs.platform.name", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_fcs_platformnname,
-          {"Platform Node Name", "fcs.platform.nodename", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Platform Node Name", "fcs.platform.nodename", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_platformtype,
           {"Platform Type", "fcs.platform.type", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_plat_type_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_plat_type_val), 0x0, NULL, HFILL}},
         { &hf_fcs_platformaddr,
-          {"Management Address", "fcs.platform.mgmtaddr", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Management Address", "fcs.platform.mgmtaddr", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_reason,
           {"Reason Code", "fcs.reason", FT_UINT8, BASE_HEX,
-           VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}},
+           VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL}},
         { &hf_fcs_rjtdetail,
           {"Reason Code Explanantion", "fcs.reasondet", FT_UINT8, BASE_HEX,
-           VALS (fc_fcs_rjt_code_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_rjt_code_val), 0x0, NULL, HFILL}},
         { &hf_fcs_vendor,
           {"Vendor Unique Reject Code", "fcs.err.vendor", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_numcap,
           {"Number of Capabilities", "fcs.numcap", FT_UINT32, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcs_mgmt_subtype,
           {"Management GS Subtype", "fcs.gssubtype", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcs_vnd_capmask,
           {"Vendor Unique Capability Bitmask", "fcs.vbitmask", FT_UINT24,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_fcsmask,
           {"Subtype Capability Bitmask", "fcs.fcsmask", FT_UINT32, BASE_HEX,
-           VALS (fc_fcs_fcsmask_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_fcsmask_val), 0x0, NULL, HFILL}},
         { &hf_fcs_unsmask,
           {"Subtype Capability Bitmask", "fcs.unsmask", FT_UINT32, BASE_HEX,
-           VALS (fc_fcs_unsmask_val), 0x0, "", HFILL}},
+           VALS (fc_fcs_unsmask_val), 0x0, NULL, HFILL}},
         { &hf_fcs_maxres_size,
           {"Maximum/Residual Size", "fcs.maxres_size", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcs_releasecode,
-          {"Release Code", "fcs.releasecode", FT_STRING, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"Release Code", "fcs.releasecode", FT_STRING, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 1a954dc5c9..bbf05b88a6 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -834,85 +834,85 @@ proto_register_fcfzs(void)
     static hf_register_info hf[] = {
         { &hf_fcfzs_opcode,
           {"Opcode", "fcfzs.opcode", FT_UINT16, BASE_HEX,
-           VALS (fc_fzs_opcode_val), 0x0, "", HFILL}},
+           VALS (fc_fzs_opcode_val), 0x0, NULL, HFILL}},
         { &hf_fcfzs_gzc_vendor,
           {"Vendor Specific Flags", "fcfzs.gzc.vendor", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_gest_vendor,
           {"Vendor Specific State", "fcfzs.gest.vendor", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_numzoneattrs,
           {"Number of Zone Attribute Entries", "fcfzs.zone.numattrs",
-           FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+           FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_zonesetnmlen,
           {"Zone Set Name Length", "fcfzs.zoneset.namelen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_zonesetname,
-          {"Zone Set Name", "fcfzs.zoneset.name", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Zone Set Name", "fcfzs.zoneset.name", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_fcfzs_numzones,
           {"Number of Zones", "fcfzs.zoneset.numzones", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_numzonesetattrs,
           {"Number of Zone Set Attribute Entries", "fcfzs.zoneset.numattrs",
-           FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+           FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_zonenmlen,
           {"Zone Name Length", "fcfzs.zone.namelen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcfzs_zonename,
-          {"Zone Name", "fcfzs.zone.name", FT_STRING, BASE_HEX, NULL, 0x0, "",
+          {"Zone Name", "fcfzs.zone.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcfzs_nummbrs,
           {"Number of Zone Members", "fcfzs.zone.nummbrs", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_nummbrentries,
           {"Number of Zone Member Attribute Entries", "fcfzs.zonembr.numattrs",
-           FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+           FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_mbrtype,
           {"Zone Member Identifier Type", "fcfzs.zonembr.idtype", FT_UINT8,
-           BASE_HEX, VALS (fc_fzs_zonembr_type_val), 0x0, "", HFILL}},
+           BASE_HEX, VALS (fc_fzs_zonembr_type_val), 0x0, NULL, HFILL}},
         { &hf_fcfzs_mbridlen,
           {"Zone Member Identifier Length", "fcfzs.zonembr.idlen", FT_UINT8,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_mbrid,
-          {"Zone Member Identifier", "fcfzs.zone.mbrid", FT_STRING, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Zone Member Identifier", "fcfzs.zone.mbrid", FT_STRING, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_reason,
           {"Reason Code", "fcfzs.reason", FT_UINT8, BASE_HEX,
-           VALS (fc_ct_rjt_code_vals), 0x0, "", HFILL}},
+           VALS (fc_ct_rjt_code_vals), 0x0, NULL, HFILL}},
         { &hf_fcfzs_rjtdetail,
           {"Reason Code Explanation", "fcfzs.rjtdetail", FT_UINT8, BASE_HEX,
-           VALS (fc_fzs_rjt_code_val), 0x0, "", HFILL}},
+           VALS (fc_fzs_rjt_code_val), 0x0, NULL, HFILL}},
         { &hf_fcfzs_rjtvendor,
           {"Vendor Specific Reason", "fcfzs.rjtvendor", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_maxres_size,
           {"Maximum/Residual Size", "fcfzs.maxres_size", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_fcfzs_mbrid_lun,
-          {"LUN", "fcfzs.zone.lun", FT_BYTES, BASE_HEX, NULL, 0x0, "",
+          {"LUN", "fcfzs.zone.lun", FT_BYTES, BASE_NONE, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcfzs_gzc_flags,
           {"Capabilities", "fcfzs.gzc.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcfzs_gzc_flags_hard_zones,
           {"Hard Zones", "fcfzs.gzc.flags.hard_zones", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcfzs_gzc_flags_hard_zones), 0x80, "", HFILL}},
+           TFS(&tfs_fc_fcfzs_gzc_flags_hard_zones), 0x80, NULL, HFILL}},
         { &hf_fcfzs_gzc_flags_soft_zones,
           {"Soft Zones", "fcfzs.gzc.flags.soft_zones", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcfzs_gzc_flags_soft_zones), 0x40, "", HFILL}},
+           TFS(&tfs_fc_fcfzs_gzc_flags_soft_zones), 0x40, NULL, HFILL}},
         { &hf_fcfzs_gzc_flags_zoneset_db,
           {"ZoneSet Database", "fcfzs.gzc.flags.zoneset_db", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcfzs_gzc_flags_zoneset_db), 0x01, "", HFILL}},
+           TFS(&tfs_fc_fcfzs_gzc_flags_zoneset_db), 0x01, NULL, HFILL}},
         { &hf_fcfzs_zone_state,
           {"Zone State", "fcfzs.zone.state", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcfzs_soft_zone_set_enforced,
           {"Soft Zone Set", "fcfzs.soft_zone_set.enforced", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcfzs_soft_zone_set_enforced), 0x80, "", HFILL}},
+           TFS(&tfs_fc_fcfzs_soft_zone_set_enforced), 0x80, NULL, HFILL}},
         { &hf_fcfzs_hard_zone_set_enforced,
           {"Hard Zone Set", "fcfzs.hard_zone_set.enforced", FT_BOOLEAN, 8,
-           TFS(&tfs_fc_fcfzs_hard_zone_set_enforced), 0x40, "", HFILL}},
+           TFS(&tfs_fc_fcfzs_hard_zone_set_enforced), 0x40, NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-fcip.c b/epan/dissectors/packet-fcip.c
index dae789c4bd..71279e5690 100644
--- a/epan/dissectors/packet-fcip.c
+++ b/epan/dissectors/packet-fcip.c
@@ -599,13 +599,13 @@ proto_register_fcip (void)
           {"Pflags (1's Complement)", "fcip.pflagsc", FT_UINT8, BASE_HEX,
            NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_src_wwn,
-          {"Source Fabric WWN", "fcip.srcwwn", FT_STRING, BASE_HEX,
+          {"Source Fabric WWN", "fcip.srcwwn", FT_STRING, BASE_NONE,
            NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_dst_wwn,
-          {"Destination Fabric WWN", "fcip.dstwwn", FT_STRING, BASE_HEX,
+          {"Destination Fabric WWN", "fcip.dstwwn", FT_STRING, BASE_NONE,
            NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_src_entity_id,
-          {"FC/FCIP Entity Id", "fcip.srcid", FT_BYTES, BASE_HEX,
+          {"FC/FCIP Entity Id", "fcip.srcid", FT_BYTES, BASE_NONE,
            NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_conn_flags,
           {"Connection Usage Flags", "fcip.connflags", FT_UINT8, BASE_HEX,
@@ -617,7 +617,7 @@ proto_register_fcip (void)
           {"K_A_TOV", "fcip.katov", FT_UINT32, BASE_DEC,
            NULL, 0x0, NULL, HFILL}},
         { &hf_fcip_conn_nonce,
-          {"Connection Nonce", "fcip.nonce", FT_BYTES, BASE_HEX,
+          {"Connection Nonce", "fcip.nonce", FT_BYTES, BASE_NONE,
            NULL, 0x0, NULL, HFILL}},
     };
 
diff --git a/epan/dissectors/packet-fcoe.c b/epan/dissectors/packet-fcoe.c
index d5dc0fc9d4..9cd29748e6 100644
--- a/epan/dissectors/packet-fcoe.c
+++ b/epan/dissectors/packet-fcoe.c
@@ -290,25 +290,23 @@ proto_register_fcoe(void)
     static hf_register_info hf[] = {
         { &hf_fcoe_sof,
           {"SOF", "fcoe.sof", FT_UINT8, BASE_HEX, VALS(&fcoe_sof_vals), 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcoe_eof,
           {"EOF", "fcoe.eof", FT_UINT8, BASE_HEX, VALS(&fcoe_eof_vals), 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_fcoe_ver,
-          {"Version", "fcoe.ver", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL}},
+          {"Version", "fcoe.ver", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fcoe_len,
           {"Frame length", "fcoe.len", FT_UINT32,
-            BASE_DEC, NULL, 0, "", HFILL}},
+            BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fcoe_crc,
-          {"CRC", "fcoe.crc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL}},
+          {"CRC", "fcoe.crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
         { &hf_fcoe_crc_good,
-          {"CRC good", "fcoe.crc_good", FT_BOOLEAN, BASE_NONE, NULL, 0,
-            "True: CRC matches packet content; "
-            "False: doesn't match or not checked.", HFILL }},
+          {"CRC good", "fcoe.crc_good", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            "True: CRC matches packet content; False: doesn't match or not checked.", HFILL }},
         { &hf_fcoe_crc_bad,
-          {"CRC bad", "fcoe.crc_bad", FT_BOOLEAN, BASE_NONE, NULL, 0,
-            "True: CRC doesn't match packet content; "
-            "False: matches or not checked.", HFILL }}
+          {"CRC bad", "fcoe.crc_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            "True: CRC doesn't match packet content; False: matches or not checked.", HFILL }}
     };
     static gint *ett[] = {
         &ett_fcoe,
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index 550ae2fcff..69aebf0da4 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -719,92 +719,92 @@ proto_register_fcp (void)
     static hf_register_info hf[] = {
         { &hf_fcp_type,
           {"Field to branch off to SCSI", "fcp.type", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         {&hf_fcp_multilun,
-         {"Multi-Level LUN", "fcp.multilun", FT_BYTES, BASE_HEX, NULL, 0x0,
-          "", HFILL}},
+         {"Multi-Level LUN", "fcp.multilun", FT_BYTES, BASE_NONE, NULL, 0x0,
+          NULL, HFILL}},
         { &hf_fcp_singlelun,
-          {"LUN", "fcp.lun", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"LUN", "fcp.lun", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_fcp_crn,
-          {"Command Ref Num", "fcp.crn", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+          {"Command Ref Num", "fcp.crn", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_taskattr,
           {"Task Attribute", "fcp.taskattr", FT_UINT8, BASE_HEX,
-           VALS (fcp_task_attr_val), 0x7, "", HFILL}},
+           VALS (fcp_task_attr_val), 0x7, NULL, HFILL}},
         { &hf_fcp_taskmgmt,
           {"Task Management Flags", "fcp.taskmgmt", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_fcp_addlcdblen,
           {"Additional CDB Length", "fcp.addlcdblen", FT_UINT8, BASE_DEC, NULL,
-           0xFC, "", HFILL}},
+           0xFC, NULL, HFILL}},
         { &hf_fcp_rddata,
-          {"RDDATA", "fcp.rddata", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL}},
+          {"RDDATA", "fcp.rddata", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL}},
         { &hf_fcp_wrdata,
-          {"WRDATA", "fcp.wrdata", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL}},
+          {"WRDATA", "fcp.wrdata", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL}},
         { &hf_fcp_dl,
-          {"FCP_DL", "fcp.dl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"FCP_DL", "fcp.dl", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcp_bidir_dl,
-          {"FCP_BIDIRECTIONAL_READ_DL", "fcp.bidir_dl", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+          {"FCP_BIDIRECTIONAL_READ_DL", "fcp.bidir_dl", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_fcp_data_ro,
-          {"FCP_DATA_RO", "fcp.data_ro", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"FCP_DATA_RO", "fcp.data_ro", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_burstlen,
-          {"Burst Length", "fcp.burstlen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"Burst Length", "fcp.burstlen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_retry_delay_timer,
-          {"Retry Delay Timer", "fcp.rsp.retry_delay_timer", FT_UINT16, BASE_DEC, NULL, 0x0, "",
+          {"Retry Delay Timer", "fcp.rsp.retry_delay_timer", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_rspflags,
-          {"FCP_RSP Flags", "fcp.rspflags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"FCP_RSP Flags", "fcp.rspflags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_resid,
-          {"FCP_RESID", "fcp.resid", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"FCP_RESID", "fcp.resid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_bidir_resid,
-          {"Bidirectional Read Resid", "fcp.bidir_resid", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"Bidirectional Read Resid", "fcp.bidir_resid", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_snslen,
-          {"FCP_SNS_LEN", "fcp.snslen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"FCP_SNS_LEN", "fcp.snslen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_rsplen,
-          {"FCP_RSP_LEN", "fcp.rsplen", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"FCP_RSP_LEN", "fcp.rsplen", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_fcp_rspcode,
           {"RSP_CODE", "fcp.rspcode", FT_UINT8, BASE_HEX,
-           VALS (fcp_rsp_code_val), 0x0, "", HFILL}},
+           VALS (fcp_rsp_code_val), 0x0, NULL, HFILL}},
         { &hf_fcp_scsistatus,
           {"SCSI Status", "fcp.status", FT_UINT8, BASE_HEX,
-           VALS (scsi_status_val), 0x0, "", HFILL}},
+           VALS (scsi_status_val), 0x0, NULL, HFILL}},
 	{ &hf_fcp_mgmt_flags_obsolete,
-	  { "Obsolete", "fcp.mgmt.flags.obsolete", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_obsolete_tfs), 0x80, "", HFILL }},
+	  { "Obsolete", "fcp.mgmt.flags.obsolete", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_obsolete_tfs), 0x80, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_clear_aca,
-	  { "Clear ACA", "fcp.mgmt.flags.clear_aca", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_aca_tfs), 0x40, "", HFILL }},
+	  { "Clear ACA", "fcp.mgmt.flags.clear_aca", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_aca_tfs), 0x40, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_target_reset,
-	  { "Target Reset", "fcp.mgmt.flags.target_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_target_reset_tfs), 0x20, "", HFILL }},
+	  { "Target Reset", "fcp.mgmt.flags.target_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_target_reset_tfs), 0x20, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_lu_reset,
-	  { "LU Reset", "fcp.mgmt.flags.lu_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_lu_reset_tfs), 0x10, "", HFILL }},
+	  { "LU Reset", "fcp.mgmt.flags.lu_reset", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_lu_reset_tfs), 0x10, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_rsvd,
-	  { "Rsvd", "fcp.mgmt.flags.rsvd", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_rsvd_tfs), 0x08, "", HFILL }},
+	  { "Rsvd", "fcp.mgmt.flags.rsvd", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_rsvd_tfs), 0x08, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_clear_task_set,
-	  { "Clear Task Set", "fcp.mgmt.flags.clear_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_task_set_tfs), 0x04, "", HFILL }},
+	  { "Clear Task Set", "fcp.mgmt.flags.clear_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_clear_task_set_tfs), 0x04, NULL, HFILL }},
 	{ &hf_fcp_mgmt_flags_abort_task_set,
-	  { "Abort Task Set", "fcp.mgmt.flags.abort_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_abort_task_set_tfs), 0x02, "", HFILL }},
+	  { "Abort Task Set", "fcp.mgmt.flags.abort_task_set", FT_BOOLEAN, 8, TFS(&fcp_mgmt_flags_abort_task_set_tfs), 0x02, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_bidi,
-	  { "Bidi Rsp", "fcp.rsp.flags.bidi", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_tfs), 0x80, "", HFILL }},
+	  { "Bidi Rsp", "fcp.rsp.flags.bidi", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_tfs), 0x80, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_bidi_rru,
-	  { "Bidi Read Resid Under", "fcp.rsp.flags.bidi_rru", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rru_tfs), 0x40, "", HFILL }},
+	  { "Bidi Read Resid Under", "fcp.rsp.flags.bidi_rru", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rru_tfs), 0x40, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_bidi_rro,
-	  { "Bidi Read Resid Over", "fcp.rsp.flags.bidi_rro", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rro_tfs), 0x20, "", HFILL }},
+	  { "Bidi Read Resid Over", "fcp.rsp.flags.bidi_rro", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_bidi_rro_tfs), 0x20, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_conf_req,
-	  { "Conf Req", "fcp.rsp.flags.conf_req", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_conf_req_tfs), 0x10, "", HFILL }},
+	  { "Conf Req", "fcp.rsp.flags.conf_req", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_conf_req_tfs), 0x10, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_resid_under,
-	  { "Resid Under", "fcp.rsp.flags.resid_under", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_under_tfs), 0x08, "", HFILL }},
+	  { "Resid Under", "fcp.rsp.flags.resid_under", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_under_tfs), 0x08, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_resid_over,
-	  { "Resid Over", "fcp.rsp.flags.resid_over", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_over_tfs), 0x04, "", HFILL }},
+	  { "Resid Over", "fcp.rsp.flags.resid_over", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_resid_over_tfs), 0x04, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_sns_vld,
-	  { "SNS Vld", "fcp.rsp.flags.sns_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_sns_vld_tfs), 0x02, "", HFILL }},
+	  { "SNS Vld", "fcp.rsp.flags.sns_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_sns_vld_tfs), 0x02, NULL, HFILL }},
 	{ &hf_fcp_rsp_flags_res_vld,
-	  { "RES Vld", "fcp.rsp.flags.res_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_res_vld_tfs), 0x01, "", HFILL }},
+	  { "RES Vld", "fcp.rsp.flags.res_vld", FT_BOOLEAN, 8, TFS(&fcp_rsp_flags_res_vld_tfs), 0x01, NULL, HFILL }},
         { &hf_fcp_request_in,
           { "Request In", "fcp.request_in", FT_FRAMENUM, BASE_NONE, NULL,
            0, "The frame number for the request", HFILL }},
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index d26cbf7d59..eec416f99f 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -1115,208 +1115,208 @@ proto_register_fcsbccs (void)
     static hf_register_info hf[] = {
         { &hf_sbccs_chid,
           {"Channel Image ID", "sbccs.chid", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_cuid,
           {"Control Unit Image ID", "sbccs.cuid", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_sbccs_devaddr,
           {"Device Address", "sbccs.devaddr", FT_UINT16, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_iui,
           {"Information Unit Identifier", "sbccs.iui", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dhflags,
-          {"DH Flags", "sbccs.dhflags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"DH Flags", "sbccs.dhflags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_sbccs_ccw,
-          {"CCW Number", "sbccs.ccw", FT_UINT16, BASE_HEX, NULL, 0x0, "",
+          {"CCW Number", "sbccs.ccw", FT_UINT16, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_sbccs_token,
-          {"Token", "sbccs.token", FT_UINT24, BASE_DEC, NULL, 0x0, "",
+          {"Token", "sbccs.token", FT_UINT24, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_sbccs_dib_iucnt,
           {"DIB IU Count", "sbccs.iucnt", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_datacnt,
           {"DIB Data Byte Count", "sbccs.databytecnt", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_cmd,
           {"CCW Command", "sbccs.ccwcmd", FT_UINT8, BASE_HEX,
-           VALS (fc_sbccs_dib_cmd_val), 0x0, "", HFILL}},
+           VALS (fc_sbccs_dib_cmd_val), 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_cnt,
-          {"CCW Count", "sbccs.ccwcnt", FT_UINT16, BASE_DEC, NULL, 0x0, "",
+          {"CCW Count", "sbccs.ccwcnt", FT_UINT16, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_sbccs_dib_ioprio,
           {"I/O Priority", "sbccs.ioprio", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_status,
-          {"Status", "sbccs.status", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Status", "sbccs.status", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_sbccs_dib_residualcnt,
           {"Residual Count", "sbccs.residualcnt", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_iupacing,
           {"IU Pacing", "sbccs.iupacing", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_qtuf,
           {"Queue-Time Unit Factor", "sbccs.qtuf", FT_UINT8, BASE_DEC,
-           NULL, 0xF0, "", HFILL}},
+           NULL, 0xF0, NULL, HFILL}},
         { &hf_sbccs_dib_qtu,
           {"Queue-Time Unit", "sbccs.qtu", FT_UINT16, BASE_DEC, NULL, 0xFFF,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_dtuf,
           {"Defer-Time Unit Function", "sbccs.dtuf", FT_UINT8, BASE_DEC,
-           NULL, 0xF0, "", HFILL}},
+           NULL, 0xF0, NULL, HFILL}},
         { &hf_sbccs_dib_dtu,
           {"Defer-Time Unit", "sbccs.dtu", FT_UINT16, BASE_DEC, NULL, 0xFFF,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_ctlfn,
           {"Control Function", "sbccs.ctlfn", FT_UINT8, BASE_HEX,
-           VALS (fc_sbccs_dib_ctl_fn_val), 0x0, "", HFILL}},
+           VALS (fc_sbccs_dib_ctl_fn_val), 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_linkctlfn,
           {"Link Control Function", "sbccs.linkctlfn", FT_UINT8, BASE_HEX,
-           VALS (fc_sbccs_dib_link_ctl_fn_val), 0x0, "", HFILL}},
+           VALS (fc_sbccs_dib_link_ctl_fn_val), 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_ctccntr,
           {"CTC Counter", "sbccs.ctccntr", FT_UINT16, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_lrc,
-          {"LRC", "sbccs.lrc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"LRC", "sbccs.lrc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dev_xcp_code,
           {"Device Level Exception Code", "sbccs.dip.xcpcode", FT_UINT8,
-           BASE_DEC, VALS (fc_sbccs_dib_dev_xcpcode_val), 0x0, "", HFILL}},
+           BASE_DEC, VALS (fc_sbccs_dib_dev_xcpcode_val), 0x0, NULL, HFILL}},
         { &hf_sbccs_prg_pth_errcode,
           {"Purge Path Error Code", "sbccs.purgepathcode", FT_UINT8,
-           BASE_DEC, VALS (fc_sbccs_dib_purge_path_err_val), 0x0, "", HFILL}},
+           BASE_DEC, VALS (fc_sbccs_dib_purge_path_err_val), 0x0, NULL, HFILL}},
         { &hf_sbccs_prg_rsp_errcode,
           {"Purge Path Response Error Code", "sbccs.purgepathrspcode",
            FT_UINT8, BASE_DEC, VALS (fc_sbccs_dib_purge_path_rsp_err_val),
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_sbccs_dib_lprcode,
           {"LPR Reason Code", "sbccs.lprcode", FT_UINT8, BASE_DEC,
-           VALS (fc_sbccs_dib_lpr_errcode_val), 0xF, "", HFILL}},
+           VALS (fc_sbccs_dib_lpr_errcode_val), 0xF, NULL, HFILL}},
         { &hf_sbccs_dib_tin_imgid_cnt,
           {"TIN Image ID", "sbccs.tinimageidcnt", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_sbccs_dib_lrjcode,
           {"LRJ Reaspn Code", "sbccs.lrjcode", FT_UINT8, BASE_HEX,
-           VALS (fc_sbccs_dib_lrj_errcode_val), 0x7F, "", HFILL}},
+           VALS (fc_sbccs_dib_lrj_errcode_val), 0x7F, NULL, HFILL}},
         { &hf_sbccs_iui_as,
           {"AS", "sbccs.iui.as", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_iui_as), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_iui_as), 0x10, NULL, HFILL}},
         { &hf_sbccs_iui_es,
           {"ES", "sbccs.iui.es", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_iui_es), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_iui_es), 0x08, NULL, HFILL}},
         { &hf_sbccs_iui_val,
           {"Val", "sbccs.iui.val", FT_UINT8, BASE_HEX,
-           VALS(fc_sbccs_iu_val), 0x07, "", HFILL}},
+           VALS(fc_sbccs_iu_val), 0x07, NULL, HFILL}},
         { &hf_sbccs_dhflags_end,
           {"End", "sbccs.dhflags.end", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_dhflags_end), 0x80, "", HFILL}},
+           TFS(&tfs_sbccs_dhflags_end), 0x80, NULL, HFILL}},
         { &hf_sbccs_dhflags_chaining,
           {"Chaining", "sbccs.dhflags.chaining", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_dhflags_chaining), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_dhflags_chaining), 0x10, NULL, HFILL}},
         { &hf_sbccs_dhflags_earlyend,
           {"Early End", "sbccs.dhflags.earlyend", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_dhflags_earlyend), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_dhflags_earlyend), 0x08, NULL, HFILL}},
         { &hf_sbccs_dhflags_nocrc,
           {"No CRC", "sbccs.dhflags.nocrc", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_dhflags_nocrc), 0x04, "", HFILL}},
+           TFS(&tfs_sbccs_dhflags_nocrc), 0x04, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_flags,
           {"CCW Control Flags", "sbccs.ccwflags", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_flags_cd,
           {"CD", "sbccs.ccwflags.cd", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_ccwflags_cd), 0x80, "", HFILL}},
+           TFS(&tfs_sbccs_ccwflags_cd), 0x80, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_flags_cc,
           {"CC", "sbccs.ccwflags.cc", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_ccwflags_cc), 0x40, "", HFILL}},
+           TFS(&tfs_sbccs_ccwflags_cc), 0x40, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_flags_sli,
           {"SLI", "sbccs.ccwflags.sli", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_ccwflags_sli), 0x20, "", HFILL}},
+           TFS(&tfs_sbccs_ccwflags_sli), 0x20, NULL, HFILL}},
         { &hf_sbccs_dib_ccw_flags_crr,
           {"CRR", "sbccs.ccwflags.crr", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_ccwflags_crr), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_ccwflags_crr), 0x08, NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags,
           {"Command Flags", "sbccs.cmdflags", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags_du,
           {"DU", "sbccs.cmdflags.du", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_cmdflags_du), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_cmdflags_du), 0x10, NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags_coc,
           {"COC", "sbccs.cmdflags.coc", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_cmdflags_coc), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_cmdflags_coc), 0x08, NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags_syr,
           {"SYR", "sbccs.cmdflags.syr", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_cmdflags_syr), 0x04, "", HFILL}},
+           TFS(&tfs_sbccs_cmdflags_syr), 0x04, NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags_rex,
           {"REX", "sbccs.cmdflags.rex", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_cmdflags_rex), 0x02, "", HFILL}},
+           TFS(&tfs_sbccs_cmdflags_rex), 0x02, NULL, HFILL}},
         { &hf_sbccs_dib_cmdflags_sss,
           {"SSS", "sbccs.cmdflags.sss", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_cmdflags_sss), 0x01, "", HFILL}},
+           TFS(&tfs_sbccs_cmdflags_sss), 0x01, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags,
           {"Status Flags", "sbccs.statusflags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags_ffc,
           {"FFC", "sbccs.statusflags.ffc", FT_UINT8, BASE_HEX,
-           VALS(status_ffc_val), 0xE0, "", HFILL}},
+           VALS(status_ffc_val), 0xE0, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags_ci,
           {"CI", "sbccs.statusflags.ci", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_statusflags_ci), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_statusflags_ci), 0x10, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags_cr,
           {"CR", "sbccs.statusflags.cr", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_statusflags_cr), 0x04, "", HFILL}},
+           TFS(&tfs_sbccs_statusflags_cr), 0x04, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags_lri,
           {"LRI", "sbccs.statusflags.lri", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_statusflags_lri), 0x02, "", HFILL}},
+           TFS(&tfs_sbccs_statusflags_lri), 0x02, NULL, HFILL}},
         { &hf_sbccs_dib_statusflags_rv,
           {"RV", "sbccs.statusflags.rv", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_statusflags_rv), 0x01, "", HFILL}},
+           TFS(&tfs_sbccs_statusflags_rv), 0x01, NULL, HFILL}},
         { &hf_sbccs_dib_status_attention,
           {"Attention", "sbccs.status.attention", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_attention), 0x80, "", HFILL}},
+           TFS(&tfs_sbccs_status_attention), 0x80, NULL, HFILL}},
         { &hf_sbccs_dib_status_modifier,
           {"Status Modifier", "sbccs.status.modifier", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_modifier), 0x40, "", HFILL}},
+           TFS(&tfs_sbccs_status_modifier), 0x40, NULL, HFILL}},
         { &hf_sbccs_dib_status_cue,
           {"Control-Unit End", "sbccs.status.cue", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_cue), 0x20, "", HFILL}},
+           TFS(&tfs_sbccs_status_cue), 0x20, NULL, HFILL}},
         { &hf_sbccs_dib_status_busy,
           {"Busy", "sbccs.status.busy", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_busy), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_status_busy), 0x10, NULL, HFILL}},
         { &hf_sbccs_dib_status_channelend,
           {"Channel End", "sbccs.status.channel_end", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_channelend), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_status_channelend), 0x08, NULL, HFILL}},
         { &hf_sbccs_dib_status_deviceend,
           {"Device End", "sbccs.status.device_end", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_deviceend), 0x04, "", HFILL}},
+           TFS(&tfs_sbccs_status_deviceend), 0x04, NULL, HFILL}},
         { &hf_sbccs_dib_status_unit_check,
           {"Unit Check", "sbccs.status.unit_check", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_unitcheck), 0x02, "", HFILL}},
+           TFS(&tfs_sbccs_status_unitcheck), 0x02, NULL, HFILL}},
         { &hf_sbccs_dib_status_unit_exception,
           {"Unit Exception", "sbccs.status.unitexception", FT_BOOLEAN, 8,
-           TFS(&tfs_sbccs_status_unitexception), 0x01, "", HFILL}},
+           TFS(&tfs_sbccs_status_unitexception), 0x01, NULL, HFILL}},
         { &hf_sbccs_dib_ctlparam,
           {"Control Parameters", "sbccs.ctlparam", FT_UINT24, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_ctlparam_rc,
           {"RC", "sbccs.ctlparam.rc", FT_BOOLEAN, 24,
-           TFS(&tfs_sbccs_ctlparam_rc), 0x80, "", HFILL}},
+           TFS(&tfs_sbccs_ctlparam_rc), 0x80, NULL, HFILL}},
         { &hf_sbccs_dib_ctlparam_ru,
           {"RU", "sbccs.ctlparam.ru", FT_BOOLEAN, 24,
-           TFS(&tfs_sbccs_ctlparam_ru), 0x10, "", HFILL}},
+           TFS(&tfs_sbccs_ctlparam_ru), 0x10, NULL, HFILL}},
         { &hf_sbccs_dib_ctlparam_ro,
           {"RO", "sbccs.ctlparam.ro", FT_BOOLEAN, 24,
-           TFS(&tfs_sbccs_ctlparam_ro), 0x08, "", HFILL}},
+           TFS(&tfs_sbccs_ctlparam_ro), 0x08, NULL, HFILL}},
         { &hf_sbccs_dib_linkctlinfo,
           {"Link Control Information", "sbccs.linkctlinfo", FT_UINT16,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_sbccs_dib_linkctlinfo_ctcconn,
           {"CTC Conn", "sbccs.linkctlinfo.ctc_conn", FT_BOOLEAN, 16,
-           TFS(&tfs_sbccs_linkctlinfo_ctcconn), 0x80, "", HFILL}},
+           TFS(&tfs_sbccs_linkctlinfo_ctcconn), 0x80, NULL, HFILL}},
         { &hf_sbccs_dib_linkctlinfo_ecrcg,
           {"Enhanced CRC Generation", "sbccs.linkctlinfo.ecrcg", FT_BOOLEAN, 16,
-           TFS(&tfs_sbccs_linkctlinfo_ecrcg), 0x01, "", HFILL}},
+           TFS(&tfs_sbccs_linkctlinfo_ecrcg), 0x01, NULL, HFILL}},
     };
 
 
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index e2edcabf1c..0b88c55677 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -469,94 +469,94 @@ proto_register_fcsp (void)
     static hf_register_info hf[] = {
         { &hf_auth_proto_ver,
           {"Protocol Version", "fcsp.version", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_auth_msg_code,
           {"Message Code", "fcsp.opcode", FT_UINT8, BASE_HEX,
-           VALS (fcauth_msgcode_vals), 0x0, "", HFILL}},
+           VALS (fcauth_msgcode_vals), 0x0, NULL, HFILL}},
         { &hf_auth_flags,
-          {"Flags", "fcsp.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "fcsp.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_auth_len,
           {"Packet Length", "fcsp.len", FT_UINT32, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_auth_tid,
           {"Transaction Identifier", "fcsp.tid", FT_UINT32, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_auth_initiator_wwn,
-          {"Initiator Name (WWN)", "fcsp.initwwn", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Initiator Name (WWN)", "fcsp.initwwn", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_auth_initiator_name,
           {"Initiator Name (Unknown Type)", "fcsp.initname", FT_BYTES,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_auth_initiator_name_type,
           {"Initiator Name Type", "fcsp.initnametype", FT_UINT16, BASE_HEX,
-           VALS (fcauth_name_type_vals), 0x0, "", HFILL}},
+           VALS (fcauth_name_type_vals), 0x0, NULL, HFILL}},
         { &hf_auth_initiator_name_len,
           {"Initiator Name Length", "fcsp.initnamelen", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_usable_proto,
           {"Number of Usable Protocols", "fcsp.usableproto", FT_UINT32,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_auth_rjt_code,
           {"Reason Code", "fcsp.rjtcode", FT_UINT8, BASE_DEC,
-           VALS (fcauth_rjtcode_vals), 0x0, "", HFILL}},
+           VALS (fcauth_rjtcode_vals), 0x0, NULL, HFILL}},
         { &hf_auth_rjt_codedet,
           {"Reason Code Explanation", "fcsp.rjtcodet", FT_UINT8, BASE_DEC,
-           VALS (fcauth_rjtcode_detail_vals), 0x0, "", HFILL}},
+           VALS (fcauth_rjtcode_detail_vals), 0x0, NULL, HFILL}},
         { &hf_auth_responder_wwn,
-          {"Responder Name (WWN)", "fcsp.rspwwn", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Responder Name (WWN)", "fcsp.rspwwn", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_auth_responder_name,
-          {"Responder Name (Unknown Type)", "fcsp.rspname", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Responder Name (Unknown Type)", "fcsp.rspname", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_responder_name_type,
           {"Responder Name Type", "fcsp.rspnametype", FT_UINT16, BASE_HEX,
-           VALS (fcauth_name_type_vals), 0x0, "", HFILL}},
+           VALS (fcauth_name_type_vals), 0x0, NULL, HFILL}},
         { &hf_auth_responder_name_len,
           {"Responder Name Type", "fcsp.rspnamelen", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_hashid,
           {"Hash Identifier", "fcsp.dhchap.hashid", FT_UINT32, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_auth_dhchap_groupid,
           {"DH Group Identifier", "fcsp.dhchap.groupid", FT_UINT32, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_auth_dhchap_chal_len,
           {"Challenge Value Length", "fcsp.dhchap.challen", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_val_len,
           {"DH Value Length", "fcsp.dhchap.vallen", FT_UINT32, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_auth_dhchap_rsp_len,
           {"Response Value Length", "fcsp.dhchap.rsplen", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_proto_type,
           {"Authentication Protocol Type", "fcsp.proto", FT_UINT32, BASE_DEC,
-           VALS (fcauth_proto_type_vals), 0x0, "", HFILL}},
+           VALS (fcauth_proto_type_vals), 0x0, NULL, HFILL}},
         { &hf_auth_proto_param_len,
           {"Protocol Parameters Length", "fcsp.protoparamlen", FT_UINT32,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_param_tag,
           {"Parameter Tag", "fcsp.dhchap.paramtype", FT_UINT16, BASE_HEX,
-           VALS (fcauth_dhchap_param_vals), 0x0, "", HFILL}},
+           VALS (fcauth_dhchap_param_vals), 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_param_len,
           {"Parameter Length", "fcsp.dhchap.paramlen", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_hash_type,
           {"Hash Algorithm", "fcsp.dhchap.hashtype", FT_UINT32, BASE_DEC,
-           VALS (fcauth_dhchap_hash_algo_vals), 0x0, "", HFILL}},
+           VALS (fcauth_dhchap_hash_algo_vals), 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_group_type,
           {"DH Group", "fcsp.dhchap.dhgid", FT_UINT32, BASE_DEC,
-           VALS (fcauth_dhchap_dhgid_vals), 0x0, "", HFILL}},
+           VALS (fcauth_dhchap_dhgid_vals), 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_chal_value,
-          {"Challenge Value", "fcsp.dhchap.chalval", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Challenge Value", "fcsp.dhchap.chalval", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_auth_dhchap_dhvalue,
-          {"DH Value", "fcsp.dhchap.dhvalue", FT_BYTES, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+          {"DH Value", "fcsp.dhchap.dhvalue", FT_BYTES, BASE_NONE, NULL, 0x0,
+           NULL, HFILL}},
         { &hf_auth_dhchap_rsp_value,
-          {"Response Value", "fcsp.dhchap.rspval", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Response Value", "fcsp.dhchap.rspval", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
           
     };
 
diff --git a/epan/dissectors/packet-fcswils.c b/epan/dissectors/packet-fcswils.c
index 31881cb04b..db31f0414a 100644
--- a/epan/dissectors/packet-fcswils.c
+++ b/epan/dissectors/packet-fcswils.c
@@ -1939,7 +1939,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_flags,
           {"Flag", "swils.elp.flag",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_r_a_tov,
           {"R_A_TOV", "swils.elp.ratov",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -1948,10 +1948,10 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_req_epn,
           {"Req Eport Name", "swils.elp.reqepn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_req_esn,
           {"Req Switch Name", "swils.elp.reqesn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_clsf_svcp,
           {"Class F Svc Param", "swils.elp.clsfp",
            FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
@@ -1975,19 +1975,19 @@ proto_register_fcswils (void)
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls2_svcp,
           {"Class 2 Svc Param", "swils.elp.cls2p",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls2_rcvsz,
           {"Class 2 Frame Size", "swils.elp.cls1rsz",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls3_svcp,
           {"Class 3 Svc Param", "swils.elp.cls3p",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_cls3_rcvsz,
           {"Class 3 Frame Size", "swils.elp.cls1rsz",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_isl_fc_mode,
           {"ISL Flow Ctrl Mode", "swils.elp.fcmode",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_elp_fcplen,
           {"Flow Ctrl Param Len", "swils.elp.fcplen",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2014,13 +2014,13 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_switch_name,
           {"Switch Name", "swils.efp.sname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_mcast_grpno,
           {"Mcast Grp#", "swils.efp.mcastno",
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_alias_token,
           {"Alias Token", "swils.efp.aliastok",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_record_len,
           {"Record Len", "swils.efp.recordlen",
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2032,18 +2032,18 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_efp_pswitch_name,
           {"Principal Switch Name", "swils.efp.psname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_dia_switch_name,
           {"Switch Name", "swils.dia.sname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rdi_payload_len,
           {"Payload Len", "swils.rdi.len",
            FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rdi_req_sname,
           {"Req Switch Name", "swils.rdi.reqsn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_cmd,
-          {"Command: ", "swils.fspf.cmd",
+          {"Command:", "swils.fspf.cmd",
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_rev,
           {"Version", "swils.fspf.ver",
@@ -2059,10 +2059,10 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_fspfh_auth,
           {"Authentication", "swils.fspf.auth",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_hlo_options,
           {"Options", "swils.hlo.options",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_hlo_hloint,
           {"Hello Interval (secs)", "swils.hlo.hloint",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2089,7 +2089,7 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ldrec_linkid,
           {"Link ID", "swils.ldr.linkid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ldrec_out_pidx,
           {"Output Port Idx", "swils.ldr.out_portidx",
            FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL}},
@@ -2110,7 +2110,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, VALS (fc_swils_rscn_addrfmt_val), 0x0F, NULL, HFILL}},
         { &hf_swils_rscn_affectedport,
           {"Affected Port ID", "swils.rscn.affectedport",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_detectfn,
           {"Detection Function", "swils.rscn.detectfn",
            FT_UINT32, BASE_HEX, VALS (fc_swils_rscn_detectfn_val), 0x0, NULL, HFILL}},
@@ -2119,28 +2119,28 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_portid,
           {"Port Id", "swils.rscn.portid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_pwwn,
           {"Port WWN", "swils.rscn.pwwn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rscn_nwwn,
           {"Node WWN", "swils.rscn.nwwn",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_swvendorid,
           {"Switch Vendor ID", "swils.esc.swvendor",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_pdesc_vendorid,
           {"Vendor ID", "swils.esc.vendorid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_esc_protocolid,
           {"Protocol ID", "swils.esc.protocol",
            FT_UINT16, BASE_HEX, VALS (fc_swils_esc_protocol_val), 0x0, NULL, HFILL}},
         { &hf_swils_zone_activezonenm,
           {"Active Zoneset Name", "swils.mr.activezonesetname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_objname,
           {"Zone Object Name", "swils.zone.zoneobjname",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_objtype,
           {"Zone Object Type", "swils.zone.zoneobjtype",
            FT_UINT8, BASE_HEX, VALS (fc_swils_zoneobj_type_val), 0x0, NULL, HFILL}},
@@ -2152,7 +2152,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_mbrid,
           {"Member Identifier", "swils.zone.mbrid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_status,
           {"Zone Command Status", "swils.zone.status",
            FT_UINT8, BASE_HEX, VALS (fc_swils_mr_rsp_val), 0x0, 
@@ -2169,7 +2169,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, VALS (fc_swils_sfc_op_val), 0x0, NULL, HFILL}},
         { &hf_swils_sfc_zonenm,
           {"Zone Set Name", "swils.sfc.zonename",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_rjt,
           {"Reason Code", "swils.rjt.reason",
            FT_UINT8, BASE_HEX, VALS (fc_swils_rjt_val), 0x0, NULL, HFILL}},
@@ -2181,7 +2181,7 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_zone_mbrid_lun,
           {"LUN", "swils.zone.lun",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_rev,
           {"Revision", "swils.ess.revision",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2196,16 +2196,16 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_vendorname,
           {"Vendor Name", "swils.ess.vendorname",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_modelname,
           {"Model Name", "swils.ess.modelname",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_relcode,
           {"Release Code", "swils.ess.relcode",
-           FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_vendorspecific,
           {"Vendor Specific", "swils.ess.vendorspecific",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_type,
           {"Type", "swils.ess.capability.type",
            FT_UINT8, BASE_DEC, VALS (fc_ct_gstype_vals), 0x0, NULL, HFILL}},
@@ -2283,10 +2283,10 @@ proto_register_fcswils (void)
            FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_t10,
           {"T10 Vendor ID", "swils.ess.capability.t10id",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_ess_cap_vendorobj,
           {"Vendor-Specific Info", "swils.ess.capability.vendorobj",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_rev,
           {"Revision", "swils.mrra.revision",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
@@ -2295,10 +2295,10 @@ proto_register_fcswils (void)
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_vendorid,
           {"Vendor ID", "swils.mrra.vendorid",
-           FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_vendorinfo,
           {"Vendor-Specific Info", "swils.mrra.vendorinfo",
-           FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL}},
+           FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}},
         { &hf_swils_mrra_reply,
           {"MRRA Response", "swils.mrra.reply",
            FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
diff --git a/epan/dissectors/packet-fddi.c b/epan/dissectors/packet-fddi.c
index 0195c25282..ac2f9103ea 100644
--- a/epan/dissectors/packet-fddi.c
+++ b/epan/dissectors/packet-fddi.c
@@ -428,23 +428,23 @@ proto_register_fddi(void)
 		 */
 		{ &hf_fddi_fc,
 		{ "Frame Control",	"fddi.fc", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_fc_clf,
 		{ "Class/Length/Format", "fddi.fc.clf", FT_UINT8, BASE_HEX, VALS(clf_vals), FDDI_FC_CLFF,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_fc_prio,
 		{ "Priority", "fddi.fc.prio", FT_UINT8, BASE_DEC, NULL, FDDI_FC_ASYNC_PRI,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_fc_smt_subtype,
 		{ "SMT Subtype", "fddi.fc.smt_subtype", FT_UINT8, BASE_DEC, VALS(smt_subtype_vals), FDDI_FC_ZZZZ,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_fc_mac_subtype,
 		{ "MAC Subtype", "fddi.fc.mac_subtype", FT_UINT8, BASE_DEC, VALS(mac_subtype_vals), FDDI_FC_ZZZZ,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_dst,
 		{ "Destination",	"fddi.dst", FT_ETHER, BASE_NONE, NULL, 0x0,
@@ -452,7 +452,7 @@ proto_register_fddi(void)
 
 		{ &hf_fddi_src,
 		{ "Source",		"fddi.src", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_fddi_addr,
 		{ "Source or Destination Address", "fddi.addr", FT_ETHER, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c
index de79ea6f79..fcb954a7de 100644
--- a/epan/dissectors/packet-ff.c
+++ b/epan/dissectors/packet-ff.c
@@ -13890,7 +13890,7 @@ proto_register_ff(void)
 
 		{ &hf_ff_sm_find_tag_reply_req_ip_addr,
 			{ "Queried Object IP Address", "ff.sm.find_tag_reply.req.ip_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_sm_find_tag_reply_req_od_ver,
 			{ "Queried Object OD Version", "ff.sm.find_tag_reply.req.od_ver",
@@ -13954,7 +13954,7 @@ proto_register_ff(void)
 
 		{ &hf_ff_sm_id_rsp_operational_ip_addr,
 			{ "Operational IP Address", "ff.sm.id.rsp.operational_ip_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_sm_id_rsp_dev_id,
 			{ "Device ID", "ff.sm.id.rsp.dev_id",
@@ -14149,7 +14149,7 @@ proto_register_ff(void)
 		{ &hf_ff_sm_set_assign_info_req_operational_ip_addr,
 			{ "Operational IP Address",
 				"ff.sm.set_assign_info.req.operational_ip_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 
 
@@ -14289,7 +14289,7 @@ proto_register_ff(void)
 		{ &hf_ff_sm_dev_annunc_req_operational_ip_addr,
 			{ "Operational IP Address",
 				"ff.sm.dev_annunc.req.operational_ip_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_sm_dev_annunc_req_dev_id,
 			{ "Device ID", "ff.sm.dev_annunc.req.dev_id",
@@ -16702,22 +16702,22 @@ proto_register_ff(void)
 		{ &hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_send_addr,
 			{ "Diagnostic Message Interface A Send Address",
 				"ff.lr.get_info.rsp.diagnostic_msg_if_a_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_get_info_rsp_diagnostic_msg_if_a_recv_addr,
 			{ "Diagnostic Message Interface A Receive Address",
 				"ff.lr.get_info.rsp.diagnostic_msg_if_a_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_send_addr,
 			{ "Diagnostic Message Interface B Send Address",
 				"ff.lr.get_info.rsp.diagnostic_msg_if_b_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_get_info_rsp_diagnostic_msg_if_b_recv_addr,
 			{ "Diagnostic Message Interface B Receive Address",
 				"ff.lr.get_info.rsp.diagnostic_msg_if_b_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 
 
@@ -16793,22 +16793,22 @@ proto_register_ff(void)
 		{ &hf_ff_lr_put_info_req_diagnostic_msg_if_a_send_addr,
 			{ "Diagnostic Message Interface A Send Address",
 				"ff.lr.put_info.req.diagnostic_msg_if_a_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_req_diagnostic_msg_if_a_recv_addr,
 			{ "Diagnostic Message Interface A Receive Address",
 				"ff.lr.put_info.req.diagnostic_msg_if_a_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_req_diagnostic_msg_if_b_send_addr,
 			{ "Diagnostic Message Interface B Send Address",
 				"ff.lr.put_info.req.diagnostic_msg_if_b_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_req_diagnostic_msg_if_b_recv_addr,
 			{ "Diagnostic Message Interface B Receive Address",
 				"ff.lr.put_info.req.diagnostic_msg_if_b_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 
 
@@ -16848,22 +16848,22 @@ proto_register_ff(void)
 		{ &hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_send_addr,
 			{ "Diagnostic Message Interface A Send Address",
 				"ff.lr.put_info.rsp.diagnostic_msg_if_a_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_rsp_diagnostic_msg_if_a_recv_addr,
 			{ "Diagnostic Message Interface A Receive Address",
 				"ff.lr.put_info.rsp.diagnostic_msg_if_a_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_send_addr,
 			{ "Diagnostic Message Interface B Send Address",
 				"ff.lr.put_info.rsp.diagnostic_msg_if_b_send_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 		{ &hf_ff_lr_put_info_rsp_diagnostic_msg_if_b_recv_addr,
 			{ "Diagnostic Message Interface B Receive Address",
 				"ff.lr.put_info.rsp.diagnostic_msg_if_b_recv_addr",
-				FT_IPv6, BASE_HEX, NULL, 0x0, NULL, HFILL } },
+				FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 
 
diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c
index 870e446462..35c5fb7a6a 100644
--- a/epan/dissectors/packet-fip.c
+++ b/epan/dissectors/packet-fip.c
@@ -474,98 +474,98 @@ proto_register_fip(void)
          */
         { &hf_fip_ver,
           {"Version", "fip.ver", FT_UINT8, BASE_DEC,
-            NULL, 0xf0, "", HFILL}},
+            NULL, 0xf0, NULL, HFILL}},
         { &hf_fip_op,
           {"Opcode", "fip.opcode", FT_UINT16, BASE_HEX,
-           VALS(&fip_opcodes), 0, "", HFILL}},
+           VALS(&fip_opcodes), 0, NULL, HFILL}},
         { &hf_fip_disc_subcode,
           {"Discovery Subcode", "fip.disc_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_disc_subcodes), 0, "", HFILL}},
+           VALS(&fip_disc_subcodes), 0, NULL, HFILL}},
         { &hf_fip_ls_subcode,
           {"Link Service Subcode", "fip.ls.subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_ls_subcodes), 0, "", HFILL}},
+           VALS(&fip_ls_subcodes), 0, NULL, HFILL}},
         { &hf_fip_ctrl_subcode,
           {"Control Subcode", "fip.ctrl_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_ctrl_subcodes), 0, "", HFILL}},
+           VALS(&fip_ctrl_subcodes), 0, NULL, HFILL}},
         { &hf_fip_vlan_subcode,
           {"VLAN Subcode", "fip.vlan_subcode", FT_UINT8, BASE_HEX,
-           VALS(&fip_vlan_subcodes), 0, "", HFILL}},
+           VALS(&fip_vlan_subcodes), 0, NULL, HFILL}},
         { &hf_fip_hex_subcode,
           {"Unknown Subcode", "fip.subcode", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_fip_dlen,
           {"Length of Descriptors (words)", "fip.dl_len", FT_UINT16, BASE_DEC,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         { &hf_fip_flags,
           {"Flags", "fip.flags", FT_UINT16, BASE_HEX,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         { &hf_fip_flag_fpma,
           {"Fabric Provided MAC addr", "fip.flags.fpma", FT_BOOLEAN, 16,
-            NULL, FIP_FL_FPMA, "", HFILL}},
+            NULL, FIP_FL_FPMA, NULL, HFILL}},
         { &hf_fip_flag_spma,
           {"Server Provided MAC addr", "fip.flags.spma", FT_BOOLEAN, 16,
-            NULL, FIP_FL_SPMA, "", HFILL}},
+            NULL, FIP_FL_SPMA, NULL, HFILL}},
         { &hf_fip_flag_avail,
           {"Available", "fip.flags.available", FT_BOOLEAN, 16,
-            NULL, FIP_FL_AVAIL, "", HFILL}},
+            NULL, FIP_FL_AVAIL, NULL, HFILL}},
         { &hf_fip_flag_sol,
           {"Solicited", "fip.flags.sol", FT_BOOLEAN, 16,
-            NULL, FIP_FL_SOL, "", HFILL}},
+            NULL, FIP_FL_SOL, NULL, HFILL}},
         { &hf_fip_flag_fport,
           {"F_Port", "fip.flags.fport", FT_BOOLEAN, 16,
-            NULL, FIP_FL_FPORT, "", HFILL}},
+            NULL, FIP_FL_FPORT, NULL, HFILL}},
         { &hf_fip_desc_type,
           {"Descriptor Type", "fip.desc_type", FT_UINT8, BASE_HEX,
-            VALS(&fip_desc_types), 0, "", HFILL}},
+            VALS(&fip_desc_types), 0, NULL, HFILL}},
         { &hf_fip_desc_len,
           {"Descriptor Length (words)", "fip.desc_len", FT_UINT8, BASE_DEC,
-            NULL, 0, "", HFILL}},
+            NULL, 0, NULL, HFILL}},
         /*
          * Various descriptor fields.
          */
         { &hf_fip_desc_pri,
-          {"Priority", "fip.pri", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL}},
+          {"Priority", "fip.pri", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_mac,
-          {"MAC Address", "fip.mac", FT_ETHER, 0, NULL, 0, "", HFILL}},
+          {"MAC Address", "fip.mac", FT_ETHER, 0, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_map,
-          {"FC-MAP-OUI", "fip.map", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}},
+          {"FC-MAP-OUI", "fip.map", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_name,
-          {"Switch or Node Name", "fip.name", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Switch or Node Name", "fip.name", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_vfid,
-          {"VFID Descriptor", "fip.fab.vfid", FT_STRING, BASE_DEC, NULL,
-            0, "", HFILL}},
+          {"VFID Descriptor", "fip.fab.vfid", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_map,
-          {"FC-MAP", "fip.fab.map", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"FC-MAP", "fip.fab.map", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fab_name,
-          {"Fabric Descriptor", "fip.fab.name", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Fabric Descriptor", "fip.fab.name", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fcoe_size,
           {"Max FCoE frame size", "fip.fcoe_size", FT_UINT16, BASE_DEC, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_mac,
           {"VN_Port MAC Address", "fip.vn.mac", FT_ETHER, 0, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_fid,
           {"VN_Port FC_ID", "fip.vn.fc_id", FT_UINT32, BASE_HEX, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vn_wwpn,
-          {"Port Name", "fip.vn.pwwn", FT_STRING, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Port Name", "fip.vn.pwwn", FT_STRING, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_fka,
           {"FKA_ADV_Period", "fip.fka", FT_UINT32, BASE_DEC, NULL,
-            0, "", HFILL}},
+            0, NULL, HFILL}},
         { &hf_fip_desc_vend,
-          {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}},
+          {"Vendor-ID", "fip.vendor", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_vend_data,
-          {"Vendor-specific data", "fip.vendor.data", FT_BYTES, BASE_HEX, NULL,
-            0, "", HFILL}},
+          {"Vendor-specific data", "fip.vendor.data", FT_BYTES, BASE_NONE, NULL,
+            0, NULL, HFILL}},
         { &hf_fip_desc_vlan,
-          {"VLAN", "fip.vlan", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL}},
+          {"VLAN", "fip.vlan", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
         { &hf_fip_desc_unk,
-          {"Unknown Descriptor", "fip.desc", FT_BYTES, BASE_HEX, NULL,
-            0, "", HFILL}}
+          {"Unknown Descriptor", "fip.desc", FT_BYTES, BASE_NONE, NULL,
+            0, NULL, HFILL}}
     };
     static gint *ett[] = {
         &ett_fip,
diff --git a/epan/dissectors/packet-fix.c b/epan/dissectors/packet-fix.c
index 6c5aae9a70..d9a5f66b47 100644
--- a/epan/dissectors/packet-fix.c
+++ b/epan/dissectors/packet-fix.c
@@ -483,8 +483,8 @@ proto_register_fix(void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_fix_data,
-            { "Continuation Data", "fix.data", FT_BYTES, BASE_HEX, NULL, 0x00,
-            "Continuation Data", HFILL }
+            { "Continuation Data", "fix.data", FT_BYTES, BASE_NONE, NULL, 0x00,
+            NULL, HFILL }
         },
         
         { &hf_fix_field_tag,
diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c
index 5ccaf84cc2..42863ccdc7 100644
--- a/epan/dissectors/packet-fmp.c
+++ b/epan/dissectors/packet-fmp.c
@@ -2081,11 +2081,11 @@ proto_register_fmp(void)
 	static hf_register_info hf[] = {
 		 { &hf_fmp_procedure, {
                         "Procedure", "fmp.procedure", FT_UINT32, BASE_DEC,
-                       VALS(fmp_proc_vals) , 0, "Procedure", HFILL }},        /* New addition */
+                       VALS(fmp_proc_vals) , 0, NULL, HFILL }},        /* New addition */
 
 		{ &hf_fmp_hostID, {
 			"Host ID", "fmp.hostID", FT_STRING, BASE_NONE,
-			NULL, 0, "Host ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_btime, {
 			"Boot Time", "fmp.btime", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -2109,16 +2109,16 @@ proto_register_fmp(void)
 
 		{ &hf_fmp_fmpFHandle, {
 			"FMP File Handle", "fmp.fmpFHandle",
-			FT_BYTES, BASE_NONE, NULL, 0, "FMP File Handle",
+			FT_BYTES, BASE_NONE, NULL, 0, NULL,
 		        HFILL }},
 
 		{ &hf_fmp_nfsFHandle, {
 			"NFS File Handle", "fmp.nfsFHandle", FT_BYTES,
-			BASE_NONE, NULL, 0, "NFS File Handle ", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_fsID, {
 			"File System ID", "fmp.fsID", FT_UINT32, BASE_HEX,
-			NULL, 0, "File System ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_fmp_status, {
 			"Status", "fmp.status", FT_UINT32, BASE_DEC,
 			VALS(fmp_status_vals), 0, "Reply Status", HFILL }},
@@ -2133,24 +2133,24 @@ proto_register_fmp(void)
 
 		{ &hf_fmp_dskSigEnt_val, {
 			"Celerra Signature", "fmp.dsi.ds.dsList.dskSigLst_val.dse.dskSigEnt_val", FT_STRING, BASE_NONE,
-			NULL, 0, "Celerra Signature", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_fmp_devSignature, {
 			"Signature DATA", "fmp.devSig", FT_STRING, BASE_NONE,
-			NULL, 0, "Signature DATA", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_fmp_mount_path, {
                        "Native Protocol: PATH", "fmp.mount_path", FT_STRING, BASE_NONE,
                        NULL, 0, "Absolute path from the root on the server side", HFILL }},
 		{ &hf_fmp_sig_offset, {
 			"Sig Offset", "fmp.dsi.ds.sig_offset", FT_UINT64, BASE_DEC,
-			NULL, 0, "Sig Offset", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_numBlksReq, {
 			"Extent Length", "fmp.numBlksReq", FT_UINT32,
-			BASE_DEC, NULL, 0, "Extent Length", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_minBlks, {
 			"Minimum Blocks to Grant", "fmp.minBlks", FT_UINT32,
-			BASE_DEC, NULL, 0, "Minimum Blocks to Grant", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_msgNum, {
 			"Message Number", "fmp.msgNum", FT_UINT32, BASE_DEC,
@@ -2162,7 +2162,7 @@ proto_register_fmp(void)
 
 		{ &hf_fmp_fileSize, {
 			"File Size", "fmp.fileSize", FT_UINT64, BASE_DEC,
-			NULL, 0, "File Size", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_fmp_extentList_len, {
 			"Extent List Length", "fmp.extentList_len", FT_UINT32,
@@ -2211,31 +2211,31 @@ proto_register_fmp(void)
                         NULL, 0, "FMP OS Minor", HFILL }},
                 { &hf_fmp_os_name, {
                         "OS Name", "fmp.os_name", FT_STRING, BASE_NONE,
-                        NULL, 0, "OS Name", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		 { &hf_fmp_path, {
                         "Mount Path", "fmp.Path", FT_STRING, BASE_NONE,
-                        NULL, 0, "Mount Path", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_os_patch, {
                         "OS Path", "fmp.os_patch", FT_UINT32, BASE_DEC,
-                        NULL, 0, "OS Path", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_os_build, {
                         "OS Build", "fmp.os_build", FT_UINT32, BASE_DEC,
-                        NULL, 0, "OS Build", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_server_version_string, {
                         "Server Version String", "fmp.server_version_string", FT_STRING, BASE_NONE,
-                        NULL, 0, "Server Version String", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_description, {
                         "Error Description", "fmp.description", FT_STRING, BASE_NONE,
                         NULL, 0, "Client Error Description", HFILL }},
                 { &hf_fmp_nfsv3Attr_type, {
                         "Type", "fmp.nfsv3Attr_type", FT_UINT32, BASE_DEC,
-                        NULL, 0, "NFSV3 Attr Type ", HFILL }},
+                        NULL, 0, "NFSV3 Attr Type", HFILL }},
 		 { &hf_fmp_nfsv3Attr_mode, {
                         "Mode", "fmp.nfsv3Attr_mod", FT_UINT32, BASE_DEC,
-                        NULL, 0, "Mode", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_nfsv3Attr_nlink, {
                         "nlink", "fmp.nfsv3Attr_nlink", FT_UINT32, BASE_DEC,
-                        NULL, 0, "nlink", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_nfsv3Attr_uid, {
                         "uid", "fmp.nfsv3Attr_uid", FT_UINT32, BASE_DEC,
                         NULL, 0, "UID", HFILL }},
@@ -2248,10 +2248,10 @@ proto_register_fmp(void)
                         NULL, 0, "used", HFILL }},
                 { &hf_fmp_nfsv3Attr_rdev, {
                         "rdev", "fmp.nfsv3Attr_rdev", FT_UINT64, BASE_DEC,
-                        NULL, 0, "rdev", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_nfsv3Attr_fsid, {
                         "fsid", "fmp.nfsv3Attr_fsid", FT_UINT64, BASE_DEC,
-                        NULL, 0, "fsid", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_nfsv3Attr_fileid, {
                         "File ID", "fmp.nfsv3Attr_fileid", FT_UINT64, BASE_DEC,
                         NULL, 0, "fileid", HFILL }},
@@ -2260,25 +2260,25 @@ proto_register_fmp(void)
                         NULL, 0, "command", HFILL }},
 		{ &hf_fmp_topVolumeId, {
 			"Top Volume ID", "fmp.topVolumeId", FT_UINT32, BASE_HEX,
-			NULL, 0, "Top Volume ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
                 { &hf_fmp_cursor, {
                         "number of volumes", "fmp.cursor", FT_UINT32, BASE_DEC,
-                        NULL, 0, "number of volumes", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_offset64, {
                         "offset", "fmp.offset64", FT_UINT64, BASE_DEC,
-                        NULL, 0, "offset", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_slice_size, {
                         "size of the slice", "fmp.slice_size", FT_UINT64, BASE_DEC,
-                        NULL, 0, "size of the slice", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		{ &hf_fmp_volume, {
 			"Volume ID's", "fmp.volume", FT_UINT32, BASE_HEX,
 			NULL, 0, "FMP Volume ID's", HFILL }},
                 { &hf_fmp_stripeSize, {
                         "size of the stripe", "fmp.stripeSize", FT_UINT64, BASE_DEC,
-                        NULL, 0, "size of the stripe", HFILL }},
+                        NULL, 0, NULL, HFILL }},
                 { &hf_fmp_firstLogBlk64, {
                         "First Logical Block", "fmp.firstLogBlk64", FT_UINT64, BASE_DEC,
-                        NULL, 0, " ", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-fmp_notify.c b/epan/dissectors/packet-fmp_notify.c
index 253dd2079d..b41d5ffe95 100644
--- a/epan/dissectors/packet-fmp_notify.c
+++ b/epan/dissectors/packet-fmp_notify.c
@@ -481,7 +481,7 @@ proto_register_fmp_notify(void)
 	static hf_register_info hf[] = {
 		{ &hf_fmp_notify_procedure, {
                         "Procedure", "fmp_notify.fmp_notify_procedure", FT_UINT32, BASE_DEC,
-                        VALS(fmp_notify_proc_vals) , 0, "Procedure", HFILL }},        /* New addition */
+                        VALS(fmp_notify_proc_vals) , 0, NULL, HFILL }},        /* New addition */
 	
 		{ &hf_fmp_status, {
                         "Status", "fmp_notify.status", FT_UINT32, BASE_DEC,
@@ -501,7 +501,7 @@ proto_register_fmp_notify(void)
 
                 { &hf_fmp_fsID, {
                         "File System ID", "fmp_notify.fsID", FT_UINT32, BASE_HEX,
-                        NULL, 0, "File System ID", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 
                 { &hf_fmp_fsBlkSz, {
                         "FS Block Size", "fmp_notify.fsBlkSz", FT_UINT32, BASE_DEC,
@@ -510,7 +510,7 @@ proto_register_fmp_notify(void)
 
                 { &hf_fmp_numBlksReq, {
                         "Number Blocks Requested", "fmp_notify.numBlksReq", FT_UINT32,
-                        BASE_DEC, NULL, 0, "Number Blocks Requested", HFILL }},
+                        BASE_DEC, NULL, 0, NULL, HFILL }},
 	
 
                 { &hf_fmp_msgNum, {
@@ -529,11 +529,11 @@ proto_register_fmp_notify(void)
 		
                 { &hf_fmp_fileSize, {
                         "File Size", "fmp_notify.fileSize", FT_UINT64, BASE_DEC,
-                        NULL, 0, "File Size", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 
 		 { &hf_fmp_fmpFHandle, {
                         "FMP File Handle", "fmp_notify.fmpFHandle",
-                        FT_BYTES, BASE_NONE, NULL, 0, "FMP File Handle",
+                        FT_BYTES, BASE_NONE, NULL, 0, NULL,
                         HFILL }},
 
 
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 95f22cc8d3..a8c3d6d99e 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -855,49 +855,49 @@ void proto_register_fr(void)
           NULL, 0x0, "Control field", HFILL }},
 	{ &hf_fr_n_r, {
 	  "N(R)", "fr.control.n_r", FT_UINT16, BASE_DEC,
-	  NULL, XDLC_N_R_EXT_MASK, "", HFILL }},
+	  NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }},
 	{ &hf_fr_n_s, {
 	  "N(S)", "fr.control.n_s", FT_UINT16, BASE_DEC,
-	  NULL, XDLC_N_S_EXT_MASK, "", HFILL }},
+	  NULL, XDLC_N_S_EXT_MASK, NULL, HFILL }},
 	{ &hf_fr_p, {
 	  "Poll", "fr.control.p", FT_BOOLEAN, 8,
-	  TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+	  TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 	{ &hf_fr_p_ext, {
 	  "Poll", "fr.control.p", FT_BOOLEAN, 16,
-	  TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }},
+	  TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }},
 	{ &hf_fr_f, {
 	  "Final", "fr.control.f", FT_BOOLEAN, 8,
-	  TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+	  TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 	{ &hf_fr_f_ext, {
 	  "Final", "fr.control.f", FT_BOOLEAN, 16,
-	  TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }},
+	  TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }},
 	{ &hf_fr_s_ftype, {
 	  "Supervisory frame type", "fr.control.s_ftype", FT_UINT16, BASE_HEX,
-	  VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
+	  VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
 	{ &hf_fr_u_modifier_cmd, {
 	  "Command", "fr.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
-	  VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
+	  VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 	{ &hf_fr_u_modifier_resp, {
 	  "Response", "fr.control.u_modifier_resp", FT_UINT8, BASE_HEX,
-	    VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
+	    VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 	{ &hf_fr_ftype_i, {
 	  "Frame type", "fr.control.ftype", FT_UINT16, BASE_HEX,
-	  VALS(ftype_vals), XDLC_I_MASK, "", HFILL }},
+	  VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
 	{ &hf_fr_ftype_s_u, {
 	  "Frame type", "fr.control.ftype", FT_UINT8, BASE_HEX,
-	  VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+	  VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
 	{ &hf_fr_ftype_s_u_ext, {
 	  "Frame type", "fr.control.ftype", FT_UINT16, BASE_HEX,
-	  VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+	  VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
         { &hf_fr_nlpid, {
            "NLPID", "fr.nlpid", FT_UINT8, BASE_HEX,
             VALS(fr_nlpid_vals), 0x0, "Frame Relay Encapsulated Protocol NLPID", HFILL }},
 	{ &hf_fr_oui, {
 	   "Organization Code",	"fr.snap.oui", FT_UINT24, BASE_HEX,
-	   VALS(oui_vals), 0x0, "", HFILL }},
+	   VALS(oui_vals), 0x0, NULL, HFILL }},
 	{ &hf_fr_pid, {
 	   "Protocol ID", "fr.snap.pid", FT_UINT16, BASE_HEX,
-	   NULL, 0x0, "", HFILL }},
+	   NULL, 0x0, NULL, HFILL }},
         { &hf_fr_snaptype, {
            "Type", "fr.snaptype", FT_UINT16, BASE_HEX,
             VALS(etype_vals), 0x0, "Frame Relay SNAP Encapsulated Protocol", HFILL }},
diff --git a/epan/dissectors/packet-fractalgeneratorprotocol.c b/epan/dissectors/packet-fractalgeneratorprotocol.c
index 45deec68e6..8a47d332f7 100644
--- a/epan/dissectors/packet-fractalgeneratorprotocol.c
+++ b/epan/dissectors/packet-fractalgeneratorprotocol.c
@@ -201,22 +201,22 @@ proto_register_fractalgeneratorprotocol(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,            { "Type",          "fractalgeneratorprotocol.message_type",            FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
-    { &hf_message_flags,           { "Flags",         "fractalgeneratorprotocol.message_flags",           FT_UINT8,  BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_length,          { "Length",        "fractalgeneratorprotocol.message_length",          FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_data_start_x,            { "StartX",        "fractalgeneratorprotocol.data_start_x",            FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_data_start_y,            { "StartY",        "fractalgeneratorprotocol.data_start_y",            FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_data_points,             { "Points",        "fractalgeneratorprotocol.data_points",             FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_width,         { "Width",         "fractalgeneratorprotocol.parameter_width",         FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_height,        { "Height",        "fractalgeneratorprotocol.parameter_height",        FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_maxiterations, { "MaxIterations", "fractalgeneratorprotocol.parameter_maxiterations", FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_algorithmid,   { "AlgorithmID",   "fractalgeneratorprotocol.parameter_algorithmid",   FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_c1real,        { "C1Real",        "fractalgeneratorprotocol.parameter_c1real",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_c1imag,        { "C1Imag",        "fractalgeneratorprotocol.parameter_c1imag",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_c2real,        { "C2Real",        "fractalgeneratorprotocol.parameter_c2real",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_c2imag,        { "C2Imag",        "fractalgeneratorprotocol.parameter_c2imag",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_parameter_n,             { "N",             "fractalgeneratorprotocol.parameter_n",             FT_DOUBLE, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_buffer,                  { "Buffer",        "fractalgeneratorprotocol.buffer",                  FT_BYTES,  BASE_HEX, NULL,                      0x0, "", HFILL } },
+    { &hf_message_type,            { "Type",          "fractalgeneratorprotocol.message_type",            FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } },
+    { &hf_message_flags,           { "Flags",         "fractalgeneratorprotocol.message_flags",           FT_UINT8,  BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_length,          { "Length",        "fractalgeneratorprotocol.message_length",          FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_data_start_x,            { "StartX",        "fractalgeneratorprotocol.data_start_x",            FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_data_start_y,            { "StartY",        "fractalgeneratorprotocol.data_start_y",            FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_data_points,             { "Points",        "fractalgeneratorprotocol.data_points",             FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_width,         { "Width",         "fractalgeneratorprotocol.parameter_width",         FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_height,        { "Height",        "fractalgeneratorprotocol.parameter_height",        FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_maxiterations, { "MaxIterations", "fractalgeneratorprotocol.parameter_maxiterations", FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_algorithmid,   { "AlgorithmID",   "fractalgeneratorprotocol.parameter_algorithmid",   FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_c1real,        { "C1Real",        "fractalgeneratorprotocol.parameter_c1real",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_c1imag,        { "C1Imag",        "fractalgeneratorprotocol.parameter_c1imag",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_c2real,        { "C2Real",        "fractalgeneratorprotocol.parameter_c2real",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_c2imag,        { "C2Imag",        "fractalgeneratorprotocol.parameter_c2imag",        FT_DOUBLE, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_parameter_n,             { "N",             "fractalgeneratorprotocol.parameter_n",             FT_DOUBLE, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_buffer,                  { "Buffer",        "fractalgeneratorprotocol.buffer",                  FT_BYTES,  BASE_NONE, NULL,                      0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 49fb0b9154..3a8d617d5e 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -554,7 +554,7 @@ proto_register_frame(void)
 			"Time relative to time reference or first frame", HFILL }},
 
 		{ &hf_frame_time_reference,
-		{ "This is a Time Reference frame",	"frame.ref_time", FT_NONE, 0, NULL, 0x0,
+		{ "This is a Time Reference frame",	"frame.ref_time", FT_NONE, BASE_NONE, NULL, 0x0,
 			"This frame is a Time Reference frame", HFILL }},
 
 		{ &hf_frame_number,
@@ -570,7 +570,7 @@ proto_register_frame(void)
 			NULL, HFILL }},
 
 		{ &hf_frame_md5_hash,
-		{ "Frame MD5 Hash",	"frame.md5_hash", FT_STRING, 0, NULL, 0x0,
+		{ "Frame MD5 Hash",	"frame.md5_hash", FT_STRING, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }},
 
 		{ &hf_frame_p2p_dir,
@@ -586,19 +586,19 @@ proto_register_frame(void)
 			NULL, HFILL }},
 
 		{ &hf_frame_marked,
-		{ "Frame is marked",	"frame.marked", FT_BOOLEAN, 8, NULL, 0x0,
+		{ "Frame is marked",	"frame.marked", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Frame is marked in the GUI", HFILL }},
 
 		{ &hf_frame_protocols,
-		{ "Protocols in frame",	"frame.protocols", FT_STRING, 0, NULL, 0x0,
+		{ "Protocols in frame",	"frame.protocols", FT_STRING, BASE_NONE, NULL, 0x0,
 			"Protocols carried by this frame", HFILL }},
 
 		{ &hf_frame_color_filter_name,
-		{ "Coloring Rule Name",	"frame.coloring_rule.name", FT_STRING, 0, NULL, 0x0,
+		{ "Coloring Rule Name",	"frame.coloring_rule.name", FT_STRING, BASE_NONE, NULL, 0x0,
 			"The frame matched the coloring rule with this name", HFILL }},
 
 		{ &hf_frame_color_filter_text,
-		{ "Coloring Rule String", "frame.coloring_rule.string", FT_STRING, 0, NULL, 0x0,
+		{ "Coloring Rule String", "frame.coloring_rule.string", FT_STRING, BASE_NONE, NULL, 0x0,
 			"The frame matched this coloring rule string", HFILL }}
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 585b6ea9e6..79b9ba9cbc 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -4819,10 +4819,10 @@ void proto_register_ftam(void) {
   {
      { &hf_ftam_unstructured_text,
        { "ISO FTAM unstructured text", "ftam.unstructured_text", FT_STRING,
-          BASE_DEC, NULL, 0x0, "ISO FTAM unstructured text", HFILL } },
+          BASE_NONE, NULL, 0x0, NULL, HFILL } },
      { &hf_ftam_unstructured_binary,
        { "ISO FTAM unstructured binary", "ftam.unstructured_binary", FT_BYTES,
-          BASE_DEC, NULL, 0x0, "ISO FTAM unstructured binary", HFILL } },
+          BASE_NONE, NULL, 0x0, NULL, HFILL } },
 
 /*--- Included file: packet-ftam-hfarr.c ---*/
 #line 1 "packet-ftam-hfarr.c"
@@ -4868,7 +4868,7 @@ void proto_register_ftam(void) {
         "ftam.F_P_ABORT_request", HFILL }},
     { &hf_ftam_protocol_Version,
       { "protocol-Version", "ftam.protocol_Version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Protocol_Version", HFILL }},
     { &hf_ftam_implementation_information,
       { "implementation-information", "ftam.implementation_information",
@@ -4876,19 +4876,19 @@ void proto_register_ftam(void) {
         "ftam.Implementation_Information", HFILL }},
     { &hf_ftam_presentation_tontext_management,
       { "presentation-tontext-management", "ftam.presentation_tontext_management",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_service_class,
       { "service-class", "ftam.service_class",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Service_Class", HFILL }},
     { &hf_ftam_functional_units,
       { "functional-units", "ftam.functional_units",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Functional_Units", HFILL }},
     { &hf_ftam_attribute_groups,
       { "attribute-groups", "ftam.attribute_groups",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Attribute_Groups", HFILL }},
     { &hf_ftam_shared_ASE_information,
       { "shared-ASE-information", "ftam.shared_ASE_information",
@@ -5056,7 +5056,7 @@ void proto_register_ftam(void) {
         "ftam.Select_Attributes", HFILL }},
     { &hf_ftam_requested_access,
       { "requested-access", "ftam.requested_access",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Access_Request", HFILL }},
     { &hf_ftam_access_passwords,
       { "access-passwords", "ftam.access_passwords",
@@ -5072,7 +5072,7 @@ void proto_register_ftam(void) {
         "ftam.Concurrency_Control", HFILL }},
     { &hf_ftam_referent_indicator,
       { "referent-indicator", "ftam.referent_indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.Referent_Indicator", HFILL }},
     { &hf_ftam_override,
       { "override", "ftam.override",
@@ -5088,7 +5088,7 @@ void proto_register_ftam(void) {
         "ftam.Password", HFILL }},
     { &hf_ftam_attribute_names,
       { "attribute-names", "ftam.attribute_names",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Attribute_Names", HFILL }},
     { &hf_ftam_attribute_extension_names,
       { "attribute-extension-names", "ftam.attribute_extension_names",
@@ -5104,7 +5104,7 @@ void proto_register_ftam(void) {
         "ftam.Change_Attributes", HFILL }},
     { &hf_ftam_processing_mode,
       { "processing-mode", "ftam.processing_mode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.T_processing_mode", HFILL }},
     { &hf_ftam_open_contents_type,
       { "contents-type", "ftam.contents_type",
@@ -5120,7 +5120,7 @@ void proto_register_ftam(void) {
         "ftam.Contents_Type_Attribute", HFILL }},
     { &hf_ftam_enable_fadu_locking,
       { "enable-fadu-locking", "ftam.enable_fadu_locking",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_activity_identifier,
       { "activity-identifier", "ftam.activity_identifier",
@@ -5164,7 +5164,7 @@ void proto_register_ftam(void) {
         "ftam.T_response_recovery_mode", HFILL }},
     { &hf_ftam_presentation_action,
       { "presentation-action", "ftam.presentation_action",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_threshold,
       { "threshold", "ftam.threshold",
@@ -5408,7 +5408,7 @@ void proto_register_ftam(void) {
         "ftam.Object_Type_Attribute", HFILL }},
     { &hf_ftam_permitted_actions,
       { "permitted-actions", "ftam.permitted_actions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Permitted_Actions_Attribute", HFILL }},
     { &hf_ftam_access_control,
       { "access-control", "ftam.access_control",
@@ -5480,7 +5480,7 @@ void proto_register_ftam(void) {
         "ftam.GraphicString", HFILL }},
     { &hf_ftam_octetString,
       { "octetString", "ftam.octetString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.OCTET_STRING", HFILL }},
     { &hf_ftam_linked_Object,
       { "linked-Object", "ftam.linked_Object",
@@ -5564,7 +5564,7 @@ void proto_register_ftam(void) {
         "ftam.Access_Control_Element", HFILL }},
     { &hf_ftam_action_list,
       { "action-list", "ftam.action_list",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Access_Request", HFILL }},
     { &hf_ftam_concurrency_access,
       { "concurrency-access", "ftam.concurrency_access",
@@ -5584,35 +5584,35 @@ void proto_register_ftam(void) {
         "ftam.Application_Entity_Title", HFILL }},
     { &hf_ftam_read_key,
       { "read", "ftam.read",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_insert_key,
       { "insert", "ftam.insert",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_replace_key,
       { "replace", "ftam.replace",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_extend_key,
       { "extend", "ftam.extend",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_erase_key,
       { "erase", "ftam.erase",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_read_attribute_key,
       { "read-attribute", "ftam.read_attribute",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_change_attribute_key,
       { "change-attribute", "ftam.change_attribute",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_delete_Object_key,
       { "delete-Object", "ftam.delete_Object",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Concurrency_Key", HFILL }},
     { &hf_ftam_actual_values2,
       { "actual-values", "ftam.actual_values",
@@ -5804,7 +5804,7 @@ void proto_register_ftam(void) {
         "ftam.F_COPY_response", HFILL }},
     { &hf_ftam_reset,
       { "reset", "ftam.reset",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_destination_file_directory,
       { "destination-file-directory", "ftam.destination_file_directory",
@@ -5844,7 +5844,7 @@ void proto_register_ftam(void) {
         "ftam.Error_Action", HFILL }},
     { &hf_ftam_last_member_indicator,
       { "last-member-indicator", "ftam.last_member_indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_shared_ASE_infonnation,
       { "shared-ASE-infonnation", "ftam.shared_ASE_infonnation",
@@ -6004,7 +6004,7 @@ void proto_register_ftam(void) {
         "ftam.Attribute_Extensions_Pattern", HFILL }},
     { &hf_ftam_equality_comparision,
       { "equality-comparision", "ftam.equality_comparision",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Equality_Comparision", HFILL }},
     { &hf_ftam_pathname_value,
       { "pathname-value", "ftam.pathname_value",
@@ -6040,15 +6040,15 @@ void proto_register_ftam(void) {
         "ftam.INTEGER", HFILL }},
     { &hf_ftam_match_bitstring,
       { "match-bitstring", "ftam.match_bitstring",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.BIT_STRING", HFILL }},
     { &hf_ftam_significance_bitstring,
       { "significance-bitstring", "ftam.significance_bitstring",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.BIT_STRING", HFILL }},
     { &hf_ftam_relational_camparision,
       { "relational-camparision", "ftam.relational_camparision",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Equality_Comparision", HFILL }},
     { &hf_ftam_time_and_date_value,
       { "time-and-date-value", "ftam.time_and_date_value",
@@ -6056,7 +6056,7 @@ void proto_register_ftam(void) {
         "ftam.GeneralizedTime", HFILL }},
     { &hf_ftam_relational_comparision,
       { "relational-comparision", "ftam.relational_comparision",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Relational_Comparision", HFILL }},
     { &hf_ftam_integer_value,
       { "integer-value", "ftam.integer_value",
@@ -6068,7 +6068,7 @@ void proto_register_ftam(void) {
         "ftam.OBJECT_IDENTIFIER", HFILL }},
     { &hf_ftam_boolean_value,
       { "boolean-value", "ftam.boolean_value",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ftam.BOOLEAN", HFILL }},
     { &hf_ftam_document_type_Pattern,
       { "document-type-Pattern", "ftam.document_type_Pattern",
@@ -6145,343 +6145,343 @@ void proto_register_ftam(void) {
     { &hf_ftam_Protocol_Version_U_version_1,
       { "version-1", "ftam.version-1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Protocol_Version_U_version_2,
       { "version-2", "ftam.version-2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Service_Class_U_unconstrained_class,
       { "unconstrained-class", "ftam.unconstrained-class",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Service_Class_U_management_class,
       { "management-class", "ftam.management-class",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Service_Class_U_transfer_class,
       { "transfer-class", "ftam.transfer-class",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Service_Class_U_transfer_and_management_class,
       { "transfer-and-management-class", "ftam.transfer-and-management-class",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Service_Class_U_access_class,
       { "access-class", "ftam.access-class",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_read,
       { "read", "ftam.read",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_write,
       { "write", "ftam.write",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_file_access,
       { "file-access", "ftam.file-access",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_limited_file_management,
       { "limited-file-management", "ftam.limited-file-management",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_enhanced_file_management,
       { "enhanced-file-management", "ftam.enhanced-file-management",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_grouping,
       { "grouping", "ftam.grouping",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_fadu_locking,
       { "fadu-locking", "ftam.fadu-locking",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_recovery,
       { "recovery", "ftam.recovery",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_restart_data_transfer,
       { "restart-data-transfer", "ftam.restart-data-transfer",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_limited_filestore_management,
       { "limited-filestore-management", "ftam.limited-filestore-management",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_enhanced_filestore_management,
       { "enhanced-filestore-management", "ftam.enhanced-filestore-management",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_object_manipulation,
       { "object-manipulation", "ftam.object-manipulation",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_group_manipulation,
       { "group-manipulation", "ftam.group-manipulation",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_consecutive_access,
       { "consecutive-access", "ftam.consecutive-access",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Functional_Units_U_concurrent_access,
       { "concurrent-access", "ftam.concurrent-access",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_storage,
       { "storage", "ftam.storage",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_security,
       { "security", "ftam.security",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_private,
       { "private", "ftam.private",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Groups_U_extension,
       { "extension", "ftam.extension",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_read,
       { "f-read", "ftam.f-read",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_insert,
       { "f-insert", "ftam.f-insert",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_replace,
       { "f-replace", "ftam.f-replace",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_extend,
       { "f-extend", "ftam.f-extend",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_T_processing_mode_f_erase,
       { "f-erase", "ftam.f-erase",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_read,
       { "read", "ftam.read",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_insert,
       { "insert", "ftam.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_replace,
       { "replace", "ftam.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_extend,
       { "extend", "ftam.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_erase,
       { "erase", "ftam.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_read_attribute,
       { "read-attribute", "ftam.read-attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_change_attribute,
       { "change-attribute", "ftam.change-attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Access_Request_U_delete_Object,
       { "delete-Object", "ftam.delete-Object",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_not_required,
       { "not-required", "ftam.not-required",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_shared,
       { "shared", "ftam.shared",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_exclusive,
       { "exclusive", "ftam.exclusive",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Concurrency_Key_no_access,
       { "no-access", "ftam.no-access",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_read,
       { "read", "ftam.read",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_insert,
       { "insert", "ftam.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_replace,
       { "replace", "ftam.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_extend,
       { "extend", "ftam.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_erase,
       { "erase", "ftam.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_read_attribute,
       { "read-attribute", "ftam.read-attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_change_attribute,
       { "change-attribute", "ftam.change-attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_delete_Object,
       { "delete-Object", "ftam.delete-Object",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_pass,
       { "pass", "ftam.pass",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_link,
       { "link", "ftam.link",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_traversal,
       { "traversal", "ftam.traversal",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_reverse_traversal,
       { "reverse-traversal", "ftam.reverse-traversal",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Permitted_Actions_Attribute_random_Order,
       { "random-Order", "ftam.random-Order",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Equality_Comparision_no_value_available_matches,
       { "no-value-available-matches", "ftam.no-value-available-matches",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Equality_Comparision_equals_matches,
       { "equals-matches", "ftam.equals-matches",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_no_value_available_matches,
       { "no-value-available-matches", "ftam.no-value-available-matches",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_equals_matches,
       { "equals-matches", "ftam.equals-matches",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_less_than_matches,
       { "less-than-matches", "ftam.less-than-matches",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Relational_Comparision_greater_than_matches,
       { "greater-than-matches", "ftam.greater-than-matches",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_pathname,
       { "read-pathname", "ftam.read-pathname",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_type,
       { "read-Object-type", "ftam.read-Object-type",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_permitted_actions,
       { "read-permitted-actions", "ftam.read-permitted-actions",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_contents_type,
       { "read-contents-type", "ftam.read-contents-type",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_linked_Object,
       { "read-linked-Object", "ftam.read-linked-Object",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Child_objects,
       { "read-Child-objects", "ftam.read-Child-objects",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_primary_pathname,
       { "read-primary-pathname", "ftam.read-primary-pathname",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_storage_account,
       { "read-storage-account", "ftam.read-storage-account",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_creation,
       { "read-date-and-time-of-creation", "ftam.read-date-and-time-of-creation",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_modification,
       { "read-date-and-time-of-last-modification", "ftam.read-date-and-time-of-last-modification",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_read_access,
       { "read-date-and-time-of-last-read-access", "ftam.read-date-and-time-of-last-read-access",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_date_and_time_of_last_attribute_modification,
       { "read-date-and-time-of-last-attribute-modification", "ftam.read-date-and-time-of-last-attribute-modification",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_creator,
       { "read-identity-of-creator", "ftam.read-identity-of-creator",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_modifier,
       { "read-identity-of-last-modifier", "ftam.read-identity-of-last-modifier",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_reader,
       { "read-identity-of-last-reader", "ftam.read-identity-of-last-reader",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_identity_of_last_attribute_modifier,
       { "read-identity-of-last-attribute-modifier", "ftam.read-identity-of-last-attribute-modifier",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_availability,
       { "read-Object-availability", "ftam.read-Object-availability",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_Object_size,
       { "read-Object-size", "ftam.read-Object-size",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_future_Object_size,
       { "read-future-Object-size", "ftam.read-future-Object-size",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_access_control,
       { "read-access-control", "ftam.read-access-control",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_path_access_control,
       { "read-path-access-control", "ftam.read-path-access-control",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_l8gal_qualifiCatiOnS,
       { "read-l8gal-qualifiCatiOnS", "ftam.read-l8gal-qualifiCatiOnS",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ftam_Attribute_Names_read_private_use,
       { "read-private-use", "ftam.read-private-use",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-ftam-hfarr.c ---*/
 #line 134 "packet-ftam-template.c"
diff --git a/epan/dissectors/packet-ftp.c b/epan/dissectors/packet-ftp.c
index b21a02b927..0bcb51750a 100644
--- a/epan/dissectors/packet-ftp.c
+++ b/epan/dissectors/packet-ftp.c
@@ -674,22 +674,22 @@ proto_register_ftp(void)
     { &hf_ftp_request_command,
       { "Request command",    "ftp.request.command",
       	FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ftp_request_arg,
       { "Request arg",	      "ftp.request.arg",
       	FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ftp_response_code,
       { "Response code",      "ftp.response.code",
       	FT_UINT32,   BASE_DEC, VALS(response_table), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ftp_response_arg,
       { "Response arg",      "ftp.response.arg",
       	FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_ftp_pasv_ip,
       { "Passive IP address", "ftp.passive.ip",
diff --git a/epan/dissectors/packet-fw1.c b/epan/dissectors/packet-fw1.c
index c74ac146d7..b54d9c8ee3 100644
--- a/epan/dissectors/packet-fw1.c
+++ b/epan/dissectors/packet-fw1.c
@@ -231,20 +231,20 @@ proto_register_fw1(void)
   static hf_register_info hf[] = {
 	{ &hf_fw1_direction,
 	{ "Direction",	"fw1.direction", FT_STRING, BASE_NONE, NULL, 0x0,
-		"Direction", HFILL }},
+		NULL, HFILL }},
 	{ &hf_fw1_chain,
 	{ "Chain Position",	"fw1.chain", FT_STRING, BASE_NONE, NULL, 0x0,
-		"Chain Position", HFILL }},
+		NULL, HFILL }},
 	{ &hf_fw1_interface,
 	{ "Interface",	"fw1.interface", FT_STRING, BASE_NONE, NULL, 0x0,
-		"Interface", HFILL }},
+		NULL, HFILL }},
 	{ &hf_fw1_uuid,
 	{ "UUID",	"fw1.uuid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		"UUID", HFILL }},
+		NULL, HFILL }},
 		/* registered here but handled in ethertype.c */
 	{ &hf_fw1_type,
 	{ "Type",		"fw1.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
   };
   /* Setup protocol subtree array */
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c
index c5bceed6de..a3c3992a4c 100644
--- a/epan/dissectors/packet-g723.c
+++ b/epan/dissectors/packet-g723.c
@@ -132,7 +132,7 @@ proto_register_g723(void)
 		{ &hf_g723_lpc_B5_B0,
 			{ "LPC_B5...LPC_B0",           "g723.lpc.b5b0",
 			FT_UINT8, BASE_HEX, NULL, 0xfc,          
-			"LPC_B5...LPC_B0", HFILL }
+			NULL, HFILL }
 		},
 
 	};
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 36594f25fd..0f6aa90794 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -4135,146 +4135,146 @@ proto_register_giop (void)
   static hf_register_info hf[] = {
     { &hf_giop_message_type,
      { "Message type", "giop.type",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_message_size,
       { "Message size", "giop.len",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_repoid,
      { "Repository ID", "giop.repoid",
-       FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_string_length,
      { "String Length", "giop.strlen",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_sequence_length,
      { "Sequence Length", "giop.seqlen",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_profile_id,
      { "Profile ID", "giop.profid",
-       FT_UINT32, BASE_DEC, VALS(profile_id_vals), 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, VALS(profile_id_vals), 0x0, NULL, HFILL }
     },
 
 
     { &hf_giop_type_id,
      { "IOR::type_id", "giop.typeid",
-       FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_iiop_v_maj,
      { "IIOP Major Version", "giop.iiop_vmaj",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     }
     ,
     { &hf_giop_iiop_v_min,
      { "IIOP Minor Version", "giop.iiop_vmin",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_compressed,
      { "ZIOP", "giop.compressed",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_endianness,
      { "Endianness", "giop.endianness",
-       FT_UINT8, BASE_DEC, VALS(giop_endianness_vals), 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, VALS(giop_endianness_vals), 0x0, NULL, HFILL }
     },
 
     { &hf_giop_IIOP_tag,
      { "IIOP Component TAG", "giop.iioptag",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_IOR_tag,
      { "IOR Profile TAG", "giop.iortag",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_TCKind,
      { "TypeCode enum", "giop.TCKind",
-       FT_UINT32, BASE_DEC, VALS(tckind_vals), 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, VALS(tckind_vals), 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_count,
      { "TypeCode count", "giop.tccount",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_default_used,
      { "default_used", "giop.tcdefault_used",
-       FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_digits,
      { "Digits", "giop.tcdigits",
-       FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
 
     { &hf_giop_typecode_length,
      { "Length", "giop.tclength",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_max_length,
      { "Maximum length", "giop.tcmaxlen",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_member_name,
      { "TypeCode member name", "giop.tcmemname",
-       FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_name,
      { "TypeCode name", "giop.tcname",
-       FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_scale,
      { "Scale", "giop.tcscale",
-       FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_ValueModifier,
      { "ValueModifier", "giop.tcValueModifier",
-       FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_typecode_Visibility,
      { "Visibility", "giop.tcVisibility",
-       FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
 
 
     { &hf_giop_type_boolean,
       { "TypeCode boolean data", "giop.tcboolean",
-	FT_BOOLEAN, BASE_NONE,  NULL, 0x0, "", HFILL }
+	FT_BOOLEAN, BASE_NONE,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_char,
       { "TypeCode char data", "giop.tcchar",
-	FT_UINT8, BASE_DEC,  NULL, 0x0, "", HFILL }
+	FT_UINT8, BASE_DEC,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_double,
       { "TypeCode double data", "giop.tcdouble",
-	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "", HFILL }
+	FT_DOUBLE, BASE_DEC,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_enum,
      { "TypeCode enum data", "giop.tcenumdata",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /*
@@ -4283,37 +4283,37 @@ proto_register_giop (void)
 
     { &hf_giop_type_float,
       { "TypeCode float data", "giop.tcfloat",
-	FT_DOUBLE, BASE_DEC,  NULL, 0x0, "", HFILL }
+	FT_DOUBLE, BASE_DEC,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_long,
      { "TypeCode long data", "giop.tclongdata",
-       FT_INT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_octet,
       { "TypeCode octet data", "giop.tcoctet",
-	FT_UINT8, BASE_DEC,  NULL, 0x0, "", HFILL }
+	FT_UINT8, BASE_DEC,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_short,
      { "TypeCode short data", "giop.tcshortdata",
-       FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_string,
       { "TypeCode string data", "giop.tcstring",
-	FT_STRING, BASE_DEC,  NULL, 0x0, "", HFILL }
+	FT_STRING, BASE_NONE,  NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_ulong,
      { "TypeCode ulong data", "giop.tculongdata",
-       FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_giop_type_ushort,
      { "TypeCode ushort data", "giop.tcushortdata",
-       FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /*
@@ -4322,13 +4322,13 @@ proto_register_giop (void)
 
     { &hf_giop_iiop_host,
      { "IIOP::Profile_host", "giop.iiop.host",
-       FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
     }
     ,
 
     { &hf_giop_iiop_port,
      { "IIOP::Profile_port", "giop.iiop.port",
-       FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+       FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     }
     ,
 
@@ -4338,36 +4338,36 @@ proto_register_giop (void)
 
     { &hf_giop_iop_vscid,
      { "VSCID", "giop.iiop.vscid",
-       FT_UINT32, BASE_HEX, NULL, 0xffffff00, "", HFILL }
+       FT_UINT32, BASE_HEX, NULL, 0xffffff00, NULL, HFILL }
     }
     ,
 
     { &hf_giop_iop_scid,
      { "SCID", "giop.iiop.scid",
-       FT_UINT32, BASE_HEX, NULL, 0x000000ff, "", HFILL }
+       FT_UINT32, BASE_HEX, NULL, 0x000000ff, NULL, HFILL }
     }
     ,
 
   { &hf_giop_req_id,
   { "Request id", "giop.request_id",
-	  FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }
+	  FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }
   },
 
   { &hf_giop_req_operation,
   { "Request operation", "giop.request_op",
-	  FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
   },
   { &hf_giop_reply_status,
   { "Reply status", "giop.replystatus",
-	  FT_UINT32, BASE_DEC, VALS(reply_status_types), 0x0, "", HFILL }
+	  FT_UINT32, BASE_DEC, VALS(reply_status_types), 0x0, NULL, HFILL }
   },
   { &hf_giop_exception_id,
   { "Exception id", "giop.exceptionid",
-	  FT_STRING, BASE_DEC, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
   },
   { &hf_giop_objekt_key,
   { "Object Key", "giop.objektkey",
-	  FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+	  FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
   },
 
   };
diff --git a/epan/dissectors/packet-gmrp.c b/epan/dissectors/packet-gmrp.c
index 458d10aef6..6d53d96065 100644
--- a/epan/dissectors/packet-gmrp.c
+++ b/epan/dissectors/packet-gmrp.c
@@ -347,32 +347,32 @@ proto_register_gmrp(void)
 	{ &hf_gmrp_proto_id,
 	    { "Protocol ID", "gmrp.protocol_id",
 	    FT_UINT16,      BASE_HEX,      NULL,  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	},
 	{ &hf_gmrp_attribute_type,
 	    { "Type",        "gmrp.attribute_type",
 	    FT_UINT8,        BASE_HEX,      VALS(attribute_type_vals),  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	},
 	{ &hf_gmrp_attribute_length,
 	    { "Length",      "gmrp.attribute_length",
 	    FT_UINT8,        BASE_DEC,      NULL,  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	},
 	{ &hf_gmrp_attribute_event,
 	    { "Event",       "gmrp.attribute_event",
 	    FT_UINT8,        BASE_DEC,      VALS(event_vals),  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	},
 	{ &hf_gmrp_attribute_value_group_membership,
 	    { "Value",       "gmrp.attribute_value_group_membership",
 	    FT_ETHER,        BASE_HEX,      NULL,  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	},
 	{ &hf_gmrp_attribute_value_service_requirement,
 	    { "Value",       "gmrp.attribute_value_service_requirement",
 	    FT_UINT8,        BASE_HEX,      NULL,  0x0,
-	    "" , HFILL }
+	    NULL , HFILL }
 	}
 
     };
diff --git a/epan/dissectors/packet-gnm.c b/epan/dissectors/packet-gnm.c
index e4a0a3e83f..0d87c0d725 100644
--- a/epan/dissectors/packet-gnm.c
+++ b/epan/dissectors/packet-gnm.c
@@ -2079,7 +2079,7 @@ void proto_register_gnm(void) {
         "gnm.AlarmStatus", HFILL }},
     { &hf_gnm_Boolean_PDU,
       { "Boolean", "gnm.Boolean",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gnm.Boolean", HFILL }},
     { &hf_gnm_ChannelNumber_PDU,
       { "ChannelNumber", "gnm.ChannelNumber",
@@ -2219,7 +2219,7 @@ void proto_register_gnm(void) {
         "gnm.TpsInGtpList", HFILL }},
     { &hf_gnm_TransmissionCharacteristics_PDU,
       { "TransmissionCharacteristics", "gnm.TransmissionCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gnm.TransmissionCharacteristics", HFILL }},
     { &hf_gnm_UserLabel_PDU,
       { "UserLabel", "gnm.UserLabel",
@@ -2335,7 +2335,7 @@ void proto_register_gnm(void) {
         "gnm.UserLabel", HFILL }},
     { &hf_gnm_redline,
       { "redline", "gnm.redline",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gnm.Boolean", HFILL }},
     { &hf_gnm_additionalInfo,
       { "additionalInfo", "gnm.additionalInfo",
@@ -2519,7 +2519,7 @@ void proto_register_gnm(void) {
         "cmip.ObjectInstance", HFILL }},
     { &hf_gnm_redline_01,
       { "redline", "gnm.redline",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gnm.BOOLEAN", HFILL }},
     { &hf_gnm_name,
       { "name", "gnm.name",
@@ -2720,15 +2720,15 @@ void proto_register_gnm(void) {
     { &hf_gnm_TransmissionCharacteristics_satellite,
       { "satellite", "gnm.satellite",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gnm_TransmissionCharacteristics_dCME,
       { "dCME", "gnm.dCME",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gnm_TransmissionCharacteristics_echoControl,
       { "echoControl", "gnm.echoControl",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-gnm-hfarr.c ---*/
 #line 84 "packet-gnm-template.c"
diff --git a/epan/dissectors/packet-gnutella.c b/epan/dissectors/packet-gnutella.c
index 5dc7976132..992fd8a6c0 100644
--- a/epan/dissectors/packet-gnutella.c
+++ b/epan/dissectors/packet-gnutella.c
@@ -602,11 +602,11 @@ void proto_register_gnutella(void) {
 		{ &hf_gnutella_stream,
 			{ "Gnutella Upload / Download Stream", "gnutella.stream",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"Gnutella Upload / Download Stream", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gnutella_header_id,
 			{ "ID", "gnutella.header.id",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Gnutella Descriptor ID", HFILL }
 		},
 		{ &hf_gnutella_header_payload,
@@ -636,7 +636,7 @@ void proto_register_gnutella(void) {
 		},
 		{ &hf_gnutella_pong_ip,
 			{ "IP", "gnutella.pong.ip",
-			FT_IPv4, BASE_DEC, NULL, 0,
+			FT_IPv4, BASE_NONE, NULL, 0,
 			"Gnutella Pong IP Address", HFILL }
 		},
 		{ &hf_gnutella_pong_files,
@@ -681,7 +681,7 @@ void proto_register_gnutella(void) {
 		},
 		{ &hf_gnutella_queryhit_hit_extra,
 			{ "Extra", "gnutella.queryhit.hit.extra",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Gnutella Query Extra", HFILL }
 		},
 		{ &hf_gnutella_queryhit_count,
@@ -696,7 +696,7 @@ void proto_register_gnutella(void) {
 		},
 		{ &hf_gnutella_queryhit_ip,
 			{ "IP", "gnutella.queryhit.ip",
-			FT_IPv4, BASE_DEC, NULL, 0,
+			FT_IPv4, BASE_NONE, NULL, 0,
 			"Gnutella QueryHit IP Address", HFILL }
 		},
 		{ &hf_gnutella_queryhit_speed,
@@ -706,22 +706,22 @@ void proto_register_gnutella(void) {
 		},
 		{ &hf_gnutella_queryhit_extra,
 			{ "Extra", "gnutella.queryhit.extra",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Gnutella QueryHit Extra", HFILL }
 		},
 		{ &hf_gnutella_queryhit_servent_id,
 			{ "Servent ID", "gnutella.queryhit.servent_id",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Gnutella QueryHit Servent ID", HFILL }
 		},
 		{ &hf_gnutella_push_servent_id,
 			{ "Servent ID", "gnutella.push.servent_id",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Gnutella Push Servent ID", HFILL }
 		},
 		{ &hf_gnutella_push_ip,
 			{ "IP", "gnutella.push.ip",
-			FT_IPv4, BASE_DEC, NULL, 0,
+			FT_IPv4, BASE_NONE, NULL, 0,
 			"Gnutella Push IP Address", HFILL }
 		},
 		{ &hf_gnutella_push_index,
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index 4fec0387ce..c27733ba53 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -710,16 +710,16 @@ void proto_register_goose(void) {
   static hf_register_info hf[] =
   {
   	{ &hf_goose_appid,
-	{ "APPID",	"goose.appid", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "", HFILL }},
+	{ "APPID",	"goose.appid", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 
   	{ &hf_goose_length,
-	{ "Length",	"goose.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+	{ "Length",	"goose.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
   	{ &hf_goose_reserve1,
-	{ "Reserved 1",	"goose.reserve1", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "", HFILL }},
+	{ "Reserved 1",	"goose.reserve1", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 
   	{ &hf_goose_reserve2,
-	{ "Reserved 2",	"goose.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "", HFILL }},
+	{ "Reserved 2",	"goose.reserve2", FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 
 
 /*--- Included file: packet-goose-hfarr.c ---*/
@@ -858,7 +858,7 @@ void proto_register_goose(void) {
         "goose.VisibleString", HFILL }},
     { &hf_goose_t,
       { "t", "goose.t",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.UtcTime", HFILL }},
     { &hf_goose_stNum,
       { "stNum", "goose.stNum",
@@ -870,11 +870,11 @@ void proto_register_goose(void) {
         "goose.INTEGER", HFILL }},
     { &hf_goose_test,
       { "test", "goose.test",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "goose.BOOLEAN", HFILL }},
     { &hf_goose_ndsCom,
       { "ndsCom", "goose.ndsCom",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "goose.BOOLEAN", HFILL }},
     { &hf_goose_numDatSetEntries,
       { "numDatSetEntries", "goose.numDatSetEntries",
@@ -906,11 +906,11 @@ void proto_register_goose(void) {
         "goose.Data", HFILL }},
     { &hf_goose_boolean,
       { "boolean", "goose.boolean",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "goose.BOOLEAN", HFILL }},
     { &hf_goose_bit_string,
       { "bit-string", "goose.bit_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.BIT_STRING", HFILL }},
     { &hf_goose_integer,
       { "integer", "goose.integer",
@@ -922,7 +922,7 @@ void proto_register_goose(void) {
         "goose.INTEGER", HFILL }},
     { &hf_goose_floating_point,
       { "floating-point", "goose.floating_point",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.FloatingPoint", HFILL }},
     { &hf_goose_real,
       { "real", "goose.real",
@@ -930,7 +930,7 @@ void proto_register_goose(void) {
         "goose.REAL", HFILL }},
     { &hf_goose_octet_string,
       { "octet-string", "goose.octet_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.OCTET_STRING", HFILL }},
     { &hf_goose_visible_string,
       { "visible-string", "goose.visible_string",
@@ -938,7 +938,7 @@ void proto_register_goose(void) {
         "goose.VisibleString", HFILL }},
     { &hf_goose_binary_time,
       { "binary-time", "goose.binary_time",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.TimeOfDay", HFILL }},
     { &hf_goose_bcd,
       { "bcd", "goose.bcd",
@@ -946,7 +946,7 @@ void proto_register_goose(void) {
         "goose.INTEGER", HFILL }},
     { &hf_goose_booleanArray,
       { "booleanArray", "goose.booleanArray",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "goose.BIT_STRING", HFILL }},
 
 /*--- End of included file: packet-goose-hfarr.c ---*/
diff --git a/epan/dissectors/packet-gpef.c b/epan/dissectors/packet-gpef.c
index 2e76388ab0..559b03eacc 100644
--- a/epan/dissectors/packet-gpef.c
+++ b/epan/dissectors/packet-gpef.c
@@ -145,35 +145,35 @@ proto_register_gpef(void)
 	static hf_register_info hf[] = {
 	{ &hf_gpef_keycount,
 	{ "Key Count",   "gpef.key_count", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_length1,
 	{ "Length1",   "gpef.efskey.length1", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_length2,
 	{ "Length2",   "gpef.efskey.length2", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_sid_offset,
 	{ "SID Offset",   "gpef.efskey.sid_offset", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_cert_offset,
 	{ "Cert Offset",   "gpef.efskey.cert_offset", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_cert_length,
 	{ "Cert Length",   "gpef.efskey.cert_length", FT_UINT32, BASE_DEC, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey,
 	{ "EfsKey",   "gpef.efskey", FT_NONE, BASE_NONE, NULL,
-		0x0, "", HFILL }},
+		0x0, NULL, HFILL }},
 
 	{ &hf_gpef_efskey_certificate,
 	{ "Certificate", "gpef.efskey.certificate", FT_NONE, BASE_NONE, NULL,
-		0x0, "Certificate", HFILL }},
+		0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-gprs-llc.c b/epan/dissectors/packet-gprs-llc.c
index 9a0806bbbd..d132447b1b 100644
--- a/epan/dissectors/packet-gprs-llc.c
+++ b/epan/dissectors/packet-gprs-llc.c
@@ -1181,15 +1181,15 @@ proto_register_llcgprs(void)
 		{&hf_llcgprs_sjsd,
 			{ "Supervisory function bits","llcgprs.s1s2", FT_UINT16, BASE_HEX, VALS(cr_formats_ipluss),0x3, "Supervisory functions bits",HFILL }},
 		{ &hf_llcgprs_cr,
-			{ "Command/Response bit", "llcgprs.cr", FT_BOOLEAN, 8, TFS(&cr_bit), 0x40, "Command/Response bit", HFILL}},
+			{ "Command/Response bit", "llcgprs.cr", FT_BOOLEAN, 8, TFS(&cr_bit), 0x40, NULL, HFILL}},
 		{ &hf_llcgprs_sapib,
 			{ "SAPI", "llcgprs.sapib", FT_UINT8, BASE_DEC , VALS(sapi_t), 0xf, "Service Access Point Identifier",HFILL }},
 		{ &hf_llcgprs_U_fmt,
 			{ "UI format", "llcgprs.ui", FT_UINT16, BASE_HEX, NULL, UI_MASK_FMT, "UI frame format",HFILL}},
 		{ &hf_llcgprs_Un,
-			{ "U format", "llcgprs.u", FT_UINT8, BASE_DEC, NULL, 0xe0, " U frame format", HFILL}},
+			{ "U format", "llcgprs.u", FT_UINT8, BASE_DEC, NULL, 0xe0, "U frame format", HFILL}},
 		{ &hf_llcgprs_sp_bits,
-			{ "Spare bits", "llcgprs.ui_sp_bit", FT_UINT16, BASE_HEX, NULL, UI_MASK_SPB, "Spare bits", HFILL}},
+			{ "Spare bits", "llcgprs.ui_sp_bit", FT_UINT16, BASE_HEX, NULL, UI_MASK_SPB, NULL, HFILL}},
 		{ &hf_llcgprs_NU,
 			{ "N(U)", "llcgprs.nu", FT_UINT16, BASE_DEC, NULL, UI_MASK_NU, "Transmitted unconfirmed sequence number", HFILL}},
 		{ &hf_llcgprs_E_bit,
@@ -1208,13 +1208,13 @@ proto_register_llcgprs(void)
 			{ "S format", "llcgprs.s", FT_UINT16, BASE_DEC, NULL, 0xc000,"Supervisory format S", HFILL}},
 		/* MLT CHANGES - additional masks*/
 		{&hf_llcgprs_kmask,
-			{ "ignored", "llcgprs.kmask", FT_UINT8, BASE_DEC, NULL, 0xE0, "ignored", HFILL}},
+			{ "ignored", "llcgprs.kmask", FT_UINT8, BASE_DEC, NULL, 0xE0, NULL, HFILL}},
 		{&hf_llcgprs_k,
 			{ "k", "llcgprs.k", FT_UINT8, BASE_DEC, NULL, 0x1F, "k counter", HFILL}},
 		{&hf_llcgprs_isack_ns,
-			{ "N(S)", "llcgprs.sackns", FT_UINT24, BASE_DEC, NULL, 0x1FF000, "N(S)", HFILL}},
+			{ "N(S)", "llcgprs.sackns", FT_UINT24, BASE_DEC, NULL, 0x1FF000, NULL, HFILL}},
 		{&hf_llcgprs_isack_nr,
-			{ "N(R)", "llcgprs.sacknr", FT_UINT24, BASE_DEC, NULL, 0x0007FC, "N(R)", HFILL}},
+			{ "N(R)", "llcgprs.sacknr", FT_UINT24, BASE_DEC, NULL, 0x0007FC, NULL, HFILL}},
 		{&hf_llcgprs_isack_sfb,
 			{ "Supervisory function bits","llcgprs.sacksfb", FT_UINT24, BASE_HEX, VALS(cr_formats_ipluss),0x000003, "Supervisory functions bits",HFILL }},
 		{&hf_llcgprs_ifmt,
@@ -1231,7 +1231,7 @@ proto_register_llcgprs(void)
 		{&hf_llcgprs_xid_xl,
 				{ "XL Bit","llcgprs.xidxl", FT_UINT8, BASE_HEX, NULL, 0x80, "XL", HFILL}},
 		{&hf_llcgprs_xid_type,
-				{ "Type","llcgprs.xidtype", FT_UINT8, BASE_DEC, NULL, 0x7C, "Type", HFILL}},
+				{ "Type","llcgprs.xidtype", FT_UINT8, BASE_DEC, NULL, 0x7C, NULL, HFILL}},
 		{&hf_llcgprs_xid_len1,
 				{ "Length","llcgprs.xidlen1", FT_UINT8, BASE_DEC, NULL, 0x03, "Len", HFILL}},
 		{&hf_llcgprs_xid_len2,
diff --git a/epan/dissectors/packet-gprs-ns.c b/epan/dissectors/packet-gprs-ns.c
index d84117e808..1e320f84b3 100644
--- a/epan/dissectors/packet-gprs-ns.c
+++ b/epan/dissectors/packet-gprs-ns.c
@@ -325,13 +325,13 @@ proto_register_gprs_ns(void)
 		  VALS(ns_pdu_type), 0x0, "NS Command", HFILL}},
 		{ &hf_gprs_ns_ie_type, {
 		  "IE Type", "gprs_ns.ietype", FT_UINT8, BASE_HEX,
-		  VALS(ns_ie_type), 0x0, "IE Type", HFILL}},
+		  VALS(ns_ie_type), 0x0, NULL, HFILL}},
 		{ &hf_gprs_ns_ie_length, {
 		  "IE Length", "gprs_ns.ielength", FT_UINT16, BASE_DEC,
-		  NULL, 0x0, "IE Length", HFILL}},
+		  NULL, 0x0, NULL, HFILL}},
 		{ &hf_gprs_ns_cause, {
 		  "Cause", "gprs_ns.cause", FT_UINT8, BASE_HEX,
-		  VALS(cause_val), 0x0, "Cause", HFILL}},
+		  VALS(cause_val), 0x0, NULL, HFILL}},
 		{ &hf_gprs_ns_vci, {
 		  "NSVCI", "gprs_ns.nsvci", FT_UINT16, BASE_DEC,
 		  NULL, 0x0, "Network Service Virtual Connection id", HFILL}},
@@ -343,7 +343,7 @@ proto_register_gprs_ns(void)
 		  NULL, 0x0, "Cell ID", HFILL}},
 		{ &hf_gprs_ns_spare, {
 		  "Spare octet", "gprs_ns.spare", FT_UINT8, BASE_HEX,
-		  NULL, 0x0, "", HFILL}},
+		  NULL, 0x0, NULL, HFILL}},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-gre.c b/epan/dissectors/packet-gre.c
index 682412f5ad..9d8015478e 100644
--- a/epan/dissectors/packet-gre.c
+++ b/epan/dissectors/packet-gre.c
@@ -525,15 +525,15 @@ proto_register_gre(void)
 		},
 		{ &hf_gre_key,
 		  { "GRE Key", "gre.key", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_attrib_id,
 		  { "Type", "gre.ggp2_attrib_id", FT_UINT8, BASE_HEX, VALS(gre_3ggp2_attrib_id_vals), 0x7f,
-			"Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_attrib_length,
 		  { "Length", "gre.ggp2_attrib_length", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_sdi,
 		  { "SDI/DOS", "gre.3ggp2_sdi", FT_BOOLEAN, 16, TFS(&gre_3ggp2_sdi_val), 0x8000,
@@ -541,19 +541,19 @@ proto_register_gre(void)
 		},
 		{ &hf_gre_3ggp2_fci,
 		  { "Flow Control Indicator", "gre.3ggp2_fci", FT_BOOLEAN, 16, TFS(&gre_3ggp2_fci_val), 0x8000,
-			"Flow Control Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_di,
 		  { "Duration Indicator", "gre.3ggp2_di", FT_BOOLEAN, 16, TFS(&gre_3ggp2_di_val), 0x4000,
-			"Duration Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_flow_disc,
 		  { "Flow ID", "gre.ggp2_flow_disc", FT_BYTES, BASE_NONE, NULL, 0x0,
-			"Flow ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gre_3ggp2_seg,
 		  { "Type", "gre.ggp2_3ggp2_seg", FT_UINT16, BASE_HEX, VALS(gre_3ggp2_seg_vals), 0xc000,
-			"Type", HFILL }
+			NULL, HFILL }
 		},
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c
index f2feab1a72..3edb470759 100644
--- a/epan/dissectors/packet-gsm_a_common.c
+++ b/epan/dissectors/packet-gsm_a_common.c
@@ -2202,7 +2202,7 @@ proto_register_gsm_a_common(void)
 	},
 	{ &hf_gsm_a_imsi,
 		{ "IMSI",	"gsm_a.imsi",
-		FT_STRING, BASE_DEC, 0, 0,
+		FT_STRING, BASE_NONE, 0, 0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_tmsi,
@@ -2212,12 +2212,12 @@ proto_register_gsm_a_common(void)
 	},
 	{ &hf_gsm_a_imei,
 		{ "IMEI",	"gsm_a.imei",
-		FT_STRING, BASE_DEC, 0, 0,
+		FT_STRING, BASE_NONE, 0, 0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_imeisv,
 		{ "IMEISV",	"gsm_a.imeisv",
-		FT_STRING, BASE_DEC, 0, 0,
+		FT_STRING, BASE_NONE, 0, 0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_MSC_rev,
@@ -2256,12 +2256,12 @@ proto_register_gsm_a_common(void)
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_VBS_notification_rec,
-		{ "VBS notification reception ","gsm_a.VBS_notification_rec",
+		{ "VBS notification reception","gsm_a.VBS_notification_rec",
 		FT_UINT8,BASE_DEC, VALS(VBS_notification_rec_vals), 0x04,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_VGCS_notification_rec,
-		{ "VGCS notification reception ","gsm_a.VGCS_notification_rec",
+		{ "VGCS notification reception","gsm_a.VGCS_notification_rec",
 		FT_UINT8,BASE_DEC, VALS(VGCS_notification_rec_vals), 0x02,
 		NULL, HFILL }
 	},
@@ -2347,7 +2347,7 @@ proto_register_gsm_a_common(void)
 	},
 	{ &hf_gsm_a_mbs_service_id,
 		{ "MBMS Service ID", "gsm_a.mbs_service_id",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_L3_protocol_discriminator,
diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c
index 47aaa13686..77e7d01d64 100644
--- a/epan/dissectors/packet-gsm_a_dtap.c
+++ b/epan/dissectors/packet-gsm_a_dtap.c
@@ -5834,12 +5834,12 @@ proto_register_gsm_a_dtap(void)
 	},
 	{ &hf_gsm_a_cld_party_bcd_num,
 		{ "Called Party BCD Number", "gsm_a.cld_party_bcd_num",
-		FT_STRING, BASE_DEC, 0, 0,
+		FT_STRING, BASE_NONE, 0, 0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_clg_party_bcd_num,
 		{ "Calling Party BCD Number", "gsm_a.clg_party_bcd_num",
-		FT_STRING, BASE_DEC, 0, 0,
+		FT_STRING, BASE_NONE, 0, 0,
 		NULL, HFILL }
 	},
 	{ &hf_gsm_a_dtap_cause,
diff --git a/epan/dissectors/packet-gsm_a_rp.c b/epan/dissectors/packet-gsm_a_rp.c
index 7e72fdb15d..b83bb25f21 100644
--- a/epan/dissectors/packet-gsm_a_rp.c
+++ b/epan/dissectors/packet-gsm_a_rp.c
@@ -546,12 +546,12 @@ proto_register_gsm_a_rp(void)
 	{ &hf_gsm_a_rp_msg_type,
 		{ "RP Message Type",	"gsm_a.rp_msg_type",
 		FT_UINT8, BASE_HEX, VALS(gsm_rp_msg_strings), 0x0,
-		"", HFILL }
+		NULL, HFILL }
 	},
 	{ &hf_gsm_a_rp_elem_id,
 		{ "Element ID",	"gsm_a_rp.elem_id",
 		FT_UINT8, BASE_DEC, NULL, 0,
-		"", HFILL }
+		NULL, HFILL }
 	},
 	};
 
diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index bfb0338d50..60a4b95f55 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -8864,7 +8864,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_dtx_used,
               { "DTX-USED","gsm_a.rr.dtx_used",
-		FT_BOOLEAN, 8,  TFS(&gsm_a_rr_dtx_vals), 0x00,
+		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_dtx_vals), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_3g_ba_used,
@@ -9119,7 +9119,7 @@ proto_register_gsm_a_rr(void)
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_cdma200_cm_cng_msg_req,
-              { "CDMA2000 CLASSMARK CHANGE ","gsm_a.rr_cdma200_cm_cng_msg_req",
+              { "CDMA2000 CLASSMARK CHANGE","gsm_a.rr_cdma200_cm_cng_msg_req",
 		FT_BOOLEAN,8,  TFS(&gsm_a_msg_req_value), 0x08,
 		NULL, HFILL }
             },
@@ -9230,7 +9230,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_pwrc,
               { "PWRC", "gsm_a.rr.pwrc",
-		FT_BOOLEAN, BASE_NONE,  NULL, 0x00,
+		FT_BOOLEAN, BASE_NONE,  NULL, 0x0,
 		"Power Control Indicator (PWRC)", HFILL }
             },
             { &hf_gsm_a_rr_dtx_bcch,
@@ -9500,7 +9500,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_gsm_report_type,
               { "Report Type", "gsm_a.rr.gsm_report_type",
-		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_gsm_report_type_value), 0x00,
+		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_gsm_report_type_value), 0x0,
 		"Report type the MS shall use (Report Type)", HFILL }
             },
             { &hf_gsm_a_rr_serving_band_reporting,
@@ -9510,27 +9510,27 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_frequency_scrolling,
               { "Frequency Scrolling", "gsm_a.rr.frequency_scrolling",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_frequency_scrolling_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_frequency_scrolling_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_rep_priority,
               { "Rep Priority", "gsm_a.rr.rep_priority",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_rep_priority_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_rep_priority_value), 0x0,
 		"Reporting Priority", HFILL }
             },
             { &hf_gsm_a_rr_report_type,
               { "Report Type", "gsm_a.rr.report_type",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_report_type_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_report_type_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_reporting_rate,
               { "Reporting Rate", "gsm_a.rr.reporting_rate",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_reporting_rate_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_reporting_rate_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_invalid_bsic_reporting,
               { "Invalid BSIC Reporting", "gsm_a.rr.invalid_bsic_reporting",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_invalid_bsic_reporting_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_invalid_bsic_reporting_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_scale_ord,
@@ -9620,12 +9620,12 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_qsearch_c_initial,
               { "QSearch C Initial", "gsm_a.rr.qsearch_c_initial",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_qsearch_c_initial_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_qsearch_c_initial_value), 0x0,
 		"Qsearch value to be used in connected mode before Qsearch C is received (QSearch C Initial)", HFILL }
             },
             { &hf_gsm_a_rr_fdd_rep_quant,
               { "FDD Rep Quant", "gsm_a.rr.fdd_rep_quant",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_fdd_rep_quant_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_fdd_rep_quant_value), 0x0,
 		"FDD Reporting Quantity (FDD Rep Quant)", HFILL }
             },
             { &hf_gsm_a_rr_fdd_multirat_reporting,
@@ -9645,7 +9645,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_3g_search_prio,
               { "3G Search Prio", "gsm_a.rr.3g_search_prio",
-		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_3g_search_prio_value), 0x00,
+		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_3g_search_prio_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_fdd_reporting_offset,
@@ -9675,7 +9675,7 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_3g_ccn_active,
               { "3G CCN Active", "gsm_a.rr.3g_ccn_active",
-		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_3g_ccn_active_value), 0x00,
+		FT_BOOLEAN, BASE_NONE,  TFS(&gsm_a_rr_3g_ccn_active_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_700_reporting_offset,
@@ -9991,12 +9991,12 @@ proto_register_gsm_a_rr(void)
             { &hf_gsm_a_rr_t_avg_w,
               { "T Avg W", "gsm_a.rr.t_avg_w",
 		FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t_avg_x_vals), 0x0,
-		"Signal strength filter period for power control in packet idle mode ", HFILL }
+		"Signal strength filter period for power control in packet idle mode", HFILL }
             },
             { &hf_gsm_a_rr_t_avg_t,
               { "T Avg T", "gsm_a.rr.t_avg_t",
 		FT_UINT8, BASE_DEC, VALS(gsm_a_rr_t_avg_x_vals), 0x0,
-		"Signal strength filter period for power control in packet transfer mode ", HFILL }
+		"Signal strength filter period for power control in packet transfer mode", HFILL }
             },
             { &hf_gsm_a_rr_pc_meas_chan,
               { "PC Meas Chan", "gsm_a.rr.pc_meas_chan",
@@ -10050,12 +10050,12 @@ proto_register_gsm_a_rr(void)
             },
             { &hf_gsm_a_rr_bsic_seen,
               { "BSIC Seen", "gsm_a.rr.bsic_seen",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_bsic_seen_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_bsic_seen_value), 0x0,
 		NULL, HFILL }
             },
             { &hf_gsm_a_rr_scale,
               { "Scale", "gsm_a.rr.scale",
-		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_scale_value), 0x00,
+		FT_BOOLEAN, BASE_NONE, TFS(&gsm_a_rr_scale_value), 0x0,
 		"Offset applied for the reported RXLEV values (Scale)", HFILL }
             },
             { &hf_gsm_a_rr_mean_bep_gmsk,
diff --git a/epan/dissectors/packet-gsm_bsslap.c b/epan/dissectors/packet-gsm_bsslap.c
index 5f00b92534..c7a913dbb2 100644
--- a/epan/dissectors/packet-gsm_bsslap.c
+++ b/epan/dissectors/packet-gsm_bsslap.c
@@ -875,22 +875,22 @@ proto_register_gsm_bsslap(void)
 		{ &hf_gsm_bsslap_msg_type,
 			{ "Message Type IE",           "gsm_bsslap.msg_type",
 			FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_msg_strings), 0x0,          
-			"Message Type IE", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_a_bsslap_elem_id,
 			{ "Element ID",	"gsm_bsslap.elem_id",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_bsslap_ta,
 			{ "Timing Advance",           "gsm_bsslap.ta",
 			FT_UINT8, BASE_HEX, NULL, 0x0,          
-			"Timing Advance", HFILL }
+			NULL, HFILL }
 		},
         { &hf_gsm_bsslap_timer_value, 
 			{"Timer Value", "gsm_bsslap.timerValue", 
 			FT_UINT8, BASE_DEC, NULL, 0x0, 
-			"Timer Value", HFILL }
+			NULL, HFILL }
 		},
 
         { &hf_gsm_bsslap_ms_pow, 
@@ -901,7 +901,7 @@ proto_register_gsm_bsslap(void)
 		{ &hf_gsm_bsslap_cause,
 			{"Cause", "gsm_bsslap.cause", 
 			FT_UINT8, BASE_DEC, VALS(gsm_bsslap_cause_vals), 0x0, 
-			"Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_bsslap_rrlp_flg,
 			{"RRLP Flag", "gsm_bsslap.rrlp_flg", 
@@ -911,22 +911,22 @@ proto_register_gsm_bsslap(void)
 		{ &hf_gsm_bsslap_tfi,
 			{"TFI", "gsm_bsslap.tfi", 
 			FT_UINT8, BASE_DEC, NULL, 0x1f, 
-			"TFI", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_bsslap_poll_rep,
 			{"Number of polling repetitions", "gsm_bsslap.poll_rep", 
 			FT_UINT8, BASE_DEC, NULL, 0x3F, 
-			"Number of polling repetitions", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_bsslap_lac,
 			{"Location Area Code", "gsm_bsslap.lac", 
 			FT_UINT8, BASE_DEC, NULL, 0x3f, 
-			"Location Area Code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_gsm_bsslap_cell_id_disc,
 			{"Cell identification Discriminator", "gsm_bsslap.cell_id_disc", 
 			FT_UINT8, BASE_DEC, VALS(gsm_a_bsslap_cell_id_disc_vals), 0xf, 
-			"Cell identification Discriminator", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-gsm_bssmap_le.c b/epan/dissectors/packet-gsm_bssmap_le.c
index 8b3d15b3b5..3cc40f6164 100644
--- a/epan/dissectors/packet-gsm_bssmap_le.c
+++ b/epan/dissectors/packet-gsm_bssmap_le.c
@@ -977,12 +977,12 @@ proto_register_gsm_bssmap_le(void)
 		{ &hf_gsm_bssmap_le_msg_type,
 		  { "BSSMAP LE Message Type",	"bssmap_le.msgtype",
 		    FT_UINT8, BASE_HEX, VALS(gsm_bssmap_le_msg_strings), 0x0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_gsm_bssmap_le_elem_id,
 		  { "Element ID",	"bssmap_le.elem_id",
 		    FT_UINT8, BASE_DEC, NULL, 0,
-		    "", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_gsm_bssmap_le_apdu_protocol_id,
 		  { "Protocol ID", "bssmap_le.apdu_protocol_id",
@@ -992,77 +992,77 @@ proto_register_gsm_bssmap_le(void)
 		{ &hf_gsm_bssmap_le_spare,
 		  { "Spare", "gsm_bssmap_le.spare", 
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "Spare", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_ciphering_key_flag,
 		  { "Ciphering Key Flag", "gsm_bssmap_le.decipheringKeys.flag", 
 		    FT_UINT8, BASE_DEC, NULL, 0x0, 
-		    "Ciphering Key Flag", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_current_deciphering_key_value,
 		  { "Current Deciphering Key Value", "gsm_bssmap_le.decipheringKeys.current", 
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "Current Deciphering Key Value", 
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, 
 		    HFILL}
 		},
 		{ &hf_gsm_bssmap_le_next_deciphering_key_value,
 		  { "Next Deciphering Key Value", "gsm_bssmap_le.decipheringKeys.next", 
 		    FT_UINT8, BASE_DEC, NULL, 0x0, 
-		    "Next Deciphering Key Value", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_lcs_cause_value,
 		  { "Cause Value", "gsm_bssmap_le.lcsCauseValue", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_lcs_cause_values), 0x0,
-		    "Cause Value", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_diagnostic_value,
 		  { "Diagnostic Value", "gsm_bssmap_le.diagnosticValue", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_position_method_failure_diagnostic_vals), 0x0,
-		    "Diagnostic Value", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_client_category,
 		  { "Client Category", "gsm_bssmap_le.lcsClientType.clientCategory", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_client_category), 0x0,
-		    "Client Category", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_client_subtype,
 		  { "Client Subtype", "gsm_bssmap_le.lcsClientType.clientSubtype", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_client_subtype), 0x0,
-		    "Client Subtype", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_velocity_requested,
 		  { "Velocity Requested", "gsm_bssmap_le.lcsQos.velocityRequested", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_velocity_requested_vals), 0x0,
-		    "Velocity Requested", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_vertical_coordinate_indicator,
 		  { "Vertical Coordinate Indicator", "gsm_bssmap_le.lcsQos.verticalCoordinateIndicator", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_vertical_coordinate_indicator_vals), 0x0,
-		    "Vertical Coordinate Indicator", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_horizontal_accuracy_indicator,
 		  { "Horizontal Accuracy Indicator", "gsm_bssmap_le.lcsQos.horizontalAccuracyIndicator", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_horizontal_accuracy_indicator_vals), 0x0,
-		    "Horizontal Accuracy Indicator", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_horizontal_accuracy,
 		  { "Horizontal Accuracy", "gsm_bssmap_le.lcsQos.horizontalAccuracy", 
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "Horizontal Accuracy", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_vertical_accuracy,
 		  { "Vertical Accuracy", "gsm_bssmap_le.lcsQos.verticalAccuracy", 
 		    FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "Vertical Accuracy", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_vertical_accuracy_indicator,
 		  { "Vertical Accuracy Indicator", "gsm_bssmap_le.lcsQos.verticalAccuracyIndicator", 
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_vertical_accuracy_indicator_vals), 0x0,
-		    "Vertical Accuracy Indicator", HFILL}
+		    NULL, HFILL}
 		},
 		{ &hf_gsm_bssmap_le_response_time_category,
 		  { "Response Time Category", "gsm_bssmap_le.lcsQos.responseTimeCategory",
 		    FT_UINT8, BASE_HEX, VALS(bssmap_le_response_time_definitions_vals), 0x0,
-		    "Response Time Category", HFILL}
+		    NULL, HFILL}
 		},
 
 	};
diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index e3e5ab44c6..4e8c025fce 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -18017,75 +18017,75 @@ void proto_register_gsm_map(void) {
       { &hf_gsm_map_getPassword,
         { "getPassword", "gsm_map.getPassword",
           FT_UINT8, BASE_DEC, VALS(gsm_old_GetPasswordArg_vals), 0,
-          "getPassword", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_currentPassword,
         { "currentPassword", "gsm_map.currentPassword",
           FT_STRING, BASE_NONE, NULL, 0,
-          "", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_extension,
         { "Extension", "gsm_map.extension",
           FT_BOOLEAN, 8, TFS(&gsm_map_extension_value), 0x80,
-          "Extension", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_nature_of_number,
         { "Nature of number", "gsm_map.nature_of_number",
           FT_UINT8, BASE_HEX, VALS(gsm_map_nature_of_number_values), 0x70,
-          "Nature of number", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_number_plan,
         { "Number plan", "gsm_map.number_plan",
           FT_UINT8, BASE_HEX, VALS(gsm_map_number_plan_values), 0x0f,
-          "Number plan", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_isdn_address_digits,
         { "ISDN Address digits", "gsm_map.isdn.address.digits",
           FT_STRING, BASE_NONE, NULL, 0,
-          "ISDN Address digits", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_address_digits,
         { "Address digits", "gsm_map.address.digits",
           FT_STRING, BASE_NONE, NULL, 0,
-          "Address digits", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_servicecentreaddress_digits,
         { "ServiceCentreAddress digits", "gsm_map.servicecentreaddress_digits",
           FT_STRING, BASE_NONE, NULL, 0,
-          "ServiceCentreAddress digits", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_imsi_digits,
         { "IMSI digits", "gsm_map.imsi_digits",
           FT_STRING, BASE_NONE, NULL, 0,
-          "IMSI digits", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_TBCD_digits,
         { "TBCD digits", "gsm_map.imsi_digits",
           FT_STRING, BASE_NONE, NULL, 0,
-          "TBCD digits", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_Ss_Status_unused,
         { "Unused", "gsm_map.unused",
           FT_UINT8, BASE_HEX, NULL, 0xf0,
-          "Unused", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_Ss_Status_q_bit,
         { "Q bit", "gsm_map.ss_status_q_bit",
           FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_q_bit_values), 0x08,
-          "Q bit", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_Ss_Status_p_bit,
         { "P bit", "gsm_map.ss_status_p_bit",
           FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_p_values), 0x04,
-          "P bit", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_Ss_Status_r_bit,
         { "R bit", "gsm_map.ss_status_r_bit",
           FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_r_values), 0x02,
-          "R bit", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_Ss_Status_a_bit,
         { "A bit", "gsm_map.ss_status_a_bit",
           FT_BOOLEAN, 8, TFS(&gsm_map_Ss_Status_a_values), 0x01,
-          "A bit", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_notification_to_forwarding_party,
         { "Notification to forwarding party", "gsm_map.notification_to_forwarding_party",
           FT_BOOLEAN, 8, TFS(&notification_value), 0x80,
-          "Notification to forwarding party", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_redirecting_presentation,
         { "Redirecting presentation", "gsm_map.redirecting_presentation",
           FT_BOOLEAN, 8, TFS(&redirecting_presentation_value), 0x40,
-          "Redirecting presentation", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_notification_to_calling_party,
         { "Notification to calling party", "gsm_map.notification_to_clling_party",
           FT_BOOLEAN, 8, TFS(&notification_value), 0x20,
-          "Notification to calling party", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_forwarding_reason,
         { "Forwarding reason", "gsm_map.forwarding_reason",
           FT_UINT8, BASE_HEX, VALS(forwarding_reason_values), 0x0c,
@@ -18093,7 +18093,7 @@ void proto_register_gsm_map(void) {
       { &hf_gsm_map_pdp_type_org,
         { "PDP Type Organization", "gsm_map.pdp_type_org",
           FT_UINT8, BASE_HEX, VALS(pdp_type_org_values), 0x0f,
-          "PDP Type Organization", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_etsi_pdp_type_number,
         { "PDP Type Number", "gsm_map.pdp_type_org",
           FT_UINT8, BASE_HEX, VALS(etsi_pdp_type_number_values), 0,
@@ -18105,36 +18105,36 @@ void proto_register_gsm_map(void) {
       { &hf_gsm_map_ext_qos_subscribed_pri,
         { "Allocation/Retention priority", "gsm_map.ext_qos_subscribed_pri",
           FT_UINT8, BASE_DEC, NULL, 0xff,
-          "Allocation/Retention priority", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_traffic_cls,
         { "Traffic class", "gsm_map.qos.traffic_cls",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traffic_cls_vals), 0xe0,
-          "Traffic class", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_del_order,
         { "Delivery order", "gsm_map.qos.del_order",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traffic_cls_vals), 0x18,
-          "Delivery order", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_del_of_err_sdu,
         { "Delivery of erroneous SDUs", "gsm_map.qos.del_of_err_sdu",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_del_of_err_sdu_vals), 0x03,
-          "Delivery of erroneous SDUs", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_ber,
         { "Residual Bit Error Rate (BER)", "gsm_map.qos.ber",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_ber_vals), 0xf0,
-          "Residual Bit Error Rate (BER)", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_sdu_err_rat,
         { "SDU error ratio", "gsm_map.qos.sdu_err_rat",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_sdu_err_rat_vals), 0x0f,
-          "SDU error ratio", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_qos_traff_hdl_pri,
         { "Traffic handling priority", "gsm_map.qos.traff_hdl_pri",
           FT_UINT8, BASE_DEC, VALS(gsm_a_qos_traff_hdl_pri_vals), 0x03,
-          "Traffic handling priority", HFILL }},
+          NULL, HFILL }},
       
       { &hf_gsm_map_qos_max_sdu,
         { "Maximum SDU size", "gsm_map.qos.max_sdu",
           FT_UINT32, BASE_DEC, NULL, 0x0,
-          "Maximum SDU size", HFILL }},		
+          NULL, HFILL }},		
       { &hf_gsm_map_max_brate_ulink,
         { "Maximum bit rate for uplink in kbit/s", "gsm_map.qos.max_brate_ulink",
           FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -18186,61 +18186,61 @@ void proto_register_gsm_map(void) {
       { &hf_gsm_map_cbs_coding_grp,
         { "Coding Group","gsm_map.cbs.coding_grp",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_data_coding_scheme_coding_grp_vals), 0xf0,          
-          "Coding Group", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp0_lang,
         { "Language","gsm_map.cbs.coding_grp0_lang",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp0_lang_vals), 0x0f,          
-          "Language", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp1_lang,
         { "Language","gsm_map.cbs.coding_grp1_lang",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp1_lang_vals), 0x0f,          
-          "Language", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp2_lang,
         { "Language","gsm_map.cbs.coding_grp2_lang",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp2_lang_vals), 0x0f,          
-          "Language", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp3_lang,
         { "Language","gsm_map.cbs.coding_grp3_lang",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp3_lang_vals), 0x0f,          
-          "Language", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp4_7_comp,
         { "Compressed indicator","gsm_map.cbs.coding_grp4_7_comp",
           FT_BOOLEAN, 8, TFS(&gsm_map_cbs_coding_grp4_7_comp_vals), 0x20,          
-          "Compressed indicator", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp4_7_class_ind,
         { "Message Class present","gsm_map.cbs.coding_grp4_7_class_ind",
           FT_BOOLEAN, 8, TFS(&gsm_map_cbs_coding_grp4_7_class_ind_vals), 0x10,          
-          "Message Class present", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp4_7_char_set,
         { "Character set being used","gsm_map.cbs.coding_grp4_7_char_set",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp4_7_char_set_vals), 0x0c,          
-          "Character set being used", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp4_7_class,
         { "Message Class","gsm_map.cbs.coding_grp4_7_class",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp4_7_class_vals), 0x03,          
-          "Message Class", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp15_mess_code,
         { "Message coding","gsm_map.cbs.cbs_coding_grp15_mess_code",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp15_mess_code_vals), 0x04,          
-          "Message coding", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_cbs_coding_grp15_class,
         { "Message Class","gsm_map.cbs.gsm_map_cbs_coding_grp15_class",
           FT_UINT8,BASE_DEC, VALS(gsm_map_cbs_coding_grp15_class_vals), 0x03,          
-          "Message Class", HFILL }
+          NULL, HFILL }
       },
       { &hf_gsm_map_tmsi,
         { "tmsi", "gsm_map.tmsi",
-          FT_BYTES, BASE_HEX, NULL, 0,
+          FT_BYTES, BASE_NONE, NULL, 0,
           "gsm_map.TMSI", HFILL }},
       
       { &hf_gsm_map_ie_tag,
@@ -18250,11 +18250,11 @@ void proto_register_gsm_map(void) {
       { &hf_gsm_map_len,
         { "Length", "gsm_map.length",
           FT_UINT8, BASE_DEC, NULL, 0,
-          "Length", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_disc_par,
         { "Discrimination parameter", "gsm_map.disc_par",
           FT_UINT8, BASE_DEC, VALS(gsm_map_disc_par_vals), 0,
-          "Discrimination parameter", HFILL }},
+          NULL, HFILL }},
       { &hf_gsm_map_dlci,
         { "DLCI", "gsm_map.disc_par",
           FT_UINT8, BASE_DEC, NULL, 0,
@@ -18303,7 +18303,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.ProtocolId", HFILL }},
     { &hf_gsm_map_signalInfo,
       { "signalInfo", "gsm_map.signalInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_map_extensionContainer,
       { "extensionContainer", "gsm_map.extensionContainer",
@@ -18319,11 +18319,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.AccessNetworkProtocolId", HFILL }},
     { &hf_gsm_map_signalInfo_01,
       { "signalInfo", "gsm_map.signalInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LongSignalInfo", HFILL }},
     { &hf_gsm_map_imsi,
       { "imsi", "gsm_map.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_imsi_WithLMSI,
       { "imsi-WithLMSI", "gsm_map.imsi_WithLMSI",
@@ -18331,31 +18331,31 @@ void proto_register_gsm_map(void) {
         "gsm_map.IMSI_WithLMSI", HFILL }},
     { &hf_gsm_map_lmsi,
       { "lmsi", "gsm_map.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_HLR_List_item,
       { "HLR-Id", "gsm_map.HLR_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.HLR_Id", HFILL }},
     { &hf_gsm_map_naea_PreferredCIC,
       { "naea-PreferredCIC", "gsm_map.naea_PreferredCIC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.NAEA_CIC", HFILL }},
     { &hf_gsm_map_msisdn,
       { "msisdn", "gsm_map.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_externalAddress,
       { "externalAddress", "gsm_map.externalAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_cellGlobalIdOrServiceAreaIdFixedLength,
       { "cellGlobalIdOrServiceAreaIdFixedLength", "gsm_map.cellGlobalIdOrServiceAreaIdFixedLength",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.CellGlobalIdOrServiceAreaIdFixedLength", HFILL }},
     { &hf_gsm_map_laiFixedLength,
       { "laiFixedLength", "gsm_map.laiFixedLength",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_gsm_map_bearerService,
       { "bearerService", "gsm_map.bearerService",
@@ -18387,7 +18387,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.SS_Code", HFILL }},
     { &hf_gsm_map_ss_Status,
       { "ss-Status", "gsm_map.ss_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.Ext_SS_Status", HFILL }},
     { &hf_gsm_map_nbrSB,
       { "nbrSB", "gsm_map.nbrSB",
@@ -18410,11 +18410,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.BasicServiceCode", HFILL }},
     { &hf_gsm_map_ss_forwardedToNumber,
       { "forwardedToNumber", "gsm_map.ss.forwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_ss_forwardedToSubaddress,
       { "forwardedToSubaddress", "gsm_map.ss.forwardedToSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_map_ss_noReplyConditionTime,
       { "noReplyConditionTime", "gsm_map.ss.noReplyConditionTime",
@@ -18454,19 +18454,19 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.ForwardingFeature", HFILL }},
     { &hf_gsm_map_ss_ss_Status,
       { "ss-Status", "gsm_map.ss.ss_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.SS_Status", HFILL }},
     { &hf_gsm_map_ss_forwardedToNumber_01,
       { "forwardedToNumber", "gsm_map.ss.forwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ss_forwardingOptions,
       { "forwardingOptions", "gsm_map.ss.forwardingOptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.ForwardingOptions", HFILL }},
     { &hf_gsm_map_ss_longForwardedToNumber,
       { "longForwardedToNumber", "gsm_map.ss.longForwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.FTN_AddressString", HFILL }},
     { &hf_gsm_map_ss_callBarringFeatureList,
       { "callBarringFeatureList", "gsm_map.ss.callBarringFeatureList",
@@ -18518,11 +18518,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.CCBS_Index", HFILL }},
     { &hf_gsm_map_ss_b_subscriberNumber,
       { "b-subscriberNumber", "gsm_map.ss.b_subscriberNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ss_b_subscriberSubaddress,
       { "b-subscriberSubaddress", "gsm_map.ss.b_subscriberSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_map_ss_basicServiceGroup,
       { "basicServiceGroup", "gsm_map.ss.basicServiceGroup",
@@ -18534,19 +18534,19 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.GenericServiceInfo", HFILL }},
     { &hf_gsm_map_ss_ussd_DataCodingScheme,
       { "ussd-DataCodingScheme", "gsm_map.ss.ussd_DataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.USSD_DataCodingScheme", HFILL }},
     { &hf_gsm_map_ss_ussd_String,
       { "ussd-String", "gsm_map.ss.ussd_String",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.USSD_String", HFILL }},
     { &hf_gsm_map_ss_alertingPattern,
       { "alertingPattern", "gsm_map.ss.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AlertingPattern", HFILL }},
     { &hf_gsm_map_ss_msisdn,
       { "msisdn", "gsm_map.ss.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ss_SS_List_item,
       { "SS-Code", "gsm_map.ss.SS_Code",
@@ -18558,7 +18558,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.BasicServiceCode", HFILL }},
     { &hf_gsm_map_ss_imsi,
       { "imsi", "gsm_map.ss.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_ss_ss_Event,
       { "ss-Event", "gsm_map.ss.ss_Event",
@@ -18578,7 +18578,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.CCBS_RequestState", HFILL }},
     { &hf_gsm_map_ss_SS_EventSpecification_item,
       { "AddressString", "gsm_map.ss.AddressString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_ss_ccbs_Data,
       { "ccbs-Data", "gsm_map.ss.ccbs_Data",
@@ -18590,11 +18590,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.CCBS_Feature", HFILL }},
     { &hf_gsm_map_ss_translatedB_Number,
       { "translatedB-Number", "gsm_map.ss.translatedB_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ss_serviceIndicator,
       { "serviceIndicator", "gsm_map.ss.serviceIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.ServiceIndicator", HFILL }},
     { &hf_gsm_map_ss_callInfo,
       { "callInfo", "gsm_map.ss.callInfo",
@@ -18607,11 +18607,11 @@ void proto_register_gsm_map(void) {
     { &hf_gsm_map_ss_ServiceIndicator_clir_invoked,
       { "clir-invoked", "gsm_map.ss.clir-invoked",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ss_ServiceIndicator_camel_invoked,
       { "camel-invoked", "gsm_map.ss.camel-invoked",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-ER-DataTypes --- --- ---                                    */
 
@@ -18653,7 +18653,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.BasicServiceCode", HFILL }},
     { &hf_gsm_map_er_ss_Status,
       { "ss-Status", "gsm_map.er.ss_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.SS_Status", HFILL }},
     { &hf_gsm_map_er_sm_EnumeratedDeliveryFailureCause,
       { "sm-EnumeratedDeliveryFailureCause", "gsm_map.er.sm_EnumeratedDeliveryFailureCause",
@@ -18661,7 +18661,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_er.SM_EnumeratedDeliveryFailureCause", HFILL }},
     { &hf_gsm_map_er_diagnosticInfo,
       { "diagnosticInfo", "gsm_map.er.diagnosticInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_map_er_absentSubscriberDiagnosticSM,
       { "absentSubscriberDiagnosticSM", "gsm_map.er.absentSubscriberDiagnosticSM",
@@ -18728,15 +18728,15 @@ void proto_register_gsm_map(void) {
 
     { &hf_gsm_map_sm_msisdn,
       { "msisdn", "gsm_map.sm.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_sm_RP_PRI,
       { "sm-RP-PRI", "gsm_map.sm.sm_RP_PRI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_map_sm.BOOLEAN", HFILL }},
     { &hf_gsm_map_sm_serviceCentreAddress,
       { "serviceCentreAddress", "gsm_map.sm.serviceCentreAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_sm_extensionContainer,
       { "extensionContainer", "gsm_map.sm.extensionContainer",
@@ -18752,7 +18752,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.SM_RP_MTI", HFILL }},
     { &hf_gsm_map_sm_sm_RP_SMEA,
       { "sm-RP-SMEA", "gsm_map.sm.sm_RP_SMEA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_sm.SM_RP_SMEA", HFILL }},
     { &hf_gsm_map_sm_sm_deliveryNotIntended,
       { "sm-deliveryNotIntended", "gsm_map.sm.sm_deliveryNotIntended",
@@ -18760,7 +18760,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.SM_DeliveryNotIntended", HFILL }},
     { &hf_gsm_map_sm_imsi,
       { "imsi", "gsm_map.sm.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_sm_locationInfoWithLMSI,
       { "locationInfoWithLMSI", "gsm_map.sm.locationInfoWithLMSI",
@@ -18768,11 +18768,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.LocationInfoWithLMSI", HFILL }},
     { &hf_gsm_map_sm_networkNode_Number,
       { "networkNode-Number", "gsm_map.sm.networkNode_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_lmsi,
       { "lmsi", "gsm_map.sm.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_sm_gprsNodeIndicator,
       { "gprsNodeIndicator", "gsm_map.sm.gprsNodeIndicator",
@@ -18784,11 +18784,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.Additional_Number", HFILL }},
     { &hf_gsm_map_sm_msc_Number,
       { "msc-Number", "gsm_map.sm.msc_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_sgsn_Number,
       { "sgsn-Number", "gsm_map.sm.sgsn_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_sm_RP_DA,
       { "sm-RP-DA", "gsm_map.sm.sm_RP_DA",
@@ -18800,7 +18800,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.SM_RP_OA", HFILL }},
     { &hf_gsm_map_sm_sm_RP_UI,
       { "sm-RP-UI", "gsm_map.sm.sm_RP_UI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_map_sm_moreMessagesToSend,
       { "moreMessagesToSend", "gsm_map.sm.moreMessagesToSend",
@@ -18808,7 +18808,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.NULL", HFILL }},
     { &hf_gsm_map_sm_serviceCentreAddressDA,
       { "serviceCentreAddressDA", "gsm_map.sm.serviceCentreAddressDA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_sm_noSM_RP_DA,
       { "noSM-RP-DA", "gsm_map.sm.noSM_RP_DA",
@@ -18816,11 +18816,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.NULL", HFILL }},
     { &hf_gsm_map_sm_msisdn_01,
       { "msisdn", "gsm_map.sm.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_sm.T_msisdn", HFILL }},
     { &hf_gsm_map_sm_serviceCentreAddressOA,
       { "serviceCentreAddressOA", "gsm_map.sm.serviceCentreAddressOA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_sm.T_serviceCentreAddressOA", HFILL }},
     { &hf_gsm_map_sm_noSM_RP_OA,
       { "noSM-RP-OA", "gsm_map.sm.noSM_RP_OA",
@@ -18860,11 +18860,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_er.AbsentSubscriberDiagnosticSM", HFILL }},
     { &hf_gsm_map_sm_storedMSISDN,
       { "storedMSISDN", "gsm_map.sm.storedMSISDN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_mw_Status,
       { "mw-Status", "gsm_map.sm.mw_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_sm.MW_Status", HFILL }},
     { &hf_gsm_map_sm_alertReason,
       { "alertReason", "gsm_map.sm.alertReason",
@@ -18880,7 +18880,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.NULL", HFILL }},
     { &hf_gsm_map_sm_asciCallReference,
       { "asciCallReference", "gsm_map.sm.asciCallReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ASCI_CallReference", HFILL }},
     { &hf_gsm_map_sm_dispatcherList,
       { "dispatcherList", "gsm_map.sm.dispatcherList",
@@ -18892,34 +18892,34 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.NULL", HFILL }},
     { &hf_gsm_map_sm_DispatcherList_item,
       { "ISDN-AddressString", "gsm_map.sm.ISDN_AddressString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_sm_MW_Status_sc_AddressNotIncluded,
       { "sc-AddressNotIncluded", "gsm_map.sm.sc-AddressNotIncluded",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mnrf_Set,
       { "mnrf-Set", "gsm_map.sm.mnrf-Set",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mcef_Set,
       { "mcef-Set", "gsm_map.sm.mcef-Set",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_sm_MW_Status_mnrg_Set,
       { "mnrg-Set", "gsm_map.sm.mnrg-Set",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-OM-DataTypes --- --- ---                                    */
 
     { &hf_gsm_map_om_imsi,
       { "imsi", "gsm_map.om.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_om_traceReference,
       { "traceReference", "gsm_map.om.traceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.TraceReference", HFILL }},
     { &hf_gsm_map_om_traceType,
       { "traceType", "gsm_map.om.traceType",
@@ -18927,7 +18927,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_om.TraceType", HFILL }},
     { &hf_gsm_map_om_omc_Id,
       { "omc-Id", "gsm_map.om.omc_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_om_extensionContainer,
       { "extensionContainer", "gsm_map.om.extensionContainer",
@@ -18935,7 +18935,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExtensionContainer", HFILL }},
     { &hf_gsm_map_om_traceReference2,
       { "traceReference2", "gsm_map.om.traceReference2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.TraceReference2", HFILL }},
     { &hf_gsm_map_om_traceDepthList,
       { "traceDepthList", "gsm_map.om.traceDepthList",
@@ -18943,7 +18943,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_om.TraceDepthList", HFILL }},
     { &hf_gsm_map_om_traceNE_TypeList,
       { "traceNE-TypeList", "gsm_map.om.traceNE_TypeList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.TraceNE_TypeList", HFILL }},
     { &hf_gsm_map_om_traceInterfaceList,
       { "traceInterfaceList", "gsm_map.om.traceInterfaceList",
@@ -18979,71 +18979,71 @@ void proto_register_gsm_map(void) {
         "gsm_map_om.TraceDepth", HFILL }},
     { &hf_gsm_map_om_msc_s_List,
       { "msc-s-List", "gsm_map.om.msc_s_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MSC_S_InterfaceList", HFILL }},
     { &hf_gsm_map_om_mgw_List,
       { "mgw-List", "gsm_map.om.mgw_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MGW_InterfaceList", HFILL }},
     { &hf_gsm_map_om_sgsn_List,
       { "sgsn-List", "gsm_map.om.sgsn_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.SGSN_InterfaceList", HFILL }},
     { &hf_gsm_map_om_ggsn_List,
       { "ggsn-List", "gsm_map.om.ggsn_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.GGSN_InterfaceList", HFILL }},
     { &hf_gsm_map_om_rnc_List,
       { "rnc-List", "gsm_map.om.rnc_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.RNC_InterfaceList", HFILL }},
     { &hf_gsm_map_om_bmsc_List,
       { "bmsc-List", "gsm_map.om.bmsc_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.BMSC_InterfaceList", HFILL }},
     { &hf_gsm_map_om_msc_s_List_01,
       { "msc-s-List", "gsm_map.om.msc_s_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MSC_S_EventList", HFILL }},
     { &hf_gsm_map_om_mgw_List_01,
       { "mgw-List", "gsm_map.om.mgw_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MGW_EventList", HFILL }},
     { &hf_gsm_map_om_sgsn_List_01,
       { "sgsn-List", "gsm_map.om.sgsn_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.SGSN_EventList", HFILL }},
     { &hf_gsm_map_om_ggsn_List_01,
       { "ggsn-List", "gsm_map.om.ggsn_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.GGSN_EventList", HFILL }},
     { &hf_gsm_map_om_bmsc_List_01,
       { "bmsc-List", "gsm_map.om.bmsc_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.BMSC_EventList", HFILL }},
     { &hf_gsm_map_om_traceRecordingSessionReference,
       { "traceRecordingSessionReference", "gsm_map.om.traceRecordingSessionReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.TraceRecordingSessionReference", HFILL }},
     { &hf_gsm_map_om_rnc_InterfaceList,
       { "rnc-InterfaceList", "gsm_map.om.rnc_InterfaceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.RNC_InterfaceList", HFILL }},
     { &hf_gsm_map_om_msc_s_InterfaceList,
       { "msc-s-InterfaceList", "gsm_map.om.msc_s_InterfaceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MSC_S_InterfaceList", HFILL }},
     { &hf_gsm_map_om_msc_s_EventList,
       { "msc-s-EventList", "gsm_map.om.msc_s_EventList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MSC_S_EventList", HFILL }},
     { &hf_gsm_map_om_mgw_InterfaceList,
       { "mgw-InterfaceList", "gsm_map.om.mgw_InterfaceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MGW_InterfaceList", HFILL }},
     { &hf_gsm_map_om_mgw_EventList,
       { "mgw-EventList", "gsm_map.om.mgw_EventList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_om.MGW_EventList", HFILL }},
     { &hf_gsm_map_om_traceSupportIndicator,
       { "traceSupportIndicator", "gsm_map.om.traceSupportIndicator",
@@ -19052,213 +19052,213 @@ void proto_register_gsm_map(void) {
     { &hf_gsm_map_om_TraceNE_TypeList_msc_s,
       { "msc-s", "gsm_map.om.msc-s",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_mgw,
       { "mgw", "gsm_map.om.mgw",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_sgsn,
       { "sgsn", "gsm_map.om.sgsn",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_ggsn,
       { "ggsn", "gsm_map.om.ggsn",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_rnc,
       { "rnc", "gsm_map.om.rnc",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_TraceNE_TypeList_bm_sc,
       { "bm-sc", "gsm_map.om.bm-sc",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_a,
       { "a", "gsm_map.om.a",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_iu,
       { "iu", "gsm_map.om.iu",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_mc,
       { "mc", "gsm_map.om.mc",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_g,
       { "map-g", "gsm_map.om.map-g",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_b,
       { "map-b", "gsm_map.om.map-b",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_e,
       { "map-e", "gsm_map.om.map-e",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_f,
       { "map-f", "gsm_map.om.map-f",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_cap,
       { "cap", "gsm_map.om.cap",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_d,
       { "map-d", "gsm_map.om.map-d",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_InterfaceList_map_c,
       { "map-c", "gsm_map.om.map-c",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_mc,
       { "mc", "gsm_map.om.mc",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_nb_up,
       { "nb-up", "gsm_map.om.nb-up",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MGW_InterfaceList_iu_up,
       { "iu-up", "gsm_map.om.iu-up",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gb,
       { "gb", "gsm_map.om.gb",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_iu,
       { "iu", "gsm_map.om.iu",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gn,
       { "gn", "gsm_map.om.gn",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gr,
       { "map-gr", "gsm_map.om.map-gr",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gd,
       { "map-gd", "gsm_map.om.map-gd",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_map_gf,
       { "map-gf", "gsm_map.om.map-gf",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_gs,
       { "gs", "gsm_map.om.gs",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_InterfaceList_ge,
       { "ge", "gsm_map.om.ge",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gn,
       { "gn", "gsm_map.om.gn",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gi,
       { "gi", "gsm_map.om.gi",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_InterfaceList_gmb,
       { "gmb", "gsm_map.om.gmb",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iu,
       { "iu", "gsm_map.om.iu",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iur,
       { "iur", "gsm_map.om.iur",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_iub,
       { "iub", "gsm_map.om.iub",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_RNC_InterfaceList_uu,
       { "uu", "gsm_map.om.uu",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_BMSC_InterfaceList_gmb,
       { "gmb", "gsm_map.om.gmb",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_mo_mtCall,
       { "mo-mtCall", "gsm_map.om.mo-mtCall",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_mo_mt_sms,
       { "mo-mt-sms", "gsm_map.om.mo-mt-sms",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_lu_imsiAttach_imsiDetach,
       { "lu-imsiAttach-imsiDetach", "gsm_map.om.lu-imsiAttach-imsiDetach",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_handovers,
       { "handovers", "gsm_map.om.handovers",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MSC_S_EventList_ss,
       { "ss", "gsm_map.om.ss",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_MGW_EventList_context,
       { "context", "gsm_map.om.context",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_pdpContext,
       { "pdpContext", "gsm_map.om.pdpContext",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_mo_mt_sms,
       { "mo-mt-sms", "gsm_map.om.mo-mt-sms",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_rau_gprsAttach_gprsDetach,
       { "rau-gprsAttach-gprsDetach", "gsm_map.om.rau-gprsAttach-gprsDetach",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_SGSN_EventList_mbmsContext,
       { "mbmsContext", "gsm_map.om.mbmsContext",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_EventList_pdpContext,
       { "pdpContext", "gsm_map.om.pdpContext",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_GGSN_EventList_mbmsContext,
       { "mbmsContext", "gsm_map.om.mbmsContext",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_om_BMSC_EventList_mbmsMulticastServiceActivation,
       { "mbmsMulticastServiceActivation", "gsm_map.om.mbmsMulticastServiceActivation",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-MS-DataTypes --- --- ---                                    */
 
     { &hf_gsm_map_ms_imsi,
       { "imsi", "gsm_map.ms.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_ms_msc_Number,
       { "msc-Number", "gsm_map.ms.msc_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_vlr_Number,
       { "vlr-Number", "gsm_map.ms.vlr_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_lmsi,
       { "lmsi", "gsm_map.ms.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_ms_extensionContainer,
       { "extensionContainer", "gsm_map.ms.extensionContainer",
@@ -19278,7 +19278,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_v_gmlc_Address,
       { "v-gmlc-Address", "gsm_map.ms.v_gmlc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_ms_add_info,
       { "add-info", "gsm_map.ms.add_info",
@@ -19294,7 +19294,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_supportedCamelPhases,
       { "supportedCamelPhases", "gsm_map.ms.supportedCamelPhases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ms_solsaSupportIndicator,
       { "solsaSupportIndicator", "gsm_map.ms.solsaSupportIndicator",
@@ -19314,15 +19314,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_supportedLCS_CapabilitySets,
       { "supportedLCS-CapabilitySets", "gsm_map.ms.supportedLCS_CapabilitySets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedLCS_CapabilitySets", HFILL }},
     { &hf_gsm_map_ms_offeredCamel4CSIs,
       { "offeredCamel4CSIs", "gsm_map.ms.offeredCamel4CSIs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ms_supportedRAT_TypesIndicator,
       { "supportedRAT-TypesIndicator", "gsm_map.ms.supportedRAT_TypesIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedRAT_Types", HFILL }},
     { &hf_gsm_map_ms_longGroupID_Supported,
       { "longGroupID-Supported", "gsm_map.ms.longGroupID_Supported",
@@ -19334,11 +19334,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_subscriberDataStored,
       { "subscriberDataStored", "gsm_map.ms.subscriberDataStored",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AgeIndicator", HFILL }},
     { &hf_gsm_map_ms_hlr_Number,
       { "hlr-Number", "gsm_map.ms.hlr_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_add_Capability,
       { "add-Capability", "gsm_map.ms.add_Capability",
@@ -19350,7 +19350,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_imeisv,
       { "imeisv", "gsm_map.ms.imeisv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMEI", HFILL }},
     { &hf_gsm_map_ms_PagingArea_item,
       { "LocationArea", "gsm_map.ms.LocationArea",
@@ -19358,11 +19358,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.LocationArea", HFILL }},
     { &hf_gsm_map_ms_laiFixedLength,
       { "laiFixedLength", "gsm_map.ms.laiFixedLength",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_gsm_map_ms_lac,
       { "lac", "gsm_map.ms.lac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LAC", HFILL }},
     { &hf_gsm_map_ms_identity,
       { "identity", "gsm_map.ms.identity",
@@ -19378,7 +19378,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.TypeOfUpdate", HFILL }},
     { &hf_gsm_map_ms_sgsn_Number,
       { "sgsn-Number", "gsm_map.ms.sgsn_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_freezeTMSI,
       { "freezeTMSI", "gsm_map.ms.freezeTMSI",
@@ -19394,7 +19394,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_tmsi,
       { "tmsi", "gsm_map.ms.tmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.TMSI", HFILL }},
     { &hf_gsm_map_ms_numberOfRequestedVectors,
       { "numberOfRequestedVectors", "gsm_map.ms.numberOfRequestedVectors",
@@ -19406,7 +19406,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_previous_LAI,
       { "previous-LAI", "gsm_map.ms.previous_LAI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LAIFixedLength", HFILL }},
     { &hf_gsm_map_ms_hopCounter,
       { "hopCounter", "gsm_map.ms.hopCounter",
@@ -19438,31 +19438,31 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.AuthenticationQuintuplet", HFILL }},
     { &hf_gsm_map_ms_rand,
       { "rand", "gsm_map.ms.rand",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RAND", HFILL }},
     { &hf_gsm_map_ms_sres,
       { "sres", "gsm_map.ms.sres",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SRES", HFILL }},
     { &hf_gsm_map_ms_kc,
       { "kc", "gsm_map.ms.kc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Kc", HFILL }},
     { &hf_gsm_map_ms_xres,
       { "xres", "gsm_map.ms.xres",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.XRES", HFILL }},
     { &hf_gsm_map_ms_ck,
       { "ck", "gsm_map.ms.ck",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CK", HFILL }},
     { &hf_gsm_map_ms_ik,
       { "ik", "gsm_map.ms.ik",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.IK", HFILL }},
     { &hf_gsm_map_ms_autn,
       { "autn", "gsm_map.ms.autn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AUTN", HFILL }},
     { &hf_gsm_map_ms_gsm_SecurityContextData,
       { "gsm-SecurityContextData", "gsm_map.ms.gsm_SecurityContextData",
@@ -19474,11 +19474,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.UMTS_SecurityContextData", HFILL }},
     { &hf_gsm_map_ms_cksn,
       { "cksn", "gsm_map.ms.cksn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Cksn", HFILL }},
     { &hf_gsm_map_ms_ksi,
       { "ksi", "gsm_map.ms.ksi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.KSI", HFILL }},
     { &hf_gsm_map_ms_failureCause,
       { "failureCause", "gsm_map.ms.failureCause",
@@ -19486,7 +19486,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.FailureCause", HFILL }},
     { &hf_gsm_map_ms_re_attempt,
       { "re-attempt", "gsm_map.ms.re_attempt",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_map_ms.BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_accessType,
       { "accessType", "gsm_map.ms.accessType",
@@ -19494,7 +19494,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.AccessType", HFILL }},
     { &hf_gsm_map_ms_sgsn_Address,
       { "sgsn-Address", "gsm_map.ms.sgsn_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_ms_sgsn_Capability,
       { "sgsn-Capability", "gsm_map.ms.sgsn_Capability",
@@ -19522,11 +19522,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.PDN_GW_Update", HFILL }},
     { &hf_gsm_map_ms_isr_Information,
       { "isr-Information", "gsm_map.ms.isr_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ISR_Information", HFILL }},
     { &hf_gsm_map_ms_apn,
       { "apn", "gsm_map.ms.apn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN", HFILL }},
     { &hf_gsm_map_ms_pdn_gw_Identity,
       { "pdn-gw-Identity", "gsm_map.ms.pdn_gw_Identity",
@@ -19546,7 +19546,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_supportedFeatures,
       { "supportedFeatures", "gsm_map.ms.supportedFeatures",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedFeatures", HFILL }},
     { &hf_gsm_map_ms_sgsn_mmeSeparationSupported,
       { "sgsn-mmeSeparationSupported", "gsm_map.ms.sgsn_mmeSeparationSupported",
@@ -19558,11 +19558,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.AccessNetworkSignalInfo", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionInfo,
       { "integrityProtectionInfo", "gsm_map.ms.integrityProtectionInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.IntegrityProtectionInformation", HFILL }},
     { &hf_gsm_map_ms_encryptionInfo,
       { "encryptionInfo", "gsm_map.ms.encryptionInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.EncryptionInformation", HFILL }},
     { &hf_gsm_map_ms_keyStatus,
       { "keyStatus", "gsm_map.ms.keyStatus",
@@ -19570,7 +19570,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.KeyStatus", HFILL }},
     { &hf_gsm_map_ms_allowedGSM_Algorithms,
       { "allowedGSM-Algorithms", "gsm_map.ms.allowedGSM_Algorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AllowedGSM_Algorithms", HFILL }},
     { &hf_gsm_map_ms_allowedUMTS_Algorithms,
       { "allowedUMTS-Algorithms", "gsm_map.ms.allowedUMTS_Algorithms",
@@ -19578,7 +19578,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.AllowedUMTS_Algorithms", HFILL }},
     { &hf_gsm_map_ms_radioResourceInformation,
       { "radioResourceInformation", "gsm_map.ms.radioResourceInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RadioResourceInformation", HFILL }},
     { &hf_gsm_map_ms_radioResourceList,
       { "radioResourceList", "gsm_map.ms.radioResourceList",
@@ -19586,11 +19586,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.RadioResourceList", HFILL }},
     { &hf_gsm_map_ms_bssmap_ServiceHandover,
       { "bssmap-ServiceHandover", "gsm_map.ms.bssmap_ServiceHandover",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.BSSMAP_ServiceHandover", HFILL }},
     { &hf_gsm_map_ms_ranap_ServiceHandover,
       { "ranap-ServiceHandover", "gsm_map.ms.ranap_ServiceHandover",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RANAP_ServiceHandover", HFILL }},
     { &hf_gsm_map_ms_bssmap_ServiceHandoverList,
       { "bssmap-ServiceHandoverList", "gsm_map.ms.bssmap_ServiceHandoverList",
@@ -19598,7 +19598,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.BSSMAP_ServiceHandoverList", HFILL }},
     { &hf_gsm_map_ms_currentlyUsedCodec,
       { "currentlyUsedCodec", "gsm_map.ms.currentlyUsedCodec",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_iuSupportedCodecsList,
       { "iuSupportedCodecsList", "gsm_map.ms.iuSupportedCodecsList",
@@ -19610,11 +19610,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_iuSelectedCodec,
       { "iuSelectedCodec", "gsm_map.ms.iuSelectedCodec",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_alternativeChannelType,
       { "alternativeChannelType", "gsm_map.ms.alternativeChannelType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RadioResourceInformation", HFILL }},
     { &hf_gsm_map_ms_tracePropagationList,
       { "tracePropagationList", "gsm_map.ms.tracePropagationList",
@@ -19622,15 +19622,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_om.TracePropagationList", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionAlgorithms,
       { "integrityProtectionAlgorithms", "gsm_map.ms.integrityProtectionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PermittedIntegrityProtectionAlgorithms", HFILL }},
     { &hf_gsm_map_ms_encryptionAlgorithms,
       { "encryptionAlgorithms", "gsm_map.ms.encryptionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PermittedEncryptionAlgorithms", HFILL }},
     { &hf_gsm_map_ms_targetCellId,
       { "targetCellId", "gsm_map.ms.targetCellId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.GlobalCellId", HFILL }},
     { &hf_gsm_map_ms_ho_NumberNotRequired,
       { "ho-NumberNotRequired", "gsm_map.ms.ho_NumberNotRequired",
@@ -19638,7 +19638,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_targetRNCId,
       { "targetRNCId", "gsm_map.ms.targetRNCId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RNCId", HFILL }},
     { &hf_gsm_map_ms_multipleBearerRequested,
       { "multipleBearerRequested", "gsm_map.ms.multipleBearerRequested",
@@ -19650,15 +19650,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.RAB_Id", HFILL }},
     { &hf_gsm_map_ms_asciCallReference,
       { "asciCallReference", "gsm_map.ms.asciCallReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ASCI_CallReference", HFILL }},
     { &hf_gsm_map_ms_geran_classmark,
       { "geran-classmark", "gsm_map.ms.geran_classmark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GERAN_Classmark", HFILL }},
     { &hf_gsm_map_ms_iuCurrentlyUsedCodec,
       { "iuCurrentlyUsedCodec", "gsm_map.ms.iuCurrentlyUsedCodec",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_uesbi_Iu,
       { "uesbi-Iu", "gsm_map.ms.uesbi_Iu",
@@ -19674,7 +19674,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.RadioResource", HFILL }},
     { &hf_gsm_map_ms_handoverNumber,
       { "handoverNumber", "gsm_map.ms.handoverNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_relocationNumberList,
       { "relocationNumberList", "gsm_map.ms.relocationNumberList",
@@ -19702,23 +19702,23 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CodecList", HFILL }},
     { &hf_gsm_map_ms_integrityProtectionAlgorithm,
       { "integrityProtectionAlgorithm", "gsm_map.ms.integrityProtectionAlgorithm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ChosenIntegrityProtectionAlgorithm", HFILL }},
     { &hf_gsm_map_ms_encryptionAlgorithm,
       { "encryptionAlgorithm", "gsm_map.ms.encryptionAlgorithm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ChosenEncryptionAlgorithm", HFILL }},
     { &hf_gsm_map_ms_chosenChannelInfo,
       { "chosenChannelInfo", "gsm_map.ms.chosenChannelInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ChosenChannelInfo", HFILL }},
     { &hf_gsm_map_ms_chosenSpeechVersion,
       { "chosenSpeechVersion", "gsm_map.ms.chosenSpeechVersion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ChosenSpeechVersion", HFILL }},
     { &hf_gsm_map_ms_targetMSC_Number,
       { "targetMSC-Number", "gsm_map.ms.targetMSC_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_selectedRab_Id,
       { "selectedRab-Id", "gsm_map.ms.selectedRab_Id",
@@ -19726,11 +19726,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.RAB_Id", HFILL }},
     { &hf_gsm_map_ms_selectedGSM_Algorithm,
       { "selectedGSM-Algorithm", "gsm_map.ms.selectedGSM_Algorithm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SelectedGSM_Algorithm", HFILL }},
     { &hf_gsm_map_ms_iUSelectedCodec,
       { "iUSelectedCodec", "gsm_map.ms.iUSelectedCodec",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_utranCodecList,
       { "utranCodecList", "gsm_map.ms.utranCodecList",
@@ -19742,35 +19742,35 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CodecList", HFILL }},
     { &hf_gsm_map_ms_codec1,
       { "codec1", "gsm_map.ms.codec1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec2,
       { "codec2", "gsm_map.ms.codec2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec3,
       { "codec3", "gsm_map.ms.codec3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec4,
       { "codec4", "gsm_map.ms.codec4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec5,
       { "codec5", "gsm_map.ms.codec5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec6,
       { "codec6", "gsm_map.ms.codec6",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec7,
       { "codec7", "gsm_map.ms.codec7",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_codec8,
       { "codec8", "gsm_map.ms.codec8",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Codec", HFILL }},
     { &hf_gsm_map_ms_RelocationNumberList_item,
       { "RelocationNumber", "gsm_map.ms.RelocationNumber",
@@ -19790,7 +19790,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.RequestingNodeType", HFILL }},
     { &hf_gsm_map_ms_requestingPLMN_Id,
       { "requestingPLMN-Id", "gsm_map.ms.requestingPLMN_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.PLMN_Id", HFILL }},
     { &hf_gsm_map_ms_numberOfRequestedAdditional_Vectors,
       { "numberOfRequestedAdditional-Vectors", "gsm_map.ms.numberOfRequestedAdditional_Vectors",
@@ -19802,7 +19802,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_auts,
       { "auts", "gsm_map.ms.auts",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AUTS", HFILL }},
     { &hf_gsm_map_ms_eps_AuthenticationSetList,
       { "eps-AuthenticationSetList", "gsm_map.ms.eps_AuthenticationSetList",
@@ -19814,15 +19814,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.EPC_AV", HFILL }},
     { &hf_gsm_map_ms_kasme,
       { "kasme", "gsm_map.ms.kasme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.KASME", HFILL }},
     { &hf_gsm_map_ms_imei,
       { "imei", "gsm_map.ms.imei",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMEI", HFILL }},
     { &hf_gsm_map_ms_requestedEquipmentInfo,
       { "requestedEquipmentInfo", "gsm_map.ms.requestedEquipmentInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RequestedEquipmentInfo", HFILL }},
     { &hf_gsm_map_ms_equipmentStatus,
       { "equipmentStatus", "gsm_map.ms.equipmentStatus",
@@ -19834,11 +19834,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.UESBI_Iu", HFILL }},
     { &hf_gsm_map_ms_uesbi_IuA,
       { "uesbi-IuA", "gsm_map.ms.uesbi_IuA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.UESBI_IuA", HFILL }},
     { &hf_gsm_map_ms_uesbi_IuB,
       { "uesbi-IuB", "gsm_map.ms.uesbi_IuB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.UESBI_IuB", HFILL }},
     { &hf_gsm_map_ms_CSG_SubscriptionDataList_item,
       { "CSG-SubscriptionData", "gsm_map.ms.CSG_SubscriptionData",
@@ -19846,15 +19846,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CSG_SubscriptionData", HFILL }},
     { &hf_gsm_map_ms_csg_Id,
       { "csg-Id", "gsm_map.ms.csg_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CSG_Id", HFILL }},
     { &hf_gsm_map_ms_expirationDate,
       { "expirationDate", "gsm_map.ms.expirationDate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Time", HFILL }},
     { &hf_gsm_map_ms_apn_oi_Replacement,
       { "apn-oi-Replacement", "gsm_map.ms.apn_oi_Replacement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN_OI_Replacement", HFILL }},
     { &hf_gsm_map_ms_rfsp_id,
       { "rfsp-id", "gsm_map.ms.rfsp_id",
@@ -19870,7 +19870,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.APN_ConfigurationProfile", HFILL }},
     { &hf_gsm_map_ms_stn_sr,
       { "stn-sr", "gsm_map.ms.stn_sr",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_defaultContext,
       { "defaultContext", "gsm_map.ms.defaultContext",
@@ -19890,7 +19890,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.APN_Configuration", HFILL }},
     { &hf_gsm_map_ms_servedPartyIP_Address,
       { "servedPartyIP-Address", "gsm_map.ms.servedPartyIP_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Address", HFILL }},
     { &hf_gsm_map_ms_eps_qos_Subscribed,
       { "eps-qos-Subscribed", "gsm_map.ms.eps_qos_Subscribed",
@@ -19938,23 +19938,23 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.INTEGER", HFILL }},
     { &hf_gsm_map_ms_pre_emption_capability,
       { "pre-emption-capability", "gsm_map.ms.pre_emption_capability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_map_ms.BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_pre_emption_vulnerability,
       { "pre-emption-vulnerability", "gsm_map.ms.pre_emption_vulnerability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_map_ms.BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_pdn_gw_ipv4_Address,
       { "pdn-gw-ipv4-Address", "gsm_map.ms.pdn_gw_ipv4_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Address", HFILL }},
     { &hf_gsm_map_ms_pdn_gw_ipv6_Address,
       { "pdn-gw-ipv6-Address", "gsm_map.ms.pdn_gw_ipv6_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Address", HFILL }},
     { &hf_gsm_map_ms_pdn_gw_name,
       { "pdn-gw-name", "gsm_map.ms.pdn_gw_name",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.FQDN", HFILL }},
     { &hf_gsm_map_ms_gmlc_List,
       { "gmlc-List", "gsm_map.ms.gmlc_List",
@@ -19974,7 +19974,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.LCS_PrivacyExceptionList", HFILL }},
     { &hf_gsm_map_ms_GMLC_List_item,
       { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_GPRSDataList_item,
       { "PDP-Context", "gsm_map.ms.PDP_Context",
@@ -19986,19 +19986,19 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.ContextId", HFILL }},
     { &hf_gsm_map_ms_pdp_Type,
       { "pdp-Type", "gsm_map.ms.pdp_Type",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Type", HFILL }},
     { &hf_gsm_map_ms_pdp_Address,
       { "pdp-Address", "gsm_map.ms.pdp_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.PDP_Address", HFILL }},
     { &hf_gsm_map_ms_qos_Subscribed,
       { "qos-Subscribed", "gsm_map.ms.qos_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_ext_QoS_Subscribed,
       { "ext-QoS-Subscribed", "gsm_map.ms.ext_QoS_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_pdp_ChargingCharacteristics,
       { "pdp-ChargingCharacteristics", "gsm_map.ms.pdp_ChargingCharacteristics",
@@ -20006,11 +20006,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.ChargingCharacteristics", HFILL }},
     { &hf_gsm_map_ms_ext2_QoS_Subscribed,
       { "ext2-QoS-Subscribed", "gsm_map.ms.ext2_QoS_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext2_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_ext3_QoS_Subscribed,
       { "ext3-QoS-Subscribed", "gsm_map.ms.ext3_QoS_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_gprsDataList,
       { "gprsDataList", "gsm_map.ms.gprsDataList",
@@ -20066,7 +20066,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.ServiceKey", HFILL }},
     { &hf_gsm_map_ms_gsmSCF_Address,
       { "gsmSCF-Address", "gsm_map.ms.gsmSCF_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_defaultSessionHandling,
       { "defaultSessionHandling", "gsm_map.ms.defaultSessionHandling",
@@ -20078,11 +20078,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.LSAData", HFILL }},
     { &hf_gsm_map_ms_lsaIdentity,
       { "lsaIdentity", "gsm_map.ms.lsaIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_gsm_map_ms_lsaAttributes,
       { "lsaAttributes", "gsm_map.ms.lsaAttributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAAttributes", HFILL }},
     { &hf_gsm_map_ms_lsaActiveModeIndicator,
       { "lsaActiveModeIndicator", "gsm_map.ms.lsaActiveModeIndicator",
@@ -20098,11 +20098,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.LSADataList", HFILL }},
     { &hf_gsm_map_ms_msisdn,
       { "msisdn", "gsm_map.ms.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_category,
       { "category", "gsm_map.ms.category",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Category", HFILL }},
     { &hf_gsm_map_ms_subscriberStatus,
       { "subscriberStatus", "gsm_map.ms.subscriberStatus",
@@ -20154,11 +20154,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.Ext_TeleserviceCode", HFILL }},
     { &hf_gsm_map_ms_odb_GeneralData,
       { "odb-GeneralData", "gsm_map.ms.odb_GeneralData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ODB_GeneralData", HFILL }},
     { &hf_gsm_map_ms_odb_HPLMN_Data,
       { "odb-HPLMN-Data", "gsm_map.ms.odb_HPLMN_Data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ODB_HPLMN_Data", HFILL }},
     { &hf_gsm_map_ms_Ext_SS_InfoList_item,
       { "Ext-SS-Info", "gsm_map.ms.Ext_SS_Info",
@@ -20202,19 +20202,19 @@ void proto_register_gsm_map(void) {
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ms_ss_Status,
       { "ss-Status", "gsm_map.ms.ss_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.Ext_SS_Status", HFILL }},
     { &hf_gsm_map_ms_forwardedToNumber,
       { "forwardedToNumber", "gsm_map.ms.forwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_forwardedToSubaddress,
       { "forwardedToSubaddress", "gsm_map.ms.forwardedToSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_map_ms_forwardingOptions,
       { "forwardingOptions", "gsm_map.ms.forwardingOptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.T_forwardingOptions", HFILL }},
     { &hf_gsm_map_ms_noReplyConditionTime,
       { "noReplyConditionTime", "gsm_map.ms.noReplyConditionTime",
@@ -20222,7 +20222,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.Ext_NoRepCondTime", HFILL }},
     { &hf_gsm_map_ms_longForwardedToNumber,
       { "longForwardedToNumber", "gsm_map.ms.longForwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.FTN_AddressString", HFILL }},
     { &hf_gsm_map_ms_callBarringFeatureList,
       { "callBarringFeatureList", "gsm_map.ms.callBarringFeatureList",
@@ -20250,7 +20250,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CUG_Index", HFILL }},
     { &hf_gsm_map_ms_cug_Interlock,
       { "cug-Interlock", "gsm_map.ms.cug_Interlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CUG_Interlock", HFILL }},
     { &hf_gsm_map_ms_intraCUG_Options,
       { "intraCUG-Options", "gsm_map.ms.intraCUG_Options",
@@ -20274,7 +20274,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CUG_Index", HFILL }},
     { &hf_gsm_map_ms_interCUG_Restrictions,
       { "interCUG-Restrictions", "gsm_map.ms.interCUG_Restrictions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.InterCUG_Restrictions", HFILL }},
     { &hf_gsm_map_ms_ss_SubscriptionOption,
       { "ss-SubscriptionOption", "gsm_map.ms.ss_SubscriptionOption",
@@ -20338,7 +20338,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.MOLR_Class", HFILL }},
     { &hf_gsm_map_ms_ZoneCodeList_item,
       { "ZoneCode", "gsm_map.ms.ZoneCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ZoneCode", HFILL }},
     { &hf_gsm_map_ms_ss_List,
       { "ss-List", "gsm_map.ms.ss_List",
@@ -20354,7 +20354,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.BasicServiceList", HFILL }},
     { &hf_gsm_map_ms_regionalSubscriptionIdentifier,
       { "regionalSubscriptionIdentifier", "gsm_map.ms.regionalSubscriptionIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.ZoneCode", HFILL }},
     { &hf_gsm_map_ms_vbsGroupIndication,
       { "vbsGroupIndication", "gsm_map.ms.vbsGroupIndication",
@@ -20390,7 +20390,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_specificCSI_Withdraw,
       { "specificCSI-Withdraw", "gsm_map.ms.specificCSI_Withdraw",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SpecificCSI_Withdraw", HFILL }},
     { &hf_gsm_map_ms_chargingCharacteristicsWithdraw,
       { "chargingCharacteristicsWithdraw", "gsm_map.ms.chargingCharacteristicsWithdraw",
@@ -20438,7 +20438,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.LSAIdentityList", HFILL }},
     { &hf_gsm_map_ms_LSAIdentityList_item,
       { "LSAIdentity", "gsm_map.ms.LSAIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_gsm_map_ms_BasicServiceList_item,
       { "Ext-BasicServiceCode", "gsm_map.ms.Ext_BasicServiceCode",
@@ -20502,7 +20502,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.DP_AnalysedInfoCriterium", HFILL }},
     { &hf_gsm_map_ms_dialledNumber,
       { "dialledNumber", "gsm_map.ms.dialledNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_defaultCallHandling,
       { "defaultCallHandling", "gsm_map.ms.defaultCallHandling",
@@ -20582,7 +20582,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.DestinationNumberLengthList", HFILL }},
     { &hf_gsm_map_ms_DestinationNumberList_item,
       { "ISDN-AddressString", "gsm_map.ms.ISDN_AddressString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_DestinationNumberLengthList_item,
       { "DestinationNumberLengthList item", "gsm_map.ms.DestinationNumberLengthList_item",
@@ -20594,11 +20594,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ms_O_CauseValueCriteria_item,
       { "CauseValue", "gsm_map.ms.CauseValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CauseValue", HFILL }},
     { &hf_gsm_map_ms_T_CauseValueCriteria_item,
       { "CauseValue", "gsm_map.ms.CauseValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CauseValue", HFILL }},
     { &hf_gsm_map_ms_sms_CAMEL_TDP_DataList,
       { "sms-CAMEL-TDP-DataList", "gsm_map.ms.sms_CAMEL_TDP_DataList",
@@ -20618,7 +20618,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.MobilityTriggers", HFILL }},
     { &hf_gsm_map_ms_MobilityTriggers_item,
       { "MM-Code", "gsm_map.ms.MM_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MM_Code", HFILL }},
     { &hf_gsm_map_ms_t_BcsmCamelTDPDataList,
       { "t-BcsmCamelTDPDataList", "gsm_map.ms.t_BcsmCamelTDPDataList",
@@ -20634,11 +20634,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.T_BcsmTriggerDetectionPoint", HFILL }},
     { &hf_gsm_map_ms_ggsn_Address,
       { "ggsn-Address", "gsm_map.ms.ggsn_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_ms_ggsn_Number,
       { "ggsn-Number", "gsm_map.ms.ggsn_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_mobileNotReachableReason,
       { "mobileNotReachableReason", "gsm_map.ms.mobileNotReachableReason",
@@ -20662,23 +20662,23 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.VoiceGroupCallData", HFILL }},
     { &hf_gsm_map_ms_groupId,
       { "groupId", "gsm_map.ms.groupId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GroupId", HFILL }},
     { &hf_gsm_map_ms_additionalSubscriptions,
       { "additionalSubscriptions", "gsm_map.ms.additionalSubscriptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AdditionalSubscriptions", HFILL }},
     { &hf_gsm_map_ms_additionalInfo,
       { "additionalInfo", "gsm_map.ms.additionalInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AdditionalInfo", HFILL }},
     { &hf_gsm_map_ms_longGroupId,
       { "longGroupId", "gsm_map.ms.longGroupId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Long_GroupId", HFILL }},
     { &hf_gsm_map_ms_groupid,
       { "groupid", "gsm_map.ms.groupid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GroupId", HFILL }},
     { &hf_gsm_map_ms_broadcastInitEntitlement,
       { "broadcastInitEntitlement", "gsm_map.ms.broadcastInitEntitlement",
@@ -20714,7 +20714,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.PS_SubscriberState", HFILL }},
     { &hf_gsm_map_ms_ms_Classmark2,
       { "ms-Classmark2", "gsm_map.ms.ms_Classmark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MS_Classmark2", HFILL }},
     { &hf_gsm_map_ms_gprs_MS_Class,
       { "gprs-MS-Class", "gsm_map.ms.gprs_MS_Class",
@@ -20726,7 +20726,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.MNPInfoRes", HFILL }},
     { &hf_gsm_map_ms_routeingNumber,
       { "routeingNumber", "gsm_map.ms.routeingNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RouteingNumber", HFILL }},
     { &hf_gsm_map_ms_numberPortabilityStatus,
       { "numberPortabilityStatus", "gsm_map.ms.numberPortabilityStatus",
@@ -20734,11 +20734,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NumberPortabilityStatus", HFILL }},
     { &hf_gsm_map_ms_mSNetworkCapability,
       { "mSNetworkCapability", "gsm_map.ms.mSNetworkCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MSNetworkCapability", HFILL }},
     { &hf_gsm_map_ms_mSRadioAccessCapability,
       { "mSRadioAccessCapability", "gsm_map.ms.mSRadioAccessCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MSRadioAccessCapability", HFILL }},
     { &hf_gsm_map_ms_locationInformation_01,
       { "locationInformation", "gsm_map.ms.locationInformation",
@@ -20774,15 +20774,15 @@ void proto_register_gsm_map(void) {
         "gsm_map.AgeOfLocationInformation", HFILL }},
     { &hf_gsm_map_ms_geographicalInformation,
       { "geographicalInformation", "gsm_map.ms.geographicalInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GeographicalInformation", HFILL }},
     { &hf_gsm_map_ms_vlr_number,
       { "vlr-number", "gsm_map.ms.vlr_number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ms_locationNumber,
       { "locationNumber", "gsm_map.ms.locationNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LocationNumber", HFILL }},
     { &hf_gsm_map_ms_cellGlobalIdOrServiceAreaIdOrLAI,
       { "cellGlobalIdOrServiceAreaIdOrLAI", "gsm_map.ms.cellGlobalIdOrServiceAreaIdOrLAI",
@@ -20790,11 +20790,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.CellGlobalIdOrServiceAreaIdOrLAI", HFILL }},
     { &hf_gsm_map_ms_selectedLSA_Id,
       { "selectedLSA-Id", "gsm_map.ms.selectedLSA_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_gsm_map_ms_geodeticInformation,
       { "geodeticInformation", "gsm_map.ms.geodeticInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GeodeticInformation", HFILL }},
     { &hf_gsm_map_ms_currentLocationRetrieved,
       { "currentLocationRetrieved", "gsm_map.ms.currentLocationRetrieved",
@@ -20806,11 +20806,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_routeingAreaIdentity,
       { "routeingAreaIdentity", "gsm_map.ms.routeingAreaIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.RAIdentity", HFILL }},
     { &hf_gsm_map_ms_selectedLSAIdentity,
       { "selectedLSAIdentity", "gsm_map.ms.selectedLSAIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.LSAIdentity", HFILL }},
     { &hf_gsm_map_ms_assumedIdle,
       { "assumedIdle", "gsm_map.ms.assumedIdle",
@@ -20866,11 +20866,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_apn_Subscribed,
       { "apn-Subscribed", "gsm_map.ms.apn_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN", HFILL }},
     { &hf_gsm_map_ms_apn_InUse,
       { "apn-InUse", "gsm_map.ms.apn_InUse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN", HFILL }},
     { &hf_gsm_map_ms_nsapi,
       { "nsapi", "gsm_map.ms.nsapi",
@@ -20878,59 +20878,59 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NSAPI", HFILL }},
     { &hf_gsm_map_ms_transactionId,
       { "transactionId", "gsm_map.ms.transactionId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.TransactionId", HFILL }},
     { &hf_gsm_map_ms_teid_ForGnAndGp,
       { "teid-ForGnAndGp", "gsm_map.ms.teid_ForGnAndGp",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.TEID", HFILL }},
     { &hf_gsm_map_ms_teid_ForIu,
       { "teid-ForIu", "gsm_map.ms.teid_ForIu",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.TEID", HFILL }},
     { &hf_gsm_map_ms_qos_Subscribed_01,
       { "qos-Subscribed", "gsm_map.ms.qos_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos_Requested,
       { "qos-Requested", "gsm_map.ms.qos_Requested",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos_Negotiated,
       { "qos-Negotiated", "gsm_map.ms.qos_Negotiated",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_chargingId,
       { "chargingId", "gsm_map.ms.chargingId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GPRSChargingID", HFILL }},
     { &hf_gsm_map_ms_rnc_Address,
       { "rnc-Address", "gsm_map.ms.rnc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_ms_qos2_Subscribed,
       { "qos2-Subscribed", "gsm_map.ms.qos2_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext2_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos2_Requested,
       { "qos2-Requested", "gsm_map.ms.qos2_Requested",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext2_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos2_Negotiated,
       { "qos2-Negotiated", "gsm_map.ms.qos2_Negotiated",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext2_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos3_Subscribed,
       { "qos3-Subscribed", "gsm_map.ms.qos3_Subscribed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos3_Requested,
       { "qos3-Requested", "gsm_map.ms.qos3_Requested",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_qos3_Negotiated,
       { "qos3-Negotiated", "gsm_map.ms.qos3_Negotiated",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Ext3_QoS_Subscribed", HFILL }},
     { &hf_gsm_map_ms_subscriberIdentity,
       { "subscriberIdentity", "gsm_map.ms.subscriberIdentity",
@@ -20958,19 +20958,19 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.CAMEL_SubscriptionInfo", HFILL }},
     { &hf_gsm_map_ms_supportedVLR_CAMEL_Phases,
       { "supportedVLR-CAMEL-Phases", "gsm_map.ms.supportedVLR_CAMEL_Phases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ms_supportedSGSN_CAMEL_Phases,
       { "supportedSGSN-CAMEL-Phases", "gsm_map.ms.supportedSGSN_CAMEL_Phases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ms_offeredCamel4CSIsInVLR,
       { "offeredCamel4CSIsInVLR", "gsm_map.ms.offeredCamel4CSIsInVLR",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ms_offeredCamel4CSIsInSGSN,
       { "offeredCamel4CSIsInSGSN", "gsm_map.ms.offeredCamel4CSIsInSGSN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ms_msisdn_BS_List,
       { "msisdn-BS-List", "gsm_map.ms.msisdn_BS_List",
@@ -21030,7 +21030,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_specificCSIDeletedList,
       { "specificCSIDeletedList", "gsm_map.ms.specificCSIDeletedList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SpecificCSI_Withdraw", HFILL }},
     { &hf_gsm_map_ms_o_IM_CSI,
       { "o-IM-CSI", "gsm_map.ms.o_IM_CSI",
@@ -21078,7 +21078,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.Ext_SS_InfoFor_CSE", HFILL }},
     { &hf_gsm_map_ms_forwardedToNumber_01,
       { "forwardedToNumber", "gsm_map.ms.forwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_ms_modifyNotificationToCSE,
       { "modifyNotificationToCSE", "gsm_map.ms.modifyNotificationToCSE",
@@ -21114,15 +21114,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.NULL", HFILL }},
     { &hf_gsm_map_ms_eventMet,
       { "eventMet", "gsm_map.ms.eventMet",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.MM_Code", HFILL }},
     { &hf_gsm_map_ms_supportedCAMELPhases,
       { "supportedCAMELPhases", "gsm_map.ms.supportedCAMELPhases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ms_offeredCamel4Functionalities,
       { "offeredCamel4Functionalities", "gsm_map.ms.offeredCamel4Functionalities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4Functionalities", HFILL }},
     { &hf_gsm_map_ms_naea_PreferredCI,
       { "naea-PreferredCI", "gsm_map.ms.naea_PreferredCI",
@@ -21158,7 +21158,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.IST_AlertTimerValue", HFILL }},
     { &hf_gsm_map_ms_superChargerSupportedInHLR,
       { "superChargerSupportedInHLR", "gsm_map.ms.superChargerSupportedInHLR",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AgeIndicator", HFILL }},
     { &hf_gsm_map_ms_mc_SS_Info,
       { "mc-SS-Info", "gsm_map.ms.mc_SS_Info",
@@ -21166,7 +21166,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.MC_SS_Info", HFILL }},
     { &hf_gsm_map_ms_cs_AllocationRetentionPriority,
       { "cs-AllocationRetentionPriority", "gsm_map.ms.cs_AllocationRetentionPriority",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CS_AllocationRetentionPriority", HFILL }},
     { &hf_gsm_map_ms_sgsn_CAMEL_SubscriptionInfo,
       { "sgsn-CAMEL-SubscriptionInfo", "gsm_map.ms.sgsn_CAMEL_SubscriptionInfo",
@@ -21174,11 +21174,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.SGSN_CAMEL_SubscriptionInfo", HFILL }},
     { &hf_gsm_map_ms_accessRestrictionData,
       { "accessRestrictionData", "gsm_map.ms.accessRestrictionData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AccessRestrictionData", HFILL }},
     { &hf_gsm_map_ms_ics_Indicator,
       { "ics-Indicator", "gsm_map.ms.ics_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_map_ms.BOOLEAN", HFILL }},
     { &hf_gsm_map_ms_eps_SubscriptionData,
       { "eps-SubscriptionData", "gsm_map.ms.eps_SubscriptionData",
@@ -21191,429 +21191,429 @@ void proto_register_gsm_map(void) {
     { &hf_gsm_map_ms_SupportedRAT_Types_utran,
       { "utran", "gsm_map.ms.utran",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_geran,
       { "geran", "gsm_map.ms.geran",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_gan,
       { "gan", "gsm_map.ms.gan",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_i_hspa_evolution,
       { "i-hspa-evolution", "gsm_map.ms.i-hspa-evolution",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedRAT_Types_e_utran,
       { "e-utran", "gsm_map.ms.e-utran",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet1,
       { "lcsCapabilitySet1", "gsm_map.ms.lcsCapabilitySet1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet2,
       { "lcsCapabilitySet2", "gsm_map.ms.lcsCapabilitySet2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet3,
       { "lcsCapabilitySet3", "gsm_map.ms.lcsCapabilitySet3",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet4,
       { "lcsCapabilitySet4", "gsm_map.ms.lcsCapabilitySet4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedLCS_CapabilitySets_lcsCapabilitySet5,
       { "lcsCapabilitySet5", "gsm_map.ms.lcsCapabilitySet5",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ISR_Information_updateMME,
       { "updateMME", "gsm_map.ms.updateMME",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ISR_Information_cancelSGSN,
       { "cancelSGSN", "gsm_map.ms.cancelSGSN",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_all,
       { "odb-all", "gsm_map.ms.odb-all",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_HPLMN_APN,
       { "odb-HPLMN-APN", "gsm_map.ms.odb-HPLMN-APN",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_odb_VPLMN_APN,
       { "odb-VPLMN-APN", "gsm_map.ms.odb-VPLMN-APN",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedFeatures_regSub,
       { "regSub", "gsm_map.ms.regSub",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedEquipmentInfo_equipmentStatus,
       { "equipmentStatus", "gsm_map.ms.equipmentStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_RequestedEquipmentInfo_bmuef,
       { "bmuef", "gsm_map.ms.bmuef",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_utranNotAllowed,
       { "utranNotAllowed", "gsm_map.ms.utranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_geranNotAllowed,
       { "geranNotAllowed", "gsm_map.ms.geranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_ganNotAllowed,
       { "ganNotAllowed", "gsm_map.ms.ganNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_i_hspa_evolutionNotAllowed,
       { "i-hspa-evolutionNotAllowed", "gsm_map.ms.i-hspa-evolutionNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_e_utranNotAllowed,
       { "e-utranNotAllowed", "gsm_map.ms.e-utranNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AccessRestrictionData_ho_toNon3GPP_AccessNotAllowed,
       { "ho-toNon3GPP-AccessNotAllowed", "gsm_map.ms.ho-toNon3GPP-AccessNotAllowed",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allOG_CallsBarred,
       { "allOG-CallsBarred", "gsm_map.ms.allOG-CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsBarred,
       { "internationalOGCallsBarred", "gsm_map.ms.internationalOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalOGCallsNotToHPLMN_CountryBarred,
       { "internationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.internationalOGCallsNotToHPLMN-CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsBarred,
       { "interzonalOGCallsBarred", "gsm_map.ms.interzonalOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsNotToHPLMN_CountryBarred,
       { "interzonalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsNotToHPLMN-CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalOGCallsAndInternationalOGCallsNotToHPLMN_CountryBarred,
       { "interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred", "gsm_map.ms.interzonalOGCallsAndInternationalOGCallsNotToHPLMN-CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_premiumRateInformationOGCallsBarred,
       { "premiumRateInformationOGCallsBarred", "gsm_map.ms.premiumRateInformationOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_premiumRateEntertainementOGCallsBarred,
       { "premiumRateEntertainementOGCallsBarred", "gsm_map.ms.premiumRateEntertainementOGCallsBarred",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_ss_AccessBarred,
       { "ss-AccessBarred", "gsm_map.ms.ss-AccessBarred",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allECT_Barred,
       { "allECT-Barred", "gsm_map.ms.allECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_chargeableECT_Barred,
       { "chargeableECT-Barred", "gsm_map.ms.chargeableECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_internationalECT_Barred,
       { "internationalECT-Barred", "gsm_map.ms.internationalECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_interzonalECT_Barred,
       { "interzonalECT-Barred", "gsm_map.ms.interzonalECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_doublyChargeableECT_Barred,
       { "doublyChargeableECT-Barred", "gsm_map.ms.doublyChargeableECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_multipleECT_Barred,
       { "multipleECT-Barred", "gsm_map.ms.multipleECT-Barred",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allPacketOrientedServicesBarred,
       { "allPacketOrientedServicesBarred", "gsm_map.ms.allPacketOrientedServicesBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToHPLMN_AP_Barred,
       { "roamerAccessToHPLMN-AP-Barred", "gsm_map.ms.roamerAccessToHPLMN-AP-Barred",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamerAccessToVPLMN_AP_Barred,
       { "roamerAccessToVPLMN-AP-Barred", "gsm_map.ms.roamerAccessToVPLMN-AP-Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNOG_CallsBarred,
       { "roamingOutsidePLMNOG-CallsBarred", "gsm_map.ms.roamingOutsidePLMNOG-CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_allIC_CallsBarred,
       { "allIC-CallsBarred", "gsm_map.ms.allIC-CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNIC_CallsBarred,
       { "roamingOutsidePLMNIC-CallsBarred", "gsm_map.ms.roamingOutsidePLMNIC-CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMNICountryIC_CallsBarred,
       { "roamingOutsidePLMNICountryIC-CallsBarred", "gsm_map.ms.roamingOutsidePLMNICountryIC-CallsBarred",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_Barred,
       { "roamingOutsidePLMN-Barred", "gsm_map.ms.roamingOutsidePLMN-Barred",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_roamingOutsidePLMN_CountryBarred,
       { "roamingOutsidePLMN-CountryBarred", "gsm_map.ms.roamingOutsidePLMN-CountryBarred",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationAllCF_Barred,
       { "registrationAllCF-Barred", "gsm_map.ms.registrationAllCF-Barred",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationCFNotToHPLMN_Barred,
       { "registrationCFNotToHPLMN-Barred", "gsm_map.ms.registrationCFNotToHPLMN-Barred",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCF_Barred,
       { "registrationInterzonalCF-Barred", "gsm_map.ms.registrationInterzonalCF-Barred",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInterzonalCFNotToHPLMN_Barred,
       { "registrationInterzonalCFNotToHPLMN-Barred", "gsm_map.ms.registrationInterzonalCFNotToHPLMN-Barred",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_GeneralData_registrationInternationalCF_Barred,
       { "registrationInternationalCF-Barred", "gsm_map.ms.registrationInternationalCF-Barred",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType1,
       { "plmn-SpecificBarringType1", "gsm_map.ms.plmn-SpecificBarringType1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType2,
       { "plmn-SpecificBarringType2", "gsm_map.ms.plmn-SpecificBarringType2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType3,
       { "plmn-SpecificBarringType3", "gsm_map.ms.plmn-SpecificBarringType3",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_ODB_HPLMN_Data_plmn_SpecificBarringType4,
       { "plmn-SpecificBarringType4", "gsm_map.ms.plmn-SpecificBarringType4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_o_csi,
       { "o-csi", "gsm_map.ms.o-csi",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_ss_csi,
       { "ss-csi", "gsm_map.ms.ss-csi",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_tif_csi,
       { "tif-csi", "gsm_map.ms.tif-csi",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_d_csi,
       { "d-csi", "gsm_map.ms.d-csi",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_csi,
       { "vt-csi", "gsm_map.ms.vt-csi",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mo_sms_csi,
       { "mo-sms-csi", "gsm_map.ms.mo-sms-csi",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_m_csi,
       { "m-csi", "gsm_map.ms.m-csi",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_gprs_csi,
       { "gprs-csi", "gsm_map.ms.gprs-csi",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_t_csi,
       { "t-csi", "gsm_map.ms.t-csi",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mt_sms_csi,
       { "mt-sms-csi", "gsm_map.ms.mt-sms-csi",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_mg_csi,
       { "mg-csi", "gsm_map.ms.mg-csi",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_o_IM_CSI,
       { "o-IM-CSI", "gsm_map.ms.o-IM-CSI",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_d_IM_CSI,
       { "d-IM-CSI", "gsm_map.ms.d-IM-CSI",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SpecificCSI_Withdraw_vt_IM_CSI,
       { "vt-IM-CSI", "gsm_map.ms.vt-IM-CSI",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase1,
       { "phase1", "gsm_map.ms.phase1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase2,
       { "phase2", "gsm_map.ms.phase2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase3,
       { "phase3", "gsm_map.ms.phase3",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_SupportedCamelPhases_phase4,
       { "phase4", "gsm_map.ms.phase4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_o_csi,
       { "o-csi", "gsm_map.ms.o-csi",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_d_csi,
       { "d-csi", "gsm_map.ms.d-csi",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_vt_csi,
       { "vt-csi", "gsm_map.ms.vt-csi",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_t_csi,
       { "t-csi", "gsm_map.ms.t-csi",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_mt_sms_csi,
       { "mt-sms-csi", "gsm_map.ms.mt-sms-csi",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_mg_csi,
       { "mg-csi", "gsm_map.ms.mg-csi",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4CSIs_psi_enhancements,
       { "psi-enhancements", "gsm_map.ms.psi-enhancements",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_initiateCallAttempt,
       { "initiateCallAttempt", "gsm_map.ms.initiateCallAttempt",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_splitLeg,
       { "splitLeg", "gsm_map.ms.splitLeg",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_moveLeg,
       { "moveLeg", "gsm_map.ms.moveLeg",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_disconnectLeg,
       { "disconnectLeg", "gsm_map.ms.disconnectLeg",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_entityReleased,
       { "entityReleased", "gsm_map.ms.entityReleased",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_dfc_WithArgument,
       { "dfc-WithArgument", "gsm_map.ms.dfc-WithArgument",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_playTone,
       { "playTone", "gsm_map.ms.playTone",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_dtmf_MidCall,
       { "dtmf-MidCall", "gsm_map.ms.dtmf-MidCall",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_chargingIndicator,
       { "chargingIndicator", "gsm_map.ms.chargingIndicator",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_alertingDP,
       { "alertingDP", "gsm_map.ms.alertingDP",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_locationAtAlerting,
       { "locationAtAlerting", "gsm_map.ms.locationAtAlerting",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_changeOfPositionDP,
       { "changeOfPositionDP", "gsm_map.ms.changeOfPositionDP",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_or_Interactions,
       { "or-Interactions", "gsm_map.ms.or-Interactions",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_warningToneEnhancements,
       { "warningToneEnhancements", "gsm_map.ms.warningToneEnhancements",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_cf_Enhancements,
       { "cf-Enhancements", "gsm_map.ms.cf-Enhancements",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_subscribedEnhancedDialledServices,
       { "subscribedEnhancedDialledServices", "gsm_map.ms.subscribedEnhancedDialledServices",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_servingNetworkEnhancedDialledServices,
       { "servingNetworkEnhancedDialledServices", "gsm_map.ms.servingNetworkEnhancedDialledServices",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_criteriaForChangeOfPositionDP,
       { "criteriaForChangeOfPositionDP", "gsm_map.ms.criteriaForChangeOfPositionDP",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_serviceChangeDP,
       { "serviceChangeDP", "gsm_map.ms.serviceChangeDP",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_OfferedCamel4Functionalities_collectInformation,
       { "collectInformation", "gsm_map.ms.collectInformation",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_privilegedUplinkRequest,
       { "privilegedUplinkRequest", "gsm_map.ms.privilegedUplinkRequest",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_emergencyUplinkRequest,
       { "emergencyUplinkRequest", "gsm_map.ms.emergencyUplinkRequest",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ms_AdditionalSubscriptions_emergencyReset,
       { "emergencyReset", "gsm_map.ms.emergencyReset",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-CH-DataTypes --- --- ---                                    */
 
     { &hf_gsm_map_ch_cug_Interlock,
       { "cug-Interlock", "gsm_map.ch.cug_Interlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.CUG_Interlock", HFILL }},
     { &hf_gsm_map_ch_cug_OutgoingAccess,
       { "cug-OutgoingAccess", "gsm_map.ch.cug_OutgoingAccess",
@@ -21625,7 +21625,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExtensionContainer", HFILL }},
     { &hf_gsm_map_ch_msisdn,
       { "msisdn", "gsm_map.ch.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_cug_CheckInfo,
       { "cug-CheckInfo", "gsm_map.ch.cug_CheckInfo",
@@ -21649,11 +21649,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.OR_Phase", HFILL }},
     { &hf_gsm_map_ch_gmsc_OrGsmSCF_Address,
       { "gmsc-OrGsmSCF-Address", "gsm_map.ch.gmsc_OrGsmSCF_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_callReferenceNumber,
       { "callReferenceNumber", "gsm_map.ch.callReferenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.CallReferenceNumber", HFILL }},
     { &hf_gsm_map_ch_forwardingReason,
       { "forwardingReason", "gsm_map.ch.forwardingReason",
@@ -21677,7 +21677,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.SuppressionOfAnnouncement", HFILL }},
     { &hf_gsm_map_ch_alertingPattern,
       { "alertingPattern", "gsm_map.ch.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AlertingPattern", HFILL }},
     { &hf_gsm_map_ch_ccbs_Call,
       { "ccbs-Call", "gsm_map.ch.ccbs_Call",
@@ -21701,7 +21701,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_callDiversionTreatmentIndicator,
       { "callDiversionTreatmentIndicator", "gsm_map.ch.callDiversionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.CallDiversionTreatmentIndicator", HFILL }},
     { &hf_gsm_map_ch_longFTN_Supported,
       { "longFTN-Supported", "gsm_map.ch.longFTN_Supported",
@@ -21729,7 +21729,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExternalSignalInfo", HFILL }},
     { &hf_gsm_map_ch_suppressMTSS,
       { "suppressMTSS", "gsm_map.ch.suppressMTSS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.SuppressMTSS", HFILL }},
     { &hf_gsm_map_ch_mtRoamingRetrySupported,
       { "mtRoamingRetrySupported", "gsm_map.ch.mtRoamingRetrySupported",
@@ -21741,7 +21741,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.EMLPP_Priority", HFILL }},
     { &hf_gsm_map_ch_imsi,
       { "imsi", "gsm_map.ch.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_ch_extendedRoutingInfo,
       { "extendedRoutingInfo", "gsm_map.ch.extendedRoutingInfo",
@@ -21769,7 +21769,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_vmsc_Address,
       { "vmsc-Address", "gsm_map.ch.vmsc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_naea_PreferredCI,
       { "naea-PreferredCI", "gsm_map.ch.naea_PreferredCI",
@@ -21789,11 +21789,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ms.IST_AlertTimerValue", HFILL }},
     { &hf_gsm_map_ch_supportedCamelPhasesInVMSC,
       { "supportedCamelPhasesInVMSC", "gsm_map.ch.supportedCamelPhasesInVMSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ch_offeredCamel4CSIsInVMSC,
       { "offeredCamel4CSIsInVMSC", "gsm_map.ch.offeredCamel4CSIsInVMSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ch_routingInfo2,
       { "routingInfo2", "gsm_map.ch.routingInfo2",
@@ -21809,7 +21809,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.Ext_BasicServiceCode", HFILL }},
     { &hf_gsm_map_ch_allowedServices,
       { "allowedServices", "gsm_map.ch.allowedServices",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.AllowedServices", HFILL }},
     { &hf_gsm_map_ch_unavailabilityCause,
       { "unavailabilityCause", "gsm_map.ch.unavailabilityCause",
@@ -21833,7 +21833,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_roamingNumber,
       { "roamingNumber", "gsm_map.ch.roamingNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_forwardingData,
       { "forwardingData", "gsm_map.ch.forwardingData",
@@ -21841,35 +21841,35 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.ForwardingData", HFILL }},
     { &hf_gsm_map_ch_forwardedToNumber,
       { "forwardedToNumber", "gsm_map.ch.forwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_forwardedToSubaddress,
       { "forwardedToSubaddress", "gsm_map.ch.forwardedToSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_map_ch_forwardingOptions,
       { "forwardingOptions", "gsm_map.ch.forwardingOptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.ForwardingOptions", HFILL }},
     { &hf_gsm_map_ch_longForwardedToNumber,
       { "longForwardedToNumber", "gsm_map.ch.longForwardedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.FTN_AddressString", HFILL }},
     { &hf_gsm_map_ch_msc_Number,
       { "msc-Number", "gsm_map.ch.msc_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_lmsi,
       { "lmsi", "gsm_map.ch.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_ch_gmsc_Address,
       { "gmsc-Address", "gsm_map.ch.gmsc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_supportedCamelPhasesInInterrogatingNode,
       { "supportedCamelPhasesInInterrogatingNode", "gsm_map.ch.supportedCamelPhasesInInterrogatingNode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ch_orNotSupportedInGMSC,
       { "orNotSupportedInGMSC", "gsm_map.ch.orNotSupportedInGMSC",
@@ -21877,7 +21877,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_offeredCamel4CSIsInInterrogatingNode,
       { "offeredCamel4CSIsInInterrogatingNode", "gsm_map.ch.offeredCamel4CSIsInInterrogatingNode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ch_pagingArea,
       { "pagingArea", "gsm_map.ch.pagingArea",
@@ -21909,11 +21909,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_uuIndicator,
       { "uuIndicator", "gsm_map.ch.uuIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.UUIndicator", HFILL }},
     { &hf_gsm_map_ch_uui,
       { "uui", "gsm_map.ch.uui",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ch.UUI", HFILL }},
     { &hf_gsm_map_ch_uusCFInteraction,
       { "uusCFInteraction", "gsm_map.ch.uusCFInteraction",
@@ -21921,7 +21921,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_supportedCamelPhases,
       { "supportedCamelPhases", "gsm_map.ch.supportedCamelPhases",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedCamelPhases", HFILL }},
     { &hf_gsm_map_ch_suppress_T_CSI,
       { "suppress-T-CSI", "gsm_map.ch.suppress_T_CSI",
@@ -21929,7 +21929,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.NULL", HFILL }},
     { &hf_gsm_map_ch_offeredCamel4CSIs,
       { "offeredCamel4CSIs", "gsm_map.ch.offeredCamel4CSIs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.OfferedCamel4CSIs", HFILL }},
     { &hf_gsm_map_ch_routingInfo,
       { "routingInfo", "gsm_map.ch.routingInfo",
@@ -21989,7 +21989,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.CCBS_Feature", HFILL }},
     { &hf_gsm_map_ch_translatedB_Number,
       { "translatedB-Number", "gsm_map.ch.translatedB_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_replaceB_Number,
       { "replaceB-Number", "gsm_map.ch.replaceB_Number",
@@ -22009,24 +22009,24 @@ void proto_register_gsm_map(void) {
         "gsm_map_ch.CallTerminationIndicator", HFILL }},
     { &hf_gsm_map_ch_msrn,
       { "msrn", "gsm_map.ch.msrn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_ch_SuppressMTSS_suppressCUG,
       { "suppressCUG", "gsm_map.ch.suppressCUG",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ch_SuppressMTSS_suppressCCBS,
       { "suppressCCBS", "gsm_map.ch.suppressCCBS",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ch_AllowedServices_firstServiceAllowed,
       { "firstServiceAllowed", "gsm_map.ch.firstServiceAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_ch_AllowedServices_secondServiceAllowed,
       { "secondServiceAllowed", "gsm_map.ch.secondServiceAllowed",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-LCS-DataTypes --- --- ---                                   */
 
@@ -22036,7 +22036,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_ClientID", HFILL }},
     { &hf_gsm_map_lcs_mlcNumber,
       { "mlcNumber", "gsm_map.lcs.mlcNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_targetMS,
       { "targetMS", "gsm_map.lcs.targetMS",
@@ -22052,27 +22052,27 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCSLocationInfo", HFILL }},
     { &hf_gsm_map_lcs_v_gmlc_Address,
       { "v-gmlc-Address", "gsm_map.lcs.v_gmlc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_lcs_h_gmlc_Address,
       { "h-gmlc-Address", "gsm_map.lcs.h_gmlc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_lcs_ppr_Address,
       { "ppr-Address", "gsm_map.lcs.ppr_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_lcs_additional_v_gmlc_Address,
       { "additional-v-gmlc-Address", "gsm_map.lcs.additional_v_gmlc_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_map_lcs_networkNode_Number,
       { "networkNode-Number", "gsm_map.lcs.networkNode_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_lmsi,
       { "lmsi", "gsm_map.lcs.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_map_lcs_gprsNodeIndicator,
       { "gprsNodeIndicator", "gsm_map.lcs.gprsNodeIndicator",
@@ -22084,11 +22084,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_sm.Additional_Number", HFILL }},
     { &hf_gsm_map_lcs_supportedLCS_CapabilitySets,
       { "supportedLCS-CapabilitySets", "gsm_map.lcs.supportedLCS_CapabilitySets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedLCS_CapabilitySets", HFILL }},
     { &hf_gsm_map_lcs_additional_LCS_CapabilitySets,
       { "additional-LCS-CapabilitySets", "gsm_map.lcs.additional_LCS_CapabilitySets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.SupportedLCS_CapabilitySets", HFILL }},
     { &hf_gsm_map_lcs_locationType,
       { "locationType", "gsm_map.lcs.locationType",
@@ -22096,7 +22096,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LocationType", HFILL }},
     { &hf_gsm_map_lcs_mlc_Number,
       { "mlc-Number", "gsm_map.lcs.mlc_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_lcs_ClientID,
       { "lcs-ClientID", "gsm_map.lcs.lcs_ClientID",
@@ -22108,19 +22108,19 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.NULL", HFILL }},
     { &hf_gsm_map_lcs_imsi,
       { "imsi", "gsm_map.lcs.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_lcs_msisdn,
       { "msisdn", "gsm_map.lcs.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_imei,
       { "imei", "gsm_map.lcs.imei",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMEI", HFILL }},
     { &hf_gsm_map_lcs_lcs_Priority,
       { "lcs-Priority", "gsm_map.lcs.lcs_Priority",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.LCS_Priority", HFILL }},
     { &hf_gsm_map_lcs_lcs_QoS,
       { "lcs-QoS", "gsm_map.lcs.lcs_QoS",
@@ -22128,11 +22128,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_QoS", HFILL }},
     { &hf_gsm_map_lcs_supportedGADShapes,
       { "supportedGADShapes", "gsm_map.lcs.supportedGADShapes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.SupportedGADShapes", HFILL }},
     { &hf_gsm_map_lcs_lcs_ReferenceNumber,
       { "lcs-ReferenceNumber", "gsm_map.lcs.lcs_ReferenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.LCS_ReferenceNumber", HFILL }},
     { &hf_gsm_map_lcs_lcsServiceTypeID,
       { "lcsServiceTypeID", "gsm_map.lcs.lcsServiceTypeID",
@@ -22168,7 +22168,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LocationEstimateType", HFILL }},
     { &hf_gsm_map_lcs_deferredLocationEventType,
       { "deferredLocationEventType", "gsm_map.lcs.deferredLocationEventType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.DeferredLocationEventType", HFILL }},
     { &hf_gsm_map_lcs_lcsClientType,
       { "lcsClientType", "gsm_map.lcs.lcsClientType",
@@ -22180,7 +22180,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.LCSClientExternalID", HFILL }},
     { &hf_gsm_map_lcs_lcsClientDialedByMS,
       { "lcsClientDialedByMS", "gsm_map.lcs.lcsClientDialedByMS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_lcs_lcsClientInternalID,
       { "lcsClientInternalID", "gsm_map.lcs.lcsClientInternalID",
@@ -22192,7 +22192,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCSClientName", HFILL }},
     { &hf_gsm_map_lcs_lcsAPN,
       { "lcsAPN", "gsm_map.lcs.lcsAPN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.APN", HFILL }},
     { &hf_gsm_map_lcs_lcsRequestorID,
       { "lcsRequestorID", "gsm_map.lcs.lcsRequestorID",
@@ -22200,11 +22200,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCSRequestorID", HFILL }},
     { &hf_gsm_map_lcs_dataCodingScheme,
       { "dataCodingScheme", "gsm_map.lcs.dataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.USSD_DataCodingScheme", HFILL }},
     { &hf_gsm_map_lcs_nameString,
       { "nameString", "gsm_map.lcs.nameString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.NameString", HFILL }},
     { &hf_gsm_map_lcs_lcs_FormatIndicator,
       { "lcs-FormatIndicator", "gsm_map.lcs.lcs_FormatIndicator",
@@ -22212,11 +22212,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_FormatIndicator", HFILL }},
     { &hf_gsm_map_lcs_requestorIDString,
       { "requestorIDString", "gsm_map.lcs.requestorIDString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.RequestorIDString", HFILL }},
     { &hf_gsm_map_lcs_horizontal_accuracy,
       { "horizontal-accuracy", "gsm_map.lcs.horizontal_accuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Horizontal_Accuracy", HFILL }},
     { &hf_gsm_map_lcs_verticalCoordinateRequest,
       { "verticalCoordinateRequest", "gsm_map.lcs.verticalCoordinateRequest",
@@ -22224,7 +22224,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.NULL", HFILL }},
     { &hf_gsm_map_lcs_vertical_accuracy,
       { "vertical-accuracy", "gsm_map.lcs.vertical_accuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Vertical_Accuracy", HFILL }},
     { &hf_gsm_map_lcs_responseTime,
       { "responseTime", "gsm_map.lcs.responseTime",
@@ -22240,7 +22240,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.ResponseTimeCategory", HFILL }},
     { &hf_gsm_map_lcs_lcsCodewordString,
       { "lcsCodewordString", "gsm_map.lcs.lcsCodewordString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.LCSCodewordString", HFILL }},
     { &hf_gsm_map_lcs_callSessionUnrelated,
       { "callSessionUnrelated", "gsm_map.lcs.callSessionUnrelated",
@@ -22276,7 +22276,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.AreaType", HFILL }},
     { &hf_gsm_map_lcs_areaIdentification,
       { "areaIdentification", "gsm_map.lcs.areaIdentification",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.AreaIdentification", HFILL }},
     { &hf_gsm_map_lcs_reportingAmount,
       { "reportingAmount", "gsm_map.lcs.reportingAmount",
@@ -22300,7 +22300,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.ReportingPLMN", HFILL }},
     { &hf_gsm_map_lcs_plmn_Id,
       { "plmn-Id", "gsm_map.lcs.plmn_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.PLMN_Id", HFILL }},
     { &hf_gsm_map_lcs_ran_Technology,
       { "ran-Technology", "gsm_map.lcs.ran_Technology",
@@ -22312,7 +22312,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.NULL", HFILL }},
     { &hf_gsm_map_lcs_locationEstimate,
       { "locationEstimate", "gsm_map.lcs.locationEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Ext_GeographicalInformation", HFILL }},
     { &hf_gsm_map_lcs_ageOfLocationEstimate,
       { "ageOfLocationEstimate", "gsm_map.lcs.ageOfLocationEstimate",
@@ -22320,7 +22320,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.AgeOfLocationInformation", HFILL }},
     { &hf_gsm_map_lcs_add_LocationEstimate,
       { "add-LocationEstimate", "gsm_map.lcs.add_LocationEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Add_GeographicalInformation", HFILL }},
     { &hf_gsm_map_lcs_deferredmt_lrResponseIndicator,
       { "deferredmt-lrResponseIndicator", "gsm_map.lcs.deferredmt_lrResponseIndicator",
@@ -22328,11 +22328,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.NULL", HFILL }},
     { &hf_gsm_map_lcs_geranPositioningData,
       { "geranPositioningData", "gsm_map.lcs.geranPositioningData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.PositioningDataInformation", HFILL }},
     { &hf_gsm_map_lcs_utranPositioningData,
       { "utranPositioningData", "gsm_map.lcs.utranPositioningData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.UtranPositioningDataInfo", HFILL }},
     { &hf_gsm_map_lcs_cellIdOrSai,
       { "cellIdOrSai", "gsm_map.lcs.cellIdOrSai",
@@ -22348,7 +22348,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.AccuracyFulfilmentIndicator", HFILL }},
     { &hf_gsm_map_lcs_velocityEstimate,
       { "velocityEstimate", "gsm_map.lcs.velocityEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.VelocityEstimate", HFILL }},
     { &hf_gsm_map_lcs_lcs_Event,
       { "lcs-Event", "gsm_map.lcs.lcs_Event",
@@ -22356,11 +22356,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_Event", HFILL }},
     { &hf_gsm_map_lcs_na_ESRD,
       { "na-ESRD", "gsm_map.lcs.na_ESRD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_na_ESRK,
       { "na-ESRK", "gsm_map.lcs.na_ESRK",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_lcs_slr_ArgExtensionContainer,
       { "slr-ArgExtensionContainer", "gsm_map.lcs.slr_ArgExtensionContainer",
@@ -22385,51 +22385,51 @@ void proto_register_gsm_map(void) {
     { &hf_gsm_map_lcs_DeferredLocationEventType_msAvailable,
       { "msAvailable", "gsm_map.lcs.msAvailable",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_enteringIntoArea,
       { "enteringIntoArea", "gsm_map.lcs.enteringIntoArea",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_leavingFromArea,
       { "leavingFromArea", "gsm_map.lcs.leavingFromArea",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_beingInsideArea,
       { "beingInsideArea", "gsm_map.lcs.beingInsideArea",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_DeferredLocationEventType_periodicLDR,
       { "periodicLDR", "gsm_map.lcs.periodicLDR",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPoint,
       { "ellipsoidPoint", "gsm_map.lcs.ellipsoidPoint",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyCircle,
       { "ellipsoidPointWithUncertaintyCircle", "gsm_map.lcs.ellipsoidPointWithUncertaintyCircle",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithUncertaintyEllipse,
       { "ellipsoidPointWithUncertaintyEllipse", "gsm_map.lcs.ellipsoidPointWithUncertaintyEllipse",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_polygon,
       { "polygon", "gsm_map.lcs.polygon",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitude,
       { "ellipsoidPointWithAltitude", "gsm_map.lcs.ellipsoidPointWithAltitude",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidPointWithAltitudeAndUncertaintyElipsoid,
       { "ellipsoidPointWithAltitudeAndUncertaintyElipsoid", "gsm_map.lcs.ellipsoidPointWithAltitudeAndUncertaintyElipsoid",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_gsm_map_lcs_SupportedGADShapes_ellipsoidArc,
       { "ellipsoidArc", "gsm_map.lcs.ellipsoidArc",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module MAP-GR-DataTypes --- --- ---                                    */
 
@@ -22439,15 +22439,15 @@ void proto_register_gsm_map(void) {
         "gsm_map.Ext_TeleserviceCode", HFILL }},
     { &hf_gsm_map_gr_asciCallReference,
       { "asciCallReference", "gsm_map.gr.asciCallReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ASCI_CallReference", HFILL }},
     { &hf_gsm_map_gr_codec_Info,
       { "codec-Info", "gsm_map.gr.codec_Info",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_gr.CODEC_Info", HFILL }},
     { &hf_gsm_map_gr_cipheringAlgorithm,
       { "cipheringAlgorithm", "gsm_map.gr.cipheringAlgorithm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_gr.CipheringAlgorithm", HFILL }},
     { &hf_gsm_map_gr_groupKeyNumber_Vk_Id,
       { "groupKeyNumber-Vk-Id", "gsm_map.gr.groupKeyNumber_Vk_Id",
@@ -22455,7 +22455,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_gr.GroupKeyNumber", HFILL }},
     { &hf_gsm_map_gr_groupKey,
       { "groupKey", "gsm_map.gr.groupKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Kc", HFILL }},
     { &hf_gsm_map_gr_priority,
       { "priority", "gsm_map.gr.priority",
@@ -22471,11 +22471,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExtensionContainer", HFILL }},
     { &hf_gsm_map_gr_vstk,
       { "vstk", "gsm_map.gr.vstk",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_gr.VSTK", HFILL }},
     { &hf_gsm_map_gr_vstk_rand,
       { "vstk-rand", "gsm_map.gr.vstk_rand",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_gr.VSTK_RAND", HFILL }},
     { &hf_gsm_map_gr_talkerChannelParameter,
       { "talkerChannelParameter", "gsm_map.gr.talkerChannelParameter",
@@ -22483,11 +22483,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_gr.NULL", HFILL }},
     { &hf_gsm_map_gr_groupCallNumber,
       { "groupCallNumber", "gsm_map.gr.groupCallNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_gr_imsi,
       { "imsi", "gsm_map.gr.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_map_gr_talkerPriority,
       { "talkerPriority", "gsm_map.gr.talkerPriority",
@@ -22495,7 +22495,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_gr.TalkerPriority", HFILL }},
     { &hf_gsm_map_gr_additionalInfo,
       { "additionalInfo", "gsm_map.gr.additionalInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AdditionalInfo", HFILL }},
     { &hf_gsm_map_gr_uplinkRequestAck,
       { "uplinkRequestAck", "gsm_map.gr.uplinkRequestAck",
@@ -22527,7 +22527,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_gr.NULL", HFILL }},
     { &hf_gsm_map_gr_sm_RP_UI,
       { "sm-RP-UI", "gsm_map.gr.sm_RP_UI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_map_gr_an_APDU,
       { "an-APDU", "gsm_map.gr.an_APDU",
@@ -22563,31 +22563,31 @@ void proto_register_gsm_map(void) {
         "gsm_map_gr.RequestedInfo", HFILL }},
     { &hf_gsm_map_gr_groupId,
       { "groupId", "gsm_map.gr.groupId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Long_GroupId", HFILL }},
     { &hf_gsm_map_gr_cellId,
       { "cellId", "gsm_map.gr.cellId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.GlobalCellId", HFILL }},
     { &hf_gsm_map_gr_tmsi,
       { "tmsi", "gsm_map.gr.tmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.TMSI", HFILL }},
     { &hf_gsm_map_gr_cksn,
       { "cksn", "gsm_map.gr.cksn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Cksn", HFILL }},
     { &hf_gsm_map_gr_anchorMSC_Address,
       { "anchorMSC-Address", "gsm_map.gr.anchorMSC_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_map_gr_additionalSubscriptions,
       { "additionalSubscriptions", "gsm_map.gr.additionalSubscriptions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.AdditionalSubscriptions", HFILL }},
     { &hf_gsm_map_gr_kc,
       { "kc", "gsm_map.gr.kc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.Kc", HFILL }},
 
 /* --- Module MAP-DialogueInformation --- --- ---                             */
@@ -22622,11 +22622,11 @@ void proto_register_gsm_map(void) {
         "gsm_map_dialogue.MAP_ProviderAbortInfo", HFILL }},
     { &hf_gsm_map_dialogue_destinationReference,
       { "destinationReference", "gsm_map.dialogue.destinationReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_dialogue_originationReference,
       { "originationReference", "gsm_map.dialogue.originationReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_map_dialogue_extensionContainer,
       { "extensionContainer", "gsm_map.dialogue.extensionContainer",
@@ -22769,7 +22769,7 @@ void proto_register_gsm_map(void) {
         "gsm_map.ProtocolId", HFILL }},
     { &hf_gsm_old_signalInfo,
       { "signalInfo", "gsm_old.signalInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_old_extensionContainer,
       { "extensionContainer", "gsm_old.extensionContainer",
@@ -22785,11 +22785,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_call_Direction,
       { "call-Direction", "gsm_old.call_Direction",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.CallDirection", HFILL }},
     { &hf_gsm_old_b_Subscriber_Address,
       { "b-Subscriber-Address", "gsm_old.b_Subscriber_Address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_chosenChannel,
       { "chosenChannel", "gsm_old.chosenChannel",
@@ -22805,19 +22805,19 @@ void proto_register_gsm_map(void) {
         "gsm_map.ExternalSignalInfo", HFILL }},
     { &hf_gsm_old_sIWFSNumber,
       { "sIWFSNumber", "gsm_old.sIWFSNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_imsi,
       { "imsi", "gsm_old.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_old_vlr_Number,
       { "vlr-Number", "gsm_old.vlr_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_targetCellId,
       { "targetCellId", "gsm_old.targetCellId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.GlobalCellId", HFILL }},
     { &hf_gsm_old_ho_NumberNotRequired,
       { "ho-NumberNotRequired", "gsm_old.ho_NumberNotRequired",
@@ -22829,7 +22829,7 @@ void proto_register_gsm_map(void) {
         "gsm_old.Bss_APDU", HFILL }},
     { &hf_gsm_old_handoverNumber,
       { "handoverNumber", "gsm_old.handoverNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_SendAuthenticationInfoResOld_item,
       { "SendAuthenticationInfoResOld item", "gsm_old.SendAuthenticationInfoResOld_item",
@@ -22837,15 +22837,15 @@ void proto_register_gsm_map(void) {
         "gsm_old.SendAuthenticationInfoResOld_item", HFILL }},
     { &hf_gsm_old_rand,
       { "rand", "gsm_old.rand",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.RAND", HFILL }},
     { &hf_gsm_old_sres,
       { "sres", "gsm_old.sres",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.SRES", HFILL }},
     { &hf_gsm_old_kc,
       { "kc", "gsm_old.kc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.Kc", HFILL }},
     { &hf_gsm_old_tripletList,
       { "tripletList", "gsm_old.tripletList",
@@ -22865,11 +22865,11 @@ void proto_register_gsm_map(void) {
         "gsm_old.SecurityHeader", HFILL }},
     { &hf_gsm_old_protectedPayload,
       { "protectedPayload", "gsm_old.protectedPayload",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.ProtectedPayload", HFILL }},
     { &hf_gsm_old_securityParametersIndex,
       { "securityParametersIndex", "gsm_old.securityParametersIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.SecurityParametersIndex", HFILL }},
     { &hf_gsm_old_originalComponentIdentifier,
       { "originalComponentIdentifier", "gsm_old.originalComponentIdentifier",
@@ -22877,7 +22877,7 @@ void proto_register_gsm_map(void) {
         "gsm_old.OriginalComponentIdentifier", HFILL }},
     { &hf_gsm_old_initialisationVector,
       { "initialisationVector", "gsm_old.initialisationVector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.InitialisationVector", HFILL }},
     { &hf_gsm_old_operationCode,
       { "operationCode", "gsm_old.operationCode",
@@ -22897,11 +22897,11 @@ void proto_register_gsm_map(void) {
         "gsm_old.INTEGER", HFILL }},
     { &hf_gsm_old_msisdn,
       { "msisdn", "gsm_old.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_old_category,
       { "category", "gsm_old.category",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.Category", HFILL }},
     { &hf_gsm_old_basicService,
       { "basicService", "gsm_old.basicService",
@@ -22913,7 +22913,7 @@ void proto_register_gsm_map(void) {
         "gsm_old.T_operatorSS_Code", HFILL }},
     { &hf_gsm_old_operatorSS_Code_item,
       { "operatorSS-Code item", "gsm_old.operatorSS_Code_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_gsm_old_sm_RP_DA,
       { "sm-RP-DA", "gsm_old.sm_RP_DA",
@@ -22925,7 +22925,7 @@ void proto_register_gsm_map(void) {
         "gsm_old.SM_RP_OAold", HFILL }},
     { &hf_gsm_old_sm_RP_UI,
       { "sm-RP-UI", "gsm_old.sm_RP_UI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.SignalInfo", HFILL }},
     { &hf_gsm_old_moreMessagesToSend,
       { "moreMessagesToSend", "gsm_old.moreMessagesToSend",
@@ -22933,11 +22933,11 @@ void proto_register_gsm_map(void) {
         "gsm_old.NULL", HFILL }},
     { &hf_gsm_old_lmsi,
       { "lmsi", "gsm_old.lmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.LMSI", HFILL }},
     { &hf_gsm_old_serviceCentreAddressDA,
       { "serviceCentreAddressDA", "gsm_old.serviceCentreAddressDA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_old_noSM_RP_DA,
       { "noSM-RP-DA", "gsm_old.noSM_RP_DA",
@@ -22945,11 +22945,11 @@ void proto_register_gsm_map(void) {
         "gsm_old.NULL", HFILL }},
     { &hf_gsm_old_msisdn_01,
       { "msisdn", "gsm_old.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.T_msisdn", HFILL }},
     { &hf_gsm_old_serviceCentreAddressOA,
       { "serviceCentreAddressOA", "gsm_old.serviceCentreAddressOA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_old.T_serviceCentreAddressOA", HFILL }},
     { &hf_gsm_old_noSM_RP_OA,
       { "noSM-RP-OA", "gsm_old.noSM_RP_OA",
@@ -22980,11 +22980,11 @@ void proto_register_gsm_map(void) {
         "gsm_map.SS_Code", HFILL }},
     { &hf_gsm_ss_ss_Status,
       { "ss-Status", "gsm_ss.ss_Status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.SS_Status", HFILL }},
     { &hf_gsm_ss_ss_Notification,
       { "ss-Notification", "gsm_ss.ss_Notification",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_ss.SS_Notification", HFILL }},
     { &hf_gsm_ss_callIsWaiting_Indicator,
       { "callIsWaiting-Indicator", "gsm_ss.callIsWaiting_Indicator",
@@ -23020,7 +23020,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_ss.CCBS_Feature", HFILL }},
     { &hf_gsm_ss_alertingPattern,
       { "alertingPattern", "gsm_ss.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AlertingPattern", HFILL }},
     { &hf_gsm_ss_multicall_Indicator,
       { "multicall-Indicator", "gsm_ss.multicall_Indicator",
@@ -23028,15 +23028,15 @@ void proto_register_gsm_map(void) {
         "gsm_ss.Multicall_Indicator", HFILL }},
     { &hf_gsm_ss_imsi,
       { "imsi", "gsm_ss.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.IMSI", HFILL }},
     { &hf_gsm_ss_originatingEntityNumber,
       { "originatingEntityNumber", "gsm_ss.originatingEntityNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_ss_msisdn,
       { "msisdn", "gsm_ss.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_ss_chargingInformation,
       { "chargingInformation", "gsm_ss.chargingInformation",
@@ -23108,7 +23108,7 @@ void proto_register_gsm_map(void) {
         "gsm_ss.NameSet", HFILL }},
     { &hf_gsm_ss_dataCodingScheme,
       { "dataCodingScheme", "gsm_ss.dataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.USSD_DataCodingScheme", HFILL }},
     { &hf_gsm_ss_lengthInCharacters,
       { "lengthInCharacters", "gsm_ss.lengthInCharacters",
@@ -23116,7 +23116,7 @@ void proto_register_gsm_map(void) {
         "gsm_ss.INTEGER", HFILL }},
     { &hf_gsm_ss_nameString,
       { "nameString", "gsm_ss.nameString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ss.USSD_String", HFILL }},
     { &hf_gsm_ss_presentationAllowedAddress,
       { "presentationAllowedAddress", "gsm_ss.presentationAllowedAddress",
@@ -23132,19 +23132,19 @@ void proto_register_gsm_map(void) {
         "gsm_ss.RemotePartyNumber", HFILL }},
     { &hf_gsm_ss_partyNumber,
       { "partyNumber", "gsm_ss.partyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_ss_partyNumberSubaddress,
       { "partyNumberSubaddress", "gsm_ss.partyNumberSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_ss_deflectedToNumber,
       { "deflectedToNumber", "gsm_ss.deflectedToNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.AddressString", HFILL }},
     { &hf_gsm_ss_deflectedToSubaddress,
       { "deflectedToSubaddress", "gsm_ss.deflectedToSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_SubaddressString", HFILL }},
     { &hf_gsm_ss_uUS_Service,
       { "uUS-Service", "gsm_ss.uUS_Service",
@@ -23152,7 +23152,7 @@ void proto_register_gsm_map(void) {
         "gsm_ss.UUS_Service", HFILL }},
     { &hf_gsm_ss_uUS_Required,
       { "uUS-Required", "gsm_ss.uUS_Required",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "gsm_ss.BOOLEAN", HFILL }},
     { &hf_gsm_ss_notificationType,
       { "notificationType", "gsm_ss.notificationType",
@@ -23200,15 +23200,15 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.LCS_QoS", HFILL }},
     { &hf_gsm_ss_mlc_Number,
       { "mlc-Number", "gsm_ss.mlc_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map.ISDN_AddressString", HFILL }},
     { &hf_gsm_ss_gpsAssistanceData,
       { "gpsAssistanceData", "gsm_ss.gpsAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_ss.GPSAssistanceData", HFILL }},
     { &hf_gsm_ss_supportedGADShapes,
       { "supportedGADShapes", "gsm_ss.supportedGADShapes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.SupportedGADShapes", HFILL }},
     { &hf_gsm_ss_ageOfLocationInfo,
       { "ageOfLocationInfo", "gsm_ss.ageOfLocationInfo",
@@ -23220,19 +23220,19 @@ void proto_register_gsm_map(void) {
         "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_h_gmlc_address,
       { "h-gmlc-address", "gsm_ss.h_gmlc_address",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_ms.GSN_Address", HFILL }},
     { &hf_gsm_ss_locationEstimate,
       { "locationEstimate", "gsm_ss.locationEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Ext_GeographicalInformation", HFILL }},
     { &hf_gsm_ss_velocityEstimate,
       { "velocityEstimate", "gsm_ss.velocityEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.VelocityEstimate", HFILL }},
     { &hf_gsm_ss_referenceNumber,
       { "referenceNumber", "gsm_ss.referenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.LCS_ReferenceNumber", HFILL }},
     { &hf_gsm_ss_periodicLDRInfo,
       { "periodicLDRInfo", "gsm_ss.periodicLDRInfo",
@@ -23256,15 +23256,15 @@ void proto_register_gsm_map(void) {
         "gsm_ss.NULL", HFILL }},
     { &hf_gsm_ss_ganssAssistanceData,
       { "ganssAssistanceData", "gsm_ss.ganssAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_ss.GANSSAssistanceData", HFILL }},
     { &hf_gsm_ss_decipheringKeys,
       { "decipheringKeys", "gsm_ss.decipheringKeys",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_ss.DecipheringKeys", HFILL }},
     { &hf_gsm_ss_add_LocationEstimate,
       { "add-LocationEstimate", "gsm_ss.add_LocationEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.Add_GeographicalInformation", HFILL }},
     { &hf_gsm_ss_reportingPLMNList,
       { "reportingPLMNList", "gsm_ss.reportingPLMNList",
@@ -23272,7 +23272,7 @@ void proto_register_gsm_map(void) {
         "gsm_map_lcs.ReportingPLMNList", HFILL }},
     { &hf_gsm_ss_deferredLocationEventType,
       { "deferredLocationEventType", "gsm_ss.deferredLocationEventType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "gsm_map_lcs.DeferredLocationEventType", HFILL }},
     { &hf_gsm_ss_areaEventInfo,
       { "areaEventInfo", "gsm_ss.areaEventInfo",
diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c
index efbe76ac7f..d03f318813 100644
--- a/epan/dissectors/packet-gsm_sms.c
+++ b/epan/dissectors/packet-gsm_sms.c
@@ -3484,12 +3484,12 @@ proto_register_gsm_sms(void)
 	    { &hf_gsm_sms_coding_group_bits2,
 	      { "Coding Group Bits", "gsm_sms.coding_group_bits2",
 	        FT_UINT8, BASE_DEC, VALS(gsm_sms_coding_group_bits_vals), 0xc0,
-	        "Coding Group Bits", HFILL }
+	        NULL, HFILL }
 		},
 	    { &hf_gsm_sms_coding_group_bits4,
 	      { "Coding Group Bits", "gsm_sms.coding_group_bits4",
 	        FT_UINT8, BASE_DEC, VALS(gsm_sms_coding_group_bits_vals), 0xf0,
-	        "Coding Group Bits", HFILL }
+	        NULL, HFILL }
 		},
 
 		/*
@@ -3511,7 +3511,7 @@ proto_register_gsm_sms(void)
 		},
 		{	&hf_gsm_sms_ud_fragment_overlap,
 			{	"Short Message fragment overlap", "gsm-sms-ud.fragment.overlap",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 				"GSM Short Message fragment overlaps with other fragment(s)",
 				HFILL
 			}
@@ -3519,7 +3519,7 @@ proto_register_gsm_sms(void)
 		{	&hf_gsm_sms_ud_fragment_overlap_conflicts,
 			{	"Short Message fragment overlapping with conflicting data",
 				"gsm-sms-ud.fragment.overlap.conflicts",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 				"GSM Short Message fragment overlaps with conflicting data",
 				HFILL
 			}
@@ -3527,7 +3527,7 @@ proto_register_gsm_sms(void)
 		{	&hf_gsm_sms_ud_fragment_multiple_tails,
 			{	"Short Message has multiple tail fragments",
 				"gsm-sms-ud.fragment.multiple_tails",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 				"GSM Short Message fragment has multiple tail fragments",
 				HFILL
 			}
@@ -3535,7 +3535,7 @@ proto_register_gsm_sms(void)
 		{	&hf_gsm_sms_ud_fragment_too_long_fragment,
 			{	"Short Message fragment too long",
 				"gsm-sms-ud.fragment.too_long_fragment",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 				"GSM Short Message fragment data goes beyond the packet end",
 				HFILL
 			}
diff --git a/epan/dissectors/packet-gsm_sms_ud.c b/epan/dissectors/packet-gsm_sms_ud.c
index 8c5e8649f8..41fe1feaa8 100644
--- a/epan/dissectors/packet-gsm_sms_ud.c
+++ b/epan/dissectors/packet-gsm_sms_ud.c
@@ -500,14 +500,14 @@ proto_register_gsm_sms_ud(void)
 	{   &hf_gsm_sms_udh_ports_src,
 	    {	"Source port", "gsm-sms-ud.udh.ports.src",
 		FT_UINT8, BASE_DEC, NULL, 0x00,
-		"Source port",
+		NULL,
 		HFILL
 	    }
 	},
 	{   &hf_gsm_sms_udh_ports_dst,
 	    {	"Destination port", "gsm-sms-ud.udh.ports.dst",
 		FT_UINT8, BASE_DEC, NULL, 0x00,
-		"Destination port",
+		NULL,
 		HFILL
 	    }
 	},
@@ -530,7 +530,7 @@ proto_register_gsm_sms_ud(void)
 	},
 	{	&hf_gsm_sms_ud_fragment_overlap,
 		{	"Short Message fragment overlap", "gsm-sms-ud.fragment.overlap",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"GSM Short Message fragment overlaps with other fragment(s)",
 			HFILL
 		}
@@ -538,7 +538,7 @@ proto_register_gsm_sms_ud(void)
 	{	&hf_gsm_sms_ud_fragment_overlap_conflicts,
 		{	"Short Message fragment overlapping with conflicting data",
 			"gsm-sms-ud.fragment.overlap.conflicts",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"GSM Short Message fragment overlaps with conflicting data",
 			HFILL
 		}
@@ -546,7 +546,7 @@ proto_register_gsm_sms_ud(void)
 	{	&hf_gsm_sms_ud_fragment_multiple_tails,
 		{	"Short Message has multiple tail fragments",
 			"gsm-sms-ud.fragment.multiple_tails",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"GSM Short Message fragment has multiple tail fragments",
 			HFILL
 		}
@@ -554,7 +554,7 @@ proto_register_gsm_sms_ud(void)
 	{	&hf_gsm_sms_ud_fragment_too_long_fragment,
 		{	"Short Message fragment too long",
 			"gsm-sms-ud.fragment.too_long_fragment",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"GSM Short Message fragment data goes beyond the packet end",
 			HFILL
 		}
diff --git a/epan/dissectors/packet-gssapi.c b/epan/dissectors/packet-gssapi.c
index ce11ca3ddc..552d924b15 100644
--- a/epan/dissectors/packet-gssapi.c
+++ b/epan/dissectors/packet-gssapi.c
@@ -506,10 +506,10 @@ proto_register_gssapi(void)
 		  NULL, 0, "This is a GSS-API Object Identifier", HFILL }},
 	{ &hf_gssapi_segment,
 		{ "GSSAPI Segment", "gss-api.segment", FT_FRAMENUM, BASE_NONE, 
-		  NULL, 0x0, "GSSAPI Segment", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 	{ &hf_gssapi_segments,
 		{ "GSSAPI Segments", "gss-api.segment.segments", FT_NONE, BASE_NONE, 
-		  NULL, 0x0, "GSSAPI Segments", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 	{ &hf_gssapi_segment_overlap,
 		{ "Fragment overlap",	"gss-api.segment.overlap", FT_BOOLEAN, BASE_NONE, 
 		   NULL, 0x0, "Fragment overlaps with other fragments", HFILL }},
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index d6a4cac81f..9be90b04e9 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -6624,23 +6624,23 @@ void proto_register_gtp(void)
 	{&hf_gtp_response_to,
 	 {"Response To", "gtp.response_to", FT_FRAMENUM, BASE_DEC, NULL, 0x0, "This is a response to the GTP request in this frame", HFILL}},
 	{&hf_gtp_time, {"Time", "gtp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0, "The time between the Request and the Response", HFILL}},
-	{&hf_gtp_apn, {"APN", "gtp.apn", FT_STRING, BASE_DEC, NULL, 0, "Access Point Name", HFILL}},
-	{&hf_gtp_cause, {"Cause ", "gtp.cause", FT_UINT8, BASE_DEC, VALS(cause_type), 0, "Cause of operation", HFILL}},
-	{&hf_gtp_chrg_char, {"Charging characteristics", "gtp.chrg_char", FT_UINT16, BASE_DEC, NULL, 0, "Charging characteristics", HFILL}},
-	{&hf_gtp_chrg_char_s, {"Spare", "gtp.chrg_char_s", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_S, "Spare", HFILL}},
-	{&hf_gtp_chrg_char_n, {"Normal charging", "gtp.chrg_char_n", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_N, "Normal charging", HFILL}},
-	{&hf_gtp_chrg_char_p, {"Prepaid charging", "gtp.chrg_char_p", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_P, "Prepaid charging", HFILL}},
+	{&hf_gtp_apn, {"APN", "gtp.apn", FT_STRING, BASE_NONE, NULL, 0, "Access Point Name", HFILL}},
+	{&hf_gtp_cause, {"Cause", "gtp.cause", FT_UINT8, BASE_DEC, VALS(cause_type), 0, "Cause of operation", HFILL}},
+	{&hf_gtp_chrg_char, {"Charging characteristics", "gtp.chrg_char", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_chrg_char_s, {"Spare", "gtp.chrg_char_s", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_S, NULL, HFILL}},
+	{&hf_gtp_chrg_char_n, {"Normal charging", "gtp.chrg_char_n", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_N, NULL, HFILL}},
+	{&hf_gtp_chrg_char_p, {"Prepaid charging", "gtp.chrg_char_p", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_P, NULL, HFILL}},
 	{&hf_gtp_chrg_char_f,
-	 {"Flat rate charging", "gtp.chrg_char_f", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_F, "Flat rate charging", HFILL}},
+	 {"Flat rate charging", "gtp.chrg_char_f", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_F, NULL, HFILL}},
 	{&hf_gtp_chrg_char_h,
-	 {"Hot billing charging", "gtp.chrg_char_h", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_H, "Hot billing charging", HFILL}},
-	{&hf_gtp_chrg_char_r, {"Reserved", "gtp.chrg_char_r", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_R, "Reserved", HFILL}},
-	{&hf_gtp_chrg_id, {"Charging ID", "gtp.chrg_id", FT_UINT32, BASE_HEX, NULL, 0, "Charging ID", HFILL}},
-	{&hf_gtp_chrg_ipv4, {"CG address IPv4", "gtp.chrg_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "Charging Gateway address IPv4", HFILL}},
-	{&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_HEX, NULL, 0, "Charging Gateway address IPv6", HFILL}},
+	 {"Hot billing charging", "gtp.chrg_char_h", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_H, NULL, HFILL}},
+	{&hf_gtp_chrg_char_r, {"Reserved", "gtp.chrg_char_r", FT_UINT16, BASE_DEC, NULL, GTP_MASK_CHRG_CHAR_R, NULL, HFILL}},
+	{&hf_gtp_chrg_id, {"Charging ID", "gtp.chrg_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_chrg_ipv4, {"CG address IPv4", "gtp.chrg_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Charging Gateway address IPv4", HFILL}},
+	{&hf_gtp_chrg_ipv6, {"CG address IPv6", "gtp.chrg_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Charging Gateway address IPv6", HFILL}},
 	{&hf_gtp_ext_flow_label, {"Flow Label Data I", "gtp.ext_flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label data", HFILL}},
 	{&hf_gtp_ext_id, {"Extension identifier", "gtp.ext_id", FT_UINT16, BASE_DEC, VALS(sminmpec_values), 0, "Extension Identifier", HFILL}},
-	{&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_HEX, NULL, 0, "Extension Value", HFILL}},
+	{&hf_gtp_ext_val, {"Extension value", "gtp.ext_val", FT_BYTES, BASE_NONE, NULL, 0, "Extension Value", HFILL}},
 	{&hf_gtp_flags, {"Flags", "gtp.flags", FT_UINT8, BASE_HEX, NULL, 0, "Ver/PT/Spare...", HFILL}},
 	{&hf_gtp_flags_ver,
 	 {"Version", "gtp.flags.version",
@@ -6671,31 +6671,31 @@ void proto_register_gtp(void)
 	{&hf_gtp_flags_pn,
 	 {"Is N-PDU number present?", "gtp.flags.pn", FT_BOOLEAN, 8, TFS(&yes_no_tfs), GTP_PN_MASK, "Is N-PDU number present? (1 = yes, 0 = no)",
 	  HFILL}},
-	{&hf_gtp_flow_ii, {"Flow Label Data II ", "gtp.flow_ii", FT_UINT16, BASE_DEC, NULL, 0, "Downlink flow label data", HFILL}},
-	{&hf_gtp_flow_label, {"Flow label", "gtp.flow_label", FT_UINT16, BASE_HEX, NULL, 0, "Flow label", HFILL}},
+	{&hf_gtp_flow_ii, {"Flow Label Data II", "gtp.flow_ii", FT_UINT16, BASE_DEC, NULL, 0, "Downlink flow label data", HFILL}},
+	{&hf_gtp_flow_label, {"Flow label", "gtp.flow_label", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_flow_sig, {"Flow label Signalling", "gtp.flow_sig", FT_UINT16, BASE_HEX, NULL, 0, "Flow label signalling", HFILL}},
 	{&hf_gtp_gsn_addr_len,
-	 {"GSN Address Length", "gtp.gsn_addr_len", FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK, "GSN Address Length", HFILL}},
+	 {"GSN Address Length", "gtp.gsn_addr_len", FT_UINT8, BASE_DEC, NULL, GTP_EXT_GSN_ADDR_LEN_MASK, NULL, HFILL}},
 	{&hf_gtp_gsn_addr_type,
-	 {"GSN Address Type", "gtp.gsn_addr_type", FT_UINT8, BASE_DEC, VALS(gsn_addr_type), GTP_EXT_GSN_ADDR_TYPE_MASK, "GSN Address Type", HFILL}},
-	{&hf_gtp_gsn_ipv4, {"GSN address IPv4", "gtp.gsn_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "GSN address IPv4", HFILL}},
-	{&hf_gtp_gsn_ipv6, {"GSN address IPv6", "gtp.gsn_ipv6", FT_IPv6, BASE_DEC, NULL, 0, "GSN address IPv6", HFILL}},
-	{&hf_gtp_imsi, {"IMSI", "gtp.imsi", FT_STRING, BASE_DEC, NULL, 0, "International Mobile Subscriber Identity number", HFILL}},
+	 {"GSN Address Type", "gtp.gsn_addr_type", FT_UINT8, BASE_DEC, VALS(gsn_addr_type), GTP_EXT_GSN_ADDR_TYPE_MASK, NULL, HFILL}},
+	{&hf_gtp_gsn_ipv4, {"GSN address IPv4", "gtp.gsn_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_gsn_ipv6, {"GSN address IPv6", "gtp.gsn_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_imsi, {"IMSI", "gtp.imsi", FT_STRING, BASE_NONE, NULL, 0, "International Mobile Subscriber Identity number", HFILL}},
 	{&hf_gtp_length, {"Length", "gtp.length", FT_UINT16, BASE_DEC, NULL, 0, "Length (i.e. number of octets after TID or TEID)", HFILL}},
-	{&hf_gtp_map_cause, {"MAP cause", "gtp.map_cause", FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0, "MAP cause", HFILL}},
+	{&hf_gtp_map_cause, {"MAP cause", "gtp.map_cause", FT_UINT8, BASE_DEC, VALS(gsm_old_GSMMAPLocalErrorcode_vals), 0, NULL, HFILL}},
 	{&hf_gtp_message_type, {"Message Type", "gtp.message", FT_UINT8, BASE_HEX, VALS(message_type), 0x0, "GTP Message Type", HFILL}},
 	{&hf_gtp_ms_reason,
 	 {"MS not reachable reason", "gtp.ms_reason", FT_UINT8, BASE_DEC, VALS(ms_not_reachable_type), 0, "MS Not Reachable Reason", HFILL}},
-	{&hf_gtp_ms_valid, {"MS validated", "gtp.ms_valid", FT_BOOLEAN, BASE_NONE, NULL, 0, "MS validated", HFILL}},
-	{&hf_gtp_msisdn, {"MSISDN", "gtp.msisdn", FT_STRING, BASE_DEC, NULL, 0, "MS international PSTN/ISDN number", HFILL}},
+	{&hf_gtp_ms_valid, {"MS validated", "gtp.ms_valid", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+	{&hf_gtp_msisdn, {"MSISDN", "gtp.msisdn", FT_STRING, BASE_NONE, NULL, 0, "MS international PSTN/ISDN number", HFILL}},
 	{&hf_gtp_next,
 	 {"Next extension header type", "gtp.next", FT_UINT8, BASE_HEX, VALS(next_extension_header_fieldvals), 0, "Next Extension Header Type",
 	  HFILL}},
-	{&hf_gtp_node_ipv4, {"Node address IPv4", "gtp.node_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "Recommended node address IPv4", HFILL}},
-	{&hf_gtp_node_ipv6, {"Node address IPv6", "gtp.node_ipv6", FT_IPv6, BASE_HEX, NULL, 0, "Recommended node address IPv6", HFILL}},
-	{&hf_gtp_npdu_number, {"N-PDU Number", "gtp.npdu_number", FT_UINT8, BASE_HEX, NULL, 0, "N-PDU Number", HFILL}},
+	{&hf_gtp_node_ipv4, {"Node address IPv4", "gtp.node_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Recommended node address IPv4", HFILL}},
+	{&hf_gtp_node_ipv6, {"Node address IPv6", "gtp.node_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Recommended node address IPv6", HFILL}},
+	{&hf_gtp_npdu_number, {"N-PDU Number", "gtp.npdu_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_nsapi, {"NSAPI", "gtp.nsapi", FT_UINT8, BASE_DEC, NULL, 0, "Network layer Service Access Point Identifier", HFILL}},
-	{&hf_gtp_qos_version, {"Version", "gtp.qos_version", FT_STRING, BASE_DEC, NULL, 0, "Version of the QoS Profile", HFILL}},
+	{&hf_gtp_qos_version, {"Version", "gtp.qos_version", FT_STRING, BASE_NONE, NULL, 0, "Version of the QoS Profile", HFILL}},
 	{&hf_gtp_qos_spare1, {"Spare", "gtp.qos_spare1", FT_UINT8, BASE_DEC, NULL, GTP_EXT_QOS_SPARE1_MASK, "Spare (shall be sent as '00' )", HFILL}},
 	{&hf_gtp_qos_delay,
 	 {"QoS delay", "gtp.qos_delay", FT_UINT8, BASE_DEC, VALS(qos_delay_type), GTP_EXT_QOS_DELAY_MASK, "Quality of Service Delay Class", HFILL}},
@@ -6713,7 +6713,7 @@ void proto_register_gtp(void)
 	{&hf_gtp_qos_mean,
 	 {"QoS mean", "gtp.qos_mean", FT_UINT8, BASE_DEC, VALS(qos_mean_type), GTP_EXT_QOS_MEAN_MASK, "Quality of Service Mean Throughput", HFILL}},
 	{&hf_gtp_qos_al_ret_priority,
-	 {"Allocation/Retention priority ", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, "Allocation/Retention Priority", HFILL}},
+	 {"Allocation/Retention priority", "gtp.qos_al_ret_priority", FT_UINT8, BASE_DEC, NULL, 0, "Allocation/Retention Priority", HFILL}},
 	{&hf_gtp_qos_traf_class,
 	 {"Traffic class", "gtp.qos_traf_class", FT_UINT8, BASE_DEC, VALS(qos_traf_class), GTP_EXT_QOS_TRAF_CLASS_MASK, "Traffic Class", HFILL}},
 	{&hf_gtp_qos_del_order,
@@ -6722,11 +6722,11 @@ void proto_register_gtp(void)
 	 {"Delivery of erroneous SDU", "gtp.qos_del_err_sdu", FT_UINT8, BASE_DEC, VALS(qos_del_err_sdu), GTP_EXT_QOS_DEL_ERR_SDU_MASK,
 	  "Delivery of Erroneous SDU", HFILL}},
 	{&hf_gtp_qos_max_sdu_size,
-	 {"Maximum SDU size", "gtp.qos_max_sdu_size", FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0, "Maximum SDU size", HFILL}},
+	 {"Maximum SDU size", "gtp.qos_max_sdu_size", FT_UINT8, BASE_DEC, VALS(qos_max_sdu_size), 0, NULL, HFILL}},
 	{&hf_gtp_qos_max_ul,
-	 {"Maximum bit rate for uplink", "gtp.qos_max_ul", FT_UINT8, BASE_DEC, VALS(qos_max_ul), 0, "Maximum bit rate for uplink", HFILL}},
+	 {"Maximum bit rate for uplink", "gtp.qos_max_ul", FT_UINT8, BASE_DEC, VALS(qos_max_ul), 0, NULL, HFILL}},
 	{&hf_gtp_qos_max_dl,
-	 {"Maximum bit rate for downlink", "gtp.qos_max_dl", FT_UINT8, BASE_DEC, VALS(qos_max_dl), 0, "Maximum bit rate for downlink", HFILL}},
+	 {"Maximum bit rate for downlink", "gtp.qos_max_dl", FT_UINT8, BASE_DEC, VALS(qos_max_dl), 0, NULL, HFILL}},
 	{&hf_gtp_qos_res_ber,
 	 {"Residual BER", "gtp.qos_res_ber", FT_UINT8, BASE_DEC, VALS(qos_res_ber), GTP_EXT_QOS_RES_BER_MASK, "Residual Bit Error Rate", HFILL}},
 	{&hf_gtp_qos_sdu_err_ratio,
@@ -6738,17 +6738,17 @@ void proto_register_gtp(void)
 	 {"Traffic handling priority", "gtp.qos_traf_handl_prio", FT_UINT8, BASE_DEC, VALS(qos_traf_handl_prio), GTP_EXT_QOS_TRAF_HANDL_PRIORITY_MASK,
 	  "Traffic Handling Priority", HFILL}},
 	{&hf_gtp_qos_guar_ul,
-	 {"Guaranteed bit rate for uplink", "gtp.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, "Guaranteed bit rate for uplink", HFILL}},
+	 {"Guaranteed bit rate for uplink", "gtp.qos_guar_ul", FT_UINT8, BASE_DEC, VALS(qos_guar_ul), 0, NULL, HFILL}},
 	{&hf_gtp_qos_guar_dl,
-	 {"Guaranteed bit rate for downlink", "gtp.qos_guar_dl", FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0, "Guaranteed bit rate for downlink",
+	 {"Guaranteed bit rate for downlink", "gtp.qos_guar_dl", FT_UINT8, BASE_DEC, VALS(qos_guar_dl), 0, NULL,
 	  HFILL}},
 	{&hf_gtp_qos_src_stat_desc,
-	 	 {"Source Statistics Descriptor", "gtp.src_stat_desc", FT_UINT8, BASE_DEC, VALS(src_stat_desc_vals), 0xf, "Source Statistics Descriptor", HFILL}},
+	 	 {"Source Statistics Descriptor", "gtp.src_stat_desc", FT_UINT8, BASE_DEC, VALS(src_stat_desc_vals), 0xf, NULL, HFILL}},
 	{&hf_gtp_qos_sig_ind,
-	 	 {"Signalling Indication", "gtp.sig_ind", FT_BOOLEAN, 8, TFS(&gtp_sig_ind), 0x10, "Signalling Indication", HFILL}},
-	{&hf_gtp_pkt_flow_id, {"Packet Flow ID", "gtp.pkt_flow_id", FT_UINT8, BASE_DEC, NULL, 0, "Packet Flow ID", HFILL}},
+	 	 {"Signalling Indication", "gtp.sig_ind", FT_BOOLEAN, 8, TFS(&gtp_sig_ind), 0x10, NULL, HFILL}},
+	{&hf_gtp_pkt_flow_id, {"Packet Flow ID", "gtp.pkt_flow_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_ptmsi, {"P-TMSI", "gtp.ptmsi", FT_UINT32, BASE_HEX, NULL, 0, "Packet-Temporary Mobile Subscriber Identity", HFILL}},
-	{&hf_gtp_ptmsi_sig, {"P-TMSI Signature", "gtp.ptmsi_sig", FT_UINT24, BASE_HEX, NULL, 0, "P-TMSI Signature", HFILL}},
+	{&hf_gtp_ptmsi_sig, {"P-TMSI Signature", "gtp.ptmsi_sig", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_rab_gtpu_dn, {"Downlink GTP-U seq number", "gtp.rab_gtp_dn", FT_UINT16, BASE_DEC, NULL, 0, "Downlink GTP-U sequence number", HFILL}},
 	{&hf_gtp_rab_gtpu_up, {"Uplink GTP-U seq number", "gtp.rab_gtp_up", FT_UINT16, BASE_DEC, NULL, 0, "Uplink GTP-U sequence number", HFILL}},
 	{&hf_gtp_rab_pdu_dn,
@@ -6759,11 +6759,11 @@ void proto_register_gtp(void)
 	{&hf_gtp_rai_mnc, {"MNC", "gtp.mnc", FT_UINT8, BASE_DEC, NULL, 0, "Mobile Network Code", HFILL}},
 	{&hf_gtp_rai_rac, {"RAC", "gtp.rac", FT_UINT8, BASE_DEC, NULL, 0, "Routing Area Code", HFILL}},
 	{&hf_gtp_rai_lac, {"LAC", "gtp.lac", FT_UINT16, BASE_DEC, NULL, 0, "Location Area Code", HFILL}},
-	{&hf_gtp_ranap_cause, {"RANAP cause", "gtp.ranap_cause", FT_UINT8, BASE_DEC, VALS(ranap_cause_type), 0, "RANAP cause", HFILL}},
+	{&hf_gtp_ranap_cause, {"RANAP cause", "gtp.ranap_cause", FT_UINT8, BASE_DEC, VALS(ranap_cause_type), 0, NULL, HFILL}},
 	{&hf_gtp_recovery, {"Recovery", "gtp.recovery", FT_UINT8, BASE_DEC, NULL, 0, "Restart counter", HFILL}},
-	{&hf_gtp_reorder, {"Reordering required", "gtp.reorder", FT_BOOLEAN, BASE_NONE, NULL, 0, "Reordering required", HFILL}},
-	{&hf_gtp_rnc_ipv4, {"RNC address IPv4", "gtp.rnc_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "Radio Network Controller address IPv4", HFILL}},
-	{&hf_gtp_rnc_ipv6, {"RNC address IPv6", "gtp.rnc_ipv6", FT_IPv6, BASE_HEX, NULL, 0, "Radio Network Controller address IPv6", HFILL}},
+	{&hf_gtp_reorder, {"Reordering required", "gtp.reorder", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
+	{&hf_gtp_rnc_ipv4, {"RNC address IPv4", "gtp.rnc_ipv4", FT_IPv4, BASE_NONE, NULL, 0, "Radio Network Controller address IPv4", HFILL}},
+	{&hf_gtp_rnc_ipv6, {"RNC address IPv6", "gtp.rnc_ipv6", FT_IPv6, BASE_NONE, NULL, 0, "Radio Network Controller address IPv6", HFILL}},
 	{&hf_gtp_rp, {"Radio Priority", "gtp.rp", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_MASK, "Radio Priority for uplink tx", HFILL}},
 	{&hf_gtp_rp_nsapi,
 	 {"NSAPI in Radio Priority", "gtp.rp_nsapi", FT_UINT8, BASE_DEC, NULL, GTPv1_EXT_RP_NSAPI_MASK,
@@ -6776,8 +6776,8 @@ void proto_register_gtp(void)
 	  "Selection Mode", HFILL}
 	 },
 	{&hf_gtp_seq_number, {"Sequence number", "gtp.seq_number", FT_UINT16, BASE_HEX, NULL, 0, "Sequence Number", HFILL}},
-	{&hf_gtp_sndcp_number, {"SNDCP N-PDU LLC Number", "gtp.sndcp_number", FT_UINT8, BASE_HEX, NULL, 0, "SNDCP N-PDU LLC Number", HFILL}},
-	{&hf_gtp_tear_ind, {"Teardown Indicator", "gtp.tear_ind", FT_BOOLEAN, BASE_NONE, NULL, 0, "Teardown Indicator", HFILL}},
+	{&hf_gtp_sndcp_number, {"SNDCP N-PDU LLC Number", "gtp.sndcp_number", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_tear_ind, {"Teardown Indicator", "gtp.tear_ind", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 	{&hf_gtp_teid, {"TEID", "gtp.teid", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier", HFILL}},
 	{&hf_gtp_teid_cp, {"TEID Control Plane", "gtp.teid_cp", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Control Plane", HFILL}},
 	{&hf_gtp_ulink_teid_cp,
@@ -6787,36 +6787,36 @@ void proto_register_gtp(void)
 	 {"Uplink TEID Data I", "gtp.ulink_teid_data", FT_UINT32, BASE_HEX, NULL, 0, "UplinkTunnel Endpoint Identifier Data I", HFILL}},
 	{&hf_gtp_teid_ii, {"TEID Data II", "gtp.teid_ii", FT_UINT32, BASE_HEX, NULL, 0, "Tunnel Endpoint Identifier Data II", HFILL}},
 	{&hf_gtp_tft_code,
-	 {"TFT operation code", "gtp.tft_code", FT_UINT8, BASE_DEC, VALS(tft_code_type), GTPv1_TFT_CODE_MASK, "TFT operation code", HFILL}},
-	{&hf_gtp_tft_spare, {"TFT spare bit", "gtp.tft_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK, "TFT spare bit", HFILL}},
+	 {"TFT operation code", "gtp.tft_code", FT_UINT8, BASE_DEC, VALS(tft_code_type), GTPv1_TFT_CODE_MASK, NULL, HFILL}},
+	{&hf_gtp_tft_spare, {"TFT spare bit", "gtp.tft_spare", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_SPARE_MASK, NULL, HFILL}},
 	{&hf_gtp_tft_number,
-	 {"Number of packet filters", "gtp.tft_number", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK, "Number of packet filters", HFILL}},
-	{&hf_gtp_tft_eval, {"Evaluation precedence", "gtp.tft_eval", FT_UINT8, BASE_DEC, NULL, 0, "Evaluation precedence", HFILL}},
-	{&hf_gtp_tid, {"TID", "gtp.tid", FT_STRING, BASE_DEC, NULL, 0, "Tunnel Identifier", HFILL}},
+	 {"Number of packet filters", "gtp.tft_number", FT_UINT8, BASE_DEC, NULL, GTPv1_TFT_NUMBER_MASK, NULL, HFILL}},
+	{&hf_gtp_tft_eval, {"Evaluation precedence", "gtp.tft_eval", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_tid, {"TID", "gtp.tid", FT_STRING, BASE_NONE, NULL, 0, "Tunnel Identifier", HFILL}},
 	{&hf_gtp_tlli, {"TLLI", "gtp.tlli", FT_UINT32, BASE_HEX, NULL, 0, "Temporary Logical Link Identity", HFILL}},
 	{&hf_gtp_tr_comm, {"Packet transfer command", "gtp.tr_comm", FT_UINT8, BASE_DEC, VALS(tr_comm_type), 0, "Packat transfer command", HFILL}},
-	{&hf_gtp_trace_ref, {"Trace reference", "gtp.trace_ref", FT_UINT16, BASE_HEX, NULL, 0, "Trace reference", HFILL}},
-	{&hf_gtp_trace_type, {"Trace type", "gtp.trace_type", FT_UINT16, BASE_HEX, NULL, 0, "Trace type", HFILL}},
+	{&hf_gtp_trace_ref, {"Trace reference", "gtp.trace_ref", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_trace_type, {"Trace type", "gtp.trace_type", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_unknown, {"Unknown data (length)", "gtp.unknown", FT_UINT16, BASE_DEC, NULL, 0, "Unknown data", HFILL}},
 	{&hf_gtp_user_addr_pdp_org,
-	 {"PDP type organization", "gtp.user_addr_pdp_org", FT_UINT8, BASE_DEC, VALS(pdp_org_type), 0, "PDP type organization", HFILL}},
+	 {"PDP type organization", "gtp.user_addr_pdp_org", FT_UINT8, BASE_DEC, VALS(pdp_org_type), 0, NULL, HFILL}},
 	{&hf_gtp_user_addr_pdp_type, {"PDP type number", "gtp.user_addr_pdp_type", FT_UINT8, BASE_HEX, VALS(pdp_type), 0, "PDP type", HFILL}},
-	{&hf_gtp_user_ipv4, {"End user address IPv4", "gtp.user_ipv4", FT_IPv4, BASE_DEC, NULL, 0, "End user address IPv4", HFILL}},
-	{&hf_gtp_user_ipv6, {"End user address IPv6", "gtp.user_ipv6", FT_IPv6, BASE_HEX, NULL, 0, "End user address IPv6", HFILL}},
+	{&hf_gtp_user_ipv4, {"End user address IPv4", "gtp.user_ipv4", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL}},
+	{&hf_gtp_user_ipv6, {"End user address IPv6", "gtp.user_ipv6", FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL}},
 	{&hf_gtp_security_mode,
 	 {"Security Mode", "gtp.security_mode",
 	  FT_UINT8, BASE_DEC, VALS(mm_sec_modep), 0xc0,
-	  "Security Mode", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_no_of_vectors,
 	 {"No of Vectors", "gtp.no_of_vectors",
 	  FT_UINT8, BASE_DEC, NULL, 0x38,
-	  "No of Vectors", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_cipher_algorithm,
 	 {"Cipher Algorithm", "gtp.no_of_vectors",
 	  FT_UINT8, BASE_DEC, VALS(gtp_cipher_algorithm), 0x07,
-	  "Cipher Algorithm", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_cksn_ksi,
 	 {"Ciphering Key Sequence Number (CKSN)/Key Set Identifier (KSI)", "gtp.cksn_ksi",
@@ -6841,36 +6841,36 @@ void proto_register_gtp(void)
 	{&hf_gtp_ext_apn_res,
 	 {"Restriction Type", "gtp.ext_apn_res",
 	  FT_UINT8, BASE_DEC, NULL, 0x0,
-	  "Restriction Type", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_ext_rat_type,
 	 {"RAT Type", "gtp.ext_rat_type",
 	  FT_UINT8, BASE_DEC, VALS(gtp_ext_rat_type_vals), 0x0,
-	  "RAT Type", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_ext_geo_loc_type,
 	 {"Geographic Location Type", "gtp.ext_geo_loc_type",
 	  FT_UINT8, BASE_DEC, NULL, 0x0,
-	  "Geographic Location Type", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_ext_sac,
 	 {"SAC", "gtp.ext_sac",
 	  FT_UINT16, BASE_HEX, NULL, 0x0,
-	  "SAC", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_ext_imeisv,
 	 {"IMEI(SV)", "gtp.ext_imeisv",
 	  FT_STRING, BASE_NONE, NULL, 0x0,
-	  "IMEI(SV)", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_targetid,
 	 {"TargetID", "gtp.targetid",
 	  FT_UINT32, BASE_DEC, VALS(ranap_TargetID_vals), 0,
-	  "TargetID", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_bssgp_cause,
 	 {"BSSGP Cause", "gtp.bssgp_cause",
 	  FT_UINT8, BASE_DEC, VALS(tab_cause), 0,
-	  "BSSGP Cause", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_sapi,
 	 {"PS Handover XID SAPI", "gtp.ps_handover_xid_sapi",
 	  FT_UINT8, BASE_DEC, NULL, 0x0F,
@@ -6882,35 +6882,35 @@ void proto_register_gtp(void)
 	{&hf_gtp_cmn_flg_ppc,
 	 {"Prohibit Payload Compression", "gtp.cmn_flg.ppc",
 	  FT_BOOLEAN, 8, NULL, 0x01,
-	  "Prohibit Payload Compression", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_mbs_srv_type,
 	 {"MBMS Service Type", "gtp.cmn_flg.mbs_srv_type",
 	  FT_BOOLEAN, 8, NULL, 0x02,
-	  "MBMS Service Type", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_mbs_ran_pcd_rdy,
 	 {"RAN Procedures Ready", "gtp.cmn_flg.ran_pcd_rd",
 	  FT_BOOLEAN, 8, NULL, 0x04,
-	  "RAN Procedures Ready", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_mbs_cnt_inf,
 	 {"MBMS Counting Information", "gtp.cmn_flg.mbs_cnt_inf",
 	  FT_BOOLEAN, 8, NULL, 0x08,
-	  "MBMS Counting Information", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_no_qos_neg,
 	 {"No QoS negotiation", "gtp.cmn_flg.no_qos_neg",
 	  FT_BOOLEAN, 8, NULL, 0x10,
-	  "No QoS negotiation", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_nrsn,
 	 {"NRSN bit field", "gtp.cmn_flg.nrsn",
 	  FT_BOOLEAN, 8, NULL, 0x20,
-	  "NRSN bit field", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_cmn_flg_upgrd_qos_sup,
 	 {"Upgrade QoS Supported", "gtp.cmn_flg.ran_pcd_rd",
 	  FT_BOOLEAN, 8, NULL, 0x40,
-	  "Upgrade QoS Supported", HFILL}},
+	  NULL, HFILL}},
 	{&hf_gtp_tmgi,
 	 {"Temporary Mobile Group Identity (TMGI)", "gtp.cmn_flg.ran_pcd_rd",
-	  FT_BYTES, BASE_HEX, NULL, 0x0,
-	  "Temporary Mobile Group Identity (TMGI)", HFILL}},
+	  FT_BYTES, BASE_NONE, NULL, 0x0,
+	  NULL, HFILL}},
 	{&hf_gtp_no_of_mbms_sa_codes,
 	 {"Number of MBMS service area codes", "gtp.no_of_mbms_sa_codes",
 	  FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -6919,42 +6919,42 @@ void proto_register_gtp(void)
 	{&hf_gtp_mbms_ses_dur_days,
 	 {"Estimated session duration days", "gtp.mbms_ses_dur_days",
 	  FT_UINT8, BASE_DEC, NULL, 0xfe,
-	  "Estimated session duration days", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_mbms_ses_dur_s,
 	 {"Estimated session duration seconds", "gtp.mbms_ses_dur_s",
 	  FT_UINT24, BASE_DEC, NULL, 0x01ffff,
-	  "Estimated session duration seconds", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_mbms_sa_code,
 	 {"MBMS service area code", "gtp.mbms_sa_code",
 	  FT_UINT16, BASE_DEC, NULL, 0x0,
-	  "MBMS service area code", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_mbs_2g_3g_ind,
 	 {"MBMS 2G/3G Indicator", "gtp.mbs_2g_3g_ind",
 	  FT_UINT8, BASE_DEC, VALS(gtp_mbs_2g_3g_ind_vals), 0x0,
-	  "MBMS 2G/3G Indicator", HFILL}
+	  NULL, HFILL}
 	 },
 	{&hf_gtp_time_2_dta_tr,
 	 {"Time to MBMS Data Transfer", "gtp.time_2_dta_tr",
 	  FT_UINT8, BASE_DEC, NULL, 0x0,
-	  "Time to MBMS Data Transfer", HFILL}
+	  NULL, HFILL}
 	 },
 	 { &hf_gtp_ext_ei,
 	 {"Error Indication (EI)", "gtp.ei",
 	  FT_UINT8, BASE_DEC, NULL, 0x04,
-	  "Error Indication (EI)", HFILL}
+	  NULL, HFILL}
 	 },
 	 {&hf_gtp_ext_gcsi,
 	 {"GPRS-CSI (GCSI)", "gtp.gcsi",
 	  FT_UINT8, BASE_DEC, NULL, 0x02,
-	  "GPRS-CSI (GCSI)", HFILL}
+	  NULL, HFILL}
 	 },
 	 { &hf_gtp_ext_dti,
 	 {"Direct Tunnel Indicator (DTI)", "gtp.dti",
 	  FT_UINT8, BASE_DEC, NULL, 0x01,
-	  "Direct Tunnel Indicator (DTI)", HFILL}
+	  NULL, HFILL}
 	 },
     };
 
diff --git a/epan/dissectors/packet-gtpv2.c b/epan/dissectors/packet-gtpv2.c
index 4e0cce54ac..916feb9a46 100644
--- a/epan/dissectors/packet-gtpv2.c
+++ b/epan/dissectors/packet-gtpv2.c
@@ -945,12 +945,12 @@ void proto_register_gtpv2(void)
 		{&hf_gtpv2_flags,
 		{"Flags", "gtpv2.flags",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Flags", HFILL}
+		NULL, HFILL}
 		},
 		{&hf_gtpv2_version,
 		{"Version", "gtpv2.version",
 		FT_UINT8, BASE_DEC, NULL, 0xe0,
-		"Version", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_t,
 		{"T", "gtpv2.t",
@@ -960,12 +960,12 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_message_type,
 		{"Message Type", "gtpv2.message_type",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_message_type_vals), 0x0,
-		"Message Type", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_msg_length,
 		{"Message Length", "gtpv2.msg_lengt",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Message Length", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_teid,
 		{"Tunnel Endpoint Identifier", "gtpv2.teid",
@@ -980,12 +980,12 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_spare,
 		{"Spare", "gtpv2.spare",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Spare", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_ie,
 		{"IE Type", "gtpv2.ie_type",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_element_type_vals), 0x0,
-		"IE Type", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_ie_len,
 		{"IE Length", "gtpv2.ie_len",
@@ -995,12 +995,12 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_cr,
 		{"CR flag", "gtpv2.cr",
 		FT_UINT8, BASE_DEC, NULL, 0xe0,
-		"CR flag", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_instance,
 		{"Instance", "gtpv2.instance",
 		FT_UINT8, BASE_DEC, NULL, 0x0f,
-		"Instance", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_cause,
 		{"Cause", "gtpv2.cause",
@@ -1010,17 +1010,17 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_rec,
 		{"Restart Counter", "gtpv2.rec",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Restart Counter", HFILL}
+		NULL, HFILL}
 		},
 		{&hf_gtpv2_apn,
 		{"APN", "gtp.apn", 
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Access Point Name", HFILL}
 		},
 		{&hf_gtpv2_ebi,
 		{"EPS Bearer ID (EBI)", "gtpv2.ebi",
 		FT_UINT8, BASE_DEC, NULL, 0x0f,
-		"EPS Bearer ID (EBI)", HFILL}
+		NULL, HFILL}
 		},
 		{&hf_gtpv2_daf,	
 		{"DAF (Dual Address Bearer Flag)", "gtpv2.daf",	
@@ -1073,27 +1073,27 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_pdn_type,
 		{"PDN Type", "gtpv2.pdn_type",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_pdn_type_vals), 0x07,
-		"PDN Type", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_pdn_ipv4,
 		{"PDN IPv4", "gtpv2.pdn_ipv4",
-		FT_IPv4, BASE_DEC, NULL, 0x0,
-		"PDN IPv4", HFILL}
+		FT_IPv4, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_pdn_ipv6_len,
 		{"IPv6 Prefix Length", "gtpv2.pdn_ipv6_len",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"IPv6 Prefix Length", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_pdn_ipv6,
 		{"PDN IPv6", "gtpv2.pdn_ipv6",
-		FT_IPv6, BASE_HEX, NULL, 0x0,
-		"PDN IPv6", HFILL}
+		FT_IPv6, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_rat_type,
 		{"RAT Type", "gtpv2.rat_type",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_rat_type_vals), 0x0,
-		"RAT Type", HFILL}
+		NULL, HFILL}
 		},
 		{ &hf_gtpv2_uli_ecgi_flg,
 		{"ECGI Present Flag)", "gtpv2.uli_ecgi_flg",	
@@ -1123,7 +1123,7 @@ void proto_register_gtpv2(void)
 		{ &hf_gtpv2_cng_rep_act,
 		{"Change Reporting Action", "gtpv2.cng_rep_act",
 		FT_UINT8, BASE_DEC, VALS(gtpv2_cng_rep_act_vals), 0x0,
-		"Change Reporting Action", HFILL}
+		NULL, HFILL}
 		},
 	 };
 
diff --git a/epan/dissectors/packet-gvrp.c b/epan/dissectors/packet-gvrp.c
index 3608c7b5d6..d3063a9a10 100644
--- a/epan/dissectors/packet-gvrp.c
+++ b/epan/dissectors/packet-gvrp.c
@@ -303,27 +303,27 @@ proto_register_gvrp(void)
 	{ &hf_gvrp_proto_id,
 	    { "Protocol ID", "gvrp.protocol_id",
 	    FT_UINT16,      BASE_HEX,      NULL,  0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_gvrp_attribute_type,
 	    { "Type",        "gvrp.attribute_type",
 	    FT_UINT8,        BASE_HEX,      VALS(attribute_type_vals),  0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_gvrp_attribute_length,
 	    { "Length",      "gvrp.attribute_length",
 	    FT_UINT8,        BASE_DEC,      NULL,  0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_gvrp_attribute_event,
 	    { "Event",       "gvrp.attribute_event",
 	    FT_UINT8,        BASE_DEC,      VALS(event_vals),  0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_gvrp_attribute_value,
 	    { "Value",       "gvrp.attribute_value",
 	    FT_UINT16,       BASE_DEC,      NULL,  0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	}
     };
 
diff --git a/epan/dissectors/packet-h1.c b/epan/dissectors/packet-h1.c
index 909c2f657f..c73bad52b4 100644
--- a/epan/dissectors/packet-h1.c
+++ b/epan/dissectors/packet-h1.c
@@ -256,48 +256,48 @@ proto_register_h1 (void)
   static hf_register_info hf[] = {
     {&hf_h1_header,
      {"H1-Header", "h1.header", FT_UINT16, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_len,
      {"Length indicator", "h1.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_opfield,
      {"Operation identifier", "h1.opfield", FT_UINT8, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_oplen,
-     {"Operation length", "h1.oplen", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+     {"Operation length", "h1.oplen", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     {&hf_h1_opcode,
      {"Opcode", "h1.opcode", FT_UINT8, BASE_HEX, VALS (opcode_vals), 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_requestblock,
      {"Request identifier", "h1.request", FT_UINT8, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_requestlen,
      {"Request length", "h1.reqlen", FT_UINT8, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_org,
      {"Memory type", "h1.org", FT_UINT8, BASE_HEX, VALS (org_vals), 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_dbnr,
-     {"Memory block number", "h1.dbnr", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+     {"Memory block number", "h1.dbnr", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     {&hf_h1_dwnr,
      {"Address within memory block", "h1.dwnr", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_dlen,
-     {"Length in words", "h1.dlen", FT_INT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+     {"Length in words", "h1.dlen", FT_INT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     {&hf_h1_response,
-     {"Response identifier", "h1.response", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+     {"Response identifier", "h1.response", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     {&hf_h1_response_len,
      {"Response length", "h1.reslen", FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_response_value,
      {"Response value", "h1.resvalue", FT_UINT8, BASE_DEC,
-      VALS (returncode_vals), 0x0, "", HFILL }},
+      VALS (returncode_vals), 0x0, NULL, HFILL }},
     {&hf_h1_empty,
      {"Empty field", "h1.empty", FT_UINT8, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
     {&hf_h1_empty_len,
      {"Empty field length", "h1.empty_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }}
+      NULL, HFILL }}
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c
index 2c49edef29..1bb24256f5 100644
--- a/epan/dissectors/packet-h223.c
+++ b/epan/dissectors/packet-h223.c
@@ -1384,7 +1384,7 @@ void proto_register_h223 (void)
 
 	{ &hf_h223_mux_pdu,
 	  { "H.223 MUX-PDU", "h223.mux", FT_NONE, BASE_NONE, NULL, 0x0,
-	    "H.223 MUX-PDU", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_h223_mux_header,
 	  { "Header", "h223.mux.header", FT_NONE, BASE_NONE, NULL, 0x0,
@@ -1415,7 +1415,7 @@ void proto_register_h223 (void)
 	    "H.223 Virtual Circuit", HFILL }},
 	
 	{ &hf_h223_mux_extra,
-	  { "Extraneous data", "h223.mux.extra", FT_NONE, BASE_DEC, NULL, 0x0,
+	  { "Extraneous data", "h223.mux.extra", FT_NONE, BASE_NONE, NULL, 0x0,
 	    "data beyond mpl", HFILL }},
 	
 	{ &hf_h223_mux_hdlc2,
@@ -1445,11 +1445,11 @@ void proto_register_h223 (void)
 	
 	{ &hf_h223_mux_fragment,
 	  { "H.223 MUX-PDU Fragment", "h223.mux.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-	    "H.223 MUX-PDU Fragment", HFILL }},
+	    NULL, HFILL }},
 	
 	{ &hf_h223_mux_fragments,
 	  { "H.223 MUX-PDU Fragments", "h223.mux.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-	    "H.223 MUX-PDU Fragments", HFILL }},
+	    NULL, HFILL }},
 	
 	{ &hf_h223_mux_reassembled_in,
 	  { "MUX-PDU fragment, reassembled in frame", "h223.mux.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
@@ -1478,11 +1478,11 @@ void proto_register_h223 (void)
 	
 	{ &hf_h223_al_fragment,
 	  { "H.223 AL-PDU Fragment", "h223.al.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-	    "H.223 AL-PDU Fragment", HFILL }},
+	    NULL, HFILL }},
 	
 	{ &hf_h223_al_fragments,
 	  { "H.223 AL-PDU Fragments", "h223.al.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-	    "H.223 AL-PDU Fragments", HFILL }},
+	    NULL, HFILL }},
 	
 	{ &hf_h223_al_reassembled_in,
 	  { "AL-PDU fragment, reassembled in frame", "h223.al.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
@@ -1496,7 +1496,7 @@ void proto_register_h223 (void)
 
 	{ &hf_h223_al1_framed,
 	  { "H.223 AL1 framing", "h223.al1.framed", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-	    "", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_h223_al2,
 	  { "H.223 AL2", "h223.al2", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
@@ -1516,11 +1516,11 @@ void proto_register_h223 (void)
 
 	{ &hf_h223_al2_crc,
 	  { "CRC", "h223.al2.crc", FT_UINT8, BASE_HEX, NULL, 0x0,
-	    "CRC", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_h223_al2_crc_bad,
 	  { "Bad CRC","h223.al2.crc_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-	    "", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_h223_al_payload,
 	  { "H.223 AL Payload", "h223.al.payload", FT_NONE, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-h225.c b/epan/dissectors/packet-h225.c
index b59c654632..0900f71660 100644
--- a/epan/dissectors/packet-h225.c
+++ b/epan/dissectors/packet-h225.c
@@ -7561,16 +7561,16 @@ void proto_register_h225(void) {
   static hf_register_info hf[] = {
 	{ &hf_h221Manufacturer,
 		{ "H.221 Manufacturer", "h221.Manufacturer", FT_UINT32, BASE_HEX,
-		VALS(H221ManufacturerCode_vals), 0, "H.221 Manufacturer", HFILL }},
+		VALS(H221ManufacturerCode_vals), 0, NULL, HFILL }},
 	{ &hf_h225_ras_req_frame,
       		{ "RAS Request Frame", "h225.ras.reqframe", FT_FRAMENUM, BASE_NONE,
-      		NULL, 0, "RAS Request Frame", HFILL }},
+      		NULL, 0, NULL, HFILL }},
   	{ &hf_h225_ras_rsp_frame,
       		{ "RAS Response Frame", "h225.ras.rspframe", FT_FRAMENUM, BASE_NONE,
-      		NULL, 0, "RAS Response Frame", HFILL }},
+      		NULL, 0, NULL, HFILL }},
   	{ &hf_h225_ras_dup,
       		{ "Duplicate RAS Message", "h225.ras.dup", FT_UINT32, BASE_DEC,
-		NULL, 0, "Duplicate RAS Message", HFILL }},
+		NULL, 0, NULL, HFILL }},
   	{ &hf_h225_ras_deltatime,
       		{ "RAS Service Response Time", "h225.ras.timedelta", FT_RELATIVE_TIME, BASE_NONE,
       		NULL, 0, "Timedelta between RAS-Request and RAS-Response", HFILL }},
@@ -7604,7 +7604,7 @@ void proto_register_h225(void) {
         "h225.INTEGER_0_255", HFILL }},
     { &hf_h225_user_information,
       { "user-information", "h225.user_information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1_131", HFILL }},
     { &hf_h225_h323_message_body,
       { "h323-message-body", "h225.h323_message_body",
@@ -7676,7 +7676,7 @@ void proto_register_h225(void) {
         "h225.T_h4501SupplementaryService_item", HFILL }},
     { &hf_h225_h245Tunneling,
       { "h245Tunneling", "h225.h245Tunneling",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.T_h245Tunneling", HFILL }},
     { &hf_h225_H245Control_item,
       { "H245Control item", "h225.H245Control_item",
@@ -7744,7 +7744,7 @@ void proto_register_h225(void) {
         "h225.NULL", HFILL }},
     { &hf_h225_h248Message,
       { "h248Message", "h225.h248Message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING", HFILL }},
     { &hf_h225_protocolIdentifier,
       { "protocolIdentifier", "h225.protocolIdentifier",
@@ -7788,11 +7788,11 @@ void proto_register_h225(void) {
         "h225.FastStart", HFILL }},
     { &hf_h225_multipleCalls,
       { "multipleCalls", "h225.multipleCalls",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_maintainConnection,
       { "maintainConnection", "h225.maintainConnection",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_alertingAddress,
       { "alertingAddress", "h225.alertingAddress",
@@ -8004,7 +8004,7 @@ void proto_register_h225(void) {
         "h225.CallReferenceValue", HFILL }},
     { &hf_h225_activeMC,
       { "activeMC", "h225.activeMC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_conferenceGoal,
       { "conferenceGoal", "h225.conferenceGoal",
@@ -8060,11 +8060,11 @@ void proto_register_h225(void) {
         "h225.FastStart_item", HFILL }},
     { &hf_h225_mediaWaitForConnect,
       { "mediaWaitForConnect", "h225.mediaWaitForConnect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_canOverlapSend,
       { "canOverlapSend", "h225.canOverlapSend",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_endpointIdentifier,
       { "endpointIdentifier", "h225.endpointIdentifier",
@@ -8296,7 +8296,7 @@ void proto_register_h225(void) {
         "h225.T_h245IpSourceRoute", HFILL }},
     { &hf_h225_ip,
       { "ip", "h225.ip",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h225_port,
       { "port", "h225.port",
@@ -8308,7 +8308,7 @@ void proto_register_h225(void) {
         "h225.T_h245Route", HFILL }},
     { &hf_h225_h245Route_item,
       { "route item", "h225.route_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h225_h245Routing,
       { "routing", "h225.routing",
@@ -8328,15 +8328,15 @@ void proto_register_h225(void) {
         "h225.T_h245IpxAddress", HFILL }},
     { &hf_h225_node,
       { "node", "h225.node",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_6", HFILL }},
     { &hf_h225_netnum,
       { "netnum", "h225.netnum",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h225_h245IpxPort,
       { "port", "h225.port",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h225_h245Ip6Address,
       { "ip6Address", "h225.ip6Address",
@@ -8348,11 +8348,11 @@ void proto_register_h225(void) {
         "h225.OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h225_netBios,
       { "netBios", "h225.netBios",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h225_nsap,
       { "nsap", "h225.nsap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h225_nonStandardAddress,
       { "nonStandardAddress", "h225.nonStandardAddress",
@@ -8376,7 +8376,7 @@ void proto_register_h225(void) {
         "h225.T_ipSourceRoute", HFILL }},
     { &hf_h225_src_route_ipV4,
       { "ip", "h225.ip",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h225_ipV4_src_port,
       { "port", "h225.port",
@@ -8388,7 +8388,7 @@ void proto_register_h225(void) {
         "h225.T_route", HFILL }},
     { &hf_h225_route_item,
       { "route item", "h225.route_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h225_routing,
       { "routing", "h225.routing",
@@ -8400,7 +8400,7 @@ void proto_register_h225(void) {
         "h225.T_ipxAddress", HFILL }},
     { &hf_h225_ipx_port,
       { "port", "h225.port",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h225_ip6Address,
       { "ip6Address", "h225.ip6Address",
@@ -8436,15 +8436,15 @@ void proto_register_h225(void) {
         "h225.TerminalInfo", HFILL }},
     { &hf_h225_mc,
       { "mc", "h225.mc",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_undefinedNode,
       { "undefinedNode", "h225.undefinedNode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_set,
       { "set", "h225.set",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.BIT_STRING_SIZE_32", HFILL }},
     { &hf_h225_supportedTunnelledProtocols,
       { "supportedTunnelledProtocols", "h225.supportedTunnelledProtocols",
@@ -8536,11 +8536,11 @@ void proto_register_h225(void) {
         "h225.H221NonStandard", HFILL }},
     { &hf_h225_productId,
       { "productId", "h225.productId",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_h225_versionId,
       { "versionId", "h225.versionId",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_h225_enterpriseNumber,
       { "enterpriseNumber", "h225.enterpriseNumber",
@@ -8764,15 +8764,15 @@ void proto_register_h225(void) {
         "h225.TBCD_STRING_SIZE_1_4", HFILL }},
     { &hf_h225_systemMyTypeCode,
       { "systemMyTypeCode", "h225.systemMyTypeCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_h225_systemAccessType,
       { "systemAccessType", "h225.systemAccessType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_h225_qualificationInformationCode,
       { "qualificationInformationCode", "h225.qualificationInformationCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_h225_sesn,
       { "sesn", "h225.sesn",
@@ -8784,7 +8784,7 @@ void proto_register_h225(void) {
         "h225.TBCD_STRING_SIZE_3_16", HFILL }},
     { &hf_h225_tmsi,
       { "tmsi", "h225.tmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_1_4", HFILL }},
     { &hf_h225_imei,
       { "imei", "h225.imei",
@@ -8924,7 +8924,7 @@ void proto_register_h225(void) {
         "h225.GatekeeperIdentifier", HFILL }},
     { &hf_h225_needToRegister,
       { "needToRegister", "h225.needToRegister",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_alternateGatekeeper,
       { "alternateGatekeeper", "h225.alternateGatekeeper",
@@ -8936,7 +8936,7 @@ void proto_register_h225(void) {
         "h225.AlternateGK", HFILL }},
     { &hf_h225_altGKisPermanent,
       { "altGKisPermanent", "h225.altGKisPermanent",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_default,
       { "default", "h225.default",
@@ -9032,31 +9032,31 @@ void proto_register_h225(void) {
         "h225.SecurityCapabilities", HFILL }},
     { &hf_h225_q932Full,
       { "q932Full", "h225.q932Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q951Full,
       { "q951Full", "h225.q951Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q952Full,
       { "q952Full", "h225.q952Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q953Full,
       { "q953Full", "h225.q953Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q955Full,
       { "q955Full", "h225.q955Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q956Full,
       { "q956Full", "h225.q956Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q957Full,
       { "q957Full", "h225.q957Full",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_q954Info,
       { "q954Info", "h225.q954Info",
@@ -9064,11 +9064,11 @@ void proto_register_h225(void) {
         "h225.Q954Details", HFILL }},
     { &hf_h225_conferenceCalling,
       { "conferenceCalling", "h225.conferenceCalling",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_threePartyService,
       { "threePartyService", "h225.threePartyService",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_guid,
       { "guid", "h225.guid",
@@ -9112,7 +9112,7 @@ void proto_register_h225(void) {
         "h225.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h225_icv,
       { "icv", "h225.icv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.BIT_STRING", HFILL }},
     { &hf_h225_cryptoEPPwdHash,
       { "cryptoEPPwdHash", "h225.cryptoEPPwdHash",
@@ -9184,7 +9184,7 @@ void proto_register_h225(void) {
         "h225.AliasAddress", HFILL }},
     { &hf_h225_canReportCallCapacity,
       { "canReportCallCapacity", "h225.canReportCallCapacity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_capacityReportingSpecification_when,
       { "when", "h225.when",
@@ -9336,11 +9336,11 @@ void proto_register_h225(void) {
         "h225.T_cic_2_4", HFILL }},
     { &hf_h225_cic_2_4_item,
       { "cic item", "h225.cic_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_2_4", HFILL }},
     { &hf_h225_pointCode,
       { "pointCode", "h225.pointCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_2_5", HFILL }},
     { &hf_h225_member,
       { "member", "h225.member",
@@ -9352,7 +9352,7 @@ void proto_register_h225(void) {
         "h225.INTEGER_0_65535", HFILL }},
     { &hf_h225_carrierIdentificationCode,
       { "carrierIdentificationCode", "h225.carrierIdentificationCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_3_4", HFILL }},
     { &hf_h225_carrierName,
       { "carrierName", "h225.carrierName",
@@ -9364,7 +9364,7 @@ void proto_register_h225(void) {
         "h225.IA5String_SIZE_0_512", HFILL }},
     { &hf_h225_signal,
       { "signal", "h225.signal",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.H248SignalsDescriptor", HFILL }},
     { &hf_h225_callCreditServiceControl,
       { "callCreditServiceControl", "h225.callCreditServiceControl",
@@ -9468,15 +9468,15 @@ void proto_register_h225(void) {
         "h235.TimeStamp", HFILL }},
     { &hf_h225_releaseCompleteCauseIE,
       { "releaseCompleteCauseIE", "h225.releaseCompleteCauseIE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING_SIZE_2_32", HFILL }},
     { &hf_h225_sender,
       { "sender", "h225.sender",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_multicast,
       { "multicast", "h225.multicast",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_bandwidth,
       { "bandwidth", "h225.bandwidth",
@@ -9488,11 +9488,11 @@ void proto_register_h225(void) {
         "h225.TransportChannelInfo", HFILL }},
     { &hf_h225_canDisplayAmountString,
       { "canDisplayAmountString", "h225.canDisplayAmountString",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_canEnforceDurationLimit,
       { "canEnforceDurationLimit", "h225.canEnforceDurationLimit",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_amountString,
       { "amountString", "h225.amountString",
@@ -9516,7 +9516,7 @@ void proto_register_h225(void) {
         "h225.INTEGER_1_4294967295", HFILL }},
     { &hf_h225_enforceCallDurationLimit,
       { "enforceCallDurationLimit", "h225.enforceCallDurationLimit",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_callStartingPoint,
       { "callStartingPoint", "h225.callStartingPoint",
@@ -9552,7 +9552,7 @@ void proto_register_h225(void) {
         "h225.Content", HFILL }},
     { &hf_h225_raw,
       { "raw", "h225.raw",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING", HFILL }},
     { &hf_h225_text,
       { "text", "h225.text",
@@ -9564,7 +9564,7 @@ void proto_register_h225(void) {
         "h225.BMPString", HFILL }},
     { &hf_h225_bool,
       { "bool", "h225.bool",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_number8,
       { "number8", "h225.number8",
@@ -9600,7 +9600,7 @@ void proto_register_h225(void) {
         "h225.GenericData", HFILL }},
     { &hf_h225_replacementFeatureSet,
       { "replacementFeatureSet", "h225.replacementFeatureSet",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_sendAddress,
       { "sendAddress", "h225.sendAddress",
@@ -9844,7 +9844,7 @@ void proto_register_h225(void) {
         "h225.NULL", HFILL }},
     { &hf_h225_supportsAssignedGK,
       { "supportsAssignedGK", "h225.supportsAssignedGK",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_assignedGatekeeper,
       { "assignedGatekeeper", "h225.assignedGatekeeper",
@@ -9888,7 +9888,7 @@ void proto_register_h225(void) {
         "h225.SecurityErrors", HFILL }},
     { &hf_h225_discoveryComplete,
       { "discoveryComplete", "h225.discoveryComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_terminalType,
       { "terminalType", "h225.terminalType",
@@ -9912,11 +9912,11 @@ void proto_register_h225(void) {
         "h225.TimeToLive", HFILL }},
     { &hf_h225_keepAlive,
       { "keepAlive", "h225.keepAlive",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_willSupplyUUIEs,
       { "willSupplyUUIEs", "h225.willSupplyUUIEs",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_additiveRegistration,
       { "additiveRegistration", "h225.additiveRegistration",
@@ -9940,7 +9940,7 @@ void proto_register_h225(void) {
         "h225.SEQUENCE_OF_H248PackagesDescriptor", HFILL }},
     { &hf_h225_supportedH248Packages_item,
       { "H248PackagesDescriptor", "h225.H248PackagesDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.H248PackagesDescriptor", HFILL }},
     { &hf_h225_callCreditCapability,
       { "callCreditCapability", "h225.callCreditCapability",
@@ -9964,7 +9964,7 @@ void proto_register_h225(void) {
         "h225.TransportQOS", HFILL }},
     { &hf_h225_willRespondToIRR,
       { "willRespondToIRR", "h225.willRespondToIRR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_preGrantedARQ,
       { "preGrantedARQ", "h225.preGrantedARQ",
@@ -9972,19 +9972,19 @@ void proto_register_h225(void) {
         "h225.T_preGrantedARQ", HFILL }},
     { &hf_h225_makeCall,
       { "makeCall", "h225.makeCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_useGKCallSignalAddressToMakeCall,
       { "useGKCallSignalAddressToMakeCall", "h225.useGKCallSignalAddressToMakeCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_answerCall,
       { "answerCall", "h225.answerCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_useGKCallSignalAddressToAnswer,
       { "useGKCallSignalAddressToAnswer", "h225.useGKCallSignalAddressToAnswer",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_irrFrequencyInCall,
       { "irrFrequencyInCall", "h225.irrFrequencyInCall",
@@ -10156,7 +10156,7 @@ void proto_register_h225(void) {
         "h225.CallReferenceValue", HFILL }},
     { &hf_h225_canMapAlias,
       { "canMapAlias", "h225.canMapAlias",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_srcAlternatives,
       { "srcAlternatives", "h225.srcAlternatives",
@@ -10184,7 +10184,7 @@ void proto_register_h225(void) {
         "h225.TunnelledProtocol", HFILL }},
     { &hf_h225_canMapSrcAlias,
       { "canMapSrcAlias", "h225.canMapSrcAlias",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_pointToPoint,
       { "pointToPoint", "h225.pointToPoint",
@@ -10260,55 +10260,55 @@ void proto_register_h225(void) {
         "h225.AliasAddress", HFILL }},
     { &hf_h225_setup_bool,
       { "setup", "h225.setup",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_callProceeding_flg,
       { "callProceeding", "h225.callProceeding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_connect_bool,
       { "connect", "h225.connect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_alerting_bool,
       { "alerting", "h225.alerting",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_information_bool,
       { "information", "h225.information",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_releaseComplete_bool,
       { "releaseComplete", "h225.releaseComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_facility_bool,
       { "facility", "h225.facility",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_progress_bool,
       { "progress", "h225.progress",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_empty,
       { "empty", "h225.empty",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_status_bool,
       { "status", "h225.status",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_statusInquiry_bool,
       { "statusInquiry", "h225.statusInquiry",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_setupAcknowledge_bool,
       { "setupAcknowledge", "h225.setupAcknowledge",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_notify_bool,
       { "notify", "h225.notify",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_rejectReason,
       { "rejectReason", "h225.rejectReason",
@@ -10368,7 +10368,7 @@ void proto_register_h225(void) {
         "h225.NULL", HFILL }},
     { &hf_h225_answeredCall,
       { "answeredCall", "h225.answeredCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_usageInformation,
       { "usageInformation", "h225.usageInformation",
@@ -10504,7 +10504,7 @@ void proto_register_h225(void) {
         "h225.T_perCallInfo_item", HFILL }},
     { &hf_h225_originator,
       { "originator", "h225.originator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_audio,
       { "audio", "h225.audio",
@@ -10560,11 +10560,11 @@ void proto_register_h225(void) {
         "h225.H323_UU_PDU", HFILL }},
     { &hf_h225_sent,
       { "sent", "h225.sent",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_needResponse,
       { "needResponse", "h225.needResponse",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_irrStatus,
       { "irrStatus", "h225.irrStatus",
@@ -10572,7 +10572,7 @@ void proto_register_h225(void) {
         "h225.InfoRequestResponseStatus", HFILL }},
     { &hf_h225_unsolicited,
       { "unsolicited", "h225.unsolicited",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_complete,
       { "complete", "h225.complete",
@@ -10596,7 +10596,7 @@ void proto_register_h225(void) {
         "h225.InfoRequestNakReason", HFILL }},
     { &hf_h225_messageNotUnderstood,
       { "messageNotUnderstood", "h225.messageNotUnderstood",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h225.OCTET_STRING", HFILL }},
     { &hf_h225_delay,
       { "delay", "h225.delay",
@@ -10612,7 +10612,7 @@ void proto_register_h225(void) {
         "h225.SupportedProtocols", HFILL }},
     { &hf_h225_almostOutOfResources,
       { "almostOutOfResources", "h225.almostOutOfResources",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h225.BOOLEAN", HFILL }},
     { &hf_h225_callSpecific,
       { "callSpecific", "h225.callSpecific",
diff --git a/epan/dissectors/packet-h235.c b/epan/dissectors/packet-h235.c
index e2cd10ed91..c2436b835f 100644
--- a/epan/dissectors/packet-h235.c
+++ b/epan/dissectors/packet-h235.c
@@ -1078,23 +1078,23 @@ void proto_register_h235(void) {
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_halfkey,
       { "halfkey", "h235.halfkey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_modSize,
       { "modSize", "h235.modSize",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_generator,
       { "generator", "h235.generator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_2048", HFILL }},
     { &hf_h235_x,
       { "x", "h235.x",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_y,
       { "y", "h235.y",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdhp,
       { "eckasdhp", "h235.eckasdhp",
@@ -1106,7 +1106,7 @@ void proto_register_h235(void) {
         "h235.ECpoint", HFILL }},
     { &hf_h235_modulus,
       { "modulus", "h235.modulus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_base,
       { "base", "h235.base",
@@ -1114,11 +1114,11 @@ void proto_register_h235(void) {
         "h235.ECpoint", HFILL }},
     { &hf_h235_weierstrassA,
       { "weierstrassA", "h235.weierstrassA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_weierstrassB,
       { "weierstrassB", "h235.weierstrassB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_eckasdh2,
       { "eckasdh2", "h235.eckasdh2",
@@ -1126,7 +1126,7 @@ void proto_register_h235(void) {
         "h235.T_eckasdh2", HFILL }},
     { &hf_h235_fieldSize,
       { "fieldSize", "h235.fieldSize",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING_SIZE_0_511", HFILL }},
     { &hf_h235_type,
       { "type", "h235.type",
@@ -1134,7 +1134,7 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_certificatedata,
       { "certificate", "h235.certificate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_default,
       { "default", "h235.default",
@@ -1198,7 +1198,7 @@ void proto_register_h235(void) {
         "h235.DHset", HFILL }},
     { &hf_h235_challenge,
       { "challenge", "h235.challenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.ChallengeString", HFILL }},
     { &hf_h235_random,
       { "random", "h235.random",
@@ -1246,7 +1246,7 @@ void proto_register_h235(void) {
         "h235.Element", HFILL }},
     { &hf_h235_octets,
       { "octets", "h235.octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_integer,
       { "integer", "h235.integer",
@@ -1254,7 +1254,7 @@ void proto_register_h235(void) {
         "h235.INTEGER", HFILL }},
     { &hf_h235_bits,
       { "bits", "h235.bits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_name,
       { "name", "h235.name",
@@ -1262,7 +1262,7 @@ void proto_register_h235(void) {
         "h235.BMPString", HFILL }},
     { &hf_h235_flag,
       { "flag", "h235.flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_toBeSigned,
       { "toBeSigned", "h235.toBeSigned",
@@ -1274,15 +1274,15 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_signaturedata,
       { "signature", "h235.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_encryptedData,
       { "encryptedData", "h235.encryptedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_hash,
       { "hash", "h235.hash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.BIT_STRING", HFILL }},
     { &hf_h235_ranInt,
       { "ranInt", "h235.ranInt",
@@ -1290,19 +1290,19 @@ void proto_register_h235(void) {
         "h235.INTEGER", HFILL }},
     { &hf_h235_iv8,
       { "iv8", "h235.iv8",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.IV8", HFILL }},
     { &hf_h235_iv16,
       { "iv16", "h235.iv16",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.IV16", HFILL }},
     { &hf_h235_iv,
       { "iv", "h235.iv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_clearSalt,
       { "clearSalt", "h235.clearSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_cryptoEncryptedToken,
       { "cryptoEncryptedToken", "h235.cryptoEncryptedToken",
@@ -1338,7 +1338,7 @@ void proto_register_h235(void) {
         "h235.ENCRYPTED", HFILL }},
     { &hf_h235_secureChannel,
       { "secureChannel", "h235.secureChannel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.KeyMaterial", HFILL }},
     { &hf_h235_sharedSecret,
       { "sharedSecret", "h235.sharedSecret",
@@ -1354,15 +1354,15 @@ void proto_register_h235(void) {
         "h235.V3KeySyncMaterial", HFILL }},
     { &hf_h235_encryptedSessionKey,
       { "encryptedSessionKey", "h235.encryptedSessionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_encryptedSaltingKey,
       { "encryptedSaltingKey", "h235.encryptedSaltingKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_clearSaltingKey,
       { "clearSaltingKey", "h235.clearSaltingKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_paramSsalt,
       { "paramSsalt", "h235.paramSsalt",
@@ -1374,7 +1374,7 @@ void proto_register_h235(void) {
         "h235.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h235_genericKeyMaterial,
       { "genericKeyMaterial", "h235.genericKeyMaterial",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_SrtpCryptoCapability_item,
       { "SrtpCryptoInfo", "h235.SrtpCryptoInfo",
@@ -1390,7 +1390,7 @@ void proto_register_h235(void) {
         "h235.SrtpSessionParameters", HFILL }},
     { &hf_h235_allowMKI,
       { "allowMKI", "h235.allowMKI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_SrtpKeys_item,
       { "SrtpKeyParameters", "h235.SrtpKeyParameters",
@@ -1398,11 +1398,11 @@ void proto_register_h235(void) {
         "h235.SrtpKeyParameters", HFILL }},
     { &hf_h235_masterKey,
       { "masterKey", "h235.masterKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_masterSalt,
       { "masterSalt", "h235.masterSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_lifetime,
       { "lifetime", "h235.lifetime",
@@ -1426,7 +1426,7 @@ void proto_register_h235(void) {
         "h235.INTEGER_1_128", HFILL }},
     { &hf_h235_value,
       { "value", "h235.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h235.OCTET_STRING", HFILL }},
     { &hf_h235_kdr,
       { "kdr", "h235.kdr",
@@ -1434,15 +1434,15 @@ void proto_register_h235(void) {
         "h235.INTEGER_0_24", HFILL }},
     { &hf_h235_unencryptedSrtp,
       { "unencryptedSrtp", "h235.unencryptedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_unencryptedSrtcp,
       { "unencryptedSrtcp", "h235.unencryptedSrtcp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_unauthenticatedSrtp,
       { "unauthenticatedSrtp", "h235.unauthenticatedSrtp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h235.BOOLEAN", HFILL }},
     { &hf_h235_fecOrder,
       { "fecOrder", "h235.fecOrder",
diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c
index 2473f2ecbf..1f6264836e 100644
--- a/epan/dissectors/packet-h245.c
+++ b/epan/dissectors/packet-h245.c
@@ -14887,7 +14887,7 @@ void proto_register_h245(void) {
         "h245.NonStandardIdentifier", HFILL }},
     { &hf_h245_nsd_data,
       { "data", "h245.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.T_nsd_data", HFILL }},
     { &hf_h245_object,
       { "object", "h245.object",
@@ -15067,7 +15067,7 @@ void proto_register_h245(void) {
         "h245.DataApplicationCapability", HFILL }},
     { &hf_h245_h233EncryptionTransmitCapability,
       { "h233EncryptionTransmitCapability", "h245.h233EncryptionTransmitCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h233EncryptionReceiveCapability,
       { "h233EncryptionReceiveCapability", "h245.h233EncryptionReceiveCapability",
@@ -15191,39 +15191,39 @@ void proto_register_h245(void) {
         "h245.T_aal1", HFILL }},
     { &hf_h245_nullClockRecovery,
       { "nullClockRecovery", "h245.nullClockRecovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_srtsClockRecovery_bool,
       { "srtsClockRecovery", "h245.srtsClockRecovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_adaptiveClockRecovery,
       { "adaptiveClockRecovery", "h245.adaptiveClockRecovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_nullErrorCorrection,
       { "nullErrorCorrection", "h245.nullErrorCorrection",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_longInterleaver,
       { "longInterleaver", "h245.longInterleaver",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_shortInterleaver,
       { "shortInterleaver", "h245.shortInterleaver",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_errorCorrectionOnly,
       { "errorCorrectionOnly", "h245.errorCorrectionOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_structuredDataTransfer,
       { "structuredDataTransfer", "h245.structuredDataTransfer",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_partiallyFilledCells,
       { "partiallyFilledCells", "h245.partiallyFilledCells",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_aal5,
       { "aal5", "h245.aal5",
@@ -15239,11 +15239,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_65535", HFILL }},
     { &hf_h245_transportStream_bool,
       { "transportStream", "h245.transportStream",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_programStream,
       { "programStream", "h245.programStream",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_availableBitRates,
       { "availableBitRates", "h245.availableBitRates",
@@ -15283,47 +15283,47 @@ void proto_register_h245(void) {
         "h245.Q2931Address", HFILL }},
     { &hf_h245_srtsClockRecoveryflag,
       { "srtsClockRecovery", "h245.srtsClockRecovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_transportWithI_frames,
       { "transportWithI-frames", "h245.transportWithI_frames",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoWithAL1,
       { "videoWithAL1", "h245.videoWithAL1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoWithAL2,
       { "videoWithAL2", "h245.videoWithAL2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoWithAL3,
       { "videoWithAL3", "h245.videoWithAL3",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL1,
       { "audioWithAL1", "h245.audioWithAL1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL2,
       { "audioWithAL2", "h245.audioWithAL2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL3,
       { "audioWithAL3", "h245.audioWithAL3",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL1,
       { "dataWithAL1", "h245.dataWithAL1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL2,
       { "dataWithAL2", "h245.dataWithAL2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL3,
       { "dataWithAL3", "h245.dataWithAL3",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_maximumAl2SDUSize,
       { "maximumAl2SDUSize", "h245.maximumAl2SDUSize",
@@ -15363,11 +15363,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_2_255", HFILL }},
     { &hf_h245_maxMUXPDUSizeCapability,
       { "maxMUXPDUSizeCapability", "h245.maxMUXPDUSizeCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_nsrpSupport,
       { "nsrpSupport", "h245.nsrpSupport",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mobileOperationTransmitCapability,
       { "mobileOperationTransmitCapability", "h245.mobileOperationTransmitCapability",
@@ -15375,23 +15375,23 @@ void proto_register_h245(void) {
         "h245.T_mobileOperationTransmitCapability", HFILL }},
     { &hf_h245_modeChangeCapability,
       { "modeChangeCapability", "h245.modeChangeCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexA,
       { "h223AnnexA", "h245.h223AnnexA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexADoubleFlagFlag,
       { "h223AnnexADoubleFlag", "h245.h223AnnexADoubleFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexB,
       { "h223AnnexB", "h245.h223AnnexB",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexBwithHeader,
       { "h223AnnexBwithHeader", "h245.h223AnnexBwithHeader",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h223AnnexCCapability,
       { "h223AnnexCCapability", "h245.h223AnnexCCapability",
@@ -15415,43 +15415,43 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_65025", HFILL }},
     { &hf_h245_videoWithAL1M,
       { "videoWithAL1M", "h245.videoWithAL1M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoWithAL2M,
       { "videoWithAL2M", "h245.videoWithAL2M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoWithAL3M,
       { "videoWithAL3M", "h245.videoWithAL3M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL1M,
       { "audioWithAL1M", "h245.audioWithAL1M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL2M,
       { "audioWithAL2M", "h245.audioWithAL2M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioWithAL3M,
       { "audioWithAL3M", "h245.audioWithAL3M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL1M,
       { "dataWithAL1M", "h245.dataWithAL1M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL2M,
       { "dataWithAL2M", "h245.dataWithAL2M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataWithAL3M,
       { "dataWithAL3M", "h245.dataWithAL3M",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_alpduInterleaving,
       { "alpduInterleaving", "h245.alpduInterleaving",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_maximumAL1MPDUSize,
       { "maximumAL1MPDUSize", "h245.maximumAL1MPDUSize",
@@ -15467,43 +15467,43 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_65535", HFILL }},
     { &hf_h245_rsCodeCapability,
       { "rsCodeCapability", "h245.rsCodeCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_suspendResumeCapabilitywAddress,
       { "suspendResumeCapabilitywAddress", "h245.suspendResumeCapabilitywAddress",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_suspendResumeCapabilitywoAddress,
       { "suspendResumeCapabilitywoAddress", "h245.suspendResumeCapabilitywoAddress",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_rejCapability,
       { "rejCapability", "h245.rejCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_sREJCapability,
       { "sREJCapability", "h245.sREJCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mREJCapability,
       { "mREJCapability", "h245.mREJCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_crc8bitCapability,
       { "crc8bitCapability", "h245.crc8bitCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_crc16bitCapability,
       { "crc16bitCapability", "h245.crc16bitCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_crc32bitCapability,
       { "crc32bitCapability", "h245.crc32bitCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_uihCapability,
       { "uihCapability", "h245.uihCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_numOfDLCS,
       { "numOfDLCS", "h245.numOfDLCS",
@@ -15511,11 +15511,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_2_8191", HFILL }},
     { &hf_h245_twoOctetAddressFieldCapability,
       { "twoOctetAddressFieldCapability", "h245.twoOctetAddressFieldCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_loopBackTestCapability,
       { "loopBackTestCapability", "h245.loopBackTestCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_n401Capability,
       { "n401Capability", "h245.n401Capability",
@@ -15531,7 +15531,7 @@ void proto_register_h245(void) {
         "h245.V75Capability", HFILL }},
     { &hf_h245_audioHeader,
       { "audioHeader", "h245.audioHeader",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_maximumAudioDelayJitter,
       { "maximumAudioDelayJitter", "h245.maximumAudioDelayJitter",
@@ -15555,15 +15555,15 @@ void proto_register_h245(void) {
         "h245.T_mcCapability", HFILL }},
     { &hf_h245_centralizedConferenceMC,
       { "centralizedConferenceMC", "h245.centralizedConferenceMC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_decentralizedConferenceMC,
       { "decentralizedConferenceMC", "h245.decentralizedConferenceMC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_rtcpVideoControlCapability,
       { "rtcpVideoControlCapability", "h245.rtcpVideoControlCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mediaPacketizationCapability,
       { "mediaPacketizationCapability", "h245.mediaPacketizationCapability",
@@ -15583,15 +15583,15 @@ void proto_register_h245(void) {
         "h245.RedundancyEncodingCapability", HFILL }},
     { &hf_h245_logicalChannelSwitchingCapability,
       { "logicalChannelSwitchingCapability", "h245.logicalChannelSwitchingCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_t120DynamicPortCapability,
       { "t120DynamicPortCapability", "h245.t120DynamicPortCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_h261aVideoPacketization,
       { "h261aVideoPacketization", "h245.h261aVideoPacketization",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_rtpPayloadTypes,
       { "rtpPayloadType", "h245.rtpPayloadType",
@@ -15639,23 +15639,23 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_65535", HFILL }},
     { &hf_h245_atmUBR,
       { "atmUBR", "h245.atmUBR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_atmrtVBR,
       { "atmrtVBR", "h245.atmrtVBR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_atmnrtVBR,
       { "atmnrtVBR", "h245.atmnrtVBR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_atmABR,
       { "atmABR", "h245.atmABR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_atmCBR,
       { "atmCBR", "h245.atmCBR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_nonStandardParameter,
       { "nonStandardParameter", "h245.nonStandardParameter",
@@ -15667,7 +15667,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_255", HFILL }},
     { &hf_h245_servicePrioritySignalled,
       { "servicePrioritySignalled", "h245.servicePrioritySignalled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_servicePriorityValue,
       { "servicePriorityValue", "h245.servicePriorityValue",
@@ -15739,7 +15739,7 @@ void proto_register_h245(void) {
         "h245.ATMParameters", HFILL }},
     { &hf_h245_localQoS,
       { "localQoS", "h245.localQoS",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_genericTransportParameters,
       { "genericTransportParameters", "h245.genericTransportParameters",
@@ -15783,7 +15783,7 @@ void proto_register_h245(void) {
         "h245.T_atm_AAL5_compressed", HFILL }},
     { &hf_h245_variable_delta,
       { "variable-delta", "h245.variable_delta",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mediaTransport,
       { "mediaTransport", "h245.mediaTransport",
@@ -15875,11 +15875,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_255", HFILL }},
     { &hf_h245_multicastCapability,
       { "multicastCapability", "h245.multicastCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_multiUniCastConference,
       { "multiUniCastConference", "h245.multiUniCastConference",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mediaDistributionCapability,
       { "mediaDistributionCapability", "h245.mediaDistributionCapability",
@@ -15891,27 +15891,27 @@ void proto_register_h245(void) {
         "h245.MediaDistributionCapability", HFILL }},
     { &hf_h245_centralizedControl,
       { "centralizedControl", "h245.centralizedControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_distributedControl,
       { "distributedControl", "h245.distributedControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_centralizedAudio,
       { "centralizedAudio", "h245.centralizedAudio",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_distributedAudio,
       { "distributedAudio", "h245.distributedAudio",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_centralizedVideo,
       { "centralizedVideo", "h245.centralizedVideo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_distributedVideo,
       { "distributedVideo", "h245.distributedVideo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_centralizedData,
       { "centralizedData", "h245.centralizedData",
@@ -15979,7 +15979,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_4", HFILL }},
     { &hf_h245_temporalSpatialTradeOffCapability,
       { "temporalSpatialTradeOffCapability", "h245.temporalSpatialTradeOffCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_maxBitRate_1_19200,
       { "maxBitRate", "h245.maxBitRate",
@@ -15987,55 +15987,55 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_19200", HFILL }},
     { &hf_h245_stillImageTransmission,
       { "stillImageTransmission", "h245.stillImageTransmission",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoBadMBsCap,
       { "videoBadMBsCap", "h245.videoBadMBsCap",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_SPatML,
       { "profileAndLevel-SPatML", "h245.profileAndLevel_SPatML",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_MPatLL,
       { "profileAndLevel-MPatLL", "h245.profileAndLevel_MPatLL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_MPatML,
       { "profileAndLevel-MPatML", "h245.profileAndLevel_MPatML",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_MPatH_14,
       { "profileAndLevel-MPatH-14", "h245.profileAndLevel_MPatH_14",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_MPatHL,
       { "profileAndLevel-MPatHL", "h245.profileAndLevel_MPatHL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_SNRatLL,
       { "profileAndLevel-SNRatLL", "h245.profileAndLevel_SNRatLL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_SNRatML,
       { "profileAndLevel-SNRatML", "h245.profileAndLevel_SNRatML",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_SpatialatH_14,
       { "profileAndLevel-SpatialatH-14", "h245.profileAndLevel_SpatialatH_14",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_HPatML,
       { "profileAndLevel-HPatML", "h245.profileAndLevel_HPatML",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_HPatH_14,
       { "profileAndLevel-HPatH-14", "h245.profileAndLevel_HPatH_14",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_profileAndLevel_HPatHL,
       { "profileAndLevel-HPatHL", "h245.profileAndLevel_HPatHL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoBitRate,
       { "videoBitRate", "h245.videoBitRate",
@@ -16087,19 +16087,19 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_192400", HFILL }},
     { &hf_h245_unrestrictedVector,
       { "unrestrictedVector", "h245.unrestrictedVector",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_arithmeticCoding,
       { "arithmeticCoding", "h245.arithmeticCoding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_advancedPrediction,
       { "advancedPrediction", "h245.advancedPrediction",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_pbFrames,
       { "pbFrames", "h245.pbFrames",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_hrd_B,
       { "hrd-B", "h245.hrd_B",
@@ -16131,7 +16131,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_3600", HFILL }},
     { &hf_h245_errorCompensation,
       { "errorCompensation", "h245.errorCompensation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_enhancementLayerInfo,
       { "enhancementLayerInfo", "h245.enhancementLayerInfo",
@@ -16143,7 +16143,7 @@ void proto_register_h245(void) {
         "h245.H263Options", HFILL }},
     { &hf_h245_baseBitRateConstrained,
       { "baseBitRateConstrained", "h245.baseBitRateConstrained",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_snrEnhancement,
       { "snrEnhancement", "h245.snrEnhancement",
@@ -16179,95 +16179,95 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_64", HFILL }},
     { &hf_h245_advancedIntraCodingMode,
       { "advancedIntraCodingMode", "h245.advancedIntraCodingMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_deblockingFilterMode,
       { "deblockingFilterMode", "h245.deblockingFilterMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_improvedPBFramesMode,
       { "improvedPBFramesMode", "h245.improvedPBFramesMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_unlimitedMotionVectors,
       { "unlimitedMotionVectors", "h245.unlimitedMotionVectors",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fullPictureFreeze,
       { "fullPictureFreeze", "h245.fullPictureFreeze",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_partialPictureFreezeAndRelease,
       { "partialPictureFreezeAndRelease", "h245.partialPictureFreezeAndRelease",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_resizingPartPicFreezeAndRelease,
       { "resizingPartPicFreezeAndRelease", "h245.resizingPartPicFreezeAndRelease",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fullPictureSnapshot,
       { "fullPictureSnapshot", "h245.fullPictureSnapshot",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_partialPictureSnapshot,
       { "partialPictureSnapshot", "h245.partialPictureSnapshot",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoSegmentTagging,
       { "videoSegmentTagging", "h245.videoSegmentTagging",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_progressiveRefinement,
       { "progressiveRefinement", "h245.progressiveRefinement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dynamicPictureResizingByFour,
       { "dynamicPictureResizingByFour", "h245.dynamicPictureResizingByFour",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dynamicPictureResizingSixteenthPel,
       { "dynamicPictureResizingSixteenthPel", "h245.dynamicPictureResizingSixteenthPel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dynamicWarpingHalfPel,
       { "dynamicWarpingHalfPel", "h245.dynamicWarpingHalfPel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dynamicWarpingSixteenthPel,
       { "dynamicWarpingSixteenthPel", "h245.dynamicWarpingSixteenthPel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_independentSegmentDecoding,
       { "independentSegmentDecoding", "h245.independentSegmentDecoding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_slicesInOrder_NonRect,
       { "slicesInOrder-NonRect", "h245.slicesInOrder_NonRect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_slicesInOrder_Rect,
       { "slicesInOrder-Rect", "h245.slicesInOrder_Rect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_slicesNoOrder_NonRect,
       { "slicesNoOrder-NonRect", "h245.slicesNoOrder_NonRect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_slicesNoOrder_Rect,
       { "slicesNoOrder-Rect", "h245.slicesNoOrder_Rect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_alternateInterVLCMode,
       { "alternateInterVLCMode", "h245.alternateInterVLCMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_modifiedQuantizationMode,
       { "modifiedQuantizationMode", "h245.modifiedQuantizationMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_reducedResolutionUpdate,
       { "reducedResolutionUpdate", "h245.reducedResolutionUpdate",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_transparencyParameters,
       { "transparencyParameters", "h245.transparencyParameters",
@@ -16275,7 +16275,7 @@ void proto_register_h245(void) {
         "h245.TransparencyParameters", HFILL }},
     { &hf_h245_separateVideoBackChannel,
       { "separateVideoBackChannel", "h245.separateVideoBackChannel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_refPictureSelection,
       { "refPictureSelection", "h245.refPictureSelection",
@@ -16359,7 +16359,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_256", HFILL }},
     { &hf_h245_videoMux,
       { "videoMux", "h245.videoMux",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoBackChannelSend,
       { "videoBackChannelSend", "h245.videoBackChannelSend",
@@ -16475,7 +16475,7 @@ void proto_register_h245(void) {
         "h245.T_pixelAspectInformation", HFILL }},
     { &hf_h245_anyPixelAspectRatio,
       { "anyPixelAspectRatio", "h245.anyPixelAspectRatio",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_pixelAspectCode,
       { "pixelAspectCode", "h245.pixelAspectCode",
@@ -16515,47 +16515,47 @@ void proto_register_h245(void) {
         "h245.H263ModeComboFlags", HFILL }},
     { &hf_h245_referencePicSelect,
       { "referencePicSelect", "h245.referencePicSelect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_enhancedReferencePicSelectBool,
       { "enhancedReferencePicSelect", "h245.enhancedReferencePicSelect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_dataPartitionedSlices,
       { "dataPartitionedSlices", "h245.dataPartitionedSlices",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fixedPointIDCT0,
       { "fixedPointIDCT0", "h245.fixedPointIDCT0",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_interlacedFields,
       { "interlacedFields", "h245.interlacedFields",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_currentPictureHeaderRepetition,
       { "currentPictureHeaderRepetition", "h245.currentPictureHeaderRepetition",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_previousPictureHeaderRepetition,
       { "previousPictureHeaderRepetition", "h245.previousPictureHeaderRepetition",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_nextPictureHeaderRepetition,
       { "nextPictureHeaderRepetition", "h245.nextPictureHeaderRepetition",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_pictureNumberBoolean,
       { "pictureNumber", "h245.pictureNumber",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_spareReferencePictures,
       { "spareReferencePictures", "h245.spareReferencePictures",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_constrainedBitstream,
       { "constrainedBitstream", "h245.constrainedBitstream",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_pictureRate,
       { "pictureRate", "h245.pictureRate",
@@ -16599,7 +16599,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_256", HFILL }},
     { &hf_h245_silenceSuppression,
       { "silenceSuppression", "h245.silenceSuppression",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_g728,
       { "g728", "h245.g728",
@@ -16671,31 +16671,31 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_256", HFILL }},
     { &hf_h245_annexA,
       { "annexA", "h245.annexA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexB,
       { "annexB", "h245.annexB",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexD,
       { "annexD", "h245.annexD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexE,
       { "annexE", "h245.annexE",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexF,
       { "annexF", "h245.annexF",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexG,
       { "annexG", "h245.annexG",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_annexH,
       { "annexH", "h245.annexH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_highRateMode0,
       { "highRateMode0", "h245.highRateMode0",
@@ -16727,35 +16727,35 @@ void proto_register_h245(void) {
         "h245.G723AnnexCAudioMode", HFILL }},
     { &hf_h245_audioLayer1,
       { "audioLayer1", "h245.audioLayer1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioLayer2,
       { "audioLayer2", "h245.audioLayer2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioLayer3,
       { "audioLayer3", "h245.audioLayer3",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioSampling32k,
       { "audioSampling32k", "h245.audioSampling32k",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioSampling44k1,
       { "audioSampling44k1", "h245.audioSampling44k1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioSampling48k,
       { "audioSampling48k", "h245.audioSampling48k",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_singleChannel,
       { "singleChannel", "h245.singleChannel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_twoChannels,
       { "twoChannels", "h245.twoChannels",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_bitRate_1_448,
       { "bitRate", "h245.bitRate",
@@ -16763,51 +16763,51 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_448", HFILL }},
     { &hf_h245_audioSampling16k,
       { "audioSampling16k", "h245.audioSampling16k",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioSampling22k05,
       { "audioSampling22k05", "h245.audioSampling22k05",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_audioSampling24k,
       { "audioSampling24k", "h245.audioSampling24k",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_threeChannels2_1,
       { "threeChannels2-1", "h245.threeChannels2_1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_threeChannels3_0,
       { "threeChannels3-0", "h245.threeChannels3_0",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fourChannels2_0_2_0,
       { "fourChannels2-0-2-0", "h245.fourChannels2_0_2_0",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fourChannels2_2,
       { "fourChannels2-2", "h245.fourChannels2_2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fourChannels3_1,
       { "fourChannels3-1", "h245.fourChannels3_1",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fiveChannels3_0_2_0,
       { "fiveChannels3-0-2-0", "h245.fiveChannels3_0_2_0",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fiveChannels3_2,
       { "fiveChannels3-2", "h245.fiveChannels3_2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_lowFrequencyEnhancement,
       { "lowFrequencyEnhancement", "h245.lowFrequencyEnhancement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_multilingual,
       { "multilingual", "h245.multilingual",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_bitRate2_1_1130,
       { "bitRate", "h245.bitRate",
@@ -16819,11 +16819,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_256", HFILL }},
     { &hf_h245_comfortNoise,
       { "comfortNoise", "h245.comfortNoise",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_scrambled,
       { "scrambled", "h245.scrambled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_vbd_cap_type,
       { "type", "h245.type",
@@ -16867,7 +16867,7 @@ void proto_register_h245(void) {
         "h245.DataProtocolCapability", HFILL }},
     { &hf_h245_nlpidData,
       { "nlpidData", "h245.nlpidData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_nlpid,
       { "nlpid", "h245.nlpid",
@@ -16999,91 +16999,91 @@ void proto_register_h245(void) {
         "h245.T_t84Restricted", HFILL }},
     { &hf_h245_qcif_bool,
       { "qcif", "h245.qcif",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_cif_bool,
       { "cif", "h245.cif",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_ccir601Seq,
       { "ccir601Seq", "h245.ccir601Seq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_ccir601Prog,
       { "ccir601Prog", "h245.ccir601Prog",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_hdtvSeq,
       { "hdtvSeq", "h245.hdtvSeq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_hdtvProg,
       { "hdtvProg", "h245.hdtvProg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_g3FacsMH200x100,
       { "g3FacsMH200x100", "h245.g3FacsMH200x100",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_g3FacsMH200x200,
       { "g3FacsMH200x200", "h245.g3FacsMH200x200",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_g4FacsMMR200x100,
       { "g4FacsMMR200x100", "h245.g4FacsMMR200x100",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_g4FacsMMR200x200,
       { "g4FacsMMR200x200", "h245.g4FacsMMR200x200",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_jbig200x200Seq,
       { "jbig200x200Seq", "h245.jbig200x200Seq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_jbig200x200Prog,
       { "jbig200x200Prog", "h245.jbig200x200Prog",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_jbig300x300Seq,
       { "jbig300x300Seq", "h245.jbig300x300Seq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_jbig300x300Prog,
       { "jbig300x300Prog", "h245.jbig300x300Prog",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_digPhotoLow,
       { "digPhotoLow", "h245.digPhotoLow",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_digPhotoMedSeq,
       { "digPhotoMedSeq", "h245.digPhotoMedSeq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_digPhotoMedProg,
       { "digPhotoMedProg", "h245.digPhotoMedProg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_digPhotoHighSeq,
       { "digPhotoHighSeq", "h245.digPhotoHighSeq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_digPhotoHighProg,
       { "digPhotoHighProg", "h245.digPhotoHighProg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_fillBitRemoval,
       { "fillBitRemoval", "h245.fillBitRemoval",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_transcodingJBIG,
       { "transcodingJBIG", "h245.transcodingJBIG",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_transcodingMMR,
       { "transcodingMMR", "h245.transcodingMMR",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_version,
       { "version", "h245.version",
@@ -17131,7 +17131,7 @@ void proto_register_h245(void) {
         "h245.NULL", HFILL }},
     { &hf_h245_t38TCPBidirectionalMode,
       { "t38TCPBidirectionalMode", "h245.t38TCPBidirectionalMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_encryptionCapability,
       { "encryptionCapability", "h245.encryptionCapability",
@@ -17223,15 +17223,15 @@ void proto_register_h245(void) {
         "h245.NonStandardParameter", HFILL }},
     { &hf_h245_chairControlCapability,
       { "chairControlCapability", "h245.chairControlCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_videoIndicateMixingCapability,
       { "videoIndicateMixingCapability", "h245.videoIndicateMixingCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_multipointVisualizationCapability,
       { "multipointVisualizationCapability", "h245.multipointVisualizationCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_capabilityIdentifier,
       { "capabilityIdentifier", "h245.capabilityIdentifier",
@@ -17255,7 +17255,7 @@ void proto_register_h245(void) {
         "h245.T_nonCollapsing_item", HFILL }},
     { &hf_h245_nonCollapsingRaw,
       { "nonCollapsingRaw", "h245.nonCollapsingRaw",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.T_nonCollapsingRaw", HFILL }},
     { &hf_h245_transport,
       { "transport", "h245.transport",
@@ -17271,7 +17271,7 @@ void proto_register_h245(void) {
         "h245.NonStandardParameter", HFILL }},
     { &hf_h245_uuid,
       { "uuid", "h245.uuid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h245_domainBased,
       { "domainBased", "h245.domainBased",
@@ -17339,7 +17339,7 @@ void proto_register_h245(void) {
         "h245.MultiplexFormat", HFILL }},
     { &hf_h245_controlOnMuxStream,
       { "controlOnMuxStream", "h245.controlOnMuxStream",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_capabilityOnMuxStream,
       { "capabilityOnMuxStream", "h245.capabilityOnMuxStream",
@@ -17371,7 +17371,7 @@ void proto_register_h245(void) {
         "h245.FECC_rfc2733", HFILL }},
     { &hf_h245_redundancyEncodingBool,
       { "redundancyEncoding", "h245.redundancyEncoding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_separateStreamBool,
       { "separateStream", "h245.separateStream",
@@ -17379,11 +17379,11 @@ void proto_register_h245(void) {
         "h245.T_separateStreamBool", HFILL }},
     { &hf_h245_separatePort,
       { "separatePort", "h245.separatePort",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_samePortBool,
       { "samePort", "h245.samePort",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_protectedCapability,
       { "protectedCapability", "h245.protectedCapability",
@@ -17507,11 +17507,11 @@ void proto_register_h245(void) {
         "h245.TransportAddress", HFILL }},
     { &hf_h245_associateConference,
       { "associateConference", "h245.associateConference",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_externalReference,
       { "externalReference", "h245.externalReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_255", HFILL }},
     { &hf_h245_t120SetupProcedure,
       { "t120SetupProcedure", "h245.t120SetupProcedure",
@@ -17539,15 +17539,15 @@ void proto_register_h245(void) {
         "h245.NumericString_SIZE_1_16", HFILL }},
     { &hf_h245_nsapAddress,
       { "nsapAddress", "h245.nsapAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h245_subaddress,
       { "subaddress", "h245.subaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h245_audioHeaderPresent,
       { "audioHeaderPresent", "h245.audioHeaderPresent",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_nullData,
       { "nullData", "h245.nullData",
@@ -17615,11 +17615,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_8191", HFILL }},
     { &hf_h245_programDescriptors,
       { "programDescriptors", "h245.programDescriptors",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_streamDescriptors,
       { "streamDescriptors", "h245.streamDescriptors",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_adaptationLayerType,
       { "adaptationLayerType", "h245.adaptationLayerType",
@@ -17667,7 +17667,7 @@ void proto_register_h245(void) {
         "h245.T_h223_al_type_al3M", HFILL }},
     { &hf_h245_h223_lc_segmentableFlag,
       { "segmentableFlag", "h245.segmentableFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.T_h223_lc_segmentableFlag", HFILL }},
     { &hf_h245_transferMode,
       { "transferMode", "h245.transferMode",
@@ -17751,7 +17751,7 @@ void proto_register_h245(void) {
         "h245.ArqType", HFILL }},
     { &hf_h245_alsduSplitting,
       { "alsduSplitting", "h245.alsduSplitting",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_rsCodeCorrection,
       { "rsCodeCorrection", "h245.rsCodeCorrection",
@@ -17811,7 +17811,7 @@ void proto_register_h245(void) {
         "h245.NULL", HFILL }},
     { &hf_h245_uIH,
       { "uIH", "h245.uIH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_v76_mode,
       { "mode", "h245.mode",
@@ -17859,7 +17859,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_4095", HFILL }},
     { &hf_h245_loopbackTestProcedure,
       { "loopbackTestProcedure", "h245.loopbackTestProcedure",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_sessionID_0_255,
       { "sessionID", "h245.sessionID",
@@ -17875,7 +17875,7 @@ void proto_register_h245(void) {
         "h245.T_mediaChannel", HFILL }},
     { &hf_h245_mediaGuaranteedDelivery,
       { "mediaGuaranteedDelivery", "h245.mediaGuaranteedDelivery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_mediaControlChannel,
       { "mediaControlChannel", "h245.mediaControlChannel",
@@ -17883,7 +17883,7 @@ void proto_register_h245(void) {
         "h245.T_mediaControlChannel", HFILL }},
     { &hf_h245_mediaControlGuaranteedDelivery,
       { "mediaControlGuaranteedDelivery", "h245.mediaControlGuaranteedDelivery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_destination,
       { "destination", "h245.destination",
@@ -18035,15 +18035,15 @@ void proto_register_h245(void) {
         "h245.T_iPXAddress", HFILL }},
     { &hf_h245_node,
       { "node", "h245.node",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_6", HFILL }},
     { &hf_h245_netnum,
       { "netnum", "h245.netnum",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h245_ipx_tsapIdentifier,
       { "tsapIdentifier", "h245.tsapIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_h245_iP6Address,
       { "iP6Address", "h245.iP6Address",
@@ -18059,7 +18059,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_65535", HFILL }},
     { &hf_h245_netBios,
       { "netBios", "h245.netBios",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h245_iPSourceRouteAddress,
       { "iPSourceRouteAddress", "h245.iPSourceRouteAddress",
@@ -18079,7 +18079,7 @@ void proto_register_h245(void) {
         "h245.NULL", HFILL }},
     { &hf_h245_network,
       { "network", "h245.network",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h245_iPSrcRoute_tsapIdentifier,
       { "tsapIdentifier", "h245.tsapIdentifier",
@@ -18091,11 +18091,11 @@ void proto_register_h245(void) {
         "h245.T_route", HFILL }},
     { &hf_h245_route_item,
       { "route item", "h245.route_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_h245_nsap,
       { "nsap", "h245.nsap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_20", HFILL }},
     { &hf_h245_nonStandardAddress,
       { "nonStandardAddress", "h245.nonStandardAddress",
@@ -18131,7 +18131,7 @@ void proto_register_h245(void) {
         "h245.INTEGER_0_255", HFILL }},
     { &hf_h245_h235Key,
       { "h235Key", "h245.h235Key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_65535", HFILL }},
     { &hf_h245_escrowentry,
       { "escrowentry", "h245.escrowentry",
@@ -18151,7 +18151,7 @@ void proto_register_h245(void) {
         "h245.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h245_escrowValue,
       { "escrowValue", "h245.escrowValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.BIT_STRING_SIZE_1_65535", HFILL }},
     { &hf_h245_olc_ack_fw_lcn,
       { "forwardLogicalChannelNumber", "h245.forwardLogicalChannelNumber",
@@ -18259,7 +18259,7 @@ void proto_register_h245(void) {
         "h245.Ack_mediaControlChannel", HFILL }},
     { &hf_h245_flowControlToZero,
       { "flowControlToZero", "h245.flowControlToZero",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_cLC_source,
       { "source", "h245.source",
@@ -18591,7 +18591,7 @@ void proto_register_h245(void) {
         "h245.H223AL3MParameters", HFILL }},
     { &hf_h245_segmentableFlag,
       { "segmentableFlag", "h245.segmentableFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_redundancyEncodingMode,
       { "redundancyEncodingMode", "h245.redundancyEncodingMode",
@@ -19055,7 +19055,7 @@ void proto_register_h245(void) {
         "h245.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h245_criteriaValue,
       { "value", "h245.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_65535", HFILL }},
     { &hf_h245_mcuNumber,
       { "mcuNumber", "h245.mcuNumber",
@@ -19071,7 +19071,7 @@ void proto_register_h245(void) {
         "h245.T_mCTerminalIDResponse", HFILL }},
     { &hf_h245_terminalID,
       { "terminalID", "h245.terminalID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.TerminalID", HFILL }},
     { &hf_h245_terminalIDResponse,
       { "terminalIDResponse", "h245.terminalIDResponse",
@@ -19083,7 +19083,7 @@ void proto_register_h245(void) {
         "h245.T_conferenceIDResponse", HFILL }},
     { &hf_h245_conferenceID,
       { "conferenceID", "h245.conferenceID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.ConferenceID", HFILL }},
     { &hf_h245_passwordResponse,
       { "passwordResponse", "h245.passwordResponse",
@@ -19091,7 +19091,7 @@ void proto_register_h245(void) {
         "h245.T_passwordResponse", HFILL }},
     { &hf_h245_password,
       { "password", "h245.password",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.Password", HFILL }},
     { &hf_h245_terminalListResponse,
       { "terminalListResponse", "h245.terminalListResponse",
@@ -19127,7 +19127,7 @@ void proto_register_h245(void) {
         "h245.T_extensionAddressResponse", HFILL }},
     { &hf_h245_extensionAddress,
       { "extensionAddress", "h245.extensionAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.TerminalID", HFILL }},
     { &hf_h245_chairTokenOwnerResponse,
       { "chairTokenOwnerResponse", "h245.chairTokenOwnerResponse",
@@ -19139,7 +19139,7 @@ void proto_register_h245(void) {
         "h245.T_terminalCertificateResponse", HFILL }},
     { &hf_h245_certificateResponse,
       { "certificateResponse", "h245.certificateResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_65535", HFILL }},
     { &hf_h245_broadcastMyLogicalChannelResponse,
       { "broadcastMyLogicalChannelResponse", "h245.broadcastMyLogicalChannelResponse",
@@ -19383,7 +19383,7 @@ void proto_register_h245(void) {
         "h245.T_specificRequest", HFILL }},
     { &hf_h245_multiplexCapabilityBool,
       { "multiplexCapability", "h245.multiplexCapability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_capabilityTableEntryNumbers,
       { "capabilityTableEntryNumbers", "h245.capabilityTableEntryNumbers",
@@ -19407,7 +19407,7 @@ void proto_register_h245(void) {
         "h245.NULL", HFILL }},
     { &hf_h245_encryptionSE,
       { "encryptionSE", "h245.encryptionSE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_encryptionIVRequest,
       { "encryptionIVRequest", "h245.encryptionIVRequest",
@@ -19507,7 +19507,7 @@ void proto_register_h245(void) {
         "h245.SubstituteConferenceIDCommand", HFILL }},
     { &hf_h245_conferenceIdentifier,
       { "conferenceIdentifier", "h245.conferenceIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_16", HFILL }},
     { &hf_h245_masterToSlave,
       { "masterToSlave", "h245.masterToSlave",
@@ -19691,15 +19691,15 @@ void proto_register_h245(void) {
         "h245.EncryptionUpdateDirection", HFILL }},
     { &hf_h245_secureChannel,
       { "secureChannel", "h245.secureChannel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_sharedSecret,
       { "sharedSecret", "h245.sharedSecret",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_certProtectedKey,
       { "certProtectedKey", "h245.certProtectedKey",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_keyProtectionMethod,
       { "keyProtectionMethod", "h245.keyProtectionMethod",
@@ -19751,11 +19751,11 @@ void proto_register_h245(void) {
         "h245.INTEGER_1_65535", HFILL }},
     { &hf_h245_bitRateLockedToPCRClock,
       { "bitRateLockedToPCRClock", "h245.bitRateLockedToPCRClock",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_bitRateLockedToNetworkClock,
       { "bitRateLockedToNetworkClock", "h245.bitRateLockedToNetworkClock",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h245.BOOLEAN", HFILL }},
     { &hf_h245_cmd_aal,
       { "aal", "h245.aal",
@@ -19867,7 +19867,7 @@ void proto_register_h245(void) {
         "h245.NULL", HFILL }},
     { &hf_h245_returnedFunction,
       { "returnedFunction", "h245.returnedFunction",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.T_returnedFunction", HFILL }},
     { &hf_h245_sbeNumber,
       { "sbeNumber", "h245.sbeNumber",
@@ -20023,11 +20023,11 @@ void proto_register_h245(void) {
         "h245.NonStandardIdentifier", HFILL }},
     { &hf_h245_productNumber,
       { "productNumber", "h245.productNumber",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_h245_versionNumber,
       { "versionNumber", "h245.versionNumber",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_h245_ind_aal,
       { "aal", "h245.aal",
@@ -20063,15 +20063,15 @@ void proto_register_h245(void) {
         "h245.IndR_multiplex", HFILL }},
     { &hf_h245_iv8,
       { "iv8", "h245.iv8",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.IV8", HFILL }},
     { &hf_h245_iv16,
       { "iv16", "h245.iv16",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.IV16", HFILL }},
     { &hf_h245_iv,
       { "iv", "h245.iv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_alphanumeric,
       { "alphanumeric", "h245.alphanumeric",
@@ -20115,7 +20115,7 @@ void proto_register_h245(void) {
         "h245.Params", HFILL }},
     { &hf_h245_encryptedSignalType,
       { "encryptedSignalType", "h245.encryptedSignalType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_h245_algorithmOID,
       { "algorithmOID", "h245.algorithmOID",
@@ -20135,7 +20135,7 @@ void proto_register_h245(void) {
         "h245.T_extendedAlphanumeric", HFILL }},
     { &hf_h245_encrypted,
       { "encrypted", "h245.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h245.OCTET_STRING", HFILL }},
     { &hf_h245_encryptedAlphanumeric,
       { "encryptedAlphanumeric", "h245.encryptedAlphanumeric",
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index 47aceb8960..56d3803508 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -5135,16 +5135,16 @@ void proto_register_h248(void) {
   static hf_register_info hf[] = {
     { &hf_h248_mtpaddress_ni, {
       "NI", "h248.mtpaddress.ni", FT_UINT32, BASE_DEC,
-      NULL, 0, "NI", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_mtpaddress_pc, {
       "PC", "h248.mtpaddress.pc", FT_UINT32, BASE_DEC,
-      NULL, 0, "PC", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_pkg_name, {
       "Package", "h248.package_name", FT_UINT16, BASE_HEX,
-      VALS(package_name_vals), 0, "Package", HFILL }},
+      VALS(package_name_vals), 0, NULL, HFILL }},
     { &hf_248_pkg_param, {
       "Parameter ID", "h248.package_paramid", FT_UINT16, BASE_HEX,
-      NULL, 0, "Parameter ID", HFILL }},
+      NULL, 0, NULL, HFILL }},
     { &hf_h248_signal_code, {
       "Signal ID", "h248.package_signalid", FT_UINT16, BASE_HEX,
       NULL, 0, "Parameter ID", HFILL }},
@@ -5160,7 +5160,7 @@ void proto_register_h248(void) {
 	{ &hf_h248_pkg_bcp_BNCChar_PDU,
       { "BNCChar", "h248.package_bcp.BNCChar",
         FT_UINT32, BASE_DEC, VALS(gcp_term_types), 0,
-        "BNCChar", HFILL }},
+        NULL, HFILL }},
 
   { &hf_h248_error_code,
   { "errorCode", "h248.errorCode",
@@ -5173,32 +5173,32 @@ void proto_register_h248(void) {
   { &hf_h248_term_wild_type,
   { "Wildcard Mode", "h248.term.wildcard.mode",
       FT_UINT8, BASE_DEC, VALS(wildcard_modes), 0x80,
-      "", HFILL }},
+      NULL, HFILL }},
   { &hf_h248_term_wild_level,
   { "Wildcarding Level", "h248.term.wildcard.level",
       FT_UINT8, BASE_DEC, VALS(wildcard_levels), 0x40,
-      "", HFILL }},
+      NULL, HFILL }},
   { &hf_h248_term_wild_position,
   { "Wildcarding Position", "h248.term.wildcard.pos",
       FT_UINT8, BASE_DEC, NULL, 0x3F,
-      "", HFILL }},
+      NULL, HFILL }},
 
   { &hf_h248_no_pkg,
   { "Unknown Package", "h248.pkg.unknown",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_no_sig,
   { "Unknown Signal", "h248.pkg.unknown.sig",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_no_evt,
   { "Unknown Event", "h248.pkg.unknown.evt",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_param,
   { "Parameter", "h248.pkg.unknown.param",
-	  FT_BYTES, BASE_HEX, NULL, 0,
-	  "", HFILL }},
+	  FT_BYTES, BASE_NONE, NULL, 0,
+	  NULL, HFILL }},
   { &hf_h248_serviceChangeReasonStr,
       { "ServiceChangeReasonStr", "h248.serviceChangeReasonstr",
         FT_STRING, BASE_NONE, NULL, 0,
@@ -5217,15 +5217,15 @@ void proto_register_h248(void) {
         "h248.Message", HFILL }},
     { &hf_h248_secParmIndex,
       { "secParmIndex", "h248.secParmIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SecurityParmIndex", HFILL }},
     { &hf_h248_seqNum,
       { "seqNum", "h248.seqNum",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SequenceNum", HFILL }},
     { &hf_h248_ad,
       { "ad", "h248.ad",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.AuthData", HFILL }},
     { &hf_h248_version,
       { "version", "h248.version",
@@ -5269,7 +5269,7 @@ void proto_register_h248(void) {
         "h248.PathName", HFILL }},
     { &hf_h248_mtpAddress,
       { "mtpAddress", "h248.mtpAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.MtpAddress", HFILL }},
     { &hf_h248_domName,
       { "name", "h248.name",
@@ -5421,7 +5421,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_15", HFILL }},
     { &hf_h248_emergency,
       { "emergency", "h248.emergency",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_topologyReq,
       { "topologyReq", "h248.topologyReq",
@@ -5433,7 +5433,7 @@ void proto_register_h248(void) {
         "h248.TopologyRequest", HFILL }},
     { &hf_h248_iepscallind_BOOL,
       { "iepscallind", "h248.iepscallind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.Iepscallind_BOOL", HFILL }},
     { &hf_h248_contextProp,
       { "contextProp", "h248.contextProp",
@@ -5481,11 +5481,11 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_15", HFILL }},
     { &hf_h248_selectemergency,
       { "selectemergency", "h248.selectemergency",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_selectiepscallind,
       { "selectiepscallind", "h248.selectiepscallind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_selectLogic,
       { "selectLogic", "h248.selectLogic",
@@ -5689,7 +5689,7 @@ void proto_register_h248(void) {
         "h248.AuditDescriptor", HFILL }},
     { &hf_h248_auditToken,
       { "auditToken", "h248.auditToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.T_auditToken", HFILL }},
     { &hf_h248_auditPropertyToken,
       { "auditPropertyToken", "h248.auditPropertyToken",
@@ -5793,7 +5793,7 @@ void proto_register_h248(void) {
         "h248.StreamMode", HFILL }},
     { &hf_h248_name,
       { "name", "h248.name",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_propertyParms,
       { "propertyParms", "h248.propertyParms",
@@ -5829,11 +5829,11 @@ void proto_register_h248(void) {
         "h248.RequestID", HFILL }},
     { &hf_h248_iAEDPkgdName,
       { "pkgdName", "h248.pkgdName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_iAEBDEventName,
       { "eventName", "h248.eventName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_indAudSignal,
       { "signal", "h248.signal",
@@ -5853,7 +5853,7 @@ void proto_register_h248(void) {
         "h248.IndAudSignal", HFILL }},
     { &hf_h248_iASignalName,
       { "signalName", "h248.signalName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_signalRequestID,
       { "signalRequestID", "h248.signalRequestID",
@@ -5861,15 +5861,15 @@ void proto_register_h248(void) {
         "h248.RequestID", HFILL }},
     { &hf_h248_digitMapName,
       { "digitMapName", "h248.digitMapName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.DigitMapName", HFILL }},
     { &hf_h248_iAStatName,
       { "statName", "h248.statName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_packageName,
       { "packageName", "h248.packageName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.Name", HFILL }},
     { &hf_h248_packageVersion,
       { "packageVersion", "h248.packageVersion",
@@ -5889,7 +5889,7 @@ void proto_register_h248(void) {
         "h248.ObservedEvent", HFILL }},
     { &hf_h248_eventName,
       { "eventName", "h248.eventName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventName", HFILL }},
     { &hf_h248_eventParList,
       { "eventParList", "h248.eventParList",
@@ -5905,7 +5905,7 @@ void proto_register_h248(void) {
         "h248.TimeNotation", HFILL }},
     { &hf_h248_eventParameterName,
       { "eventParameterName", "h248.eventParameterName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventParameterName", HFILL }},
     { &hf_h248_eventParamValue,
       { "eventParamValue", "h248.eventParamValue",
@@ -5921,15 +5921,15 @@ void proto_register_h248(void) {
         "h248.Relation", HFILL }},
     { &hf_h248_range,
       { "range", "h248.range",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_sublist,
       { "sublist", "h248.sublist",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_EventParamValues_item,
       { "EventParamValue", "h248.EventParamValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.EventParamValue", HFILL }},
     { &hf_h248_serviceChangeParms,
       { "serviceChangeParms", "h248.serviceChangeParms",
@@ -5949,11 +5949,11 @@ void proto_register_h248(void) {
         "h248.SEQUENCE_OF_WildcardField", HFILL }},
     { &hf_h248_wildcard_item,
       { "WildcardField", "h248.WildcardField",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.WildcardField", HFILL }},
     { &hf_h248_terminationId,
       { "id", "h248.id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.T_terminationId", HFILL }},
     { &hf_h248_TerminationIDList_item,
       { "TerminationID", "h248.TerminationID",
@@ -6001,11 +6001,11 @@ void proto_register_h248(void) {
         "h248.StreamMode", HFILL }},
     { &hf_h248_reserveValue,
       { "reserveValue", "h248.reserveValue",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_reserveGroup,
       { "reserveGroup", "h248.reserveGroup",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_propertyParms_01,
       { "propertyParms", "h248.propertyParms",
@@ -6017,7 +6017,7 @@ void proto_register_h248(void) {
         "h248.PropertyParm", HFILL }},
     { &hf_h248_propertyName,
       { "propertyName", "h248.propertyName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PropertyName", HFILL }},
     { &hf_h248_propertyParamValue,
       { "value", "h248.value",
@@ -6025,7 +6025,7 @@ void proto_register_h248(void) {
         "h248.SEQUENCE_OF_PropertyID", HFILL }},
     { &hf_h248_propertyParamValue_item,
       { "PropertyID", "h248.PropertyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PropertyID", HFILL }},
     { &hf_h248_propParm_extraInfo,
       { "extraInfo", "h248.extraInfo",
@@ -6105,7 +6105,7 @@ void proto_register_h248(void) {
         "h248.NULL", HFILL }},
     { &hf_h248_keepActive,
       { "keepActive", "h248.keepActive",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h248.BOOLEAN", HFILL }},
     { &hf_h248_eventDM,
       { "eventDM", "h248.eventDM",
@@ -6133,7 +6133,7 @@ void proto_register_h248(void) {
         "h248.SecondRequestedEvent", HFILL }},
     { &hf_h248_pkgdName,
       { "pkgdName", "h248.pkgdName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.PkgdName", HFILL }},
     { &hf_h248_secondaryEventAction,
       { "eventAction", "h248.eventAction",
@@ -6165,7 +6165,7 @@ void proto_register_h248(void) {
         "h248.Signal", HFILL }},
     { &hf_h248_signalName,
       { "signalName", "h248.signalName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SignalName", HFILL }},
     { &hf_h248_sigType,
       { "sigType", "h248.sigType",
@@ -6177,7 +6177,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_65535", HFILL }},
     { &hf_h248_notifyCompletion,
       { "notifyCompletion", "h248.notifyCompletion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.NotifyCompletion", HFILL }},
     { &hf_h248_sigParList,
       { "sigParList", "h248.sigParList",
@@ -6197,7 +6197,7 @@ void proto_register_h248(void) {
         "h248.INTEGER_0_65535", HFILL }},
     { &hf_h248_sigParameterName,
       { "sigParameterName", "h248.sigParameterName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SigParameterName", HFILL }},
     { &hf_h248_value,
       { "value", "h248.value",
@@ -6209,7 +6209,7 @@ void proto_register_h248(void) {
         "h248.T_extraInfo", HFILL }},
     { &hf_h248_SigParamValues_item,
       { "SigParamValue", "h248.SigParamValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SigParamValue", HFILL }},
     { &hf_h248_mtl,
       { "mtl", "h248.mtl",
@@ -6289,7 +6289,7 @@ void proto_register_h248(void) {
         "h248.NULL", HFILL }},
     { &hf_h248_SCreasonValue_item,
       { "SCreasonValueOctetStr", "h248.SCreasonValueOctetStr",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.SCreasonValueOctetStr", HFILL }},
     { &hf_h248_timestamp,
       { "timestamp", "h248.timestamp",
@@ -6309,7 +6309,7 @@ void proto_register_h248(void) {
         "h248.StatisticsParameter", HFILL }},
     { &hf_h248_statName,
       { "statName", "h248.statName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.StatName", HFILL }},
     { &hf_h248_statValue,
       { "statValue", "h248.statValue",
@@ -6321,7 +6321,7 @@ void proto_register_h248(void) {
         "h248.NonStandardIdentifier", HFILL }},
     { &hf_h248_data,
       { "data", "h248.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.OCTET_STRING", HFILL }},
     { &hf_h248_object,
       { "object", "h248.object",
@@ -6361,68 +6361,68 @@ void proto_register_h248(void) {
         "h248.IA5String_SIZE_8", HFILL }},
     { &hf_h248_Value_item,
       { "Value item", "h248.Value_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h248.OCTET_STRING", HFILL }},
     { &hf_h248_T_auditToken_muxToken,
       { "muxToken", "h248.muxToken",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_modemToken,
       { "modemToken", "h248.modemToken",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_mediaToken,
       { "mediaToken", "h248.mediaToken",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_eventsToken,
       { "eventsToken", "h248.eventsToken",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_signalsToken,
       { "signalsToken", "h248.signalsToken",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_digitMapToken,
       { "digitMapToken", "h248.digitMapToken",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_statsToken,
       { "statsToken", "h248.statsToken",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_observedEventsToken,
       { "observedEventsToken", "h248.observedEventsToken",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_packagesToken,
       { "packagesToken", "h248.packagesToken",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_T_auditToken_eventBufferToken,
       { "eventBufferToken", "h248.eventBufferToken",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onTimeOut,
       { "onTimeOut", "h248.onTimeOut",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByEvent,
       { "onInterruptByEvent", "h248.onInterruptByEvent",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onInterruptByNewSignalDescr,
       { "onInterruptByNewSignalDescr", "h248.onInterruptByNewSignalDescr",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_otherReason,
       { "otherReason", "h248.otherReason",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_h248_NotifyCompletion_onIteration,
       { "onIteration", "h248.onIteration",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-h248-hfarr.c ---*/
 #line 1427 "packet-h248-template.c"
diff --git a/epan/dissectors/packet-h248_10.c b/epan/dissectors/packet-h248_10.c
index c67e576ba2..2cd927dc42 100644
--- a/epan/dissectors/packet-h248_10.c
+++ b/epan/dissectors/packet-h248_10.c
@@ -83,7 +83,7 @@ static const h248_package_t h248_pkg_CHP = {
 void proto_register_h248_dot10(void) {
 	static hf_register_info hf[] = {
 		/* H.248.1 E.1  Generic Package */
-		{ &hf_h248_CHP_mgcon, { "MGCon ", "h248.chp.mgcon", FT_BYTES, BASE_HEX, NULL, 0, "This event occurs when the MG requires that the MGC start or finish load reduction.", HFILL }},
+		{ &hf_h248_CHP_mgcon, { "MGCon", "h248.chp.mgcon", FT_BYTES, BASE_NONE, NULL, 0, "This event occurs when the MG requires that the MGC start or finish load reduction.", HFILL }},
 		{ &hf_h248_CHP_mgcon_reduction, { "Reduction", "h248.chp.mgcon.reduction", FT_UINT32, BASE_DEC, NULL, 0, "Percentage of the load that the MGC is requested to block", HFILL }}, 
 	};
 	
diff --git a/epan/dissectors/packet-h248_3gpp.c b/epan/dissectors/packet-h248_3gpp.c
index 91f7a96cd4..e679782fe5 100644
--- a/epan/dissectors/packet-h248_3gpp.c
+++ b/epan/dissectors/packet-h248_3gpp.c
@@ -450,40 +450,40 @@ void proto_register_h248_3gpp(void) {
 		{ &hf_h248_package_3GUP_Mode,
 		{ "Mode", "h248.package_3GUP.Mode",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_Mode_vals), 0,
-			"Mode", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_UPversions,
 		{ "UPversions", "h248.package_3GUP.upversions",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_upversions_vals), 0,
-			"UPversions", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_delerrsdu,
 		{ "Delivery of erroneous SDUs", "h248.package_3GUP.delerrsdu",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_delerrsdu_vals), 0,
-			"Delivery of erroneous SDUs", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_interface,
 		{ "Interface", "h248.package_3GUP.interface",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_interface_vals), 0,
-			"Interface", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_package_3GUP_initdir,
 		{ "Initialisation Direction", "h248.package_3GUP.initdir",
 			FT_UINT32, BASE_DEC, VALS(h248_3GUP_initdir_vals), 0,
-			"Initialisation Direction", HFILL }},
+			NULL, HFILL }},
 		
 		
 		{ &hf_h248_package_3GCSD,
 		{ "CSD Package", "h248.package_3GCSD",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Circuit Switched Data Package", HFILL }},
 		{ &hf_h248_package_3GCSD_plmnbc,
 		{ "PLMN Bearer Capability", "h248.package_3GCSD.plmnbc",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The PLMN Bearer Capability", HFILL }},
 		{ &hf_h248_package_3GCSD_gsmchancod,
 		{ "GSM channel coding", "h248.package_3GCSD.gsmchancod",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Channel information needed for GSM", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_protres,
 		{ "Protocol Negotiation Result", "h248.package_3GCSD.protres",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This event is used to report the result of the protocol negotiation", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_protres_result,
 		{ "Negotiation Result", "h248.package_3GCSD.protres.result",
@@ -495,7 +495,7 @@ void proto_register_h248_3gpp(void) {
 			"indicates the possible failure cause", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_ratechg,
 		{ "Rate Change", "h248.package_3GCSD.ratechg",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This event is used to report a rate change", HFILL }},
 		{ &hf_h248_pkg_3GCSD_evt_ratechg_rate,
 		{ "New Rate", "h248.package_3GCSD.ratechg.rate",
@@ -503,7 +503,7 @@ void proto_register_h248_3gpp(void) {
 			"reports the new rate for the termination", HFILL }},
 		{ &hf_h248_pkg_3GCSD_sig_actprot,
 		{ "Activate Protocol", "h248.package_3GCSD.actprot",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Activate the higher layer protocol", HFILL }},
 		{ &hf_h248_pkg_3GCSD_actprot_sig_localpeer,
 		{ "Local Peer Role", "h248.package_3GCSD.actprot.localpeer",
@@ -512,8 +512,8 @@ void proto_register_h248_3gpp(void) {
 		
 
 		{ &hf_h248_package_3GTFO,
-		{ "Tandem Free Operation ", "h248.package_3GTFO",
-			FT_BYTES, BASE_HEX, NULL, 0,
+		{ "Tandem Free Operation", "h248.package_3GTFO",
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"This package defines events and properties for Tandem Free Operation (TFO) control", HFILL }},
 		{ &hf_h248_pkg_3GTFO_enable,
 		{ "TFO Activity Control", "h248.package_3GTFO.tfoenable",
@@ -521,35 +521,35 @@ void proto_register_h248_3gpp(void) {
 			"Defines if TFO is enabled or not", HFILL }},
 		{ &hf_h248_pkg_3GTFO_codeclist,
 		{ "TFO Codec List", "h248.package_3GTFO.codeclist",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"List of codecs for use in TFO protocol", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_codec_modify,
 		{ "Optimal Codec Event", "h248.package_3GTFO.codec_modify",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC that TFO negotiation has resulted in an optimal codec type being proposed", HFILL }},
 		{ &hf_h248_pkg_3GTFO_evt_codec_modify_optimalcodec,
 		{ "Optimal Codec Type", "h248.package_3GTFO.codec_modify.optimalcodec",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"indicates which is the proposed codec type for TFO", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_distant_codec_list,
 		{ "Codec List Event", "h248.package_3GTFO.distant_codec_list",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC of the distant TFO partner's supported codec list", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_distant_codec_list_distlist,
 		{ "Distant Codec List", "h248.package_3GTFO.distant_codec_list.distlist",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"indicates the codec list for TFO", HFILL }},
 		
 		{ &hf_h248_pkg_3GTFO_evt_status,
 		{ "TFO Status Event", "h248.package_3GTFO.status",
-			FT_BYTES, BASE_DEC, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"The event is used to notify the MGC that a TFO link has been established or broken", HFILL }},
 		{ &hf_h248_pkg_3GTFO_evt_status_tfostatus,
 		{ "TFO Status", "h248.package_3GTFO.status.tfostatus",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"reports whether TFO has been established or broken", HFILL }},
 	};
 	
diff --git a/epan/dissectors/packet-h248_7.c b/epan/dissectors/packet-h248_7.c
index 479f3348c7..1ea9137cbc 100644
--- a/epan/dissectors/packet-h248_7.c
+++ b/epan/dissectors/packet-h248_7.c
@@ -136,20 +136,20 @@ static const h248_package_t h248_pkg_an = {
 
 void proto_register_h248_7(void) {
 	static hf_register_info hf[] = {
-		{ &hf_h248_an_apf, { "Fixed Announcement Play", "h248.an.apf", FT_BYTES, BASE_HEX, NULL, 0, "Initiates the play of a fixed announcement", HFILL }},
-		{ &hf_h248_an_apf_an, { "Announcement name", "h248.an.apf.an", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
-		{ &hf_h248_an_apf_noc, { "Number of cycles", "h248.an.apf.noc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, 
-		{ &hf_h248_an_apf_av, { "Announcement Variant", "h248.an.apf.av", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_an_apf_di, {"Announcement Direction","h248.an.apf.di",FT_UINT32, BASE_HEX, VALS(h248_an_di_vals), 0, "", HFILL}},
-
-		{ &hf_h248_an_apv, { "Fixed Announcement Play", "h248.an.apv", FT_BYTES, BASE_HEX, NULL, 0, "Initiates the play of a fixed announcement", HFILL }},
-		{ &hf_h248_an_apv_an, { "Announcement name", "h248.an.apv.an", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
-		{ &hf_h248_an_apv_noc, { "Number of cycles", "h248.an.apv.noc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, 
-		{ &hf_h248_an_apv_av, { "Announcement Variant", "h248.an.apv.av", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_an_apv_num, { "Number", "h248.an.apv.num", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, 
-		{ &hf_h248_an_apv_spi, { "Specific parameters interpretation", "h248.an.apv.spi", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, 
-		{ &hf_h248_an_apv_sp, { "Specific parameters", "h248.an.apv.sp", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }}, 
-		{ &hf_h248_an_apv_di, {"Announcement Direction","h248.an.apv.di",FT_UINT32, BASE_HEX, VALS(h248_an_di_vals), 0, "", HFILL}}
+		{ &hf_h248_an_apf, { "Fixed Announcement Play", "h248.an.apf", FT_BYTES, BASE_NONE, NULL, 0, "Initiates the play of a fixed announcement", HFILL }},
+		{ &hf_h248_an_apf_an, { "Announcement name", "h248.an.apf.an", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_an_apf_noc, { "Number of cycles", "h248.an.apf.noc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, 
+		{ &hf_h248_an_apf_av, { "Announcement Variant", "h248.an.apf.av", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_an_apf_di, {"Announcement Direction","h248.an.apf.di",FT_UINT32, BASE_HEX, VALS(h248_an_di_vals), 0, NULL, HFILL}},
+
+		{ &hf_h248_an_apv, { "Fixed Announcement Play", "h248.an.apv", FT_BYTES, BASE_NONE, NULL, 0, "Initiates the play of a fixed announcement", HFILL }},
+		{ &hf_h248_an_apv_an, { "Announcement name", "h248.an.apv.an", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_an_apv_noc, { "Number of cycles", "h248.an.apv.noc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, 
+		{ &hf_h248_an_apv_av, { "Announcement Variant", "h248.an.apv.av", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_an_apv_num, { "Number", "h248.an.apv.num", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, 
+		{ &hf_h248_an_apv_spi, { "Specific parameters interpretation", "h248.an.apv.spi", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }}, 
+		{ &hf_h248_an_apv_sp, { "Specific parameters", "h248.an.apv.sp", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}, 
+		{ &hf_h248_an_apv_di, {"Announcement Direction","h248.an.apv.di",FT_UINT32, BASE_HEX, VALS(h248_an_di_vals), 0, NULL, HFILL}}
 		
 		};
 	
diff --git a/epan/dissectors/packet-h248_annex_c.c b/epan/dissectors/packet-h248_annex_c.c
index fbbc03506e..928ca0e042 100644
--- a/epan/dissectors/packet-h248_annex_c.c
+++ b/epan/dissectors/packet-h248_annex_c.c
@@ -967,43 +967,43 @@ void proto_register_h248_annex_c(void) {
 			{ "Media", "h248.pkg.annexc.media", FT_UINT32, BASE_HEX, VALS(h248_annexc_media_vals), 0, "Media Type", HFILL }},
 		{ &hf_h248_pkg_annexc_ACodec,
 		{ "ACodec", "h248.pkg.annexc.ACodec",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"ACodec", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_Mediatx,
 		{ "Mediatx", "h248.pkg.annexc.Mediatx",
 			FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_Mediatx_vals), 0,
-			"Mediatx", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_BIR,
 		{ "BIR", "h248.pkg.annexc.BIR",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"BIR", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_NSAP,
 		{ "NSAP", "h248.pkg.annexc.NSAP",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"NSAP", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_transmission_mode,
 		{ "Transmission Mode", "h248.pkg.annexc.transmission_mode",
 			FT_UINT32, BASE_DEC, VALS(h248_annexc_transmission_mode), 0,
-			"Transmission Mode", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_num_of_channels,
 		{ "Number of Channels", "h248.pkg.annexc.num_of_channels",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Number of Channels", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_sampling_rate,
 		{ "Sampling Rate", "h248.pkg.annexc.sampling_rate",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Sampling Rate", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_bit_rate,
 		{ "Bit Rate", "h248.pkg.annexc.bit_rate",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Bit Rate", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_samplepp,
 		{ "Samplepp", "h248.pkg.annexc.samplepp",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Samplepp", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_silence_supp,
 		{ "SilenceSupp", "h248.pkg.annexc.silence_supp",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Silence Suppression", HFILL }},
 		{ &hf_h248_pkg_annexc_encrypt_type,
 		{ "Encrypttype", "h248.pkg.annexc.encrypt_type",
@@ -1032,19 +1032,19 @@ void proto_register_h248_annex_c(void) {
 		{ &hf_h248_pkg_annexc_h222,
 		{ "H222LogicalChannelParameters", "h248.pkg.annexc.h222",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"H222LogicalChannelParameters", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_h223,
 		{ "H223LogicalChannelParameters", "h248.pkg.annexc.h223",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"H223LogicalChannelParameters", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_v76,
 		{ "V76LogicalChannelParameters", "h248.pkg.annexc.v76",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"V76LogicalChannelParameters", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_h2250,
 		{ "H2250LogicalChannelParameters", "h248.pkg.annexc.h2250",
 			FT_BYTES, BASE_NONE, NULL, 0,
-			"H2250LogicalChannelParameters", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_aesa,
 		{ "AESA", "h248.pkg.annexc.aesa",
 			FT_BYTES, BASE_NONE, NULL, 0,
@@ -1060,7 +1060,7 @@ void proto_register_h248_annex_c(void) {
 		{ &hf_h248_pkg_annexc_sc,
 		{ "Service Class", "h248.pkg.annexc.sc",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Service Class", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_bcob,
 		{ "BCOB", "h248.pkg.annexc.bcob",
 			FT_UINT8, BASE_DEC, NULL, 0x1F,
@@ -1110,15 +1110,15 @@ void proto_register_h248_annex_c(void) {
 			
 		{ &hf_h248_pkg_annexc_bei,
 		{ "BEI", "h248.pkg.annexc.bei",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Best Effort Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_ti,
 		{ "TI", "h248.pkg.annexc.ti",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Tagging Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_fd,
 		{ "FD", "h248.pkg.annexc.fd",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Frame Discard", HFILL }},
 			
 		{ &hf_h248_pkg_annexc_a2pcdv,
@@ -1187,7 +1187,7 @@ void proto_register_h248_annex_c(void) {
 		{ &hf_h248_pkg_annexc_port,
 		{ "Port", "h248.pkg.annexc.port",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"Port", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_porttype,
 		{ "PortType", "h248.pkg.annexc.porttype",
 			FT_UINT32, BASE_DEC, VALS(h248_pkg_annexc_porttype_values), 0,
@@ -1203,7 +1203,7 @@ void proto_register_h248_annex_c(void) {
 			"Served User Transport", HFILL }},
 		{ &hf_h248_pkg_annexc_tci,
 		{ "TCI", "h248.pkg.annexc.tci",
-			FT_BOOLEAN, BASE_NONE, NULL, 0,
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Test Connection Indicator", HFILL }},
 		{ &hf_h248_pkg_annexc_timer_cu,
 		{ "Timer CU", "h248.pkg.annexc.timer_cu",
@@ -1250,7 +1250,7 @@ void proto_register_h248_annex_c(void) {
 		{ &hf_h248_pkg_annexc_contcheck,
 		{ "Continuity Check", "h248.pkg.annexc.tmsr",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_contcheck_values), 0x0C,
-			"", HFILL }},
+			NULL, HFILL }},
 		
 		{ &hf_h248_pkg_annexc_itc,
 		{ "ITC", "h248.pkg.annexc.itc",
@@ -1267,7 +1267,7 @@ void proto_register_h248_annex_c(void) {
 		{ &hf_h248_pkg_annexc_mult,
 		{ "Rate Multiplier", "h248.pkg.annexc.mult",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"Rate Multiplier", HFILL }},
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_syncasync,
 		{ "SyncAsync", "h248.pkg.annexc.syncasync",
 			FT_UINT8, BASE_DEC, VALS(h248_pkg_annexc_syncasync_values), 0x80,
@@ -1361,15 +1361,15 @@ void proto_register_h248_annex_c(void) {
 			"Additional User Information Layer 3 protocol", HFILL }},
 		{ &hf_h248_pkg_annexc_dialedn,
 		{ "Dialed Number", "h248.pkg.annexc.dialedn",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Dialed Number", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_dialingn,
 		{ "Dialing Number", "h248.pkg.annexc.dialingn",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Dialing Number", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_echoci,
 		{ "ECHOCI", "h248.pkg.annexc.echoci",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Not used", HFILL }},
 		{ &hf_h248_pkg_annexc_nci,
 		{ "NCI", "h248.pkg.annexc.nci",
@@ -1379,108 +1379,108 @@ void proto_register_h248_annex_c(void) {
 			
 		{ &hf_h248_pkg_annexc_USI,
 		{ "USI", "h248.pkg.annexc.USI",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"User Service Information", HFILL }},
 			
 
 		{ &hf_h248_pkg_annexc_fmsdu,
 		{ "fmsdu", "h248.pkg.annexc.fmsdu",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"FMSDU", HFILL }},
 		{ &hf_h248_pkg_annexc_bmsdu,
 		{ "bmsdu", "h248.pkg.annexc.bmsdu",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"bmsdu", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_h248_pkg_annexc_sscs,
 		{ "sscs", "h248.pkg.annexc.sscs",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"sscs", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 			
 			
 		{ &hf_h248_pkg_annexc_sdp_v,
 		{ "sdp_v", "h248.pkg.annexc.sdp_v",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP V", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_o,
 		{ "sdp_o", "h248.pkg.annexc.sdp_o",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP O", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_s,
 		{ "sdp_s", "h248.pkg.annexc.sdp_s",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP S", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_i,
 		{ "sdp_i", "h248.pkg.annexc.sdp_i",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP I", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_u,
 		{ "sdp_u", "h248.pkg.annexc.sdp_u",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP U", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_e,
 		{ "sdp_e", "h248.pkg.annexc.sdp_e",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP E", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_p,
 		{ "sdp_p", "h248.pkg.annexc.sdp_p",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP P", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_c,
 		{ "sdp_c", "h248.pkg.annexc.sdp_c",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP C", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_b,
 		{ "sdp_b", "h248.pkg.annexc.sdp_b",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP B", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_z,
 		{ "sdp_z", "h248.pkg.annexc.sdp_z",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP Z", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_k,
 		{ "sdp_k", "h248.pkg.annexc.sdp_k",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP K", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_a,
 		{ "sdp_a", "h248.pkg.annexc.sdp_a",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP A", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_t,
 		{ "sdp_t", "h248.pkg.annexc.sdp_t",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP T", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_r,
 		{ "sdp_r", "h248.pkg.annexc.sdp_r",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP R", HFILL }},
 		{ &hf_h248_pkg_annexc_sdp_m,
 		{ "sdp_m", "h248.pkg.annexc.sdp_m",
-			FT_STRING, BASE_HEX, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"SDP M", HFILL }},
 			
 		{ &hf_h248_pkg_annexc_olc,
 		{ "OLC", "h248.pkg.annexc.olc",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel", HFILL }},
 		{ &hf_h248_pkg_annexc_olcack,
 		{ "OLCack", "h248.pkg.annexc.olcack",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel Acknowledge", HFILL }},
 		{ &hf_h248_pkg_annexc_olccnf,
 		{ "OLCcnf", "h248.pkg.annexc.olccnf",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel CNF", HFILL }},
 		{ &hf_h248_pkg_annexc_olcrej,
 		{ "OLCrej", "h248.pkg.annexc.olcrej",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Open Logical Channel Reject", HFILL }},
 		{ &hf_h248_pkg_annexc_clc,
 		{ "CLC", "h248.pkg.annexc.clc",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Close Logical Channel", HFILL }},
 		{ &hf_h248_pkg_annexc_clcack,
 		{ "CLCack", "h248.pkg.annexc.clcack",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Close Logical Channel Acknowledge", HFILL }},
 		
 	};
diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c
index efc9586490..92b344c5c4 100644
--- a/epan/dissectors/packet-h248_annex_e.c
+++ b/epan/dissectors/packet-h248_annex_e.c
@@ -434,32 +434,32 @@ static h248_package_t h248_pkg_tdmc = {
 void proto_register_h248_annex_e(void) {
 	static hf_register_info hf[] = {
 		/* H.248.1 E.1  Generic Package */
-		{ &hf_h248_pkg_generic, { "Generic Package", "h248.pkg.generic", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_generic_cause_evt, { "Cause Event", "h248.pkg.generic.cause", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.pkg.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, "", HFILL }}, 
-		{ &hf_h248_pkg_generic_cause_failurecause, { "Generic Cause", "h248.pkg.generic.cause.failurecause", FT_STRING, BASE_HEX, NULL, 0, "", HFILL }},
-		{&hf_h248_pkg_generic_sc_evt, {"Signal Completion","h248.pkg.generic.sc",FT_BYTES, BASE_HEX, NULL, 0, "", HFILL}},
-		{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.pkg.generic.sc.sig_id", FT_BYTES, BASE_HEX, NULL , 0, "", HFILL }}, 
-		{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.pkg.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, "", HFILL }}, 
-		{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.pkg.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, "", HFILL }}, 
-		{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.pkg.generic.sc.rid", FT_UINT32, BASE_DEC,  NULL, 0, "", HFILL }}, 
+		{ &hf_h248_pkg_generic, { "Generic Package", "h248.pkg.generic", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_cause_evt, { "Cause Event", "h248.pkg.generic.cause", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_generic_cause_gencause, { "Generic Cause", "h248.pkg.generic.cause.gencause", FT_UINT32, BASE_HEX, VALS(h248_pkg_generic_cause_gencause_vals), 0, NULL, HFILL }}, 
+		{ &hf_h248_pkg_generic_cause_failurecause, { "Generic Cause", "h248.pkg.generic.cause.failurecause", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{&hf_h248_pkg_generic_sc_evt, {"Signal Completion","h248.pkg.generic.sc",FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL}},
+		{ &hf_h248_pkg_generic_sc_sig_id, { "Signal Identity", "h248.pkg.generic.sc.sig_id", FT_BYTES, BASE_NONE, NULL , 0, NULL, HFILL }}, 
+		{ &hf_h248_pkg_generic_sc_meth, { "Termination Method", "h248.pkg.generic.sc.meth", FT_UINT32, BASE_DEC, VALS(h248_pkg_generic_sc_vals) , 0, NULL, HFILL }}, 
+		{ &hf_h248_pkg_generic_sc_slid, { "Signal List ID", "h248.pkg.generic.sc.slid", FT_UINT32, BASE_DEC, NULL , 0, NULL, HFILL }}, 
+		{ &hf_h248_pkg_generic_sc_rid, { "Request ID", "h248.pkg.generic.sc.rid", FT_UINT32, BASE_DEC,  NULL, 0, NULL, HFILL }}, 
 		/* H.248.1 E.9 Analog Line Supervision Package */
-		{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.pkg.al", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.pkg.al.onhook", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook, { "offhook", "h248.pkg.al.offhook", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_flashhook, { "flashhook", "h248.pkg.al.flashhook", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_onhook_par_strict, { "strict", "h248.pkg.al.ev.onhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_onhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, 8, TFS(&h248_pkg_al_evt_onhook_par_init_vals), 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook_par_strict, { "strict", "h248.pkg.al.ev.offhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_offhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, 8, TFS(&h248_pkg_al_evt_offhook_par_init_vals), 0, "", HFILL }},
-		{ &hf_h248_pkg_al_evt_flashhook_par_mindur, { "Minimum duration in ms", "h248.pkg.al.ev.flashhook.mindur", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+		{ &hf_h248_pkg_al, { "Analog Line Supervision Package", "h248.pkg.al", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook, { "onhook", "h248.pkg.al.onhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook, { "offhook", "h248.pkg.al.offhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_flashhook, { "flashhook", "h248.pkg.al.flashhook", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook_par_strict, { "strict", "h248.pkg.al.ev.onhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_onhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_onhook_par_init_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook_par_strict, { "strict", "h248.pkg.al.ev.offhook.strict", FT_UINT8, BASE_DEC, VALS(h248_pkg_al_evt_onhook_strict_vals), 0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_offhook_par_init, { "init", "h248.pkg.al.ev.onhook.init", FT_BOOLEAN, BASE_NONE, TFS(&h248_pkg_al_evt_offhook_par_init_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_al_evt_flashhook_par_mindur, { "Minimum duration in ms", "h248.pkg.al.ev.flashhook.mindur", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		/* H.248.1 E.12 RTP package */
-		{ &hf_h248_pkg_rtp, { "RTP package", "h248.pkg.rtp", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_rtp_stat_ps, { "Packets Sent", "h248.pkg.rtp.stat.ps", FT_UINT64, BASE_DEC, NULL, 0, "Packets Sent", HFILL }},
+		{ &hf_h248_pkg_rtp, { "RTP package", "h248.pkg.rtp", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_rtp_stat_ps, { "Packets Sent", "h248.pkg.rtp.stat.ps", FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 		/* H.248.1 E.13 TDM Circuit Package */
-		{ &hf_h248_pkg_tdmc, { "TDM Circuit Package", "h248.pkg.tdmc", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_h248_pkg_tdmc_ec, { "Echo Cancellation", "h248.pkg.tdmc.ec", FT_BOOLEAN, 8, TFS(&h248_tdmc_ec_vals), 0, "Echo Cancellation", HFILL }},
-		{ &hf_h248_pkg_tdmc_gain, { "Gain", "h248.pkg.tdmc.gain", FT_UINT32, BASE_HEX, NULL, 0, "Gain", HFILL }},
+		{ &hf_h248_pkg_tdmc, { "TDM Circuit Package", "h248.pkg.tdmc", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_h248_pkg_tdmc_ec, { "Echo Cancellation", "h248.pkg.tdmc.ec", FT_BOOLEAN, BASE_NONE, TFS(&h248_tdmc_ec_vals), 0x0, NULL, HFILL }},
+		{ &hf_h248_pkg_tdmc_gain, { "Gain", "h248.pkg.tdmc.gain", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	};
 	
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-h248_q1950.c b/epan/dissectors/packet-h248_q1950.c
index 0374dc2835..de03b56687 100644
--- a/epan/dissectors/packet-h248_q1950.c
+++ b/epan/dissectors/packet-h248_q1950.c
@@ -435,7 +435,7 @@ void proto_register_q1950(void) {
 		/* A.3 Bearer characteristics package */
 		{ &hf_h248_pkg_BCP,
 			{ "BCP (Bearer characteristics package)", "h248.pkg.BCP", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BCP_BNCChar,
 			{ "BNCChar (BNC Characteristics)", "h248.pkg.bcp.bncchar", 
@@ -445,7 +445,7 @@ void proto_register_q1950(void) {
 		/* A.4 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_BNCCT,
 			{ "BNCCT (Bearer network connection cut-through package)", "h248.pkg.BNCCT", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_BNCCT_prop,
 			{ "Bearer network connection cut-through capability", "h248.pkg.bcp.bncct", 
@@ -454,27 +454,27 @@ void proto_register_q1950(void) {
 		
 		{ &hf_h248_pkg_GB,
 			{ "GB (Generic bearer connection)", "h248.pkg.GB", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange,
 			{ "BNCChange", "h248.pkg.GB.BNCChang", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This event occurs whenever a change to a Bearer Network connection occurs", HFILL }
 		},
 		{ &hf_h248_pkg_GB_BNCChange_type,
 			{ "Type", "h248.pkg.GB.BNCChang.Type", 
-			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, "", HFILL }
+			FT_UINT32, BASE_HEX, VALS(h248_pkg_GB_BNCChange_type_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_GB_EstBNC,
 			{ "Type", "h248.pkg.GB.BNCChang.EstBNC", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer establishment signalling", HFILL }
 		},
 		{ &hf_h248_pkg_GB_ModBNC,
 			{ "Type", "h248.pkg.GB.BNCChang.Type", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer modification", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC,
 			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC", 
-			FT_BYTES, BASE_HEX, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Generalcause,
 			{ "Generalcause", "h248.pkg.GB.BNCChang.RelBNC.Generalcause", 
@@ -482,17 +482,17 @@ void proto_register_q1950(void) {
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Failurecause,
 			{ "Failurecause", "h248.pkg.GB.BNCChang.RelBNC.Failurecause", 
-			FT_BYTES, BASE_HEX, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, "The Release Cause is the value generated by the Released equipment", HFILL }
 		},
 		{ &hf_h248_pkg_GB_RelBNC_Reset,
 			{ "RelBNC", "h248.pkg.GB.BNCChang.RelBNC", 
-			FT_BOOLEAN, BASE_NONE, NULL, 0, "This signal triggers the bearer control function to send bearer release", HFILL }
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, "This signal triggers the bearer control function to send bearer release", HFILL }
 		},
 
 		/* A.5 Bearer Network connection cut-through package */
 		{ &hf_h248_pkg_RI,
 			{ "RI (Reuse idle package)", "h248.pkg.RI", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_RII,
 			{ "Reuse Idle Indication", "h248.pkg.bcp.rii", 
@@ -501,70 +501,70 @@ void proto_register_q1950(void) {
 
 		{ &hf_h248_pkg_bt,
 			{ "BT (Bearer control Tunneling)", "h248.pkg.BT", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tunopt,
 			{ "Tunnelling Options", "h248.pkg.BT.TunOpt", 
-				FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }
+				FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_tind,
 			{ "tind (Tunnel INDication)", "h248.pkg.BT.TIND", 
-				FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bt_bit,
 			{ "Bearer Information Transport", "h248.pkg.BT.BIT", 
-				FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		
 		
 		/* A.8 Basic call progress tones generator with directionality */
 		{ &hf_h248_pkg_bcg,
 			{ "bcg (Basic call progress tones generator with directionality)", "h248.pkg.bcg", 
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt_par_btd,
 			{ "btd (Tone Direction)", "h248.pkg.bcp.btd", 
-			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, "btd (Tone Direction)", HFILL }
+			FT_UINT32, BASE_HEX, VALS(h248_pkg_bcg_sig_bdt_par_btd_vals), 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bdt,
 			{ "bdt (Dial Tone)", "h248.pkg.bcg.bdt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_brt,
 			{ "brt (Ringing tone)", "h248.pkg.bcg.brt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bbt,
 			{ "bbt (Busy tone)", "h248.pkg.bcg.bbt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bct,
 			{ "bct (Congestion tone)", "h248.pkg.bcg.bct", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bsit,
 			{ "bsit (Special information tone)", "h248.pkg.bcg.bsit", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bwt,
 			{ "bwt (Warning tone)", "h248.pkg.bcg.bwt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpt,
 			{ "bpt (Payphone recognition tone)", "h248.pkg.bcg.bpt", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcw,
 			{ "bcw (Call waiting tone)", "h248.pkg.bcg.bcw", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bcr,
 			{ "bcr (Call ringing tone)", "h248.pkg.bcg.bcr", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 		{ &hf_h248_pkg_bcg_sig_bpy,
 			{ "bpy (Pay tone)", "h248.pkg.bcg.bpy", 
-			FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-h261.c b/epan/dissectors/packet-h261.c
index 0caff91467..59da18ca61 100644
--- a/epan/dissectors/packet-h261.c
+++ b/epan/dissectors/packet-h261.c
@@ -129,7 +129,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -141,7 +141,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -153,7 +153,7 @@ proto_register_h261(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -165,7 +165,7 @@ proto_register_h261(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -177,7 +177,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -189,7 +189,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -201,7 +201,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -213,7 +213,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -225,7 +225,7 @@ proto_register_h261(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -237,7 +237,7 @@ proto_register_h261(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 };
diff --git a/epan/dissectors/packet-h263.c b/epan/dissectors/packet-h263.c
index 734ed74269..02001e8ad1 100644
--- a/epan/dissectors/packet-h263.c
+++ b/epan/dissectors/packet-h263.c
@@ -756,7 +756,7 @@ proto_register_h263_data(void)
 				"H.263 Split screen indicator",
 				"h263.split_screen_indicator",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Split screen indicator", HFILL
@@ -768,7 +768,7 @@ proto_register_h263_data(void)
 				"H.263 Document camera indicator",
 				"h263.document_camera_indicator",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Document camera indicator", HFILL
@@ -780,7 +780,7 @@ proto_register_h263_data(void)
 				"H.263 Full Picture Freeze Release",
 				"h263.split_screen_indicator",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Full Picture Freeze Release", HFILL
@@ -840,7 +840,7 @@ proto_register_h263_data(void)
 				"H.263 Picture Coding Type",
 				"h263.picture_coding_type",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&picture_coding_type_flg),
 				0x0,
 				"Picture Coding Type", HFILL
@@ -852,7 +852,7 @@ proto_register_h263_data(void)
 				"H.263 Optional Unrestricted Motion Vector mode",
 				"h263.opt_unres_motion_vector_mode",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Optional Unrestricted Motion Vector mode", HFILL
@@ -864,7 +864,7 @@ proto_register_h263_data(void)
 				"H.263 Optional Syntax-based Arithmetic Coding mode",
 				"h263.syntax_based_arithmetic_coding_mode",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Optional Syntax-based Arithmetic Coding mode", HFILL
@@ -876,7 +876,7 @@ proto_register_h263_data(void)
 				"H.263 Optional Advanced Prediction mode",
 				"h263.optional_advanced_prediction_mode",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&on_off_flg),
 				0x0,
 				"Optional Advanced Prediction mode", HFILL
@@ -888,7 +888,7 @@ proto_register_h263_data(void)
 				"H.263 Optional PB-frames mode",
 				"h263.PB_frames_mode",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&PB_frames_mode_flg),
 				0x0,
 				"Optional PB-frames mode", HFILL
@@ -924,7 +924,7 @@ proto_register_h263_data(void)
 				"H.263 Continuous Presence Multipoint and Video Multiplex (CPM)",
 				"h263.cpm",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&cpm_flg),
 				0x0,
 				"Continuous Presence Multipoint and Video Multiplex (CPM)", HFILL
@@ -960,7 +960,7 @@ proto_register_h263_data(void)
 				"H.263 Custom PCF",
 				"h263.custom_pcf",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				TFS(&custom_pcf_flg),
 				0x0,
 				"Custom PCF", HFILL
@@ -972,7 +972,7 @@ proto_register_h263_data(void)
 				"H.263 Extra Insertion Information (PEI)",
 				"h263.pei",
 				FT_BOOLEAN,
-				8,
+				BASE_NONE,
 				NULL,
 				0x0,
 				"Extra Insertion Information (PEI)", HFILL
diff --git a/epan/dissectors/packet-h263p.c b/epan/dissectors/packet-h263p.c
index c74fabd623..dd4f8bbc53 100644
--- a/epan/dissectors/packet-h263p.c
+++ b/epan/dissectors/packet-h263p.c
@@ -322,7 +322,7 @@ proto_register_h263P(void)
 				BASE_DEC,
 				NULL,
 				0xe0,
-				"Thread ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -358,7 +358,7 @@ proto_register_h263P(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"Extra picture header", HFILL
+				NULL, HFILL
 			}
 		},
 		{
diff --git a/epan/dissectors/packet-h264.c b/epan/dissectors/packet-h264.c
index aa182bf950..d46ae0789b 100644
--- a/epan/dissectors/packet-h264.c
+++ b/epan/dissectors/packet-h264.c
@@ -2115,7 +2115,7 @@ proto_register_h264(void)
 		{ &hf_h264_forbidden_bit,
 			{ "Forbidden bit", "h264.forbidden.bit",
 			FT_UINT8, BASE_DEC, NULL, 0x20,
-			"Forbidden bit", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_h264_profile,
 			{ "Profile",           "h264.profile",
@@ -2125,7 +2125,7 @@ proto_register_h264(void)
 		{ &hf_h264_profile_idc,
 			{ "Profile_idc",           "h264.profile_idc",
 			FT_UINT8, BASE_DEC, VALS(h264_profile_idc_values), 0xff,          
-			"Profile_idc", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_h264_rbsp_stop_bit,
 			{ "rbsp_stop_bit",           "h264.rbsp_stop_bit",
@@ -2295,7 +2295,7 @@ proto_register_h264(void)
 		{ &hf_h264_direct_8x8_inference_flag,
 			{ "direct_8x8_inference_flag",           "h264.direct_8x8_inference_flag",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"direct_8x8_inference_flag", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_h264_frame_cropping_flag,
 			{ "frame_cropping_flag",           "h264.frame_cropping_flag",
diff --git a/epan/dissectors/packet-h282.c b/epan/dissectors/packet-h282.c
index 27d4939ada..fc6701a639 100644
--- a/epan/dissectors/packet-h282.c
+++ b/epan/dissectors/packet-h282.c
@@ -4439,7 +4439,7 @@ void proto_register_h282(void) {
         "h282.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h282_h221NonStandard,
       { "h221NonStandard", "h282.h221NonStandard",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.H221NonStandardIdentifier", HFILL }},
     { &hf_h282_key,
       { "key", "h282.key",
@@ -4447,11 +4447,11 @@ void proto_register_h282(void) {
         "h282.Key", HFILL }},
     { &hf_h282_data,
       { "data", "h282.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.OCTET_STRING", HFILL }},
     { &hf_h282_h221nonStandard,
       { "h221nonStandard", "h282.h221nonStandard",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.H221NonStandardIdentifier", HFILL }},
     { &hf_h282_camera,
       { "camera", "h282.camera",
@@ -4487,23 +4487,23 @@ void proto_register_h282(void) {
         "h282.DeviceID", HFILL }},
     { &hf_h282_audioSourceFlag,
       { "audioSourceFlag", "h282.audioSourceFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_audioSinkFlag,
       { "audioSinkFlag", "h282.audioSinkFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_videoSourceFlag,
       { "videoSourceFlag", "h282.videoSourceFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_videoSinkFlag,
       { "videoSinkFlag", "h282.videoSinkFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_remoteControlFlag,
       { "remoteControlFlag", "h282.remoteControlFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_instanceNumber,
       { "instanceNumber", "h282.instanceNumber",
@@ -4519,11 +4519,11 @@ void proto_register_h282(void) {
         "h282.StreamID", HFILL }},
     { &hf_h282_videoStreamFlag,
       { "videoStreamFlag", "h282.videoStreamFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_sourceChangeFlag,
       { "sourceChangeFlag", "h282.sourceChangeFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_streamName,
       { "streamName", "h282.streamName",
@@ -4623,11 +4623,11 @@ void proto_register_h282(void) {
         "h282.PresetNumber", HFILL }},
     { &hf_h282_storeModeSupported,
       { "storeModeSupported", "h282.storeModeSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_presetTextLabel,
       { "presetTextLabel", "h282.presetTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumberOfFilters,
       { "maxNumberOfFilters", "h282.maxNumberOfFilters",
@@ -4647,7 +4647,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_255", HFILL }},
     { &hf_h282_filterTextLabel_01,
       { "filterTextLabel", "h282.filterTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumberOfLens,
       { "maxNumberOfLens", "h282.maxNumberOfLens",
@@ -4667,7 +4667,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_255", HFILL }},
     { &hf_h282_lensTextLabel,
       { "lensTextLabel", "h282.lensTextLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxNumber_01,
       { "maxNumber", "h282.maxNumber",
@@ -4687,7 +4687,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_1_10", HFILL }},
     { &hf_h282_lightLabel,
       { "lightLabel", "h282.lightLabel",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h282.DeviceText", HFILL }},
     { &hf_h282_maxSpeed,
       { "maxSpeed", "h282.maxSpeed",
@@ -5247,7 +5247,7 @@ void proto_register_h282(void) {
         "h282.INTEGER_10_1000", HFILL }},
     { &hf_h282_multiplyFactor,
       { "multiplyFactor", "h282.multiplyFactor",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_inputDevices,
       { "inputDevices", "h282.inputDevices",
@@ -5407,23 +5407,23 @@ void proto_register_h282(void) {
         "h282.AutoSlideDisplayTime", HFILL }},
     { &hf_h282_continuousRewindControl,
       { "continuousRewindControl", "h282.continuousRewindControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_continuousFastForwardControl,
       { "continuousFastForwardControl", "h282.continuousFastForwardControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_searchBackwardsControl,
       { "searchBackwardsControl", "h282.searchBackwardsControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_searchForwardsControl,
       { "searchForwardsControl", "h282.searchForwardsControl",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_pause_01,
       { "pause", "h282.pause",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_selectProgram,
       { "selectProgram", "h282.selectProgram",
@@ -5439,7 +5439,7 @@ void proto_register_h282(void) {
         "h282.ProgramDuration", HFILL }},
     { &hf_h282_continuousPlayBackMode,
       { "continuousPlayBackMode", "h282.continuousPlayBackMode",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_setPlaybackSpeed,
       { "setPlaybackSpeed", "h282.setPlaybackSpeed",
@@ -5447,11 +5447,11 @@ void proto_register_h282(void) {
         "h282.PlaybackSpeed", HFILL }},
     { &hf_h282_play,
       { "play", "h282.play",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_setAudioOutputMute,
       { "setAudioOutputMute", "h282.setAudioOutputMute",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_playToNormalPlayTimePoint,
       { "playToNormalPlayTimePoint", "h282.playToNormalPlayTimePoint",
@@ -5459,7 +5459,7 @@ void proto_register_h282(void) {
         "h282.ProgramDuration", HFILL }},
     { &hf_h282_record,
       { "record", "h282.record",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_recordForDuration,
       { "recordForDuration", "h282.recordForDuration",
@@ -5699,7 +5699,7 @@ void proto_register_h282(void) {
         "h282.PlaybackSpeed", HFILL }},
     { &hf_h282_mute,
       { "mute", "h282.mute",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_currentdeviceState,
       { "currentdeviceState", "h282.currentdeviceState",
@@ -5875,11 +5875,11 @@ void proto_register_h282(void) {
         "h282.NonStandardIdentifier", HFILL }},
     { &hf_h282_deviceLockChanged,
       { "deviceLockChanged", "h282.deviceLockChanged",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_deviceAvailabilityChanged,
       { "deviceAvailabilityChanged", "h282.deviceAvailabilityChanged",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_cameraPannedToLimit,
       { "cameraPannedToLimit", "h282.cameraPannedToLimit",
@@ -5951,7 +5951,7 @@ void proto_register_h282(void) {
         "h282.NULL", HFILL }},
     { &hf_h282_sourceEventNotify,
       { "sourceEventNotify", "h282.sourceEventNotify",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_result_01,
       { "result", "h282.result",
@@ -5979,7 +5979,7 @@ void proto_register_h282(void) {
         "h282.NULL", HFILL }},
     { &hf_h282_lockFlag,
       { "lockFlag", "h282.lockFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h282.BOOLEAN", HFILL }},
     { &hf_h282_result_03,
       { "result", "h282.result",
diff --git a/epan/dissectors/packet-h283.c b/epan/dissectors/packet-h283.c
index f5d492cf1f..1458980b84 100644
--- a/epan/dissectors/packet-h283.c
+++ b/epan/dissectors/packet-h283.c
@@ -626,7 +626,7 @@ void proto_register_h283(void) {
         "h283.NonStandardIdentifier", HFILL }},
     { &hf_h283_data,
       { "data", "h283.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h283.OCTET_STRING", HFILL }},
     { &hf_h283_srcAddr,
       { "srcAddr", "h283.srcAddr",
@@ -674,7 +674,7 @@ void proto_register_h283(void) {
         "h283.INTEGER_0_65535", HFILL }},
     { &hf_h283_reliable,
       { "reliable", "h283.reliable",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h283.BOOLEAN", HFILL }},
     { &hf_h283_dataType,
       { "dataType", "h283.dataType",
diff --git a/epan/dissectors/packet-h323.c b/epan/dissectors/packet-h323.c
index 8958ac8c1e..fde5eff8c5 100644
--- a/epan/dissectors/packet-h323.c
+++ b/epan/dissectors/packet-h323.c
@@ -473,7 +473,7 @@ void proto_register_h323(void) {
         "h323.T_messageContent", HFILL }},
     { &hf_h323_messageContent_item,
       { "messageContent item", "h323.messageContent_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h323.OCTET_STRING", HFILL }},
     { &hf_h323_tunnellingRequired,
       { "tunnellingRequired", "h323.tunnellingRequired",
@@ -553,7 +553,7 @@ void proto_register_h323(void) {
         "h323.T_fastStart", HFILL }},
     { &hf_h323_fastStart_item,
       { "fastStart item", "h323.fastStart_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h323.OCTET_STRING", HFILL }},
     { &hf_h323_resetH245,
       { "resetH245", "h323.resetH245",
diff --git a/epan/dissectors/packet-h450-ros.c b/epan/dissectors/packet-h450-ros.c
index 1c4e899040..5490ccf641 100644
--- a/epan/dissectors/packet-h450-ros.c
+++ b/epan/dissectors/packet-h450-ros.c
@@ -617,7 +617,7 @@ void proto_register_h450_ros(void) {
         "h450_ros.Code", HFILL }},
     { &hf_h450_ros_argument,
       { "argument", "h450.ros.argument",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450_ros.InvokeArgument", HFILL }},
     { &hf_h450_ros_invokeId,
       { "invokeId", "h450.ros.invokeId",
@@ -629,7 +629,7 @@ void proto_register_h450_ros(void) {
         "h450_ros.T_result", HFILL }},
     { &hf_h450_ros_resultArgument,
       { "result", "h450.ros.result",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450_ros.ResultArgument", HFILL }},
     { &hf_h450_ros_errcode,
       { "errcode", "h450.ros.errcode",
@@ -637,7 +637,7 @@ void proto_register_h450_ros(void) {
         "h450_ros.Code", HFILL }},
     { &hf_h450_ros_parameter,
       { "parameter", "h450.ros.parameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450_ros.T_parameter", HFILL }},
     { &hf_h450_ros_problem,
       { "problem", "h450.ros.problem",
diff --git a/epan/dissectors/packet-h450.c b/epan/dissectors/packet-h450.c
index 21f6325b9a..091155757b 100644
--- a/epan/dissectors/packet-h450.c
+++ b/epan/dissectors/packet-h450.c
@@ -4840,10 +4840,10 @@ void proto_register_h450(void) {
   static hf_register_info hf[] = {
     { &hf_h450_operation, { "Operation", "h450.operation",
                            FT_UINT8, BASE_DEC, VALS(h450_str_operation), 0x0,
-                           "Operation", HFILL }},
+                           NULL, HFILL }},
     { &hf_h450_error,     { "Error", "h450.error",
                            FT_UINT8, BASE_DEC, VALS(h450_str_error), 0x0,
-                           "Error", HFILL }},
+                           NULL, HFILL }},
 
 /*--- Included file: packet-h450-hfarr.c ---*/
 #line 1 "packet-h450-hfarr.c"
@@ -4944,15 +4944,15 @@ void proto_register_h450(void) {
         "h450.UserSpecifiedSubaddress", HFILL }},
     { &hf_h450_nsapSubaddress,
       { "nsapSubaddress", "h450.nsapSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450.NSAPSubaddress", HFILL }},
     { &hf_h450_subaddressInformation,
       { "subaddressInformation", "h450.subaddressInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450.SubaddressInformation", HFILL }},
     { &hf_h450_oddCountIndicator,
       { "oddCountIndicator", "h450.oddCountIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450.BOOLEAN", HFILL }},
     { &hf_h450_extensionId,
       { "extensionId", "h450.extensionId",
@@ -5047,7 +5047,7 @@ void proto_register_h450(void) {
         "h450_2.BMPString_SIZE_1_128", HFILL }},
     { &hf_h450_2_basicCallInfoElements,
       { "basicCallInfoElements", "h450.2.basicCallInfoElements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450.H225InformationElement", HFILL }},
     { &hf_h450_2_cTUpdateArg_argumentExtension,
       { "argumentExtension", "h450.2.argumentExtension",
@@ -5238,7 +5238,7 @@ void proto_register_h450(void) {
         "h450_3.INTEGER_1_15", HFILL }},
     { &hf_h450_3_h225InfoElement,
       { "h225InfoElement", "h450.3.h225InfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450.H225InformationElement", HFILL }},
     { &hf_h450_3_lastReroutingNr,
       { "lastReroutingNr", "h450.3.lastReroutingNr",
@@ -5310,7 +5310,7 @@ void proto_register_h450(void) {
         "h450_3.DivertingLegInformation2Arg_extension", HFILL }},
     { &hf_h450_3_presentationAllowedIndicator,
       { "presentationAllowedIndicator", "h450.3.presentationAllowedIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450.PresentationAllowedIndicator", HFILL }},
     { &hf_h450_3_redirectionNr,
       { "redirectionNr", "h450.3.redirectionNr",
@@ -5338,7 +5338,7 @@ void proto_register_h450(void) {
         "h450_3.IntResult", HFILL }},
     { &hf_h450_3_remoteEnabled,
       { "remoteEnabled", "h450.3.remoteEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450_3.BOOLEAN", HFILL }},
     { &hf_h450_3_intResult_extension,
       { "extension", "h450.3.extension",
@@ -5730,7 +5730,7 @@ void proto_register_h450(void) {
         "h450_4.MixedExtension", HFILL }},
     { &hf_h450_7_callbackReq,
       { "callbackReq", "h450.7.callbackReq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450_7.BOOLEAN", HFILL }},
     { &hf_h450_7_mWIDeactivateArg_extensionArg,
       { "extensionArg", "h450.7.extensionArg",
@@ -5821,7 +5821,7 @@ void proto_register_h450(void) {
         "h450_8.NULL", HFILL }},
     { &hf_h450_8_simpleName,
       { "simpleName", "h450.8.simpleName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h450_8.SimpleName", HFILL }},
     { &hf_h450_8_extendedName,
       { "extendedName", "h450.8.extendedName",
@@ -5868,11 +5868,11 @@ void proto_register_h450(void) {
         "h450_7.BasicService", HFILL }},
     { &hf_h450_9_can_retain_service,
       { "can-retain-service", "h450.9.can_retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450_9.BOOLEAN", HFILL }},
     { &hf_h450_9_retain_sig_connection,
       { "retain-sig-connection", "h450.9.retain_sig_connection",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450_9.BOOLEAN", HFILL }},
     { &hf_h450_9_ccRequestArg_extension,
       { "extension", "h450.9.extension",
@@ -5884,7 +5884,7 @@ void proto_register_h450(void) {
         "h450_4.MixedExtension", HFILL }},
     { &hf_h450_9_retain_service,
       { "retain-service", "h450.9.retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h450_9.BOOLEAN", HFILL }},
     { &hf_h450_9_ccRequestRes_extension,
       { "extension", "h450.9.extension",
diff --git a/epan/dissectors/packet-h460.c b/epan/dissectors/packet-h460.c
index 353147dec9..2d855e30cd 100644
--- a/epan/dissectors/packet-h460.c
+++ b/epan/dissectors/packet-h460.c
@@ -2245,7 +2245,7 @@ void proto_register_h460(void) {
         "h460_2.INTEGER_1_255", HFILL }},
     { &hf_h460_2_regionalData,
       { "regionalData", "h460.2.regionalData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h460_2.OCTET_STRING", HFILL }},
 
 /* --- Module CIRCUIT-STATUS-MAP --- --- ---                                  */
@@ -2276,7 +2276,7 @@ void proto_register_h460(void) {
         "h460_3.INTEGER_0_4095", HFILL }},
     { &hf_h460_3_status,
       { "status", "h460.3.status",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h460_3.OCTET_STRING", HFILL }},
     { &hf_h460_3_serviceStatus,
       { "serviceStatus", "h460.3.serviceStatus",
@@ -2394,7 +2394,7 @@ void proto_register_h460(void) {
         "h225.GenericIdentifier", HFILL }},
     { &hf_h460_9_extensionContent,
       { "extensionContent", "h460.9.extensionContent",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h460_9.OCTET_STRING", HFILL }},
     { &hf_h460_9_rtpAddress,
       { "rtpAddress", "h460.9.rtpAddress",
@@ -2759,7 +2759,7 @@ void proto_register_h460(void) {
         "h225.TransportAddress", HFILL }},
     { &hf_h460_15_immediateResume,
       { "immediateResume", "h460.15.immediateResume",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h460_15.BOOLEAN", HFILL }},
     { &hf_h460_15_resetH245,
       { "resetH245", "h460.15.resetH245",
@@ -2767,7 +2767,7 @@ void proto_register_h460(void) {
         "h460_15.NULL", HFILL }},
     { &hf_h460_15_okToSuspend,
       { "okToSuspend", "h460.15.okToSuspend",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h460_15.BOOLEAN", HFILL }},
     { &hf_h460_15_randomNumber,
       { "randomNumber", "h460.15.randomNumber",
@@ -2860,7 +2860,7 @@ void proto_register_h460(void) {
         "h460_21.INTEGER_1_65535", HFILL }},
     { &hf_h460_21_groupIdentifer,
       { "groupIdentifer", "h460.21.groupIdentifer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h460_21.GloballyUniqueID", HFILL }},
     { &hf_h460_21_capability,
       { "capability", "h460.21.capability",
diff --git a/epan/dissectors/packet-h501.c b/epan/dissectors/packet-h501.c
index d19071b0a4..96d12483e3 100644
--- a/epan/dissectors/packet-h501.c
+++ b/epan/dissectors/packet-h501.c
@@ -3006,7 +3006,7 @@ void proto_register_h501(void) {
         "h501.AddressTemplate", HFILL }},
     { &hf_h501_partialResponse,
       { "partialResponse", "h501.partialResponse",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h501.BOOLEAN", HFILL }},
     { &hf_h501_supportedProtocols,
       { "supportedProtocols", "h501.supportedProtocols",
@@ -3106,7 +3106,7 @@ void proto_register_h501(void) {
         "h501.OBJECT_IDENTIFIER", HFILL }},
     { &hf_h501_value,
       { "value", "h501.value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h501.OCTET_STRING", HFILL }},
     { &hf_h501_invalidCall,
       { "invalidCall", "h501.invalidCall",
@@ -3166,7 +3166,7 @@ void proto_register_h501(void) {
         "h501.NULL", HFILL }},
     { &hf_h501_unknownMessage,
       { "unknownMessage", "h501.unknownMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h501.OCTET_STRING", HFILL }},
     { &hf_h501_reason_09,
       { "reason", "h501.reason",
@@ -3178,7 +3178,7 @@ void proto_register_h501(void) {
         "h501.NULL", HFILL }},
     { &hf_h501_applicationMessage,
       { "applicationMessage", "h501.applicationMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "h501.ApplicationMessage", HFILL }},
     { &hf_h501_reason_10,
       { "reason", "h501.reason",
@@ -3262,7 +3262,7 @@ void proto_register_h501(void) {
         "h501.NULL", HFILL }},
     { &hf_h501_callSpecific,
       { "callSpecific", "h501.callSpecific",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h501.BOOLEAN", HFILL }},
     { &hf_h501_priceInfo,
       { "priceInfo", "h501.priceInfo",
@@ -3318,7 +3318,7 @@ void proto_register_h501(void) {
         "h501.SecurityMode", HFILL }},
     { &hf_h501_multipleCalls,
       { "multipleCalls", "h501.multipleCalls",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h501.BOOLEAN", HFILL }},
     { &hf_h501_currency,
       { "currency", "h501.currency",
@@ -3414,7 +3414,7 @@ void proto_register_h501(void) {
         "h501.AlternatePE", HFILL }},
     { &hf_h501_alternateIsPermanent,
       { "alternateIsPermanent", "h501.alternateIsPermanent",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "h501.BOOLEAN", HFILL }},
     { &hf_h501_contactAddress,
       { "contactAddress", "h501.contactAddress",
diff --git a/epan/dissectors/packet-hci_h1.c b/epan/dissectors/packet-hci_h1.c
index 9fbd20d3ff..4ec12f4222 100644
--- a/epan/dissectors/packet-hci_h1.c
+++ b/epan/dissectors/packet-hci_h1.c
@@ -120,7 +120,7 @@ proto_register_hci_h1(void)
 	{ &hf_hci_h1_type,
 		{ "HCI Packet Type",           "hci_h1.type",
 		FT_UINT8, BASE_HEX, VALS(hci_h1_type_vals), 0x0,
-		"HCI Packet Type", HFILL }},
+		NULL, HFILL }},
 
 	{ &hf_hci_h1_direction,
 		{ "Direction",           "hci_h1.direction",
diff --git a/epan/dissectors/packet-hci_h4.c b/epan/dissectors/packet-hci_h4.c
index 2d455d15d6..99fb11ddb6 100644
--- a/epan/dissectors/packet-hci_h4.c
+++ b/epan/dissectors/packet-hci_h4.c
@@ -110,7 +110,7 @@ proto_register_hci_h4(void)
 	{ &hf_hci_h4_type,
 		{ "HCI Packet Type",           "hci_h4.type",
 		FT_UINT8, BASE_HEX, VALS(hci_h4_type_vals), 0x0,
-		"HCI Packet Type", HFILL }},
+		NULL, HFILL }},
 
 	{ &hf_hci_h4_direction,
 		{ "Direction",           "hci_h4.direction",
diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 1555bb94f2..4094a044cc 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -709,70 +709,70 @@ proto_register_hclnfsd(void)
 	static hf_register_info hf[] = {
 		{ &hf_hclnfsd_procedure_v1, {
 			"V1 Procedure", "hclnfsd.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(hclnfsd1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(hclnfsd1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_hclnfsd_request_type, {
 			"Request Type", "hclnfsd.request_type", FT_UINT32, BASE_DEC,
-			VALS(names_request_type), 0, "Request Type", HFILL }},
+			VALS(names_request_type), 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_device, {
-			"Device", "hclnfsd.device", FT_STRING, BASE_DEC,
-			NULL, 0, "Device", HFILL }},
+			"Device", "hclnfsd.device", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_login, {
-			"Login Text", "hclnfsd.logintext", FT_STRING, BASE_DEC,
-			NULL, 0, "Login Text", HFILL }},
+			"Login Text", "hclnfsd.logintext", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_lockname, {
-			"Lockname", "hclnfsd.lockname", FT_STRING, BASE_DEC,
-			NULL, 0, "Lockname", HFILL }},
+			"Lockname", "hclnfsd.lockname", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_unknown_data, {
-			"Unknown", "hclnfsd.unknown_data", FT_BYTES, BASE_DEC,
+			"Unknown", "hclnfsd.unknown_data", FT_BYTES, BASE_NONE,
 			NULL, 0, "Data", HFILL }},
 
 		{ &hf_hclnfsd_lockowner, {
-			"Lockowner", "hclnfsd.lockowner", FT_BYTES, BASE_DEC,
-			NULL, 0, "Lockowner", HFILL }},
+			"Lockowner", "hclnfsd.lockowner", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_printername, {
-			"Printer Name", "hclnfsd.printername", FT_STRING, BASE_DEC,
+			"Printer Name", "hclnfsd.printername", FT_STRING, BASE_NONE,
 			NULL, 0, "Printer name", HFILL }},
 
 		{ &hf_hclnfsd_filename, {
-			"Filename", "hclnfsd.filename", FT_STRING, BASE_DEC,
-			NULL, 0, "Filename", HFILL }},
+			"Filename", "hclnfsd.filename", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_fileext, {
 			"File Extension", "hclnfsd.fileext", FT_UINT32, BASE_DEC,
-			NULL, 0, "File Extension", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_grpname, {
-			"Group", "hclnfsd.group", FT_STRING, BASE_DEC,
-			NULL, 0, "Group", HFILL }},
+			"Group", "hclnfsd.group", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_hostname, {
-			"Hostname", "hclnfsd.hostname", FT_STRING, BASE_DEC,
-			NULL, 0, "Hostname", HFILL }},
+			"Hostname", "hclnfsd.hostname", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_username, {
-			"Username", "hclnfsd.username", FT_STRING, BASE_DEC,
-			NULL, 0, "Username", HFILL }},
+			"Username", "hclnfsd.username", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_queuename, {
-			"Name", "hclnfsd.printqueuename", FT_STRING, BASE_DEC,
+			"Name", "hclnfsd.printqueuename", FT_STRING, BASE_NONE,
 			NULL, 0, "Print Queue Name", HFILL }},
 
 		{ &hf_hclnfsd_queuecomment, {
-			"Comment", "hclnfsd.printqueuecomment", FT_STRING, BASE_DEC,
+			"Comment", "hclnfsd.printqueuecomment", FT_STRING, BASE_NONE,
 			NULL, 0, "Print Queue Comment", HFILL }},
 
 		{ &hf_hclnfsd_printparams, {
-			"Print Parameters", "hclnfsd.printparameters", FT_STRING, BASE_DEC,
-			NULL, 0, "Print Parameters", HFILL }},
+			"Print Parameters", "hclnfsd.printparameters", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_status, {
 			"Status", "hclnfsd.status", FT_UINT32, BASE_DEC,
-			NULL, 0, "Status", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_uid, {
 			"UID", "hclnfsd.uid", FT_UINT32, BASE_DEC,
@@ -780,75 +780,75 @@ proto_register_hclnfsd(void)
 
 		{ &hf_hclnfsd_sequence, {
 			"Sequence", "hclnfsd.sequence", FT_UINT32, BASE_HEX,
-			NULL, 0, "Sequence", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_cookie, {
 			"Cookie", "hclnfsd.cookie", FT_UINT32, BASE_HEX,
-			NULL, 0, "Cookie", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_mode, {
 			"Mode", "hclnfsd.mode", FT_UINT32, BASE_DEC,
-			NULL, 0, "Mode", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_access, {
 			"Access", "hclnfsd.access", FT_UINT32, BASE_DEC,
-			NULL, 0, "Access", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_exclusive, {
 			"Exclusive", "hclnfsd.exclusive", FT_UINT32, BASE_DEC,
-			NULL, 0, "Exclusive", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_offset, {
 			"Offset", "hclnfsd.offset", FT_UINT32, BASE_DEC,
-			NULL, 0, "Offset", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_length, {
 			"Length", "hclnfsd.length", FT_UINT32, BASE_DEC,
-			NULL, 0, "Length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_queuestatus, {
 			"Queue Status", "hclnfsd.queuestatus", FT_UINT32, BASE_DEC,
-			NULL, 0, "Queue Status", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_printqueuenumber, {
 			"Print Queue Number", "hclnfsd.pqn", FT_UINT32, BASE_DEC,
-			NULL, 0, "Print Queue Number", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_numphysicalprinters, {
 			"Number of Physical Printers", "hclnfsd.npp", FT_UINT32, BASE_DEC,
-			NULL, 0, "Number of Physical Printers", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_jobstatus, {
 			"Job Status", "hclnfsd.jobstatus", FT_UINT32, BASE_DEC,
-			NULL, 0, "Job Status", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_timesubmitted, {
 			"Time Submitted", "hclnfsd.timesubmitted", FT_UINT32, BASE_DEC,
-			NULL, 0, "Time Submitted", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_size, {
 			"Size", "hclnfsd.size", FT_UINT32, BASE_DEC,
-			NULL, 0, "Size", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_copies, {
 			"Copies", "hclnfsd.copies", FT_UINT32, BASE_DEC,
-			NULL, 0, "Copies", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_gid, {
 			"GID", "hclnfsd.gid", FT_UINT32, BASE_DEC,
 			NULL, 0, "Group ID", HFILL }},
 
 		{ &hf_hclnfsd_server_ip, {
-			"Server IP", "hclnfsd.server_ip", FT_IPv4, BASE_DEC,
-			NULL, 0, "Server IP", HFILL }},
+			"Server IP", "hclnfsd.server_ip", FT_IPv4, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_host_ip, {
-			"Host IP", "hclnfsd.host_ip", FT_IPv4, BASE_DEC,
-			NULL, 0, "Host IP", HFILL }},
+			"Host IP", "hclnfsd.host_ip", FT_IPv4, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_hclnfsd_auth_ident_obscure, {
 			"Obscure Ident", "hclnfsd.authorize.ident.obscure", FT_STRING,
-			BASE_DEC	, NULL, 0, "Authentication Obscure Ident", HFILL }},
+			BASE_NONE	, NULL, 0, "Authentication Obscure Ident", HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_hclnfsd,
diff --git a/epan/dissectors/packet-hilscher.c b/epan/dissectors/packet-hilscher.c
index 2a6d3e9b92..c4cad775eb 100644
--- a/epan/dissectors/packet-hilscher.c
+++ b/epan/dissectors/packet-hilscher.c
@@ -185,15 +185,15 @@ void proto_register_hilscher(void)
     static hf_register_info hf[] = {
 	{ &hf_information_type,
 	  { "Hilscher information block type", "hilscher.information_type",
-	    FT_UINT8, BASE_HEX, VALS(information_type), 0x0, "", HFILL }
+	    FT_UINT8, BASE_HEX, VALS(information_type), 0x0, NULL, HFILL }
 	},
 	{ &hf_gpio_number,
 	  { "Event on", "hilscher.net_analyzer.gpio_number", FT_UINT8,
-	    BASE_HEX, VALS(gpio_number), 0x0, "", HFILL }
+	    BASE_HEX, VALS(gpio_number), 0x0, NULL, HFILL }
 	},
 	{ &hf_gpio_edge,
 		{ "Event type", "hilscher.net_analyzer.gpio_edge", FT_UINT8,
-		  BASE_HEX, VALS(gpio_edge), 0x0, "", HFILL }
+		  BASE_HEX, VALS(gpio_edge), 0x0, NULL, HFILL }
 	},
     };
 
diff --git a/epan/dissectors/packet-homeplug.c b/epan/dissectors/packet-homeplug.c
index 76d90cd469..3fd398abaa 100644
--- a/epan/dissectors/packet-homeplug.c
+++ b/epan/dissectors/packet-homeplug.c
@@ -358,131 +358,131 @@ proto_register_homeplug(void)
     /* MAC Control Field */
     { &hf_homeplug_mctrl,
       { "MAC Control Field", "homeplug.mctrl",
-      FT_NONE, BASE_NONE, NULL, 0x0, "MAC Control Field", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_mctrl_reserved,
       { "Reserved", "homeplug.mctrl.rsvd",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MCTRL_RSVD, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MCTRL_RSVD, NULL, HFILL }
     },
 
     { &hf_homeplug_mctrl_ne,
       { "Number of MAC Data Entries", "homeplug.mctrl.ne",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MCTRL_NE, "Number of MAC Data Entries", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MCTRL_NE, NULL, HFILL }
     },
 
     /* MAC Entry Header */
     { &hf_homeplug_mehdr,
       { "MAC Management Entry Header", "homeplug.mehdr",
-      FT_NONE, BASE_NONE, NULL, 0x0, "MAC Management Entry Header", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_mehdr_mev,
       { "MAC Entry Version", "homeplug.mehdr.mev",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MEHDR_MEV, "MAC Entry Version", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_MEHDR_MEV, NULL, HFILL }
     },
 
     { &hf_homeplug_mehdr_metype,
       { "MAC Entry Type", "homeplug.mehdr.metype",
-      FT_UINT8, BASE_HEX, VALS(homeplug_metype_vals), HOMEPLUG_MEHDR_METYPE, "MAC Entry Type", HFILL }
+      FT_UINT8, BASE_HEX, VALS(homeplug_metype_vals), HOMEPLUG_MEHDR_METYPE, NULL, HFILL }
     },
 
     /* MAC Entry Len */
     { &hf_homeplug_melen,
       { "MAC Management Entry Length", "homeplug.melen",
-      FT_UINT8, BASE_DEC, NULL, 0x0, "MAC Management Entry Length", HFILL }
+      FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /* MAC Management Entry */
     { &hf_homeplug_mme,
       { "MAC Management Entry Data", "homeplug.mmentry",
-      FT_UINT8, BASE_DEC, NULL, 0x0, "MAC Management Entry Data", HFILL }
+      FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /* Request Channel Estimation */
     { &hf_homeplug_rce,
       { "Request Channel Estimation", "homeplug.rce",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Request Channel Estimation", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_rce_cev,
       { "Channel Estimation Version", "homeplug.rce.cev",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_RCE_CEV, "Channel Estimation Version", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_RCE_CEV, NULL, HFILL }
     },
 
     { &hf_homeplug_rce_rsvd,
       { "Reserved", "homeplug.rce.rsvd",
-      FT_NONE, BASE_NONE, NULL, HOMEPLUG_RCE_RSVD, "Reserved", HFILL }
+      FT_NONE, BASE_NONE, NULL, HOMEPLUG_RCE_RSVD, NULL, HFILL }
     },
 
     /* Channel Estimation Response */
     { &hf_homeplug_cer,
       { "Channel Estimation Response", "homeplug.cer",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Channel Estimation Response", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_cerv,
       { "Channel Estimation Response Version", "homeplug.cer.cerv",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_CERV, "Channel Estimation Response Version", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_CERV, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_rsvd1,
       { "Reserved", "homeplug.cer.rsvd1",
-      FT_NONE, BASE_NONE, NULL, HOMEPLUG_CER_RSVD, "Reserved", HFILL }
+      FT_NONE, BASE_NONE, NULL, HOMEPLUG_CER_RSVD, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_rxtmi,
       { "Receive Tone Map Index", "homeplug.cer.rxtmi",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RXTMI, "Receive Tone Map Index", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RXTMI, NULL, HFILL }
     },
 
     /* TODO must append vt[79-0] */
 
     { &hf_homeplug_cer_vt,
       {"Valid Tone Flags", "homeplug.cer.vt",
-      FT_UINT8, BASE_HEX, NULL, 0x0, "Valid Tone Flags", HFILL }
+      FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_rate,
       { "FEC Rate", "homeplug.cer.rate",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RATE, "FEC Rate", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RATE, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_bp,
       { "Bridge Proxy", "homeplug.cer.bp",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_BP, "Bridge Proxy", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_BP, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_mod,
       { "Modulation Method", "homeplug.cer.mod",
       FT_UINT8, BASE_DEC, VALS(homeplug_cer_mod_vals), HOMEPLUG_CER_MOD_MASK,
-      "Modulation Method", HFILL }
+      NULL, HFILL }
     },
 
     { &hf_homeplug_cer_vt11,
       { "Valid Tone Flags [83-80]", "homeplug.cer.vt11",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_VT11, "Valid Tone Flags [83-80]", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_VT11, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_rsvd2,
       { "Reserved", "homeplug.cer.rsvd2",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RSVD2, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_RSVD2, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_nbdas,
       { "Number Bridged Destination Addresses", "homeplug.cer.nbdas",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_NBDAS, "Number Bridged Destination Addresses", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_CER_NBDAS, NULL, HFILL }
     },
 
     { &hf_homeplug_cer_bda,
       { "Bridged Destination Address", "homeplug.cer.bda",
-      FT_ETHER, BASE_NONE, NULL, 0x0, "Bridged Destination Address", HFILL }
+      FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     /* Vendor Specific */
     { &hf_homeplug_vs,
       { "Vendor Specific", "homeplug.vs",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Vendor Specific", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_vs_oui,
@@ -493,156 +493,156 @@ proto_register_homeplug(void)
 
     { &hf_homeplug_vs_vd,
       { "Vendor Defined", "homeplug.vs.vd",
-      FT_BYTES, BASE_NONE, NULL, 0x0, "Vendor Defined", HFILL }
+      FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     /* Set Network Encryption Key */
     { &hf_homeplug_snk,
       { "Set Network Encryption Key", "homeplug.snk",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Set Network Encryption Key", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_snk_eks,
       { "Encryption Key Select", "homeplug.snk.eks",
-      FT_UINT8, BASE_DEC, NULL, 0x0, "Encryption Key Select", HFILL }
+      FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_snk_nek,
       { "Network Encryption Key", "homeplug.snk.nek",
-      FT_BYTES, BASE_NONE, NULL, 0x0, "Network Encryption Key", HFILL }
+      FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     /* Request Parameters and Statistics */
     { &hf_homeplug_rps,
       { "Request Parameters and Statistics", "homeplug.rps",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Request Parameters and Statistics", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     /* Parameters and Statistics Response */
     { &hf_homeplug_psr,
       { "Parameters and Statistics Response", "homeplug.psr",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Parameters and Statistics Response", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txack,
       { "Transmit ACK Counter", "homeplug.psr.txack",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit ACK Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txnack,
       { "Transmit NACK Counter", "homeplug.psr.txnack",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit NACK Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txfail,
       { "Transmit FAIL Counter", "homeplug.psr.txfail",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit FAIL Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txcloss,
       { "Transmit Contention Loss Counter", "homeplug.psr.txcloss",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit Contention Loss Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txcoll,
       { "Transmit Collision Counter", "homeplug.psr.txcoll",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit Collision Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txca3lat,
       { "Transmit CA3 Latency Counter", "homeplug.psr.txca3lat",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit CA3 Latency Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_txca2lat,
       { "Transmit CA2 Latency Counter", "homeplug.psr.txca2lat",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit CA2 Latency Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_homeplug_psr_txca1lat,
       { "Transmit CA1 Latency Counter", "homeplug.psr.txca1lat",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit CA1 Latency Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_homeplug_psr_txca0lat,
       { "Transmit CA0 Latency Counter", "homeplug.psr.txca0lat",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Transmit CA0 Latency Counter", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_psr_rxbp40,
       { "Receive Cumulative Bytes per 40-symbol", "homeplug.psr.rxbp40",
-      FT_UINT32, BASE_DEC, NULL, 0x0, "Receive Cumulative Bytes per 40-symbol", HFILL }
+      FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /* Set Local Parameters */
     { &hf_homeplug_slp,
       { "Set Local Parameters", "homeplug.slp",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Set Local Parameters", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_slp_ma,
       { "MAC Address", "homeplug.slp.ma",
-      FT_ETHER, BASE_NONE, NULL, 0x0, "MAC Address", HFILL }
+      FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     /* Network Statistics */
     { &hf_homeplug_ns,
       { "Network Statistics", "homeplug.ns",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Network Statistics", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_extended,
       { "Network Statistics is Extended", "homeplug.ns.extended",
-      FT_BOOLEAN, 8, NULL, 0x0, "Network Statistics is Extended (MELEN >= 199)", HFILL }
+      FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Network Statistics is Extended (MELEN >= 199)", HFILL }
     },
 
     { &hf_homeplug_ns_netw_ctrl_ac,
       { "Action Control", "homeplug.ns.ac",
-      FT_BOOLEAN, 8, TFS(&homeplug_ns_ac_vals), HOMEPLUG_NS_AC, "Action Control", HFILL }
+      FT_BOOLEAN, 8, TFS(&homeplug_ns_ac_vals), HOMEPLUG_NS_AC, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_netw_ctrl_icid,
       { "IC_ID", "homeplug.ns.icid",
-      FT_UINT8, BASE_HEX|BASE_RANGE_STRING, RVALS(homeplug_ns_icid_vals), HOMEPLUG_NS_ICID, "IC_ID", HFILL }
+      FT_UINT8, BASE_HEX|BASE_RANGE_STRING, RVALS(homeplug_ns_icid_vals), HOMEPLUG_NS_ICID, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_bytes40_robo,
       { "Bytes in 40 symbols in ROBO", "homeplug.ns.bytes40_robo",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Bytes in 40 symbols in ROBO", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_fails_robo,
       { "Fails Received in ROBO", "homeplug.ns.fails_robo",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Fails Received in ROBO", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_drops_robo,
       { "Frame Drops in ROBO", "homeplug.ns.drops_robo",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Frame Drops in ROBO", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_netw_da,
       { "Address of Network DA", "homeplug.ns.netw_da",
-      FT_ETHER, BASE_NONE, NULL, 0x0, "Address of Network DA", HFILL }
+      FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_bytes40,
       { "Bytes in 40 symbols", "homeplug.ns.bytes40",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Bytes in 40 symbols", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_fails,
       { "Fails Received", "homeplug.ns.fails",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Fails Received", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_drops,
       { "Frame Drops", "homeplug.ns.drops",
-      FT_UINT16, BASE_DEC, NULL, 0x0, "Frame Drops", HFILL }
+      FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /* ... Extended */
     { &hf_homeplug_ns_tx_bfr_state,
       { "Transmit Buffer State", "homeplug.ns.tx_bfr_state",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Transmit Buffer State", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_buf_in_use,
@@ -654,17 +654,17 @@ proto_register_homeplug(void)
     { &hf_homeplug_ns_prio,
       { "Priority", "homeplug.ns.prio",
       FT_UINT8, BASE_DEC, VALS(homeplug_txprio_vals), HOMEPLUG_NS_PRIO,
-      "Priority", HFILL }
+      NULL, HFILL }
     },
 
     { &hf_homeplug_ns_msdu_len,
       { "MSDU Length", "homeplug.ns.msdu_len",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_NS_MSDU_LEN, "MSDU Length", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_NS_MSDU_LEN, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_seqn,
       { "Sequence Number", "homeplug.ns.seqn",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_NS_SEQN, "Sequence Number", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_NS_SEQN, NULL, HFILL }
     },
 
     { &hf_homeplug_ns_toneidx,
@@ -676,7 +676,7 @@ proto_register_homeplug(void)
     /* Bridging Characteristics Network */
     { &hf_homeplug_bcn,
       { "Bridging Characteristics Network", "homeplug.bcn",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Bridging Characteristics Network", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_bcn_network,
@@ -693,17 +693,17 @@ proto_register_homeplug(void)
 
     { &hf_homeplug_bcn_rsvd,
       { "Reserved", "homeplug.bcn.rsvd",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCN_RSVD, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCN_RSVD, NULL, HFILL }
     },
 
     { &hf_homeplug_bcn_fbn,
       { "First Bridge Number", "homeplug.bcn.fbn",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCN_FBN, "First Bridge Number", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCN_FBN, NULL, HFILL }
     },
 
     { &hf_homeplug_bcn_brda,
       { "Address of Bridge", "homeplug.bcn.brda",
-      FT_ETHER, BASE_HEX, NULL, 0x0, "Address of Bridge", HFILL }
+      FT_ETHER, BASE_HEX, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_bcn_bp_das,
@@ -720,7 +720,7 @@ proto_register_homeplug(void)
     /* Bridging Characteristics Local */
     { &hf_homeplug_bcl,
       { "Bridging Characteristics Local", "homeplug.bcl",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Bridging Characteristics Local", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_bcl_network,
@@ -737,7 +737,7 @@ proto_register_homeplug(void)
 
     { &hf_homeplug_bcl_rsvd,
       { "Reserved", "homeplug.bcl.rsvd",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCL_RSVD, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_BCL_RSVD, NULL, HFILL }
     },
 
     { &hf_homeplug_bcl_hprox_das,
@@ -754,7 +754,7 @@ proto_register_homeplug(void)
     /* Set Transmit Characteristics */
     { &hf_homeplug_stc,
       { "Set Transmit Characteristics", "homeplug.stc",
-      FT_NONE, BASE_NONE, NULL, 0x0, "Set Transmit Characteristics", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_lco,
@@ -771,7 +771,7 @@ proto_register_homeplug(void)
     { &hf_homeplug_stc_txprio,
       { "Transmit Priority", "homeplug.stc.txprio",
       FT_UINT8, BASE_DEC, VALS(homeplug_txprio_vals), HOMEPLUG_STC_TXPRIO,
-      "Transmit Priority", HFILL }
+      NULL, HFILL }
     },
 
     { &hf_homeplug_stc_rexp,
@@ -794,50 +794,50 @@ proto_register_homeplug(void)
 
     { &hf_homeplug_stc_rsvd1,
       { "Reserved", "homeplug.stc.rsvd1",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_STC_RSVD1, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_STC_RSVD1, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_retry,
       { "Retry Control", "homeplug.stc.retry",
       FT_UINT8, BASE_DEC, VALS(homeplug_stc_retry_vals), HOMEPLUG_STC_RETRY,
-      "Retry Control", HFILL }
+      NULL, HFILL }
     },
 
     { &hf_homeplug_stc_rsvd2,
       { "Reserved", "homeplug.stc.rsvd2",
-      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_STC_RSVD2, "Reserved", HFILL }
+      FT_UINT8, BASE_DEC, NULL, HOMEPLUG_STC_RSVD2, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_dder,
       { "Disable Default Encryption Receive", "homeplug.stc.dder",
-      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DDER, "Disable Default Encryption Receive", HFILL }
+      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DDER, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_dur,
       { "Disable Unencrypted Receive", "homeplug.stc.dur",
-      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DUR, "Disable Unencrypted Receive", HFILL }
+      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DUR, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_ebp,
       { "INT51X1 (Host/DTE Option) Enable Backpressure", "homeplug.stc.ebp",
       FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_EBP,
-      "INT51X1 (Host/DTE Option) Enable Backpressure", HFILL }
+      NULL, HFILL }
     },
 
     { &hf_homeplug_stc_dees,
       { "Disable EEPROM Save", "homeplug.stc.dees",
-      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DEES, "Disable EEPROM Save", HFILL }
+      FT_BOOLEAN, 8, NULL, HOMEPLUG_STC_DEES, NULL, HFILL }
     },
 
     { &hf_homeplug_stc_txeks,
       { "EKS to be used for encryption", "homeplug.stc.txeks",
-      FT_UINT8, BASE_DEC, NULL, 0x0, "EKS to be used for encryption", HFILL }
+      FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     /* Undecoded data */
     { &hf_homeplug_data,
       { "Data", "homeplug.data",
-      FT_BYTES, BASE_NONE, NULL, 0x0, "Data", HFILL }
+      FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
     }
   };
 
diff --git a/epan/dissectors/packet-hpext.c b/epan/dissectors/packet-hpext.c
index 4b30da18cb..6cb5d1e364 100644
--- a/epan/dissectors/packet-hpext.c
+++ b/epan/dissectors/packet-hpext.c
@@ -99,11 +99,11 @@ proto_register_hpext(void)
 	static hf_register_info hf[] = {
 		{ &hf_hpext_dxsap,
 		{ "DXSAP",	"hpext.dxsap", FT_UINT16, BASE_HEX,
-			VALS(xsap_vals), 0x0, "", HFILL }},
+			VALS(xsap_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_hpext_sxsap,
 		{ "SXSAP", "hpext.sxsap", FT_UINT16, BASE_HEX,
-			VALS(xsap_vals), 0x0, "", HFILL }}
+			VALS(xsap_vals), 0x0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_hpext
diff --git a/epan/dissectors/packet-hpsw.c b/epan/dissectors/packet-hpsw.c
index 805a1b204b..9853166fa7 100644
--- a/epan/dissectors/packet-hpsw.c
+++ b/epan/dissectors/packet-hpsw.c
@@ -274,16 +274,16 @@ proto_register_hpsw(void)
 	static hf_register_info hf[] = {
 		{ &hf_hpsw_version,
 		{ "Version", "hpsw.version", FT_UINT8, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_hpsw_type,
 		{ "Type", "hpsw.type", FT_UINT8, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_hpsw_tlvtype,
 		{ "Type", "hpsw.tlv_type", FT_UINT8, BASE_HEX,
-			VALS(hpsw_tlv_type_vals), 0x0, "", HFILL }},
+			VALS(hpsw_tlv_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_hpsw_tlvlength,
 		{ "Length", "hpsw.tlv_len", FT_UINT8, BASE_DEC,
-			NULL, 0x0, "", HFILL }}
+			NULL, 0x0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-hsrp.c b/epan/dissectors/packet-hsrp.c
index f3dd56b831..139f69f687 100644
--- a/epan/dissectors/packet-hsrp.c
+++ b/epan/dissectors/packet-hsrp.c
@@ -648,16 +648,16 @@ void proto_register_hsrp(void)
                 { &hf_hsrp_reserved,
                   { "Reserved", "hsrp.reserved",
                     FT_UINT8, BASE_DEC, NULL, 0x0,
-                    "Reserved", HFILL }},
+                    NULL, HFILL }},
 
                 { &hf_hsrp_auth_data,
                   { "Authentication Data", "hsrp.auth_data",
-                    FT_STRING, 0, NULL, 0x0,
+                    FT_STRING, BASE_NONE, NULL, 0x0,
                     "Contains a clear-text 8 character reused password", HFILL }},
 
                 { &hf_hsrp_virt_ip_addr,
                   { "Virtual IP Address", "hsrp.virt_ip",
-                    FT_IPv4, 0, NULL, 0x0,
+                    FT_IPv4, BASE_NONE, NULL, 0x0,
                     "The virtual IP address used by this group", HFILL }},
 
 		{ &hf_hsrp_adv_type,
@@ -713,22 +713,22 @@ void proto_register_hsrp(void)
                 { &hf_hsrp2_group_state_tlv,
                   { "Group State TLV", "hsrp2.group_state_tlv",
                     FT_UINT8, BASE_DEC, NULL, 0x0,
-                    "Group State TLV", HFILL }},
+                    NULL, HFILL }},
 
                 { &hf_hsrp2_interface_state_tlv,
                   { "Interface State TLV", "hsrp2.interface_state_tlv",
                     FT_UINT8, BASE_DEC, NULL, 0x0,
-                    "Interface State TLV", HFILL }},
+                    NULL, HFILL }},
 
                 { &hf_hsrp2_text_auth_tlv,
                   { "Text Authentication TLV", "hsrp2.text_auth_tlv",
                     FT_UINT8, BASE_DEC, NULL, 0x0,
-                    "Text Authentication TLV", HFILL }},
+                    NULL, HFILL }},
 
                 { &hf_hsrp2_md5_auth_tlv,
                   { "MD5 Authentication TLV", "hsrp2.md5_auth_tlv",
                     FT_UINT8, BASE_DEC, NULL, 0x0,
-                    "MD5 Authentication TLV", HFILL }},
+                    NULL, HFILL }},
 
                 { &hf_hsrp2_ipversion,
                   { "IP Ver.", "hsrp2.ipversion",
@@ -762,17 +762,17 @@ void proto_register_hsrp(void)
 
                 { &hf_hsrp2_auth_data,
                   { "Authentication Data", "hsrp2.auth_data",
-                    FT_STRING, 0, NULL, 0x0,
+                    FT_STRING, BASE_NONE, NULL, 0x0,
                     "Contains a clear-text 8 character reused password", HFILL }},
 
                 { &hf_hsrp2_virt_ip_addr,
                   { "Virtual IP Address", "hsrp2.virt_ip",
-                    FT_IPv4, 0, NULL, 0x0,
+                    FT_IPv4, BASE_NONE, NULL, 0x0,
                     "The virtual IP address used by this group", HFILL }},
 
                 { &hf_hsrp2_virt_ip_addr_v6,
                   { "Virtual IPv6 Address", "hsrp2.virt_ip_v6",
-                    FT_IPv6, 0, NULL, 0x0,
+                    FT_IPv6, BASE_NONE, NULL, 0x0,
                     "The virtual IPv6 address used by this group", HFILL }},
 
                 { &hf_hsrp2_active_group,
@@ -797,7 +797,7 @@ void proto_register_hsrp(void)
 
                 { &hf_hsrp2_md5_ip_address,
                   { "Sender's IP Address", "hsrp.md5_ip_address",
-                    FT_IPv4, 0, NULL, 0x0,
+                    FT_IPv4, BASE_NONE, NULL, 0x0,
                     "IP Address of the sender interface", HFILL }},
 
                 { &hf_hsrp2_md5_key_id,
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c
index a42f24e78c..ce9c633ff9 100644
--- a/epan/dissectors/packet-http.c
+++ b/epan/dissectors/packet-http.c
@@ -2281,7 +2281,7 @@ proto_register_http(void)
 		"TRUE if HTTP request", HFILL }},
 	    { &hf_http_basic,
 	      { "Credentials",		"http.authbasic",
-		FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 	    { &hf_http_request_method,
 	      { "Request Method",	"http.request.method",
 		FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-hyperscsi.c b/epan/dissectors/packet-hyperscsi.c
index 941ea27722..eb9bc7c9ed 100644
--- a/epan/dissectors/packet-hyperscsi.c
+++ b/epan/dissectors/packet-hyperscsi.c
@@ -166,26 +166,26 @@ proto_register_hyperscsi(void)
   static hf_register_info hf[] = {
     { &hf_hs_res, 
       { "Reserved", "hyperscsi.reserved", FT_UINT8, BASE_DEC, NULL, 0x0, 
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_hs_tagno,
       { "Tag No", "hyperscsi.tagno", FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
 
     { &hf_hs_lastfrag,
-      { "Last Fragment", "hyperscsi.lastfrag", FT_BOOLEAN, 8, TFS(&tfs_lastfrag), 0x04, "", HFILL}},
+      { "Last Fragment", "hyperscsi.lastfrag", FT_BOOLEAN, 8, TFS(&tfs_lastfrag), 0x04, NULL, HFILL}},
 
     { &hf_hs_fragno, 
       { "Fragment No", "hyperscsi.fragno", FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_hs_ver,
       { "HyperSCSI Version", "hyperscsi.version", FT_UINT8, BASE_DEC, NULL, 
-	0x0, "", HFILL}},
+	0x0, NULL, HFILL}},
 
     { &hf_hs_cmd,
       { "HyperSCSI Command", "hyperscsi.cmd", FT_UINT8, BASE_DEC, VALS(hscsi_opcodes), 0x0, 
-	"", HFILL}},
+	NULL, HFILL}},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index 8c4cae80ed..b078aae198 100644
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -266,10 +266,10 @@ void
 proto_register_i2c(void)
 {
 	static hf_register_info hf[] = {
-		{ &hf_i2c_bus, { "Bus ID", "i2c.bus", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
-		{ &hf_i2c_addr, { "Target address", "i2c.addr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_i2c_event, { "Event", "i2c.event", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_i2c_flags, { "Flags", "i2c.flags", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+		{ &hf_i2c_bus, { "Bus ID", "i2c.bus", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_i2c_addr, { "Target address", "i2c.addr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_i2c_event, { "Event", "i2c.event", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_i2c_flags, { "Flags", "i2c.flags", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_i2c
diff --git a/epan/dissectors/packet-iapp.c b/epan/dissectors/packet-iapp.c
index 3ebc428980..9e41bd6a98 100644
--- a/epan/dissectors/packet-iapp.c
+++ b/epan/dissectors/packet-iapp.c
@@ -472,10 +472,10 @@ proto_register_iapp(void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
 	static hf_register_info hf[] = {
 		{ &hf_iapp_version,
-			{ "Version", "iapp.version", FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL }
+			{ "Version", "iapp.version", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
 		},
 		{ &hf_iapp_type,
-			{ "type", "iapp.type", FT_UINT8, BASE_DEC, NULL, 0x00, "", HFILL }
+			{ "type", "iapp.type", FT_UINT8, BASE_DEC, NULL, 0x00, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c
index 24ae6b0ecf..f3ff65b50f 100644
--- a/epan/dissectors/packet-iax2.c
+++ b/epan/dissectors/packet-iax2.c
@@ -2105,8 +2105,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_callno,
      {"Call identifier", "iax2.call", FT_UINT32, BASE_DEC, NULL, 0,
-      "This is the identifier Wireshark assigns to identify this call. It does "
-      "not correspond to any real field in the protocol", HFILL }},
+      "This is the identifier Wireshark assigns to identify this call. It does not correspond to any real field in the protocol", HFILL }},
 
     {&hf_iax2_scallno,
      {"Source call", "iax2.src_call", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
@@ -2122,31 +2121,26 @@ proto_register_iax2 (void)
     {&hf_iax2_retransmission,
      {"Retransmission", "iax2.retransmission", FT_BOOLEAN, 16,
       NULL, 0x8000,
-      "retransmission is set if this packet is a retransmission of an earlier "
-      "failed packet", HFILL}},
+      "retransmission is set if this packet is a retransmission of an earlier failed packet", HFILL}},
 
     {&hf_iax2_ts,
      {"Timestamp", "iax2.timestamp", FT_UINT32, BASE_DEC, NULL, 0x0,
-      "timestamp is the time, in ms after the start of this call, at which "
-      "this packet was transmitted",
+      "timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
       HFILL}},
 
     {&hf_iax2_minits,
      {"Timestamp", "iax2.timestamp", FT_UINT16, BASE_DEC, NULL, 0x0,
-      "timestamp is the time, in ms after the start of this call, at which "
-      "this packet was transmitted",
+      "timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
       HFILL}},
 
     {&hf_iax2_minividts,
      {"Timestamp", "iax2.timestamp", FT_UINT16, BASE_DEC, NULL, 0x7FFF,
-      "timestamp is the time, in ms after the start of this call, at which "
-      "this packet was transmitted",
+      "timestamp is the time, in ms after the start of this call, at which this packet was transmitted",
       HFILL}},
 
     {&hf_iax2_absts,
      {"Absolute Time", "iax2.abstime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-      "The absoulte time of this packet (calculated by adding the IAX timestamp to "
-      " the start time of this call)",
+      "The absoulte time of this packet (calculated by adding the IAX timestamp to  the start time of this call)",
       HFILL}},
 
     {&hf_iax2_lateness,
@@ -2162,8 +2156,7 @@ proto_register_iax2 (void)
     {&hf_iax2_oseqno,
      {"Outbound seq.no.", "iax2.oseqno", FT_UINT16, BASE_DEC, NULL,
       0x0, 
-      "oseqno is the sequence no of this packet. The first packet has "
-      "oseqno==0, and subsequent packets increment the oseqno by 1",
+      "oseqno is the sequence no of this packet. The first packet has oseqno==0, and subsequent packets increment the oseqno by 1",
       HFILL}},
 
     {&hf_iax2_iseqno,
@@ -2200,7 +2193,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_voice_csub,
      {"Voice Subclass (compressed codec no)", "iax2.voice.subclass", FT_UINT8, BASE_DEC, NULL, 0x0, 
-      "Voice Subclass (compressed codec no)",
+      NULL,
       HFILL}},
 
     {&hf_iax2_voice_codec,
@@ -2210,7 +2203,7 @@ proto_register_iax2 (void)
 
     {&hf_iax2_video_csub,
      {"Video Subclass (compressed codec no)", "iax2.video.subclass", FT_UINT8, BASE_DEC, NULL, 0xBF, 
-      "Video Subclass (compressed codec no)",
+      NULL,
       HFILL}},
     
     {&hf_iax2_marker,
@@ -2233,222 +2226,222 @@ proto_register_iax2 (void)
      */
 
     {&hf_IAX_IE_APPARENTADDR_SINFAMILY,
-     {"Family", "iax2.iax.app_addr.sinfamily", FT_UINT16, BASE_DEC, NULL, 0, "Family", HFILL }},
+     {"Family", "iax2.iax.app_addr.sinfamily", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     {&hf_IAX_IE_APPARENTADDR_SINPORT,
-     {"Port", "iax2.iax.app_addr.sinport", FT_UINT16, BASE_DEC, NULL, 0, "Port", HFILL }},
+     {"Port", "iax2.iax.app_addr.sinport", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     {&hf_IAX_IE_APPARENTADDR_SINADDR,
-     {"Address", "iax2.iax.app_addr.sinaddr", FT_IPv4, BASE_HEX, NULL, 0, "Address", HFILL }},
+     {"Address", "iax2.iax.app_addr.sinaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
     
     {&hf_iax2_ies[IAX_IE_CALLED_NUMBER],
      {"Number/extension being called", "iax2.iax.called_number",
       FT_STRING,
-      BASE_NONE, NULL, 0x0, "", HFILL}},
+      BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLING_NUMBER],
      {"Calling number", "iax2.iax.calling_number", FT_STRING,
       BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLING_ANI],
      {"Calling number ANI for billing", "iax2.iax.calling_ani",
       FT_STRING,
-      BASE_NONE, NULL, 0x0, "", HFILL}},
+      BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLING_NAME],
      {"Name of caller", "iax2.iax.calling_name", FT_STRING, BASE_NONE,
       NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLED_CONTEXT],
      {"Context for number", "iax2.iax.called_context", FT_STRING,
       BASE_NONE,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_USERNAME],
      {"Username (peer or user) for authentication",
       "iax2.iax.username",
-      FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+      FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_PASSWORD],
      {"Password for authentication", "iax2.iax.password", FT_STRING,
-      BASE_NONE, NULL, 0x0, "", HFILL}},
+      BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CAPABILITY],
      {"Actual codec capability", "iax2.iax.capability", FT_UINT32,
       BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_FORMAT],
      {"Desired codec format", "iax2.iax.format", FT_UINT32, BASE_HEX,
-      VALS (codec_types), 0x0, "", HFILL}},
+      VALS (codec_types), 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_LANGUAGE],
      {"Desired language", "iax2.iax.language", FT_STRING, BASE_NONE,
       NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_VERSION],
      {"Protocol version", "iax2.iax.version", FT_UINT16, BASE_HEX, NULL,
       0x0,
-      "", HFILL}},
+      NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_ADSICPE],
      {"CPE ADSI capability", "iax2.iax.cpe_adsi", FT_UINT16, BASE_HEX,
       NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_DNID],
      {"Originally dialed DNID", "iax2.iax.dnid", FT_STRING, BASE_NONE,
       NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_AUTHMETHODS],
      {"Authentication method(s)", "iax2.iax.auth.methods", FT_UINT16,
       BASE_HEX,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CHALLENGE],
      {"Challenge data for MD5/RSA", "iax2.iax.auth.challenge",
       FT_STRING,
-      BASE_NONE, NULL, 0x0, "", HFILL}},
+      BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_MD5_RESULT],
      {"MD5 challenge result", "iax2.iax.auth.md5", FT_STRING,
       BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RSA_RESULT],
      {"RSA challenge result", "iax2.iax.auth.rsa", FT_STRING,
       BASE_NONE, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_REFRESH],
      {"When to refresh registration", "iax2.iax.refresh", FT_INT16,
       BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_DPSTATUS],
      {"Dialplan status", "iax2.iax.dialplan_status", FT_UINT16,
       BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLNO],
      {"Call number of peer", "iax2.iax.call_no", FT_UINT16, BASE_DEC,
       NULL,
-      0x0, "", HFILL}},
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CAUSE],
-     {"Cause", "iax2.iax.cause", FT_STRING, BASE_NONE, NULL, 0x0, "",
+     {"Cause", "iax2.iax.cause", FT_STRING, BASE_NONE, NULL, 0x0, NULL,
       HFILL}},
 
     {&hf_iax2_ies[IAX_IE_IAX_UNKNOWN],
      {"Unknown IAX command", "iax2.iax.iax_unknown", FT_BYTES,
-      BASE_HEX, NULL,
-      0x0, "", HFILL}},
+      BASE_NONE, NULL,
+      0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_MSGCOUNT],
      {"How many messages waiting", "iax2.iax.msg_count", FT_INT16,
       BASE_DEC,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_AUTOANSWER],
      {"Request auto-answering", "iax2.iax.autoanswer", FT_NONE,
       BASE_NONE,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_MUSICONHOLD],
      {"Request musiconhold with QUELCH", "iax2.iax.moh", FT_NONE,
       BASE_NONE,
-      NULL, 0x0, "", HFILL}},
+      NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_TRANSFERID],
      {"Transfer Request Identifier", "iax2.iax.transferid", FT_UINT32,
-      BASE_HEX, NULL, 0x0, "", HFILL}},
+      BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RDNIS],
      {"Referring DNIS", "iax2.iax.rdnis", FT_STRING, BASE_NONE, NULL,
-      0x0, "",
+      0x0, NULL,
       HFILL}},
 
     {&hf_iax2_ies[IAX_IE_PROVISIONING],
      {"Provisioning info","iax2.iax.provisioning", FT_STRING, BASE_NONE,
-       NULL, 0x0, "", HFILL}},
+       NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_AESPROVISIONING],
      {"AES Provisioning info","iax2.iax.aesprovisioning", FT_STRING, BASE_NONE,
-       NULL, 0x0, "", HFILL}},
+       NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_DATETIME],
-     {"Date/Time", "iax2.iax.datetime.raw", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+     {"Date/Time", "iax2.iax.datetime.raw", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ie_datetime,
-     {"Date/Time", "iax2.iax.datetime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, "", HFILL }},
+     {"Date/Time", "iax2.iax.datetime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     {&hf_iax2_ies[IAX_IE_DEVICETYPE],
-     {"Device type", "iax2.iax.devicetype", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Device type", "iax2.iax.devicetype", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_SERVICEIDENT],
-     {"Service identifier", "iax2.iax.serviceident", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Service identifier", "iax2.iax.serviceident", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_FIRMWAREVER],
-     {"Firmware version", "iax2.iax.firmwarever", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Firmware version", "iax2.iax.firmwarever", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_FWBLOCKDESC],
-     {"Firmware block description", "iax2.iax.fwblockdesc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Firmware block description", "iax2.iax.fwblockdesc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_FWBLOCKDATA],
-     {"Firmware block of data", "iax2.iax.fwblockdata", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Firmware block of data", "iax2.iax.fwblockdata", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_PROVVER],
-     {"Provisioning version", "iax2.iax.provver", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Provisioning version", "iax2.iax.provver", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLINGPRES],
-     {"Calling presentation", "iax2.iax.callingpres", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Calling presentation", "iax2.iax.callingpres", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLINGTON],
-     {"Calling type of number", "iax2.iax.callington", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Calling type of number", "iax2.iax.callington", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CALLINGTNS],
-     {"Calling transit network select", "iax2.iax.callingtns", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Calling transit network select", "iax2.iax.callingtns", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_SAMPLINGRATE],
-     {"Supported sampling rates", "iax2.iax.samplingrate", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Supported sampling rates", "iax2.iax.samplingrate", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CAUSECODE],
      {"Hangup cause", "iax2.iax.causecode", FT_UINT8, BASE_HEX, VALS(iax_causecodes),
-       0x0, "", HFILL}},
+       0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_ENCRYPTION],
-     {"Encryption format", "iax2.iax.encryption", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Encryption format", "iax2.iax.encryption", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_ENCKEY],
-     {"Encryption key", "iax2.iax.enckey", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Encryption key", "iax2.iax.enckey", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_CODEC_PREFS],
-     {"Codec negotiation", "iax2.iax.codecprefs", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+     {"Codec negotiation", "iax2.iax.codecprefs", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_JITTER],
-     {"Received jitter (as in RFC1889)", "iax2.iax.rrjitter", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Received jitter (as in RFC1889)", "iax2.iax.rrjitter", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_LOSS],
      {"Received loss (high byte loss pct, low 24 bits loss count, as in rfc1889)", "iax2.iax.rrloss",
-       FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+       FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_PKTS],
-     {"Total frames received", "iax2.iax.rrpkts", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Total frames received", "iax2.iax.rrpkts", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_DELAY],
-     {"Max playout delay in ms for received frames", "iax2.iax.rrdelay", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Max playout delay in ms for received frames", "iax2.iax.rrdelay", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_DROPPED],
-     {"Dropped frames (presumably by jitterbuffer)", "iax2.iax.rrdropped", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Dropped frames (presumably by jitterbuffer)", "iax2.iax.rrdropped", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_RR_OOO],
-     {"Frame received out of order", "iax2.iax.rrooo", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+     {"Frame received out of order", "iax2.iax.rrooo", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     {&hf_iax2_ies[IAX_IE_DATAFORMAT],
      {"Data call format", "iax2.iax.dataformat", FT_UINT32, BASE_HEX,
-      VALS(iax_dataformats), 0x0, "", HFILL}},
+      VALS(iax_dataformats), 0x0, NULL, HFILL}},
 
     {&hf_IAX_IE_UNKNOWN_BYTE,
      {"Unknown", "iax2.iax.unknownbyte", FT_UINT8, BASE_HEX, NULL,
@@ -2471,86 +2464,86 @@ proto_register_iax2 (void)
     {&hf_iax2_cap_g723_1,
      {"G.723.1 compression", "iax2.cap.g723_1", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_G723_1,
-      "G.723.1 compression", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_gsm,
      {"GSM compression", "iax2.cap.gsm", FT_BOOLEAN, 32,
        TFS(&tfs_supported_not_supported), AST_FORMAT_GSM, 
-      "GSM compression", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_ulaw,
      {"Raw mu-law data (G.711)", "iax2.cap.ulaw",FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_ULAW,
-      "Raw mu-law data (G.711)", HFILL }},
+      NULL, HFILL }},
 
      {&hf_iax2_cap_alaw,
       {"Raw A-law data (G.711)", "iax2.cap.alaw",FT_BOOLEAN, 32,
        TFS(&tfs_supported_not_supported), AST_FORMAT_ALAW,
-       "Raw A-law data (G.711)", HFILL }},
+       NULL, HFILL }},
 
     {&hf_iax2_cap_g726,
      {"G.726 compression", "iax2.cap.g726",FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_G726,
-      "G.726 compression", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_adpcm,
      {"ADPCM", "iax2.cap.adpcm", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_ADPCM,
-      "ADPCM", HFILL }},
+      NULL, HFILL }},
     
     {&hf_iax2_cap_slinear,
      {"Raw 16-bit Signed Linear (8000 Hz) PCM", "iax2.cap.slinear", 
       FT_BOOLEAN, 32, TFS(&tfs_supported_not_supported), AST_FORMAT_SLINEAR, 
-      "Raw 16-bit Signed Linear (8000 Hz) PCM", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_lpc10,
      {"LPC10, 180 samples/frame", "iax2.cap.lpc10", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_LPC10,
-      "LPC10, 180 samples/frame", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_g729a,
      {"G.729a Audio", "iax2.cap.g729a", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_G729A,
-      "G.729a Audio", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_speex,
      {"SPEEX Audio", "iax2.cap.speex", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_SPEEX,
-      "SPEEX Audio", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_ilbc,
      {"iLBC Free compressed Audio", "iax2.cap.ilbc", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_ILBC,
-      "iLBC Free compressed Audio", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_jpeg,
      {"JPEG images", "iax2.cap.jpeg", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_JPEG,
-      "JPEG images", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_png,
      {"PNG images", "iax2.cap.png", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_PNG,
-      "PNG images", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_h261,
      {"H.261 video", "iax2.cap.h261", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_H261,
-      "H.261 video", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_cap_h263,
      {"H.263 video", "iax2.cap.h263", FT_BOOLEAN, 32,
       TFS(&tfs_supported_not_supported), AST_FORMAT_H263,
-      "H.263 video", HFILL }},
+      NULL, HFILL }},
 
     /* reassembly stuff */
     {&hf_iax2_fragments,
      {"IAX2 Fragments", "iax2.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-      "IAX2 Fragments", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_fragment,
      {"IAX2 Fragment data", "iax2.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-      "IAX2 Fragment data", HFILL }},
+      NULL, HFILL }},
 
     {&hf_iax2_fragment_overlap,
      {"Fragment overlap", "iax2.fragment.overlap", FT_BOOLEAN, BASE_NONE,
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 547d2fae69..e01f17cbd2 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -2206,19 +2206,19 @@ proto_register_icmpv6(void)
   static hf_register_info hf[] = {
     { &hf_icmpv6_type,
       { "Type",           "icmpv6.type",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_code,
       { "Code",           "icmpv6.code",	FT_UINT8,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_checksum,
       { "Checksum",       "icmpv6.checksum",	FT_UINT16, BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_checksum_bad,
       { "Bad Checksum",   "icmpv6.checksum_bad", FT_BOOLEAN, BASE_NONE,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_haad_ha_addrs,
-      { "Home Agent Addresses", "icmpv6.haad.ha_addrs", FT_IPv6, BASE_HEX, NULL, 0x0,
-       "", HFILL }},
+      { "Home Agent Addresses", "icmpv6.haad.ha_addrs", FT_IPv6, BASE_NONE, NULL, 0x0,
+       NULL, HFILL }},
     { &hf_icmpv6_ra_cur_hop_limit,
       { "Cur hop limit",           "icmpv6.ra.cur_hop_limit", FT_UINT8,  BASE_DEC, NULL, 0x0,
       	"Current hop limit", HFILL }},
@@ -2245,55 +2245,55 @@ proto_register_icmpv6(void)
       	"Pad Length (in bytes)", HFILL }},
     { &hf_icmpv6_opt_cga,
       { "CGA",           "icmpv6.option.cga", FT_BYTES,  BASE_NONE, NULL, 0x0,
-      	"CGA", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_opt_cga_modifier,
-      { "Modifier", "icmpv6.option.cga.modifier", FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Modifier", HFILL }},
+      { "Modifier", "icmpv6.option.cga.modifier", FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
     { &hf_icmpv6_opt_cga_subnet_prefix,
-      { "Subnet Prefix", "icmpv6.option.cga.subnet_prefix", FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Subnet Prefix", HFILL }},
+      { "Subnet Prefix", "icmpv6.option.cga.subnet_prefix", FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
     { &hf_icmpv6_opt_cga_count,
-        { "Count", "icmpv6.option.cga.count", FT_BYTES, BASE_HEX, NULL, 0x0,
-          "Count", HFILL }},
+        { "Count", "icmpv6.option.cga.count", FT_BYTES, BASE_NONE, NULL, 0x0,
+          NULL, HFILL }},
     { &hf_icmpv6_opt_cga_ext_type,
-        { "Ext Type", "icmpv6.option.cga.ext_type", FT_BYTES, BASE_HEX, NULL, 0x0,
-          "Ext Type", HFILL }},
+        { "Ext Type", "icmpv6.option.cga.ext_type", FT_BYTES, BASE_NONE, NULL, 0x0,
+          NULL, HFILL }},
     { &hf_icmpv6_opt_cga_ext_length,
-        { "Ext Length", "icmpv6.option.cga.ext_length", FT_BYTES, BASE_HEX, NULL, 0x0,
-          "Ext Length", HFILL }},
+        { "Ext Length", "icmpv6.option.cga.ext_length", FT_BYTES, BASE_NONE, NULL, 0x0,
+          NULL, HFILL }},
 	{ &hf_icmpv6_opt_rsa_key_hash,
-      { "Key Hash",           "icmpv6.option.rsa.key_hash", FT_BYTES,  BASE_HEX, NULL, 0x0,
-      	"Key Hash", HFILL }},
+      { "Key Hash",           "icmpv6.option.rsa.key_hash", FT_BYTES,  BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 	{ &hf_icmpv6_opt_name_type,
       { "Name Type",           "icmpv6.option.name_type", FT_UINT8,  BASE_DEC, VALS(icmpv6_option_name_type_vals), 0x0,
-      	"Name Type", HFILL }},
+      	NULL, HFILL }},
 	{ &hf_icmpv6_opt_name_x501,
-      { "DER Encoded X.501 Name",           "icmpv6.option.name_x501", FT_BYTES,  BASE_HEX, NULL, 0x0,
-      	"DER Encoded X.501 Name", HFILL }},
+      { "DER Encoded X.501 Name",           "icmpv6.option.name_x501", FT_BYTES,  BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 	{ &hf_icmpv6_opt_name_fqdn,
       { "FQDN",           "icmpv6.option.name_type.fqdn", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"FQDN", HFILL }},
+      	NULL, HFILL }},
 	{ &hf_icmpv6_opt_cert_type,
       { "Cert Type",           "icmpv6.option.name_type", FT_UINT8,  BASE_DEC, VALS(icmpv6_option_cert_type_vals), 0x0,
-      	"Cert Type", HFILL }},
+      	NULL, HFILL }},
 	{ &hf_icmpv6_identifier,
       { "Identifier",           "icmpv6.identifier", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"Identifier", HFILL }},
+      	NULL, HFILL }},
 	{ &hf_icmpv6_all_comp,
       { "All Components",           "icmpv6.all_comp", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"All Components", HFILL }},
+      	NULL, HFILL }},
 	{ &hf_icmpv6_comp,
       { "Component",           "icmpv6.comp", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"Component", HFILL }},
+      	NULL, HFILL }},
     { &hf_icmpv6_x509if_Name,
       { "Name", "icmpv6.x509_Name", FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0x0,
-        "Name", HFILL }},
+        NULL, HFILL }},
     { &hf_icmpv6_x509af_Certificate,
       { "Certificate", "icmpv6.x509_Certificate", FT_NONE, BASE_NONE, NULL, 0x0,
-        "Certificate", HFILL }},
+        NULL, HFILL }},
     { &hf_icmpv6_recursive_dns_serv,
-      { "Recursive DNS Servers", "icmpv6.recursive_dns_serv", FT_IPv6, BASE_HEX, NULL, 0x0,
-        "Recursive DNS Servers", HFILL }}
+      { "Recursive DNS Servers", "icmpv6.recursive_dns_serv", FT_IPv6, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }}
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-icp.c b/epan/dissectors/packet-icp.c
index 55395f383a..41da1ae27b 100644
--- a/epan/dissectors/packet-icp.c
+++ b/epan/dissectors/packet-icp.c
@@ -219,19 +219,19 @@ proto_register_icp(void)
 	static hf_register_info hf[] = {
 		{ &hf_icp_opcode,
 		{ "Opcode", "icp.opcode", FT_UINT8, BASE_HEX, VALS(opcode_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_icp_version,
 		{ "Version", "icp.version", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_icp_length,
 		{ "Length", "icp.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_icp_request_nr,
 		{ "Request Number", "icp.nr", FT_UINT32, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_icp,
diff --git a/epan/dissectors/packet-icq.c b/epan/dissectors/packet-icq.c
index 367490c2eb..4ab79848b5 100644
--- a/epan/dissectors/packet-icq.c
+++ b/epan/dissectors/packet-icq.c
@@ -1778,19 +1778,19 @@ proto_register_icq(void)
 {
     static hf_register_info hf[] = {
 	{ &hf_icq_type,
-	  {"Type", "icq.type", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+	  {"Type", "icq.type", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_icq_uin,
-	  {"UIN", "icq.uin", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+	  {"UIN", "icq.uin", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	{ &hf_icq_sessionid,
-	  {"Session ID", "icq.sessionid", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+	  {"Session ID", "icq.sessionid", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_icq_client_cmd,
-	  {"Client command", "icq.client_cmd", FT_UINT16, BASE_HEX, VALS(clientCmdCode), 0x0, "", HFILL }},
+	  {"Client command", "icq.client_cmd", FT_UINT16, BASE_HEX, VALS(clientCmdCode), 0x0, NULL, HFILL }},
 	{ &hf_icq_server_cmd,
-	  {"Server command", "icq.server_cmd", FT_UINT16, BASE_DEC, VALS(serverCmdCode), 0x0, "", HFILL }},
+	  {"Server command", "icq.server_cmd", FT_UINT16, BASE_DEC, VALS(serverCmdCode), 0x0, NULL, HFILL }},
 	{ &hf_icq_checkcode,
-	  {"Checkcode", "icq.checkcode", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+	  {"Checkcode", "icq.checkcode", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	{ &hf_icq_decode,
-	  {"Decode", "icq.decode", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }}
+	  {"Decode", "icq.decode", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}
     };
     static gint *ett[] = {
         &ett_icq,
diff --git a/epan/dissectors/packet-idp.c b/epan/dissectors/packet-idp.c
index b86bfd1d9a..0389ecfbe6 100644
--- a/epan/dissectors/packet-idp.c
+++ b/epan/dissectors/packet-idp.c
@@ -144,52 +144,52 @@ proto_register_idp(void)
 	static hf_register_info hf_idp[] = {
 		{ &hf_idp_checksum,
 		    { "Checksum",	"idp.checksum", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_src,
-		    { "Source Address",	"idp.src", FT_STRING, BASE_DEC,
-			NULL, 0x0, "Source Address", HFILL }},
+		    { "Source Address",	"idp.src", FT_STRING, BASE_NONE,
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_dst,
-		    { "Destination Address",	"idp.dst", FT_STRING, BASE_DEC,
-			NULL, 0x0,  "Destination Address", HFILL }},
+		    { "Destination Address",	"idp.dst", FT_STRING, BASE_NONE,
+			NULL, 0x0,  NULL, HFILL }},
 
 		{ &hf_idp_len,
 		    { "Length",		"idp.len", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		/* XXX - does this have separate hop count and time subfields? */
 		{ &hf_idp_hops,
 		    { "Transport Control (Hops)", "idp.hops", FT_UINT8, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_packet_type,
 		    { "Packet Type",	"idp.packet_type", FT_UINT8, BASE_DEC,
-			VALS(idp_packet_type_vals), 0x0, "", HFILL }},
+			VALS(idp_packet_type_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_idp_dnet,
 		    { "Destination Network","idp.dst.net", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_dnode,
 		    { "Destination Node",	"idp.dst.node", FT_ETHER, BASE_NONE,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_dsocket,
 		    { "Destination Socket",	"idp.dst.socket", FT_UINT16, BASE_HEX,
-			VALS(idp_socket_vals), 0x0, "", HFILL }},
+			VALS(idp_socket_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_idp_snet,
 		    { "Source Network","idp.src.net", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_snode,
 		    { "Source Node",	"idp.src.node", FT_ETHER, BASE_NONE,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_idp_ssocket,
 		    { "Source Socket",	"idp.src.socket", FT_UINT16, BASE_HEX,
-			VALS(idp_socket_vals), 0x0, "", HFILL }},
+			VALS(idp_socket_vals), 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-iec104.c b/epan/dissectors/packet-iec104.c
index 5d5a1f3808..b53bac1358 100644
--- a/epan/dissectors/packet-iec104.c
+++ b/epan/dissectors/packet-iec104.c
@@ -693,11 +693,11 @@ proto_register_iec104asdu(void)
 		    "Common Address of Asdu", HFILL }},
 
 		{ &hf_oa,
-		  { "OA  ", "104asdu.oa", FT_UINT8, BASE_DEC, NULL, 0x0,
+		  { "OA", "104asdu.oa", FT_UINT8, BASE_DEC, NULL, 0x0,
 		    "Originator Address", HFILL }},
 
 		{ &hf_typeid,
-		  { "TypeId ", "104asdu.typeid", FT_UINT8, BASE_DEC, VALS(asdu_types), 0x0,
+		  { "TypeId", "104asdu.typeid", FT_UINT8, BASE_DEC, VALS(asdu_types), 0x0,
 		    "Asdu Type Id", HFILL }},
 
 		{ &hf_causetx,
@@ -706,15 +706,15 @@ proto_register_iec104asdu(void)
 
 		{ &hf_nega,
 		  { "Negative", "104asdu.nega", FT_BOOLEAN, 8, NULL, F_NEGA,
-		    "Negative", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_test,
 		  { "Test", "104asdu.test", FT_BOOLEAN, 8, NULL, F_TEST,
-		    "Test", HFILL }},
+		    NULL, HFILL }},
 
 
 		{ &hf_ioa,
-		  { "IOA  ", "104asdu.ioa", FT_UINT24, BASE_DEC, NULL, 0x0,
+		  { "IOA", "104asdu.ioa", FT_UINT24, BASE_DEC, NULL, 0x0,
 		    "Information Object Address", HFILL }},
 
 		{ &hf_numix,
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 8e279fb3f1..39ea61a730 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -8955,7 +8955,7 @@ proto_register_ieee80211 (void)
 
     {&hf_hosttime,
      {"Host timestamp", "wlan.hosttime", FT_UINT64, BASE_DEC, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     {&hf_data_rate,
      {"Data Rate", "wlan.data_rate", FT_UINT64, BASE_DEC, NULL, 0,
@@ -9063,7 +9063,7 @@ proto_register_ieee80211 (void)
 
     {&hf_fc_protected,
      {"Protected flag", "wlan.fc.protected", FT_BOOLEAN, 8, TFS (&protected_flags), FLAG_PROTECTED,
-      "Protected flag", HFILL }},
+      NULL, HFILL }},
 
     {&hf_fc_order,
      {"Order flag", "wlan.fc.order", FT_BOOLEAN, 8, TFS (&order_flags), FLAG_ORDER,
@@ -9099,7 +9099,7 @@ proto_register_ieee80211 (void)
 
     {&hf_addr_addr1,
      {"First Address of Contained Frame", "wlan.controlwrap.addr1", FT_ETHER, BASE_NONE, NULL, 0,
-      "First Address of Contained Frame", HFILL }},
+      NULL, HFILL }},
 
     {&hf_addr_bssid,
      {"BSS Id", "wlan.bssid", FT_ETHER, BASE_NONE, NULL, 0,
@@ -9107,11 +9107,11 @@ proto_register_ieee80211 (void)
 
     {&hf_frag_number,
      {"Fragment number", "wlan.frag", FT_UINT16, BASE_DEC, NULL, 0,
-      "Fragment number", HFILL }},
+      NULL, HFILL }},
 
     {&hf_seq_number,
      {"Sequence number", "wlan.seq", FT_UINT16, BASE_DEC, NULL, 0,
-      "Sequence number", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_priority,
      {"Priority", "wlan.qos.priority", FT_UINT16, BASE_DEC, NULL, 0,
@@ -9123,42 +9123,42 @@ proto_register_ieee80211 (void)
 
     {&hf_qos_bit4,
      {"QoS bit 4", "wlan.qos.bit4", FT_BOOLEAN, 8, TFS (&bit4_flag), QOS_FLAG_EOSP,
-      "QoS bit 4", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_ack_policy,
      {"Ack Policy", "wlan.qos.ack", FT_UINT8, BASE_HEX,  VALS (&ack_policy), 0,
-      "Ack Policy", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_amsdu_present,
      {"Payload Type", "wlan.qos.amsdupresent", FT_BOOLEAN, BASE_NONE,
-      TFS (&hf_qos_amsdu_present_flag), 0, "Payload Type", HFILL }},
+      TFS (&hf_qos_amsdu_present_flag), 0x0, NULL, HFILL }},
 
     {&hf_qos_txop_limit,
      {"TXOP Limit", "wlan.qos.txop_limit", FT_UINT16, BASE_DEC, NULL, 0,
-      "TXOP Limit", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_buf_state_indicated,
      {"Buffer State Indicated", "wlan.qos.buf_state_indicated",
        FT_BOOLEAN, 8, TFS(&tfs_yes_no), 0x02,
-      "Buffer State Indicated", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_highest_pri_buf_ac,
      {"Highest-Priority Buffered AC", "wlan.qos.highest_pri_buf_ac",
        FT_UINT8, BASE_DEC, VALS(wme_acs), 0x0C,
-      "Highest-Priority Buffered AC", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_qap_buf_load,
      {"QAP Buffered Load", "wlan.qos.qap_buf_load",
        FT_UINT8, BASE_DEC, NULL, 0xF0,
-      "QAP Buffered Load", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_txop_dur_req,
      {"TXOP Duration Requested", "wlan.qos.txop_dur_req", FT_UINT16, BASE_DEC, NULL, 0,
-      "TXOP Duration Requested", HFILL }},
+      NULL, HFILL }},
 
     {&hf_qos_queue_size,
      {"Queue Size", "wlan.qos.queue_size", FT_UINT16, BASE_DEC, NULL, 0,
-      "Queue Size", HFILL }},
+      NULL, HFILL }},
 
     {&hf_fcs,
      {"Frame check sequence", "wlan.fcs", FT_UINT32, BASE_HEX,
@@ -9166,11 +9166,11 @@ proto_register_ieee80211 (void)
 
     {&hf_fcs_good,
      {"Good", "wlan.fcs_good", FT_BOOLEAN, BASE_NONE,
-      NULL, 0, "True if the FCS is correct", HFILL }},
+      NULL, 0x0, "True if the FCS is correct", HFILL }},
 
     {&hf_fcs_bad,
      {"Bad", "wlan.fcs_bad", FT_BOOLEAN, BASE_NONE,
-      NULL, 0, "True if the FCS is incorrect", HFILL }},
+      NULL, 0x0, "True if the FCS is incorrect", HFILL }},
 
     {&hf_fragment_overlap,
       {"Fragment overlap", "wlan.fragment.overlap", FT_BOOLEAN, BASE_NONE,
@@ -9198,11 +9198,11 @@ proto_register_ieee80211 (void)
 
     {&hf_fragment,
       {"802.11 Fragment", "wlan.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-       "802.11 Fragment", HFILL }},
+       NULL, HFILL }},
 
     {&hf_fragments,
       {"802.11 Fragments", "wlan.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-       "802.11 Fragments", HFILL }},
+       NULL, HFILL }},
 
     {&hf_reassembled_in,
       {"Reassembled 802.11 in frame", "wlan.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
@@ -9210,27 +9210,27 @@ proto_register_ieee80211 (void)
 
     {&hf_wep_iv,
      {"Initialization Vector", "wlan.wep.iv", FT_UINT24, BASE_HEX, NULL, 0,
-      "Initialization Vector", HFILL }},
+      NULL, HFILL }},
 
     {&hf_wep_iv_weak,
      {"Weak IV", "wlan.wep.weakiv", FT_BOOLEAN,BASE_NONE, NULL,0x0,
-       "Weak IV",HFILL}},
+       NULL,HFILL}},
 
     {&hf_tkip_extiv,
      {"TKIP Ext. Initialization Vector", "wlan.tkip.extiv", FT_STRING,
-      BASE_HEX, NULL, 0, "TKIP Extended Initialization Vector", HFILL }},
+      BASE_NONE, NULL, 0, "TKIP Extended Initialization Vector", HFILL }},
 
     {&hf_ccmp_extiv,
      {"CCMP Ext. Initialization Vector", "wlan.ccmp.extiv", FT_STRING,
-      BASE_HEX, NULL, 0, "CCMP Extended Initialization Vector", HFILL }},
+      BASE_NONE, NULL, 0, "CCMP Extended Initialization Vector", HFILL }},
 
     {&hf_wep_key,
      {"Key Index", "wlan.wep.key", FT_UINT8, BASE_DEC, NULL, 0,
-      "Key Index", HFILL }},
+      NULL, HFILL }},
 
     {&hf_wep_icv,
      {"WEP ICV", "wlan.wep.icv", FT_UINT32, BASE_HEX, NULL, 0,
-      "WEP ICV", HFILL }},
+      NULL, HFILL }},
 	/***  Begin: WAVE Service information element Dissection - IEEE 802.11p Draft 4.0 ***/
     {&hf_pst_timingquality,
      {"Timing Quality", "pst.timingQuality", FT_UINT16, BASE_DEC, NULL, 0,
@@ -9241,15 +9241,15 @@ proto_register_ieee80211 (void)
       "Provider Count", HFILL }},
 
     {&hf_pst_length,
-     {"Provider Service Table Length ", "pst.length", FT_UINT16, BASE_DEC, NULL, 0,
+     {"Provider Service Table Length", "pst.length", FT_UINT16, BASE_DEC, NULL, 0,
       "PST Length", HFILL }},
 
     {&hf_pst_contents,
-     {"Provider Service Table Contents ", "pst.contents", FT_UINT8, BASE_HEX, NULL, 0,
+     {"Provider Service Table Contents", "pst.contents", FT_UINT8, BASE_HEX, NULL, 0,
       "PST Contents", HFILL }},
 
     {&hf_pst_acid,
-     {"Application Class ID (ACID) ", "pst.ACID", FT_UINT8, BASE_DEC, NULL, 0,
+     {"Application Class ID (ACID)", "pst.ACID", FT_UINT8, BASE_DEC, NULL, 0,
       "PST ACID", HFILL }},
 
     {&hf_pst_acm_length,
@@ -9281,11 +9281,11 @@ proto_register_ieee80211 (void)
       "MAC Address", HFILL }},
 
     {&hf_pst_serviceport,
-     {"Service Port ", "pst.serviceport", FT_UINT16, BASE_DEC, NULL, 0,
+     {"Service Port", "pst.serviceport", FT_UINT16, BASE_DEC, NULL, 0,
       "PST Service Port", HFILL }},
 
     {&hf_pst_addressing,
-     {"Addressing ", "pst.addressing", FT_UINT8, BASE_DEC, NULL, 0,
+     {"Addressing", "pst.addressing", FT_UINT8, BASE_DEC, NULL, 0,
       "PST Addressing", HFILL }},
 
     {&hf_pst_channel,
@@ -9294,40 +9294,40 @@ proto_register_ieee80211 (void)
 
     {&hf_chan_noc,
      {"Number of Channels", "chan.chan_uknown", FT_UINT8, BASE_DEC, NULL, 0,
-      "Number of Channels", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_length,
      {"Length", "chan.chan_length", FT_UINT8, BASE_DEC, NULL, 0,
-      "Length", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_content,
      {"Contents", "chan.chan_content", FT_UINT8, BASE_DEC, NULL, 0,
-      "Contents", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_channel,
      {"channel", "chan.chan_channel", FT_UINT8, BASE_DEC, NULL, 0,
-      "channel", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_adapt,
      {"Adaptable", "chan.chan_adapt", FT_UINT8, BASE_DEC, NULL, 0,
-      "Adaptable", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_rate,
      {"Rate", "chan.chan_rate", FT_UINT8, BASE_DEC, NULL, 0,
-      "Rate", HFILL }},
+      NULL, HFILL }},
 
     {&hf_chan_tx_pow,
      {"Tx Power", "chan.chan_tx_pow", FT_UINT8, BASE_DEC, NULL, 0,
-      "Tx Power", HFILL }},
+      NULL, HFILL }},
 
     /*** Begin: Block Ack Request/Block Ack  - Dustin Johnson***/
     {&hf_block_ack_request_control,
      {"Block Ack Request (BAR) Control", "wlan.bar.control",
-      FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Request (BAR) Control", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_block_ack_control,
      {"Block Ack Request Control", "wlan.ba.control",
-      FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Request Control", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_block_ack_control_ack_policy,
      {"BAR Ack Policy", "wlan.ba.control.ackpolicy",
@@ -9339,11 +9339,11 @@ proto_register_ieee80211 (void)
 
     {&hf_block_ack_control_compressed_bitmap,
      {"Compressed Bitmap", "wlan.ba.control.cbitmap",
-      FT_BOOLEAN, 16, 0, 0x04, "Compressed Bitmap", HFILL }},
+      FT_BOOLEAN, 16, 0, 0x04, NULL, HFILL }},
 
     {&hf_block_ack_control_reserved,
      {"Reserved", "wlan.ba.control.cbitmap",
-      FT_UINT16, BASE_HEX, NULL, 0x0ff8, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0ff8, NULL, HFILL }},
 
     {&hf_block_ack_control_basic_tid_info,
      {"TID for which a Basic BlockAck frame is requested", "wlan.ba.basic.tidinfo",
@@ -9359,15 +9359,15 @@ proto_register_ieee80211 (void)
 
     {&hf_block_ack_multi_tid_info,
      {"Traffic Identifier (TID) Info", "wlan.ba.mtid.tid",
-      FT_UINT8, BASE_DEC, 0, 0, "Traffic Identifier (TID) Info", HFILL }},
+      FT_UINT8, BASE_DEC, 0, 0, NULL, HFILL }},
 
     {&hf_block_ack_multi_tid_reserved,
      {"Reserved", "wlan.bar.mtid.tidinfo.reserved",
-      FT_UINT16, BASE_HEX, 0, 0x0fff, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0x0fff, NULL, HFILL }},
 
     {&hf_block_ack_multi_tid_value,
      {"Multi-TID Value", "wlan.bar.mtid.tidinfo.value",
-      FT_UINT16, BASE_HEX, 0, 0xf000, "Multi-TID Value", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0xf000, NULL, HFILL }},
 
     {&hf_block_ack_request_type,
      {"Block Ack Request Type", "wlan.bar.type",
@@ -9375,7 +9375,7 @@ proto_register_ieee80211 (void)
 
     {&hf_block_ack_type,
      {"Block Ack Request Type", "wlan.ba.type",
-      FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, "Block Ack Request Type", HFILL }}
+      FT_UINT8, BASE_HEX, VALS(&hf_block_ack_type_flags), 0, NULL, HFILL }}
     /*** End: Block Ack Request/Block Ack  - Dustin Johnson***/
   };
 
@@ -9384,74 +9384,74 @@ proto_register_ieee80211 (void)
        XXX - make as many of these generic as possible. */
     { &hf_prism_msgcode,
      {"Message Code", "prism.msgcode", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_msglen,
      {"Message Length", "prism.msglen", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_rssi_data,
      {"RSSI Field", "prism.rssi.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_sq_data,
      {"SQ Field", "prism.sq.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_signal_data,
      {"Signal Field", "prism.signal.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_noise_data,
      {"Noise Field", "prism.noise.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_rate_data,
      {"Rate Field", "prism.rate.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_istx_data,
      {"IsTX Field", "prism.istx.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }},
+      NULL, HFILL }},
 
     { &hf_prism_frmlen_data,
      {"Frame Length Field", "prism.frmlen.data", FT_UINT32, BASE_HEX, NULL, 0x0,
-      "", HFILL }}
+      NULL, HFILL }}
   };
 
   static hf_register_info hf_wlancap[] = {
     /* AVS-specific header fields.
        XXX - make as many of these generic as possible. */
     {&hf_wlan_magic,
-     {"Header magic", "wlancap.magic", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFF0, "", HFILL } },
+     {"Header magic", "wlancap.magic", FT_UINT32, BASE_HEX, NULL, 0xFFFFFFF0, NULL, HFILL } },
     { &hf_wlan_version, { "Header revision", "wlancap.version", FT_UINT32,
-			  BASE_DEC, NULL, 0xF, "", HFILL } },
+			  BASE_DEC, NULL, 0xF, NULL, HFILL } },
     { &hf_wlan_length, { "Header length", "wlancap.length", FT_UINT32,
-			 BASE_DEC, NULL, 0x0, "", HFILL } },
+			 BASE_DEC, NULL, 0x0, NULL, HFILL } },
     {&hf_wlan_phytype,
      {"PHY type", "wlan.phytype", FT_UINT32, BASE_DEC, VALS(phy_type), 0x0,
-      "", HFILL } },
+      NULL, HFILL } },
 
     { &hf_wlan_priority, { "Priority", "wlancap.priority", FT_UINT32, BASE_DEC,
-			   NULL, 0x0, "", HFILL } },
+			   NULL, 0x0, NULL, HFILL } },
     { &hf_wlan_ssi_type, { "SSI Type", "wlancap.ssi_type", FT_UINT32, BASE_DEC,
-			   VALS(ssi_type), 0x0, "", HFILL } },
+			   VALS(ssi_type), 0x0, NULL, HFILL } },
     { &hf_wlan_ssi_signal, { "SSI Signal", "wlancap.ssi_signal", FT_INT32,
-			   BASE_DEC, NULL, 0x0, "", HFILL } },
+			   BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_wlan_ssi_noise, { "SSI Noise", "wlancap.ssi_noise", FT_INT32,
-			   BASE_DEC, NULL, 0x0, "", HFILL } },
+			   BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_wlan_preamble, { "Preamble", "wlancap.preamble", FT_UINT32,
-			   BASE_DEC, VALS(preamble_type), 0x0, "", HFILL } },
+			   BASE_DEC, VALS(preamble_type), 0x0, NULL, HFILL } },
     { &hf_wlan_encoding, { "Encoding Type", "wlancap.encoding", FT_UINT32,
-			   BASE_DEC, VALS(encoding_type), 0x0, "", HFILL } },
+			   BASE_DEC, VALS(encoding_type), 0x0, NULL, HFILL } },
     { &hf_wlan_sequence, { "Receive sequence", "wlancap.sequence", FT_UINT32,
-			   BASE_DEC, NULL, 0x0, "", HFILL } },
+			   BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_wlan_drops, { "Known Dropped Frames", "wlancap.drops", FT_UINT32,
-			   BASE_DEC, NULL, 0x0, "", HFILL } },
+			   BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_wlan_receiver_addr, { "Receiver Address", "wlancap.receiver_addr", FT_ETHER,
 			   BASE_NONE, NULL, 0x0, "Receiver Hardware Address", HFILL } },
     { &hf_wlan_padding, { "Padding", "wlancap.padding", FT_BYTES,
-			   BASE_NONE, NULL, 0x0, "", HFILL } }
+			   BASE_NONE, NULL, 0x0, NULL, HFILL } }
   };
 
   static const true_false_string rsn_preauth_flags = {
@@ -9935,32 +9935,32 @@ proto_register_ieee80211 (void)
 
     {&ff_timestamp,
      {"Timestamp", "wlan_mgt.fixed.timestamp", FT_STRING, BASE_NONE,
-      NULL, 0, "Timestamp", HFILL }},
+      NULL, 0, NULL, HFILL }},
 
     {&ff_auth_alg,
      {"Authentication Algorithm", "wlan_mgt.fixed.auth.alg",
-      FT_UINT16, BASE_DEC, VALS (&auth_alg), 0, "Authentication Algorithm", HFILL }},
+      FT_UINT16, BASE_DEC, VALS (&auth_alg), 0, NULL, HFILL }},
 
     {&ff_beacon_interval,
      {"Beacon Interval", "wlan_mgt.fixed.beacon", FT_DOUBLE, BASE_DEC, NULL, 0,
-      "Beacon Interval", HFILL }},
+      NULL, HFILL }},
 
     {&hf_fixed_parameters,
      {"Fixed parameters", "wlan_mgt.fixed.all", FT_UINT16, BASE_DEC, NULL, 0,
-      "Fixed parameters", HFILL }},
+      NULL, HFILL }},
 
     {&hf_tagged_parameters,
      {"Tagged parameters", "wlan_mgt.tagged.all", FT_UINT16, BASE_DEC, NULL, 0,
-      "Tagged parameters", HFILL }},
+      NULL, HFILL }},
 
     {&hf_tagged_ssid,
-     {"SSID", "wlan_mgt.ssid", FT_STRING, BASE_DEC, NULL, 0, 
-      "SSID", HFILL }},
+     {"SSID", "wlan_mgt.ssid", FT_STRING, BASE_NONE, NULL, 0, 
+      NULL, HFILL }},
 
     /*** Begin: Block Ack Params Fixed Field - Dustin Johnson ***/
     {&ff_block_ack_params,
       {"Block Ack Parameters", "wlan_mgt.fixed.baparams",
-      FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Parameters", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_block_ack_params_amsdu_permitted,
       {"A-MSDUs", "wlan_mgt.fixed.baparams.amsdu",
@@ -9968,11 +9968,11 @@ proto_register_ieee80211 (void)
 
     {&ff_block_ack_params_policy,
       {"Block Ack Policy", "wlan_mgt.fixed.baparams.policy",
-      FT_BOOLEAN, 16, TFS (&ff_block_ack_params_policy_flag), 0x0002, "Block Ack Policy", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ff_block_ack_params_policy_flag), 0x0002, NULL, HFILL }},
 
     {&ff_block_ack_params_tid,
       {"Traffic Identifier", "wlan_mgt.fixed.baparams.tid",
-      FT_UINT8, BASE_HEX, NULL, 0x003C, "Traffic Identifier", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0x003C, NULL, HFILL }},
 
     {&ff_block_ack_params_buffer_size,
       {"Number of Buffers (1 Buffer = 2304 Bytes)", "wlan_mgt.fixed.baparams.buffersize",
@@ -9982,35 +9982,35 @@ proto_register_ieee80211 (void)
     /*** Begin: Block Ack Timeout Fixed Field - Dustin Johnson ***/
     {&ff_block_ack_timeout,
       {"Block Ack Timeout", "wlan_mgt.fixed.batimeout",
-      FT_UINT16, BASE_HEX, NULL, 0, "Block Ack Timeout", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Block Ack Timeout Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
     {&ff_block_ack_ssc,
      {"Block Ack Starting Sequence Control (SSC)", "wlan_mgt.fixed.ssc",
-      FT_UINT16, BASE_HEX, 0, 0, "Block Ack Starting Sequence Control (SSC)", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_block_ack_ssc_fragment,
      {"Fragment", "wlan_mgt.fixed.fragment",
-      FT_UINT16, BASE_DEC, 0, 0x000f, "Fragment", HFILL }},
+      FT_UINT16, BASE_DEC, 0, 0x000f, NULL, HFILL }},
 
     {&ff_block_ack_ssc_sequence,
      {"Starting Sequence Number", "wlan_mgt.fixed.sequence",
-      FT_UINT16, BASE_DEC, 0, 0xfff0, "Starting Sequence Number", HFILL }},
+      FT_UINT16, BASE_DEC, 0, 0xfff0, NULL, HFILL }},
     /*** End: Block Ack Starting Sequence Control Fixed Field - Dustin Johnson ***/
 
     /*** Begin: DELBA Parameter Set Fixed Field - Dustin Johnson ***/
     {&ff_delba_param,
      {"Delete Block Ack (DELBA) Parameter Set", "wlan_mgt.fixed.delba.param",
-      FT_UINT16, BASE_HEX, 0, 0, "Delete Block Ack (DELBA) Parameter Set", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_delba_param_reserved,
      {"Reserved", "wlan_mgt.fixed.delba.param.reserved",
-      FT_UINT16, BASE_HEX, 0, 0x07ff, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0x07ff, NULL, HFILL }},
 
     {&ff_delba_param_init,
      {"Initiator", "wlan_mgt.fixed.delba.param.initiator",
-      FT_BOOLEAN, 16, 0, 0x0800, "Initiator", HFILL }},
+      FT_BOOLEAN, 16, 0, 0x0800, NULL, HFILL }},
 
     {&ff_delba_param_tid,
      {"TID", "wlan_mgt.fixed.delba.param.tid",
@@ -10020,7 +10020,7 @@ proto_register_ieee80211 (void)
     /*** Begin: Max Regulation Power Fixed Field - Dustin Johnson ***/
     {&ff_max_reg_pwr,
      {"Maximum Regulation Power", "wlan_mgt.fixed.maxregpwr",
-      FT_UINT16, BASE_HEX, 0, 0, "Maximum Regulation Power", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: Max Regulation Power Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Measurement Pilot Interval Fixed Field - Dustin Johnson ***/
@@ -10032,37 +10032,37 @@ proto_register_ieee80211 (void)
     /*** Begin: Country String Fixed Field - Dustin Johnson ***/
     {&ff_country_str,
      {"Country String", "wlan_mgt.fixed.country",
-      FT_STRING, BASE_NONE, 0, 0, "Country String", HFILL }},
+      FT_STRING, BASE_NONE, 0, 0, NULL, HFILL }},
     /*** End: Country String Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
     {&ff_max_tx_pwr,
      {"Maximum Transmit Power", "wlan_mgt.fixed.maxtxpwr",
-      FT_UINT8, BASE_HEX, 0, 0, "Maximum Transmit Power", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: Maximum Transmit Power Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
     {&ff_tx_pwr_used,
      {"Transmit Power Used", "wlan_mgt.fixed.txpwr",
-      FT_UINT8, BASE_HEX, 0, 0, "Transmit Power Used", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: Transmit Power Used Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Transmit Power Used Fixed Field - Dustin Johnson ***/
     {&ff_transceiver_noise_floor,
      {"Transceiver Noise Floor", "wlan_mgt.fixed.tnoisefloor",
-      FT_UINT8, BASE_HEX, 0, 0, "Transceiver Noise Floor", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: Transceiver Noise Floor Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Channel Width Fixed Field - Dustin Johnson ***/
     {&ff_channel_width,
      {"Supported Channel Width", "wlan_mgt.fixed.chanwidth",
-      FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, "Supported Channel Width", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (ff_channel_width_vals), 0, NULL, HFILL }},
     /*** End: Channel Width Fixed Field - Dustin Johnson ***/
 
     /*** Begin: QoS Information AP Fixed Field - Dustin Johnson ***/
     {&ff_qos_info_ap,
      {"QoS Information (AP)", "wlan_mgt.fixed.qosinfo.ap",
-      FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (AP)", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_qos_info_ap_edca_param_set_counter,
      {"EDCA Parameter Set Update Count", "wlan_mgt.fixed.qosinfo.ap.edcaupdate",
@@ -10074,7 +10074,7 @@ proto_register_ieee80211 (void)
 
     {&ff_qos_info_ap_queue_req,
      {"Queue Request", "wlan_mgt.fixed.qosinfo.ap",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_queue_req_flag), 0x20, "Queue Request", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_ap_queue_req_flag), 0x20, NULL, HFILL }},
 
     {&ff_qos_info_ap_txop_request,
      {"TXOP Request", "wlan_mgt.fixed.qosinfo.ap.txopreq",
@@ -10082,29 +10082,29 @@ proto_register_ieee80211 (void)
 
     {&ff_qos_info_ap_reserved,
      {"Reserved", "wlan_mgt.fixed.qosinfo.ap.reserved",
-      FT_BOOLEAN, 8, NULL, 0x80, "Reserved", HFILL }},
+      FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
     /*** End: QoS Information AP Fixed Field - Dustin Johnson ***/
 
     /*** Begin: QoS Information STA Fixed Field - Dustin Johnson ***/
     {&ff_qos_info_sta,
      {"QoS Information (STA)", "wlan_mgt.fixed.qosinfo.sta",
-      FT_UINT8, BASE_HEX, NULL, 0, "QoS Information (STA)", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_qos_info_sta_ac_vo,
      {"AC_VO", "wlan_mgt.fixed.qosinfo.sta.ac.vo",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x01, "AC_VO", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x01, NULL, HFILL }},
 
     {&ff_qos_info_sta_ac_vi,
      {"AC_VI", "wlan_mgt.fixed.qosinfo.sta.ac.vi",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x02, "AC_VI", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x02, NULL, HFILL }},
 
     {&ff_qos_info_sta_ac_bk,
      {"AC_BK", "wlan_mgt.fixed.qosinfo.sta.ac.bk",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x04, "AC_BK", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x04, NULL, HFILL }},
 
     {&ff_qos_info_sta_ac_be,
      {"AC_BE", "wlan_mgt.fixed.qosinfo.sta.ac.be",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x08, "AC_BE", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_ac_flag), 0x08, NULL, HFILL }},
 
     {&ff_qos_info_sta_q_ack,
      {"Q-Ack", "wlan_mgt.fixed.qosinfo.sta.qack",
@@ -10112,17 +10112,17 @@ proto_register_ieee80211 (void)
 
     {&ff_qos_info_sta_max_sp_len,
      {"Service Period (SP) Length", "wlan_mgt.fixed.qosinfo.sta.splen",
-      FT_UINT8, BASE_HEX, VALS (&ff_qos_info_sta_max_sp_len_flags) , 0x60, "Service Period (SP) Length", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&ff_qos_info_sta_max_sp_len_flags) , 0x60, NULL, HFILL }},
 
     {&ff_qos_info_sta_more_data_ack,
      {"More Data Ack", "wlan_mgt.fixed.qosinfo.sta.moredataack",
-      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, "More Data Ack", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ff_qos_info_sta_more_data_ack_flag), 0x80, NULL, HFILL }},
     /*** End: QoS Information STA Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
     {&ff_sm_pwr_save,
      {"Spatial Multiplexing (SM) Power Control", "wlan_mgt.fixed.sm.powercontrol",
-      FT_UINT8, BASE_HEX, NULL, 0, "Spatial Multiplexing (SM) Power Control", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_sm_pwr_save_enabled,
      {"SM Power Save", "wlan_mgt.fixed.sm.powercontrol.enabled",
@@ -10134,27 +10134,27 @@ proto_register_ieee80211 (void)
 
     {&ff_sm_pwr_save_reserved,
      {"Reserved", "wlan_mgt.fixed.sm.powercontrol.reserved",
-      FT_UINT8, BASE_HEX, NULL, 0xFC, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xFC, NULL, HFILL }},
     /*** End: Spatial Multiplexing (SM) Power Control - Dustin Johnson ***/
 
     /*** Begin: PCO Phase Control Fixed Field - Dustin Johnson ***/
     {&ff_pco_phase_cntrl,
      {"Phased Coexistence Operation (PCO) Phase Control", "wlan_mgt.fixed.pco.phasecntrl",
-      FT_BOOLEAN, 0, TFS (&ff_pco_phase_cntrl_flag), 0, "Phased Coexistence Operation (PCO) Phase Control", HFILL }},
+      FT_BOOLEAN, BASE_NONE, TFS (&ff_pco_phase_cntrl_flag), 0x0, NULL, HFILL }},
     /*** End: PCO Phase Control Fixed Field - Dustin Johnson ***/
 
     /*** Begin: PSMP Parameter Set Fixed Field - Dustin Johnson ***/
     {&ff_psmp_param_set,
      {"Power Save Multi-Poll (PSMP) Parameter Set", "wlan_mgt.fixed.psmp.paramset",
-      FT_UINT16, BASE_HEX, 0, 0, "Power Save Multi-Poll (PSMP) Parameter Set", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_param_set_n_sta,
      {"Number of STA Info Fields Present", "wlan_mgt.fixed.psmp.paramset.nsta",
-      FT_UINT8, BASE_HEX, 0, 0, "Number of STA Info Fields Present", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_param_set_more_psmp,
      {"More PSMP", "wlan_mgt.fixed.psmp.paramset.more",
-      FT_BOOLEAN, 0, TFS(&ff_psmp_param_set_more_psmp_flag), 0, "More Power Save Multi-Poll (PSMP)", HFILL }},
+      FT_BOOLEAN, BASE_NONE, TFS(&ff_psmp_param_set_more_psmp_flag), 0x0, "More Power Save Multi-Poll (PSMP)", HFILL }},
 
     {&ff_psmp_param_set_psmp_sequence_duration,
      {"PSMP Sequence Duration", "wlan_mgt.fixed.psmp.paramset.seqduration",
@@ -10172,113 +10172,113 @@ proto_register_ieee80211 (void)
 
     {&ff_mimo_cntrl_channel_width,
      {"Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
-      FT_BOOLEAN, 16, TFS(&ff_mimo_cntrl_channel_width_flag), 0x0010, "Channel Width", HFILL }},
+      FT_BOOLEAN, 16, TFS(&ff_mimo_cntrl_channel_width_flag), 0x0010, NULL, HFILL }},
 
     {&ff_mimo_cntrl_grouping,
      {"Grouping (Ng)", "wlan_mgt.fixed.mimo.control.grouping",
-      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_grouping_flags), 0x0060, "Grouping (Ng)", HFILL }},
+      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_grouping_flags), 0x0060, NULL, HFILL }},
 
     {&ff_mimo_cntrl_coefficient_size,
      {"Coefficient Size (Nb)", "wlan_mgt.fixed.mimo.control.cosize",
-      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_coefficient_size_flags), 0x0180, "Coefficient Size (Nb)", HFILL }},
+      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_coefficient_size_flags), 0x0180, NULL, HFILL }},
 
     {&ff_mimo_cntrl_codebook_info,
      {"Codebook Information", "wlan_mgt.fixed.mimo.control.codebookinfo",
-      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_codebook_info_flags), 0x0600, "Codebook Information", HFILL }},
+      FT_UINT16, BASE_HEX, VALS (&ff_mimo_cntrl_codebook_info_flags), 0x0600, NULL, HFILL }},
 
     {&ff_mimo_cntrl_remaining_matrix_segment,
      {"Remaining Matrix Segment", "wlan_mgt.fixed.mimo.control.matrixseg",
-      FT_UINT16, BASE_HEX, 0, 0x3800, "Remaining Matrix Segment", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0x3800, NULL, HFILL }},
 
     {&ff_mimo_cntrl_reserved,
      {"Reserved", "wlan_mgt.fixed.mimo.control.reserved",
-      FT_UINT16, BASE_HEX, 0, 0xC000, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0xC000, NULL, HFILL }},
 
     {&ff_mimo_cntrl_sounding_timestamp,
      {"Sounding Timestamp", "wlan_mgt.fixed.mimo.control.soundingtime",
-      FT_UINT32, BASE_HEX, 0, 0, "Sounding Timestamp", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: MIMO Control Fixed Field - Dustin Johnson ***/
 
     /*** Begin: PSMP Station Information Fixed Field - Dustin Johnson ***/
     {&ff_psmp_sta_info,
      {"Power Save Multi-Poll (PSMP) Station Information", "wlan_mgt.fixed.psmp.stainfo",
-      FT_UINT8, BASE_HEX, VALS (&ff_psmp_sta_info_flags), 0, "Power Save Multi-Poll (PSMP) Station Information", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&ff_psmp_sta_info_flags), 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_dtt_start_offset,
      {"DTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.dttstart",
-      FT_UINT16, BASE_HEX, 0, 0, "DTT Start Offset", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_dtt_duration,
      {"DTT Duration", "wlan_mgt.fixed.psmp.stainfo.dttduration",
-      FT_UINT8, BASE_HEX, 0, 0, "DTT Duration", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_sta_id,
      {"Target Station ID", "wlan_mgt.fixed.psmp.stainfo.staid",
-      FT_UINT16, BASE_HEX, 0, 0, "Target Station ID", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_utt_start_offset,
      {"UTT Start Offset", "wlan_mgt.fixed.psmp.stainfo.uttstart",
-      FT_UINT16, BASE_HEX, 0, 0, "UTT Start Offset", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_utt_duration,
      {"UTT Duration", "wlan_mgt.fixed.psmp.stainfo.uttduration",
-      FT_UINT16, BASE_HEX, 0, 0, "UTT Duration", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_reserved_small,
      {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
-      FT_UINT16, BASE_HEX, 0, 0, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_reserved_large,
      {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
-      FT_UINT64, BASE_HEX, 0, 0, "Reserved", HFILL }},
+      FT_UINT64, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_psmp_sta_info_psmp_multicast_id,
      {"Power Save Multi-Poll (PSMP) Multicast ID", "wlan_mgt.fixed.psmp.stainfo.multicastid",
-      FT_UINT64, BASE_HEX, 0, 0, "Power Save Multi-Poll (PSMP) Multicast ID", HFILL }},
+      FT_UINT64, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: PSMP Station Information Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Antenna Selection Fixed Field - Dustin Johnson ***/
     {&ff_ant_selection,
      {"Antenna Selection", "wlan_mgt.fixed.antsel",
-      FT_UINT8, BASE_HEX, 0, 0, "Antenna Selection", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&ff_ant_selection_0,
      {"Antenna 0", "wlan_mgt.fixed.antsel.ant0",
-      FT_UINT8, BASE_HEX, 0, 0x01, "Antenna 0", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }},
 
     {&ff_ant_selection_1,
      {"Antenna 1", "wlan_mgt.fixed.antsel.ant1",
-      FT_UINT8, BASE_HEX, 0, 0x02, "Antenna 1", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }},
 
     {&ff_ant_selection_2,
      {"Antenna 2", "wlan_mgt.fixed.antsel.ant2",
-      FT_UINT8, BASE_HEX, 0, 0x04, "Antenna 2", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }},
 
     {&ff_ant_selection_3,
      {"Antenna 3", "wlan_mgt.fixed.antsel.ant3",
-      FT_UINT8, BASE_HEX, 0, 0x08, "Antenna 3", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }},
 
     {&ff_ant_selection_4,
      {"Antenna 4", "wlan_mgt.fixed.antsel.ant4",
-      FT_UINT8, BASE_HEX, 0, 0x10, "Antenna 4", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }},
 
     {&ff_ant_selection_5,
      {"Antenna 5", "wlan_mgt.fixed.antsel.ant5",
-      FT_UINT8, BASE_HEX, 0, 0x20, "Antenna 5", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }},
 
     {&ff_ant_selection_6,
      {"Antenna 6", "wlan_mgt.fixed.antsel.ant6",
-      FT_UINT8, BASE_HEX, 0, 0x40, "Antenna 6", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x40, NULL, HFILL }},
 
     {&ff_ant_selection_7,
      {"Antenna 7", "wlan_mgt.fixed.antsel.ant7",
-      FT_UINT8, BASE_HEX, 0, 0x80, "Antenna 7", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0x80, NULL, HFILL }},
     /*** End: Antenna Selection Fixed Field - Dustin Johnson ***/
 
     /*** Begin: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
     {&ff_ext_channel_switch_announcement,
      {"Extended Channel Switch Announcement", "wlan_mgt.fixed.extchansw",
-      FT_UINT32, BASE_HEX, 0, 0, "", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0, NULL, HFILL }},
     /*** End: Extended Channel Switch Announcement Fixed Field - Dustin Johnson ***/
 
     /*** Begin: HT Information Fixed Field - Dustin Johnson ***/
@@ -10288,15 +10288,15 @@ proto_register_ieee80211 (void)
 
     {&ff_ht_info_information_request,
      {"Information Request", "wlan_mgt.fixed.mimo.control.chanwidth",
-      FT_BOOLEAN, 8, TFS(&ff_ht_info_information_request_flag), 0x01, "Information Request", HFILL }},
+      FT_BOOLEAN, 8, TFS(&ff_ht_info_information_request_flag), 0x01, NULL, HFILL }},
 
     {&ff_ht_info_40_mhz_intolerant,
      {"40 MHz Intolerant", "wlan_mgt.fixed.mimo.control.chanwidth",
-      FT_BOOLEAN, 8, TFS(&ff_ht_info_40_mhz_intolerant_flag), 0x02, "40 MHz Intolerant", HFILL }},
+      FT_BOOLEAN, 8, TFS(&ff_ht_info_40_mhz_intolerant_flag), 0x02, NULL, HFILL }},
 
     {&ff_ht_info_sta_chan_width,
      {"Station Channel Width", "wlan_mgt.fixed.mimo.control.chanwidth",
-      FT_BOOLEAN, 8, TFS(&ff_ht_info_sta_chan_width_flag), 0x04, "Station Channel Width", HFILL }},
+      FT_BOOLEAN, 8, TFS(&ff_ht_info_sta_chan_width_flag), 0x04, NULL, HFILL }},
 
     {&ff_ht_info_reserved,
      {"Reserved", "wlan_mgt.fixed.extchansw",
@@ -10312,7 +10312,7 @@ proto_register_ieee80211 (void)
     /*** Begin: MIMO CSI Matrices Report - Dustin Johnson ***/
     {&ff_mimo_csi_snr,
      {"Signal to Noise Ratio (SNR)", "wlan_mgt.mimo.csimatrices.snr",
-      FT_UINT8, BASE_HEX, NULL, 0, "Signal to Noise Ratio (SNR)", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: MIMO CSI Matrices Report - Dustin Johnson ***/
 
     {&ff_capture,
@@ -10321,7 +10321,7 @@ proto_register_ieee80211 (void)
 
     {&ff_cf_ess,
      {"ESS capabilities", "wlan_mgt.fixed.capabilities.ess",
-      FT_BOOLEAN, 16, TFS (&cf_ess_flags), 0x0001, "ESS capabilities", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_ess_flags), 0x0001, NULL, HFILL }},
 
     {&ff_cf_ibss,
      {"IBSS status", "wlan_mgt.fixed.capabilities.ibss",
@@ -10343,7 +10343,7 @@ proto_register_ieee80211 (void)
 
     {&ff_cf_preamble,
      {"Short Preamble", "wlan_mgt.fixed.capabilities.preamble",
-      FT_BOOLEAN, 16, TFS (&cf_preamble_flags), 0x0020, "Short Preamble", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_preamble_flags), 0x0020, NULL, HFILL }},
 
     {&ff_cf_pbcc,
      {"PBCC", "wlan_mgt.fixed.capabilities.pbcc",
@@ -10351,20 +10351,20 @@ proto_register_ieee80211 (void)
 
     {&ff_cf_agility,
      {"Channel Agility", "wlan_mgt.fixed.capabilities.agility",
-      FT_BOOLEAN, 16, TFS (&cf_agility_flags), 0x0080, "Channel Agility", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_agility_flags), 0x0080, NULL, HFILL }},
 
     {&ff_cf_spec_man,
      {"Spectrum Management", "wlan_mgt.fixed.capabilities.spec_man",
-      FT_BOOLEAN, 16, TFS (&cf_spec_man_flags), 0x0100, "Spectrum Management", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_spec_man_flags), 0x0100, NULL, HFILL }},
 
     {&ff_short_slot_time,
      {"Short Slot Time", "wlan_mgt.fixed.capabilities.short_slot_time",
-      FT_BOOLEAN, 16, TFS (&short_slot_time_flags), 0x0400, "Short Slot Time",
+      FT_BOOLEAN, 16, TFS (&short_slot_time_flags), 0x0400, NULL,
       HFILL }},
 
     {&ff_cf_apsd,
      {"Automatic Power Save Delivery", "wlan_mgt.fixed.capabilities.apsd",
-      FT_BOOLEAN, 16, TFS (&cf_apsd_flags), 0x0800, "Automatic Power Save Delivery", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_apsd_flags), 0x0800, NULL, HFILL }},
 
     {&ff_dsss_ofdm,
      {"DSSS-OFDM", "wlan_mgt.fixed.capabilities.dsss_ofdm",
@@ -10373,11 +10373,11 @@ proto_register_ieee80211 (void)
 
     {&ff_cf_del_blk_ack,
      {"Delayed Block Ack", "wlan_mgt.fixed.capabilities.del_blk_ack",
-      FT_BOOLEAN, 16, TFS (&cf_del_blk_ack_flags), 0x4000, "Delayed Block Ack", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_del_blk_ack_flags), 0x4000, NULL, HFILL }},
 
     {&ff_cf_imm_blk_ack,
      {"Immediate Block Ack", "wlan_mgt.fixed.capabilities.imm_blk_ack",
-      FT_BOOLEAN, 16, TFS (&cf_imm_blk_ack_flags), 0x8000, "Immediate Block Ack", HFILL }},
+      FT_BOOLEAN, 16, TFS (&cf_imm_blk_ack_flags), 0x8000, NULL, HFILL }},
 
     {&ff_auth_seq,
      {"Authentication SEQ", "wlan_mgt.fixed.auth_seq",
@@ -10385,11 +10385,11 @@ proto_register_ieee80211 (void)
 
     {&ff_assoc_id,
      {"Association ID", "wlan_mgt.fixed.aid",
-      FT_UINT16, BASE_HEX, NULL, 0, "Association ID", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_listen_ival,
      {"Listen Interval", "wlan_mgt.fixed.listen_ival",
-      FT_UINT16, BASE_HEX, NULL, 0, "Listen Interval", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_current_ap,
      {"Current AP", "wlan_mgt.fixed.current_ap",
@@ -10431,27 +10431,27 @@ proto_register_ieee80211 (void)
 
     {&ff_mesh_mgt_length,
      {"Message Length", "wlan_mgt.fixed.length",
-      FT_UINT8, BASE_DEC, NULL, 0, "Message Length", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_mode,
      {"Message Mode", "wlan_mgt.fixed.mode",
-      FT_UINT8, BASE_HEX, NULL, 0, "Message Mode", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_ttl,
      {"Message TTL", "wlan_mgt.fixed.ttl",
-      FT_UINT8, BASE_DEC, NULL, 0, "Message TTL", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_dstcount,
      {"Destination Count", "wlan_mgt.fixed.dstcount",
-      FT_UINT8, BASE_DEC, NULL, 0, "Destination Count", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_hopcount,
      {"Hop Count", "wlan_mgt.fixed.hopcount",
-      FT_UINT8, BASE_DEC, NULL, 0, "Hop Count", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_rreqid,
      {"RREQ ID", "wlan_mgt.fixed.rreqid",
-      FT_UINT32, BASE_DEC, NULL, 0, "RREQ ID", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_sa,
      {"Source Address", "wlan_mgt.fixed.sa",
@@ -10467,7 +10467,7 @@ proto_register_ieee80211 (void)
 
     {&ff_mesh_mgt_flags,
      {"RREQ Flags", "wlan_mgt.fixed.hopcount",
-      FT_UINT8, BASE_HEX, NULL, 0, "RREQ Flags", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&ff_mesh_mgt_da,
      {"Destination Address", "wlan_mgt.fixed.da",
@@ -10545,17 +10545,17 @@ proto_register_ieee80211 (void)
     {&tim_dtim_count,
      {"DTIM count", "wlan_mgt.tim.dtim_count",
       FT_UINT8, BASE_DEC, NULL, 0,
-      "DTIM count", HFILL }},
+      NULL, HFILL }},
 
     {&tim_dtim_period,
      {"DTIM period", "wlan_mgt.tim.dtim_period",
       FT_UINT8, BASE_DEC, NULL, 0,
-      "DTIM period", HFILL }},
+      NULL, HFILL }},
 
     {&tim_bmapctl,
      {"Bitmap control", "wlan_mgt.tim.bmapctl",
       FT_UINT8, BASE_HEX, NULL, 0,
-      "Bitmap control", HFILL }},
+      NULL, HFILL }},
 
     {&rsn_cap,
      {"RSN Capabilities", "wlan_mgt.rsn.capabilities", FT_UINT16, BASE_HEX,
@@ -10564,24 +10564,24 @@ proto_register_ieee80211 (void)
     {&rsn_cap_preauth,
      {"RSN Pre-Auth capabilities", "wlan_mgt.rsn.capabilities.preauth",
       FT_BOOLEAN, 16, TFS (&rsn_preauth_flags), 0x0001,
-      "RSN Pre-Auth capabilities", HFILL }},
+      NULL, HFILL }},
 
     {&rsn_cap_no_pairwise,
      {"RSN No Pairwise capabilities", "wlan_mgt.rsn.capabilities.no_pairwise",
       FT_BOOLEAN, 16, TFS (&rsn_no_pairwise_flags), 0x0002,
-      "RSN No Pairwise capabilities", HFILL }},
+      NULL, HFILL }},
 
     {&rsn_cap_ptksa_replay_counter,
      {"RSN PTKSA Replay Counter capabilities",
       "wlan_mgt.rsn.capabilities.ptksa_replay_counter",
       FT_UINT16, BASE_HEX, VALS (&rsn_cap_replay_counter), 0x000C,
-      "RSN PTKSA Replay Counter capabilities", HFILL }},
+      NULL, HFILL }},
 
     {&rsn_cap_gtksa_replay_counter,
      {"RSN GTKSA Replay Counter capabilities",
       "wlan_mgt.rsn.capabilities.gtksa_replay_counter",
       FT_UINT16, BASE_HEX, VALS (&rsn_cap_replay_counter), 0x0030,
-      "RSN GTKSA Replay Counter capabilities", HFILL }},
+      NULL, HFILL }},
 
     {&ht_cap,
      {"HT Capabilities Info", "wlan_mgt.ht.capabilities", FT_UINT16, BASE_HEX,
@@ -10594,37 +10594,37 @@ proto_register_ieee80211 (void)
     {&ht_ldpc_coding,
      {"HT LDPC coding capability", "wlan_mgt.ht.capabilities.ldpccoding",
       FT_BOOLEAN, 16, TFS (&ht_ldpc_coding_flag), 0x0001,
-      "HT LDPC coding capability", HFILL }},
+      NULL, HFILL }},
 
     {&ht_chan_width,
      {"HT Support channel width", "wlan_mgt.ht.capabilities.width",
       FT_BOOLEAN, 16, TFS (&ht_chan_width_flag), 0x0002,
-      "HT Support channel width", HFILL }},
+      NULL, HFILL }},
 
     {&ht_sm_pwsave,
      {"HT SM Power Save", "wlan_mgt.ht.capabilities.sm",
       FT_UINT16, BASE_HEX, VALS (&ht_sm_pwsave_flag), 0x000c,
-      "HT SM Power Save", HFILL }},
+      NULL, HFILL }},
 
     {&ht_green,
      {"HT Green Field", "wlan_mgt.ht.capabilities.green",
       FT_BOOLEAN, 16, TFS (&ht_green_flag), 0x0010,
-      "HT Green Field", HFILL }},
+      NULL, HFILL }},
 
     {&ht_short20,
      {"HT Short GI for 20MHz", "wlan_mgt.ht.capabilities.short20",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0020,
-      "HT Short GI for 20MHz", HFILL }},
+      NULL, HFILL }},
 
     {&ht_short40,
      {"HT Short GI for 40MHz", "wlan_mgt.ht.capabilities.short40",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0040,
-      "HT Short GI for 40MHz", HFILL }},
+      NULL, HFILL }},
 
     {&ht_tx_stbc,
      {"HT Tx STBC", "wlan_mgt.ht.capabilities.txstbc",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0080,
-      "HT Tx STBC", HFILL }},
+      NULL, HFILL }},
 
     {&ht_rx_stbc,
      {"HT Rx STBC", "wlan_mgt.ht.capabilities.rxstbc",
@@ -10634,12 +10634,12 @@ proto_register_ieee80211 (void)
     {&ht_delayed_block_ack,
      {"HT Delayed Block ACK", "wlan_mgt.ht.capabilities.delayedblockack",
       FT_BOOLEAN, 16, TFS (&ht_delayed_block_ack_flag), 0x0400,
-      "HT Delayed Block ACK", HFILL }},
+      NULL, HFILL }},
 
     {&ht_max_amsdu,
      {"HT Max A-MSDU length", "wlan_mgt.ht.capabilities.amsdu",
       FT_BOOLEAN, 16, TFS (&ht_max_amsdu_flag), 0x0800,
-      "HT Max A-MSDU length", HFILL }},
+      NULL, HFILL }},
 
     {&ht_dss_cck_40,
      {"HT DSSS/CCK mode in 40MHz", "wlan_mgt.ht.capabilities.dsscck",
@@ -10649,21 +10649,21 @@ proto_register_ieee80211 (void)
     {&ht_psmp,
      {"HT PSMP Support", "wlan_mgt.ht.capabilities.psmp",
       FT_BOOLEAN, 16, TFS (&ht_psmp_flag), 0x2000,
-      "HT PSMP Support", HFILL }},
+      NULL, HFILL }},
 
     {&ht_40_mhz_intolerant,
      {"HT Forty MHz Intolerant", "wlan_mgt.ht.capabilities.40mhzintolerant",
       FT_BOOLEAN, 16, TFS (&ht_40_mhz_intolerant_flag), 0x4000,
-      "HT Forty MHz Intolerant", HFILL }},
+      NULL, HFILL }},
 
     {&ht_l_sig,
      {"HT L-SIG TXOP Protection support", "wlan_mgt.ht.capabilities.lsig",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x8000,
-      "HT L-SIG TXOP Protection support", HFILL }},
+      NULL, HFILL }},
 
     {&ampduparam,
      {"A-MPDU Parameters", "wlan_mgt.ht.ampduparam", FT_UINT16, BASE_HEX,
-      NULL, 0, "A-MPDU Parameters", HFILL }},
+      NULL, 0, NULL, HFILL }},
 
     {&ampduparam_vs,
      {"A-MPDU Parameters (VS)", "wlan_mgt.vs.ht.ampduparam", FT_UINT16, BASE_HEX,
@@ -10672,21 +10672,21 @@ proto_register_ieee80211 (void)
     {&ampduparam_mpdu,
      {"Maximum Rx A-MPDU Length", "wlan_mgt.ht.ampduparam.maxlength",
       FT_UINT8, BASE_HEX, 0 , 0x03,
-      "Maximum Rx A-MPDU Length", HFILL }},
+      NULL, HFILL }},
 
     {&ampduparam_mpdu_start_spacing,
      {"MPDU Density", "wlan_mgt.ht.ampduparam.mpdudensity",
       FT_UINT8, BASE_HEX, VALS (&ampduparam_mpdu_start_spacing_flags) , 0x1c,
-      "MPDU Density", HFILL }},
+      NULL, HFILL }},
 
     {&ampduparam_reserved,
      {"Reserved", "wlan_mgt.ht.ampduparam.reserved",
       FT_UINT8, BASE_HEX, NULL, 0xE0,
-      "Reserved", HFILL }},
+      NULL, HFILL }},
 
     {&mcsset,
      {"Rx Supported Modulation and Coding Scheme Set", "wlan_mgt.ht.mcsset",
-      FT_STRING, BASE_NONE, NULL, 0, "Rx Supported Modulation and Coding Scheme Set", HFILL }},
+      FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&mcsset_vs,
      {"Rx Supported Modulation and Coding Scheme Set (VS)", "wlan_mgt.vs.ht.mcsset",
@@ -10694,59 +10694,59 @@ proto_register_ieee80211 (void)
 
     {&mcsset_rx_bitmask_0to7,
      {"Rx Bitmask Bits 0-7", "wlan_mgt.ht.mcsset.rxbitmask.0to7",
-      FT_UINT32, BASE_HEX, 0, 0x000000ff, "Rx Bitmask Bits 0-7", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x000000ff, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_8to15,
      {"Rx Bitmask Bits 8-15", "wlan_mgt.ht.mcsset.rxbitmask.8to15",
-      FT_UINT32, BASE_HEX, 0, 0x0000ff00, "Rx Bitmask Bits 8-15", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x0000ff00, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_16to23,
      {"Rx Bitmask Bits 16-23", "wlan_mgt.ht.mcsset.rxbitmask.16to23",
-      FT_UINT32, BASE_HEX, 0, 0x00ff0000, "Rx Bitmask Bits 16-23", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x00ff0000, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_24to31,
      {"Rx Bitmask Bits 24-31", "wlan_mgt.ht.mcsset.rxbitmask.24to31",
-      FT_UINT32, BASE_HEX, 0, 0xff000000, "Rx Bitmask Bits 24-31", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0xff000000, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_32,
      {"Rx Bitmask Bit 32", "wlan_mgt.ht.mcsset.rxbitmask.32",
-      FT_UINT32, BASE_HEX, 0, 0x000001, "Rx Bitmask Bit 32", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x000001, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_33to38,
      {"Rx Bitmask Bits 33-38", "wlan_mgt.ht.mcsset.rxbitmask.33to38",
-      FT_UINT32, BASE_HEX, 0, 0x00007e, "Rx Bitmask Bits 33-38", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x00007e, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_39to52,
      {"Rx Bitmask Bits 39-52", "wlan_mgt.ht.mcsset.rxbitmask.39to52",
-      FT_UINT32, BASE_HEX, 0, 0x1fff80, "Rx Bitmask Bits 39-52", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x1fff80, NULL, HFILL }},
 
     {&mcsset_rx_bitmask_53to76,
      {"Rx Bitmask Bits 53-76", "wlan_mgt.ht.mcsset.rxbitmask.53to76",
-      FT_UINT32, BASE_HEX, 0, 0x1fffffe0, "Rx Bitmask Bits 53-76", HFILL }},
+      FT_UINT32, BASE_HEX, 0, 0x1fffffe0, NULL, HFILL }},
 
     {&mcsset_highest_data_rate,
      {"Highest Supported Data Rate", "wlan_mgt.ht.mcsset.highestdatarate",
-      FT_UINT16, BASE_HEX, 0, 0x03ff, "Highest Supported Data Rate", HFILL }},
+      FT_UINT16, BASE_HEX, 0, 0x03ff, NULL, HFILL }},
 
     {&mcsset_tx_mcs_set_defined,
      {"Tx Supported MCS Set", "wlan_mgt.ht.mcsset.txsetdefined",
       FT_BOOLEAN, 16, TFS (&mcsset_tx_mcs_set_defined_flag), 0x0001,
-      "Tx Supported MCS Set", HFILL }},
+      NULL, HFILL }},
 
     {&mcsset_tx_rx_mcs_set_not_equal,
      {"Tx and Rx MCS Set", "wlan_mgt.ht.mcsset.txrxmcsnotequal",
       FT_BOOLEAN, 16, TFS (&mcsset_tx_rx_mcs_set_not_equal_flag), 0x0002,
-      "Tx and Rx MCS Set", HFILL }},
+      NULL, HFILL }},
 
     {&mcsset_tx_max_spatial_streams,
      {"Tx Maximum Number of Spatial Streams Supported", "wlan_mgt.ht.mcsset.txmaxss",
       FT_UINT16, BASE_HEX, VALS (&mcsset_tx_max_spatial_streams_flags) , 0x000c,
-      "Tx Maximum Number of Spatial Streams Supported", HFILL }},
+      NULL, HFILL }},
 
     {&mcsset_tx_unequal_modulation,
      {"Unequal Modulation", "wlan_mgt.ht.mcsset.txunequalmod",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0010,
-      "Unequal Modulation", HFILL }},
+      NULL, HFILL }},
 
     {&htex_cap,
      {"HT Extended Capabilities", "wlan_mgt.htex.capabilities", FT_UINT16, BASE_HEX,
@@ -10759,31 +10759,31 @@ proto_register_ieee80211 (void)
     {&htex_pco,
      {"Transmitter supports PCO", "wlan_mgt.htex.capabilities.pco",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0001,
-      "Transmitter supports PCO", HFILL }},
+      NULL, HFILL }},
 
     {&htex_transtime,
      {"Time needed to transition between 20MHz and 40MHz", "wlan_mgt.htex.capabilities.transtime",
       FT_UINT16, BASE_HEX, VALS (&htex_transtime_flags), 0x0006,
-      "Time needed to transition between 20MHz and 40MHz", HFILL }},
+      NULL, HFILL }},
 
     {&htex_mcs,
      {"MCS Feedback capability", "wlan_mgt.htex.capabilities.mcs",
       FT_UINT16, BASE_HEX, VALS (&htex_mcs_flags), 0x0300,
-      "MCS Feedback capability", HFILL }},
+      NULL, HFILL }},
 
     {&htex_htc_support,
      {"High Throughput", "wlan_mgt.htex.capabilities.htc",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0400,
-      "High Throughput", HFILL }},
+      NULL, HFILL }},
 
     {&htex_rd_responder,
      {"Reverse Direction Responder", "wlan_mgt.htex.capabilities.rdresponder",
       FT_BOOLEAN, 16, TFS (&tfs_supported_not_supported), 0x0800,
-      "Reverse Direction Responder", HFILL }},
+      NULL, HFILL }},
 
     {&txbf,
      {"Transmit Beam Forming (TxBF) Capabilities", "wlan_mgt.txbf", FT_UINT16, BASE_HEX,
-      NULL, 0, "Transmit Beam Forming (TxBF) Capabilities", HFILL }},
+      NULL, 0, NULL, HFILL }},
 
     {&txbf_vs,
      {"Transmit Beam Forming (TxBF) Capabilities (VS)", "wlan_mgt.vs.txbf", FT_UINT16, BASE_HEX,
@@ -10792,12 +10792,12 @@ proto_register_ieee80211 (void)
     {&txbf_cap,
      {"Transmit Beamforming", "wlan_mgt.txbf.txbf",
       FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000001,
-      "Transmit Beamforming", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_rcv_ssc,
      {"Receive Staggered Sounding", "wlan_mgt.txbf.rxss",
       FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000002,
-      "Receive Staggered Sounding", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_tx_ssc,
      {"Transmit Staggered Sounding", "wlan_mgt.txbf.txss",
@@ -10807,12 +10807,12 @@ proto_register_ieee80211 (void)
     {&txbf_rcv_ndp,
      {"Receive Null Data packet (NDP)", "wlan_mgt.txbf.rxndp",
       FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000008,
-      "Receive Null Data packet (NDP)", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_tx_ndp,
      {"Transmit Null Data packet (NDP)", "wlan_mgt.txbf.txndp",
       FT_BOOLEAN, 32, TFS (&tfs_supported_not_supported), 0x00000010,
-      "Transmit Null Data packet (NDP)", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_impl_txbf,
      {"Implicit TxBF capable", "wlan_mgt.txbf.impltxbf",
@@ -10822,7 +10822,7 @@ proto_register_ieee80211 (void)
     {&txbf_calib,
      {"Calibration", "wlan_mgt.txbf.calibration",
       FT_UINT32, BASE_HEX, VALS (&txbf_calib_flag), 0x000000c0,
-      "Calibration", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_expl_csi,
      {"STA can apply TxBF using CSI explicit feedback", "wlan_mgt.txbf.csi",
@@ -10842,12 +10842,12 @@ proto_register_ieee80211 (void)
     {&txbf_expl_bf_csi,
      {"Receiver can return explicit CSI feedback", "wlan_mgt.txbf.rcsi",
       FT_UINT32, BASE_HEX, VALS (&txbf_feedback_flags), 0x00001800,
-      "Receiver can return explicit CSI feedback", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_expl_uncomp_fm_feed,
      {"Receiver can return explicit uncompressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.uncompressed.rbf",
       FT_UINT32, BASE_HEX, VALS (&txbf_feedback_flags), 0x00006000,
-      "Receiver can return explicit uncompressed Beamforming Feedback Matrix", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_expl_comp_fm_feed,
      {"STA can compress and use compressed Beamforming Feedback Matrix", "wlan_mgt.txbf.fm.compressed.bf",
@@ -10857,7 +10857,7 @@ proto_register_ieee80211 (void)
     {&txbf_min_group,
      {"Minimal grouping used for explicit feedback reports", "wlan_mgt.txbf.mingroup",
       FT_UINT32, BASE_HEX, VALS (&txbf_min_group_flags), 0x00060000,
-      "Minimal grouping used for explicit feedback reports", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_csi_num_bf_ant,
      {"Max antennae STA can support when CSI feedback required", "wlan_mgt.txbf.csinumant",
@@ -10877,17 +10877,17 @@ proto_register_ieee80211 (void)
     {&txbf_csi_max_rows_bf,
      {"Maximum number of rows of CSI explicit feedback", "wlan_mgt.txbf.csi.maxrows",
       FT_UINT32, BASE_HEX, VALS (&txbf_csi_max_rows_bf_flags), 0x06000000,
-      "Maximum number of rows of CSI explicit feedback", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_chan_est,
      {"Maximum number of space time streams for which channel dimensions can be simultaneously estimated", "wlan_mgt.txbf.channelest",
       FT_UINT32, BASE_HEX, VALS (&txbf_chan_est_flags), 0x18000000,
-      "Maximum number of space time streams for which channel dimensions can be simultaneously estimated", HFILL }},
+      NULL, HFILL }},
 
     {&txbf_resrv,
      {"Reserved", "wlan_mgt.txbf.reserved",
       FT_UINT32, BASE_HEX, NULL, 0xe0000000,
-      "Reserved", HFILL }},
+      NULL, HFILL }},
 
     {&hta_cap,
      {"HT Additional Capabilities", "wlan_mgt.hta.capabilities", FT_UINT16, BASE_HEX,
@@ -10896,7 +10896,7 @@ proto_register_ieee80211 (void)
     {&hta_ext_chan_offset,
      {"Extension Channel Offset", "wlan_mgt.hta.capabilities.extchan",
       FT_UINT16, BASE_HEX, VALS (&hta_ext_chan_offset_flag), 0x0003,
-      "Extension Channel Offset", HFILL }},
+      NULL, HFILL }},
 
     {&hta_rec_tx_width,
      {"Recommended Tx Channel Width", "wlan_mgt.hta.capabilities.rectxwidth",
@@ -10906,22 +10906,22 @@ proto_register_ieee80211 (void)
     {&hta_rifs_mode,
      {"Reduced Interframe Spacing (RIFS) Mode", "wlan_mgt.hta.capabilities.rifsmode",
       FT_BOOLEAN, 16, TFS (&hta_rifs_mode_flag), 0x0008,
-      "Reduced Interframe Spacing (RIFS) Mode", HFILL }},
+      NULL, HFILL }},
 
     {&hta_controlled_access,
      {"Controlled Access Only", "wlan_mgt.hta.capabilities.controlledaccess",
       FT_BOOLEAN, 16, TFS (&hta_controlled_access_flag), 0x0010,
-      "Controlled Access Only", HFILL }},
+      NULL, HFILL }},
 
     {&hta_service_interval,
      {"Service Interval Granularity", "wlan_mgt.hta.capabilities.serviceinterval",
       FT_UINT16, BASE_HEX, VALS (&hta_service_interval_flag), 0x00E0,
-      "Service Interval Granularity", HFILL }},
+      NULL, HFILL }},
 
     {&hta_operating_mode,
      {"Operating Mode", "wlan_mgt.hta.capabilities.operatingmode",
       FT_UINT16, BASE_HEX, VALS (&hta_operating_mode_flag), 0x0003,
-      "Operating Mode", HFILL }},
+      NULL, HFILL }},
 
     {&hta_non_gf_devices,
      {"Non Greenfield (GF) devices Present", "wlan_mgt.hta.capabilities.nongfdevices",
@@ -10931,36 +10931,36 @@ proto_register_ieee80211 (void)
     {&hta_basic_stbc_mcs,
      {"Basic STB Modulation and Coding Scheme (MCS)", "wlan_mgt.hta.capabilities.",
       FT_UINT16, BASE_HEX, NULL , 0x007f,
-      "Basic STB Modulation and Coding Scheme (MCS)", HFILL }},
+      NULL, HFILL }},
 
     {&hta_dual_stbc_protection,
      {"Dual Clear To Send (CTS) Protection", "wlan_mgt.hta.capabilities.",
       FT_BOOLEAN, 16, TFS (&hta_dual_stbc_protection_flag), 0x0080,
-      "Dual Clear To Send (CTS) Protection", HFILL }},
+      NULL, HFILL }},
 
     {&hta_secondary_beacon,
      {"Secondary Beacon", "wlan_mgt.hta.capabilities.",
       FT_BOOLEAN, 16, TFS (&hta_secondary_beacon_flag), 0x0100,
-      "Secondary Beacon", HFILL }},
+      NULL, HFILL }},
 
     {&hta_lsig_txop_protection,
      {"L-SIG TXOP Protection Support", "wlan_mgt.hta.capabilities.",
       FT_BOOLEAN, 16, TFS (&hta_lsig_txop_protection_flag), 0x0200,
-      "L-SIG TXOP Protection Support", HFILL }},
+      NULL, HFILL }},
 
     {&hta_pco_active,
      {"Phased Coexistence Operation (PCO) Active", "wlan_mgt.hta.capabilities.",
       FT_BOOLEAN, 16, TFS (&hta_pco_active_flag), 0x0400,
-      "Phased Coexistence Operation (PCO) Active", HFILL }},
+      NULL, HFILL }},
 
     {&hta_pco_phase,
      {"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.hta.capabilities.",
       FT_BOOLEAN, 16, TFS (&hta_pco_phase_flag), 0x0800,
-      "Phased Coexistence Operation (PCO) Phase", HFILL }},
+      NULL, HFILL }},
 
     {&antsel,
      {"Antenna Selection (ASEL) Capabilities", "wlan_mgt.asel",
-      FT_UINT8, BASE_HEX, NULL, 0, "Antenna Selection (ASEL) Capabilities", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&antsel_vs,
      {"Antenna Selection (ASEL) Capabilities (VS)", "wlan_mgt.vs.asel",
@@ -10968,316 +10968,316 @@ proto_register_ieee80211 (void)
 
     {&antsel_b0,
      {"Antenna Selection Capable", "wlan_mgt.asel.capable",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x01, "Antenna Selection Capable", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x01, NULL, HFILL }},
 
     {&antsel_b1,
      {"Explicit CSI Feedback Based Tx ASEL", "wlan_mgt.asel.txcsi",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x02, "Explicit CSI Feedback Based Tx ASEL", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x02, NULL, HFILL }},
 
     {&antsel_b2,
      {"Antenna Indices Feedback Based Tx ASEL", "wlan_mgt.asel.txif",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x04, "Antenna Indices Feedback Based Tx ASEL", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x04, NULL, HFILL }},
 
     {&antsel_b3,
      {"Explicit CSI Feedback", "wlan_mgt.asel.csi",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x08, "Explicit CSI Feedback", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x08, NULL, HFILL }},
 
     {&antsel_b4,
      {"Antenna Indices Feedback", "wlan_mgt.asel.if",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x10, "Antenna Indices Feedback", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x10, NULL, HFILL }},
 
     {&antsel_b5,
      {"Rx ASEL", "wlan_mgt.asel.rx",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x20, "Rx ASEL", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x20, NULL, HFILL }},
 
     {&antsel_b6,
      {"Tx Sounding PPDUs", "wlan_mgt.asel.sppdu",
-      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x40, "Tx Sounding PPDUs", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_supported_not_supported), 0x40, NULL, HFILL }},
 
     {&antsel_b7,
      {"Reserved", "wlan_mgt.asel.reserved",
-      FT_UINT8, BASE_HEX, NULL, 0x80, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0x80, NULL, HFILL }},
 
     {&ht_info_delimiter1,
      {"HT Information Delimiter #1", "wlan_mgt.ht.info.delim1",
-      FT_UINT8, BASE_HEX, NULL, 0xff, "HT Information Delimiter #1", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
 
     {&ht_info_primary_channel,
      {"Primary Channel", "wlan_mgt.ht.info.primarychannel",
-      FT_UINT8, BASE_DEC, NULL, 0, "Primary Channel", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ht_info_secondary_channel_offset,
      {"Secondary channel offset", "wlan_mgt.ht.info.secchanoffset",
-      FT_UINT8, BASE_HEX, VALS (&ht_info_secondary_channel_offset_flags), 0x03, "Secondary channel offset", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&ht_info_secondary_channel_offset_flags), 0x03, NULL, HFILL }},
 
     {&ht_info_channel_width,
      {"Supported channel width", "wlan_mgt.ht.info.chanwidth",
-      FT_BOOLEAN, 8, TFS (&ht_info_channel_width_flag), 0x04, "Supported channel width", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ht_info_channel_width_flag), 0x04, NULL, HFILL }},
 
     {&ht_info_rifs_mode,
      {"Reduced Interframe Spacing (RIFS)", "wlan_mgt.ht.info.rifs",
-      FT_BOOLEAN, 8, TFS (&ht_info_rifs_mode_flag), 0x08, "Reduced Interframe Spacing (RIFS)", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ht_info_rifs_mode_flag), 0x08, NULL, HFILL }},
 
     {&ht_info_psmp_stas_only,
      {"Power Save Multi-Poll (PSMP) stations only", "wlan_mgt.ht.info.psmponly",
-      FT_BOOLEAN, 8, TFS (&ht_info_psmp_stas_only_flag), 0x10, "Power Save Multi-Poll (PSMP) stations only", HFILL }},
+      FT_BOOLEAN, 8, TFS (&ht_info_psmp_stas_only_flag), 0x10, NULL, HFILL }},
 
     {&ht_info_service_interval_granularity,
      {"Shortest service interval", "wlan_mgt.ht.info.",
-      FT_UINT8, BASE_HEX, VALS (&ht_info_service_interval_granularity_flags), 0xe0, "Shortest service interval", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&ht_info_service_interval_granularity_flags), 0xe0, NULL, HFILL }},
 
     {&ht_info_delimiter2,
      {"HT Information Delimiter #2", "wlan_mgt.ht.info.delim2",
-      FT_UINT16, BASE_HEX, NULL, 0xffff, "HT Information Delimiter #2", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }},
 
     {&ht_info_operating_mode,
      {"Operating mode of BSS", "wlan_mgt.ht.info.operatingmode",
-      FT_UINT16, BASE_HEX, VALS (&ht_info_operating_mode_flags), 0x0003, "Operating mode of BSS", HFILL }},
+      FT_UINT16, BASE_HEX, VALS (&ht_info_operating_mode_flags), 0x0003, NULL, HFILL }},
 
     {&ht_info_non_greenfield_sta_present,
      {"Non-greenfield STAs present", "wlan_mgt.ht.info.greenfield",
-      FT_BOOLEAN, 16, TFS (&ht_info_non_greenfield_sta_present_flag), 0x0004, "Non-greenfield STAs present", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_non_greenfield_sta_present_flag), 0x0004, NULL, HFILL }},
 
     {&ht_info_transmit_burst_limit,
      {"Transmit burst limit", "wlan_mgt.ht.info.burstlim",
-      FT_BOOLEAN, 16, TFS (&ht_info_transmit_burst_limit_flag), 0x0008, "Transmit burst limit", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_transmit_burst_limit_flag), 0x0008, NULL, HFILL }},
 
     {&ht_info_obss_non_ht_stas_present,
      {"OBSS non-HT STAs present", "wlan_mgt.ht.info.obssnonht",
-      FT_BOOLEAN, 16, TFS (&ht_info_obss_non_ht_stas_present_flag), 0x0010, "OBSS non-HT STAs present", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_obss_non_ht_stas_present_flag), 0x0010, NULL, HFILL }},
 
     {&ht_info_reserved_1,
      {"Reserved", "wlan_mgt.ht.info.reserved1",
-      FT_UINT16, BASE_HEX, NULL, 0xffe0, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0xffe0, NULL, HFILL }},
 
     {&ht_info_delimiter3,
      {"HT Information Delimiter #3", "wlan_mgt.ht.info.delim3",
-      FT_UINT16, BASE_HEX, NULL, 0xffff, "HT Information Delimiter #3", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0xffff, NULL, HFILL }},
 
     {&ht_info_reserved_2,
      {"Reserved", "wlan_mgt.ht.info.reserved2",
-      FT_UINT16, BASE_HEX, NULL, 0x003f, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x003f, NULL, HFILL }},
 
     {&ht_info_dual_beacon,
      {"Dual beacon", "wlan_mgt.ht.info.dualbeacon",
-      FT_BOOLEAN, 16, TFS (&ht_info_dual_beacon_flag), 0x0040, "Dual beacon", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_dual_beacon_flag), 0x0040, NULL, HFILL }},
 
     {&ht_info_dual_cts_protection,
      {"Dual Clear To Send (CTS) protection", "wlan_mgt.ht.info.dualcts",
-      FT_BOOLEAN, 16, TFS (&ht_info_dual_cts_protection_flag), 0x0080, "Dual Clear To Send (CTS) protection", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_dual_cts_protection_flag), 0x0080, NULL, HFILL }},
 
     {&ht_info_secondary_beacon,
      {"Beacon ID", "wlan_mgt.ht.info.secondarybeacon",
-      FT_BOOLEAN, 16, TFS (&ht_info_secondary_beacon_flag), 0x0100, "Beacon ID", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_secondary_beacon_flag), 0x0100, NULL, HFILL }},
 
     {&ht_info_lsig_txop_protection_full_support,
      {"L-SIG TXOP Protection Full Support", "wlan_mgt.ht.info.lsigprotsupport",
-      FT_BOOLEAN, 16, TFS (&ht_info_lsig_txop_protection_full_support_flag), 0x0200, "L-SIG TXOP Protection Full Support", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_lsig_txop_protection_full_support_flag), 0x0200, NULL, HFILL }},
 
     {&ht_info_pco_active,
      {"Phased Coexistence Operation (PCO)", "wlan_mgt.ht.info.pco.active",
-      FT_BOOLEAN, 16, TFS (&tfs_active_inactive), 0x0400, "Phased Coexistence Operation (PCO)", HFILL }},
+      FT_BOOLEAN, 16, TFS (&tfs_active_inactive), 0x0400, NULL, HFILL }},
 
     {&ht_info_pco_phase,
      {"Phased Coexistence Operation (PCO) Phase", "wlan_mgt.ht.info.pco.phase",
-      FT_BOOLEAN, 16, TFS (&ht_info_pco_phase_flag), 0x0800, "Phased Coexistence Operation (PCO) Phase", HFILL }},
+      FT_BOOLEAN, 16, TFS (&ht_info_pco_phase_flag), 0x0800, NULL, HFILL }},
 
     {&ht_info_reserved_3,
      {"Reserved", "wlan_mgt.ht.info.reserved3",
-      FT_UINT16, BASE_HEX, NULL, 0xf000, "Reserved", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0xf000, NULL, HFILL }},
 
     {&hf_tag_secondary_channel_offset,
      {"Secondary Channel Offset", "wlan_mgt.secchanoffset",
       FT_UINT8, BASE_HEX, VALS (&hf_tag_secondary_channel_offset_flags), 0,
-      "Secondary Channel Offset", HFILL }},
+      NULL, HFILL }},
 
     /*** Begin: Power Capability Tag - Dustin Johnson ***/
     {&hf_tag_power_capability_min,
      {"Minimum Transmit Power", "wlan_mgt.powercap.min",
-      FT_UINT8, BASE_HEX, NULL, 0, "Minimum Transmit Power", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_power_capability_max,
      {"Maximum Transmit Power", "wlan_mgt.powercap.max",
-      FT_UINT8, BASE_HEX, NULL, 0, "Maximum Transmit Power", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Power Capability Tag - Dustin Johnson ***/
     {&hf_tag_tpc_report_trsmt_pow,
      {"Transmit Power", "wlan_mgt.tcprep.trsmt_pow",
-      FT_INT8, BASE_DEC, NULL, 0, "Transmit Power", HFILL }},
+      FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
     {&hf_tag_tpc_report_link_mrg,
      {"Link Margin", "wlan_mgt.tcprep.link_mrg",
-      FT_INT8, BASE_DEC, NULL, 0, "Link Margin", HFILL }},
+      FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
     /*** Begin: Supported Channels Tag - Dustin Johnson ***/
     {&hf_tag_supported_channels,
      {"Supported Channels Set", "wlan_mgt.supchan",
-      FT_UINT8, BASE_DEC, NULL, 0, "Supported Channels Set", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_supported_channels_first,
      {"First Supported Channel", "wlan_mgt.supchan.first",
-      FT_UINT8, BASE_HEX, NULL, 0, "First Supported Channel", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_supported_channels_range,
      {"Supported Channel Range", "wlan_mgt.supchan.range",
-      FT_UINT8, BASE_HEX, NULL, 0, "Supported Channel Range", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Supported Channels Tag - Dustin Johnson ***/
 
     /*** Start: Measurement Request Tag  - Dustin Johnson***/
     {&hf_tag_measure_request_measurement_token,
      {"Measurement Token", "wlan_mgt.measure.req.measuretoken",
-      FT_UINT8, BASE_HEX, NULL, 0xff, "Measurement Token", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode,
      {"Measurement Request Mode", "wlan_mgt.measure.req.reqmode",
-      FT_UINT8, BASE_HEX, NULL, 0xff, "Measurement Request Mode", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xff, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode_reserved1,
      {"Reserved", "wlan_mgt.measure.req.reqmode.reserved1",
-      FT_UINT8, BASE_HEX, NULL, 0x01, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode_enable,
      {"Measurement Request Mode Field", "wlan_mgt.measure.req.reqmode.enable",
-      FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x02, "Measurement Request Mode Field", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode_request,
      {"Measurement Reports", "wlan_mgt.measure.req.reqmode.request",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, "Measurement Reports", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode_report,
      {"Autonomous Measurement Reports", "wlan_mgt.measure.req.reqmode.report",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x08, "Autonomous Measurement Reports", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x08, NULL, HFILL }},
 
     {&hf_tag_measure_request_mode_reserved2,
      {"Reserved", "wlan_mgt.measure.req.reqmode.reserved2",
-      FT_UINT8, BASE_HEX, NULL, 0xf0, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xf0, NULL, HFILL }},
 
     {&hf_tag_measure_request_type,
      {"Measurement Request Type", "wlan_mgt.measure.req.reqtype",
-      FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_request_type_flags), 0x00, "Measurement Request Type", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_request_type_flags), 0x00, NULL, HFILL }},
 
     {&hf_tag_measure_request_channel_number,
      {"Measurement Channel Number", "wlan_mgt.measure.req.channelnumber",
-      FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_start_time,
      {"Measurement Start Time", "wlan_mgt.measure.req.starttime",
-      FT_UINT64, BASE_HEX, NULL, 0, "Measurement Start Time", HFILL }},
+      FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_duration,
      {"Measurement Duration", "wlan_mgt.measure.req.channelnumber",
-      FT_UINT16, BASE_HEX, NULL, 0, "Measurement Duration", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_regulatory_class,
      {"Measurement Channel Number", "wlan_mgt.measure.req.regclass",
-      FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_randomization_interval,
      {"Randomization Interval", "wlan_mgt.measure.req.randint",
-      FT_UINT16, BASE_HEX, NULL, 0, "Randomization Interval", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_measurement_mode,
      {"Measurement Mode", "wlan_mgt.measure.req.measurementmode",
-      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_measurement_mode_flags), 0, "Measurement Mode", HFILL }},
+      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_measurement_mode_flags), 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_bssid,
      {"BSSID", "wlan_mgt.measure.req.bssid",
-      FT_ETHER, BASE_NONE, NULL, 0, "BSSID", HFILL }},
+      FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_reporting_condition,
      {"Reporting Condition", "wlan_mgt.measure.req.repcond",
-      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_reporting_condition_flags), 0, "Reporting Condition", HFILL }},
+      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_reporting_condition_flags), 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_threshold_offset_unsigned,
      {"Threshold/Offset", "wlan_mgt.measure.req.threshold",
-      FT_UINT8, BASE_HEX, 0, 0, "Threshold/Offset", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_threshold_offset_signed,
      {"Threshold/Offset", "wlan_mgt.measure.req.threshold",
-      FT_UINT8, BASE_HEX, 0, 0, "Threshold/Offset", HFILL }},
+      FT_UINT8, BASE_HEX, 0, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_report_mac,
      {"MAC on wich to gather data", "wlan_mgt.measure.req.reportmac",
-      FT_ETHER, BASE_NONE, NULL, 0, "MAC on wich to gather data", HFILL }},
+      FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_request_group_id,
      {"Group ID", "wlan_mgt.measure.req.groupid",
-      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_group_id_flags), 0, "Group ID", HFILL }},
+      FT_UINT8, BASE_HEX, VALS(&hf_tag_measure_request_group_id_flags), 0, NULL, HFILL }},
     /*** End: Measurement Request Tag  - Dustin Johnson***/
 
     /*** Start: Measurement Report Tag  - Dustin Johnson***/
     {&hf_tag_measure_report_measurement_token,
      {"Measurement Token", "wlan_mgt.measure.req.clr",
-      FT_UINT8, BASE_HEX, NULL, 0, "Measurement Token", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_mode,
      {"Measurement Report Mode", "wlan_mgt.measure.req.clr",
-      FT_UINT8, BASE_HEX, NULL, 0, "Measurement Report Mode", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_mode_late,
      {"Measurement Report Mode Field", "wlan_mgt.measure.rep.repmode.late",
-      FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x01, "Measurement Report Mode Field", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 
     {&hf_tag_measure_report_mode_incapable,
      {"Measurement Reports", "wlan_mgt.measure.rep.repmode.incapable",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x02, "Measurement Reports", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x02, NULL, HFILL }},
 
     {&hf_tag_measure_report_mode_refused,
      {"Autonomous Measurement Reports", "wlan_mgt.measure.rep.repmode.refused",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, "Autonomous Measurement Reports", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_acc_not_acc), 0x04, NULL, HFILL }},
 
     {&hf_tag_measure_report_mode_reserved,
      {"Reserved", "wlan_mgt.measure.rep.repmode.reserved",
-      FT_UINT8, BASE_HEX, NULL, 0xf8, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xf8, NULL, HFILL }},
 
     {&hf_tag_measure_report_type,
      {"Measurement Report Type", "wlan_mgt.measure.rep.reptype",
-      FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_report_type_flags), 0x00, "Measurement Report Type", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&hf_tag_measure_report_type_flags), 0x00, NULL, HFILL }},
 
     {&hf_tag_measure_report_channel_number,
      {"Measurement Channel Number", "wlan_mgt.measure.rep.channelnumber",
-      FT_UINT8, BASE_HEX, NULL, 0, "Measurement Channel Number", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_start_time,
      {"Measurement Start Time", "wlan_mgt.measure.rep.starttime",
-      FT_UINT64, BASE_HEX, NULL, 0, "Measurement Start Time", HFILL }},
+      FT_UINT64, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_duration,
      {"Measurement Duration", "wlan_mgt.measure.rep.channelnumber",
-      FT_UINT16, BASE_HEX, NULL, 0, "Measurement Duration", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_cca_busy_fraction,
      {"CCA Busy Fraction", "wlan_mgt.measure.rep.ccabusy",
-      FT_UINT8, BASE_HEX, NULL, 0, "CCA Busy Fraction", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_basic_map_field,
      {"Map Field", "wlan_mgt.measure.rep.mapfield",
-      FT_UINT8, BASE_HEX, NULL, 0, "Map Field", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_bss,
      {"BSS", "wlan_mgt.measure.rep.repmode.mapfield.bss",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_map_field_bss_flag), 0x01, "BSS", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_map_field_bss_flag), 0x01, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_odfm,
      {"Orthogonal Frequency Division Multiplexing (ODFM) Preamble", "wlan_mgt.measure.rep.repmode.mapfield.bss",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x02, "Orthogonal Frequency Division Multiplexing (ODFM) Preamble", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x02, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_unident_signal,
      {"Unidentified Signal", "wlan_mgt.measure.rep.repmode.mapfield.unidentsig",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x04, "Unidentified Signal", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x04, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_radar,
      {"Radar", "wlan_mgt.measure.rep.repmode.mapfield.radar",
-      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x08, "Radar", HFILL }},
+      FT_BOOLEAN, 8, TFS (&hf_tag_measure_detected_not_detected), 0x08, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_unmeasured,
      {"Unmeasured", "wlan_mgt.measure.rep.repmode.mapfield.unmeasured",
-      FT_BOOLEAN, 8, TFS (&tfs_true_false), 0x10, "Unmeasured", HFILL }},
+      FT_BOOLEAN, 8, TFS (&tfs_true_false), 0x10, NULL, HFILL }},
 
     {&hf_tag_measure_map_field_reserved,
      {"Reserved", "wlan_mgt.measure.rep.repmode.mapfield.reserved",
-      FT_UINT8, BASE_HEX, NULL, 0xe0, "Reserved", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0xe0, NULL, HFILL }},
 
     {&hf_tag_measure_rpi_histogram_report,
      {"Receive Power Indicator (RPI) Histogram Report", "wlan_mgt.measure.rep.rpi.histogram_report",
-      FT_STRING, BASE_NONE, NULL, 0, "Receive Power Indicator (RPI) Histogram Report", HFILL }},
+      FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_rpi_histogram_report_0,
      {"RPI 0 Density", "wlan_mgt.measure.rep.rpi.rpi0density",
@@ -11313,50 +11313,50 @@ proto_register_ieee80211 (void)
 
     {&hf_tag_measure_report_regulatory_class,
      {"Regulatory Class", "wlan_mgt.measure.rep.regclass",
-      FT_UINT8, BASE_HEX, NULL, 0, "Regulatory Class", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_channel_load,
      {"Channel Load", "wlan_mgt.measure.rep.chanload",
-      FT_UINT8, BASE_HEX, NULL, 0, "Channel Load", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_frame_info,
      {"Reported Frame Information", "wlan_mgt.measure.rep.frameinfo",
-      FT_UINT8, BASE_HEX, NULL, 0, "Reported Frame Information", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_frame_info_phy_type,
      {"Condensed PHY", "wlan_mgt.measure.rep.frameinfo.phytype",
-      FT_UINT8, BASE_HEX, NULL, 0x7F, "Condensed PHY", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0x7F, NULL, HFILL }},
 
     {&hf_tag_measure_report_frame_info_frame_type,
      {"Reported Frame Type", "wlan_mgt.measure.rep.frameinfo.frametype",
-      FT_UINT8, BASE_HEX, TFS(&hf_tag_measure_report_frame_info_frame_type_flag), 0x80, "Reported Frame Type", HFILL }},
+      FT_UINT8, BASE_HEX, TFS(&hf_tag_measure_report_frame_info_frame_type_flag), 0x80, NULL, HFILL }},
 
     {&hf_tag_measure_report_rcpi,
      {"Received Channel Power Indicator (RCPI)", "wlan_mgt.measure.rep.rcpi",
-      FT_UINT8, BASE_HEX, NULL, 0, "Received Channel Power Indicator (RCPI)", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_rsni,
      {"Received Signal to Noise Indicator (RSNI)", "wlan_mgt.measure.rep.rsni",
-      FT_UINT8, BASE_HEX, NULL, 0, "Received Signal to Noise Indicator (RSNI)", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_bssid,
      {"BSSID Being Reported", "wlan_mgt.measure.rep.bssid",
-      FT_ETHER, BASE_NONE, NULL, 0, "BSSID Being Reported", HFILL }},
+      FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_ant_id,
      {"Antenna ID", "wlan_mgt.measure.rep.antid",
-      FT_UINT8, BASE_HEX, NULL, 0, "Antenna ID", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_measure_report_parent_tsf,
      {"Parent Timing Synchronization Function (TSF)", "wlan_mgt.measure.rep.parenttsf",
-      FT_UINT32, BASE_HEX, NULL, 0, "Parent Timing Synchronization Function (TSF)", HFILL }},
+      FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Measurement Report Tag  - Dustin Johnson***/
 
     /*** Begin: Extended Capabilities Tag - Dustin Johnson ***/
     /* Table 7-35a-Capabilities field */
     {&hf_tag_extended_capabilities,
      {"Extended Capabilities", "wlan_mgt.extcap",
-      FT_UINT8, BASE_HEX, NULL, 0, "Extended Capabilities", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     /* P802.11n/D6.0 */
     {&hf_tag_extended_capabilities_b0,
@@ -11366,15 +11366,15 @@ proto_register_ieee80211 (void)
     /* P802.11p/D4.0 */
     {&hf_tag_extended_capabilities_b1,
      {"On-demand beacon", "wlan_mgt.extcap.infoexchange.b1",
-      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0002, "On-demand beacon", HFILL }},
+      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0002, NULL, HFILL }},
 
     {&hf_tag_extended_capabilities_b2,
      {"Extended Channel Switching", "wlan_mgt.extcap.infoexchange.b2",
-      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0004, "Extended Channel Switching", HFILL }},
+      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0004, NULL, HFILL }},
 
     {&hf_tag_extended_capabilities_b3,
      {"WAVE indication", "wlan_mgt.extcap.infoexchange.b3",
-      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0008, "WAVE indication", HFILL }},
+      FT_BOOLEAN, 8, TFS(&tfs_supported_not_supported), 0x0008, NULL, HFILL }},
     /*End: P802.11p/D4.0 */
 
     /*** End: Extended Capabilities Tag - Dustin Johnson ***/
@@ -11382,184 +11382,184 @@ proto_register_ieee80211 (void)
     /*** Begin: Neighbor Report Tag - Dustin Johnson ***/
     {&hf_tag_neighbor_report_bssid,
      {"BSSID", "wlan_mgt.nreport.bssid",
-      FT_ETHER, BASE_NONE, NULL, 0, "BSSID", HFILL }},
+      FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info,
      {"BSSID Information", "wlan_mgt.nreport.bssid.info",
-      FT_UINT32, BASE_HEX, NULL, 0, "BSSID Information", HFILL }},
+      FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_reachability,
      {"AP Reachability", "wlan_mgt.nreport.bssid.info.reachability",
-      FT_UINT16, BASE_HEX, NULL, 0x0003, "AP Reachability", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0003, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_security,
      {"Security", "wlan_mgt.nreport.bssid.info.security",
-      FT_UINT16, BASE_HEX, NULL, 0x0004, "Security", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0004, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_key_scope,
      {"Key Scope", "wlan_mgt.nreport.bssid.info.keyscope",
-      FT_UINT16, BASE_HEX, NULL, 0x0008, "Key Scope", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0008, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_spec_mng,
      {"Capability: Spectrum Management", "wlan_mgt.nreport.bssid.info.capability.specmngt",
-      FT_UINT16, BASE_HEX, NULL, 0x0010, "Capability: Spectrum Management", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0010, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_qos,
      {"Capability: QoS", "wlan_mgt.nreport.bssid.info.capability.qos",
-      FT_UINT16, BASE_HEX, NULL, 0x0020, "Capability: QoS", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0020, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_apsd,
      {"Capability: APSD", "wlan_mgt.nreport.bssid.info.capability.apsd",
-      FT_UINT16, BASE_HEX, NULL, 0x0040, "Capability: APSD", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0040, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_radio_msnt,
      {"Capability: Radio Measurement", "wlan_mgt.nreport.bssid.info.capability.radiomsnt",
-      FT_UINT16, BASE_HEX, NULL, 0x0080, "Capability: Radio Measurement", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0080, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_dback,
      {"Capability: Delayed Block Ack", "wlan_mgt.nreport.bssid.info.capability.dback",
-      FT_UINT16, BASE_HEX, NULL, 0x0100, "Capability: Delayed Block Ack", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0100, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_capability_iback,
      {"Capability: Immediate Block Ack", "wlan_mgt.nreport.bssid.info.capability.iback",
-      FT_UINT16, BASE_HEX, NULL, 0x0200, "Capability: Immediate Block Ack", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0200, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_mobility_domain,
      {"Mobility Domain", "wlan_mgt.nreport.bssid.info.mobilitydomain",
-      FT_UINT16, BASE_HEX, NULL, 0x0400, "Mobility Domain", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0400, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_high_throughput,
      {"High Throughput", "wlan_mgt.nreport.bssid.info.hthoughput",
-      FT_UINT16, BASE_HEX, NULL, 0x0800, "High Throughput", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0x0800, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_bssid_info_reserved,
      {"Reserved", "wlan_mgt.nreport.bssid.info.reserved",
-      FT_UINT32, BASE_HEX, NULL, 0, "Reserved", HFILL }},
+      FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_reg_class,
      {"Regulatory Class", "wlan_mgt.nreport.regclass",
-      FT_UINT8, BASE_HEX, NULL, 0, "Regulatory Class", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_channel_number,
      {"Channel Number", "wlan_mgt.nreport.channumber",
-      FT_UINT8, BASE_HEX, NULL, 0, "Channel Number", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_neighbor_report_phy_type,
      {"PHY Type", "wlan_mgt.nreport.phytype",
-      FT_UINT8, BASE_HEX, NULL, 0, "PHY Type", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Neighbor Report Tag - Dustin Johnson ***/
 
     /*** Begin: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
     {&hf_tag_ext_channel_switch_announcement_switch_mode,
      {"Channel Switch Mode", "wlan_mgt.extchanswitch.switchmode",
-      FT_UINT8, BASE_HEX, VALS (&hf_tag_ext_channel_switch_announcement_switch_mode_flags), 0, "Channel Switch Mode", HFILL }},
+      FT_UINT8, BASE_HEX, VALS (&hf_tag_ext_channel_switch_announcement_switch_mode_flags), 0, NULL, HFILL }},
 
     {&hf_tag_ext_channel_switch_announcement_new_reg_class,
      {"New Regulatory Class", "wlan_mgt.extchanswitch.new.regclass",
-      FT_UINT8, BASE_HEX, NULL, 0, "New Regulatory Class", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_ext_channel_switch_announcement_new_chan_number,
      {"New Channel Number", "wlan_mgt.extchanswitch.new.channumber",
-      FT_UINT8, BASE_HEX, NULL, 0, "New Channel Number", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_ext_channel_switch_announcement_switch_count,
      {"Channel Switch Count", "wlan_mgt.extchanswitch.switchcount",
-      FT_UINT8, BASE_HEX, NULL, 0, "Channel Switch Count", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
     /*** End: Extended Channel Switch Announcement Tag - Dustin Johnson ***/
 
     /*** Begin: Supported Regulatory Classes Tag - Dustin Johnson ***/
     {&hf_tag_supported_reg_classes_current,
      {"Current Regulatory Class", "wlan_mgt.supregclass.current",
-      FT_UINT8, BASE_HEX, NULL, 0, "Current Regulatory Class", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_tag_supported_reg_classes_alternate,
      {"Alternate Regulatory Classes", "wlan_mgt.supregclass.alt",
-      FT_STRING, BASE_NONE, NULL, 0, "Alternate Regulatory Classes", HFILL }},
+      FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
     /*** End: Supported Regulatory Classes Tag - Dustin Johnson ***/
 
     {&hf_marvell_ie_type,
      {"Type", "wlan_mgt.marvell.ie.type",
-      FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_marvell_ie_mesh_subtype,
      {"Subtype", "wlan_mgt.marvell.ie.subtype",
-      FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_marvell_ie_mesh_version,
      {"Version", "wlan_mgt.marvell.ie.version",
-      FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_marvell_ie_mesh_active_proto_id,
      {"Path Selection Protocol", "wlan_mgt.marvell.ie.proto_id",
-      FT_UINT8, BASE_HEX, VALS(mesh_path_selection_codes), 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, VALS(mesh_path_selection_codes), 0, NULL, HFILL }},
 
     {&hf_marvell_ie_mesh_active_metric_id,
      {"Path Selection Metric", "wlan_mgt.marvell.ie.metric_id",
-      FT_UINT8, BASE_HEX, VALS(mesh_metric_codes), 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, VALS(mesh_metric_codes), 0, NULL, HFILL }},
 
     {&hf_marvell_ie_mesh_cap,
      {"Mesh Capabilities", "wlan_mgt.marvell.ie.cap",
-      FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_marvell_ie_data,
       { "Marvell IE data", "wlan_mgt.marvell.data",
-        FT_BYTES, BASE_NONE, NULL, 0x0, "Marvell IE data", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     {&hf_aironet_ie_type,
      {"Aironet IE type", "wlan_mgt.aironet.type",
-      FT_UINT8, BASE_DEC, VALS(aironet_ie_type_vals), 0, "Aironet IE type", HFILL }},
+      FT_UINT8, BASE_DEC, VALS(aironet_ie_type_vals), 0, NULL, HFILL }},
 
     {&hf_aironet_ie_version,
      {"Aironet IE CCX version?", "wlan_mgt.aironet.version",
-      FT_UINT8, BASE_DEC, NULL, 0, "Aironet IE CCX version?", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_aironet_ie_data,
       { "Aironet IE data", "wlan_mgt.aironet.data",
-        FT_BYTES, BASE_NONE, NULL, 0x0, "Aironet IE data", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     {&hf_qbss_version,
      {"QBSS Version", "wlan_mgt.qbss.version",
-      FT_UINT8, BASE_DEC, NULL, 0, "QBSS Version", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss_scount,
      {"Station Count", "wlan_mgt.qbss.scount",
-      FT_UINT16, BASE_DEC, NULL, 0, "Station Count", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss_cu,
      {"Channel Utilization", "wlan_mgt.qbss.cu",
-       FT_UINT8, BASE_DEC, NULL, 0, "Channel Utilization", HFILL }},
+       FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss_adc,
      {"Available Admission Capabilities", "wlan_mgt.qbss.adc",
-     FT_UINT8, BASE_DEC, NULL, 0, "Available Admission Capabilities", HFILL }},
+     FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss2_cu,
      {"Channel Utilization", "wlan_mgt.qbss2.cu",
-       FT_UINT8, BASE_DEC, NULL, 0, "Channel Utilization", HFILL }},
+       FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss2_gl,
      {"G.711 CU Quantum", "wlan_mgt.qbss2.glimit",
-      FT_UINT8, BASE_DEC, NULL, 0, "G.711 CU Quantum", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss2_cal,
      {"Call Admission Limit", "wlan_mgt.qbss2.cal",
-      FT_UINT8, BASE_DEC, NULL, 0, "Call Admission Limit", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_qbss2_scount,
      {"Station Count", "wlan_mgt.qbss2.scount",
-      FT_UINT16, BASE_DEC, NULL, 0, "Station Count", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_aironet_ie_qos_unk1,
      {"Aironet IE QoS unknown 1", "wlan_mgt.aironet.qos.unk1",
-      FT_UINT8, BASE_HEX, NULL, 0, "Aironet IE QoS unknown 1", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_aironet_ie_qos_paramset,
      {"Aironet IE QoS paramset", "wlan_mgt.aironet.qos.paramset",
-      FT_UINT8, BASE_DEC, NULL, 0, "Aironet IE QoS paramset", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_aironet_ie_qos_val,
      {"Aironet IE QoS valueset", "wlan_mgt.aironet.qos.val",
-      FT_BYTES, BASE_NONE, NULL, 0, "Aironet IE QoS valueset", HFILL }},
+      FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&hf_ts_info,
      {"Traffic Stream (TS) Info", "wlan_mgt.ts_info",
@@ -11603,75 +11603,75 @@ proto_register_ieee80211 (void)
 
     {&tspec_nor_msdu,
      {"Normal MSDU Size", "wlan_mgt.tspec.nor_msdu",
-      FT_UINT16, BASE_DEC, NULL, 0, "Normal MSDU Size", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_max_msdu,
      {"Maximum MSDU Size", "wlan_mgt.tspec.max_msdu",
-      FT_UINT16, BASE_DEC, NULL, 0, "Maximum MSDU Size", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_min_srv,
      {"Minimum Service Interval", "wlan_mgt.tspec.min_srv",
-      FT_UINT32, BASE_DEC, NULL, 0, "Minimum Service Interval", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_max_srv,
      {"Maximum Service Interval", "wlan_mgt.tspec.max_srv",
-      FT_UINT32, BASE_DEC, NULL, 0, "Maximum Service Interval", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_inact_int,
      {"Inactivity Interval", "wlan_mgt.tspec.inact_int",
-      FT_UINT32, BASE_DEC, NULL, 0, "Inactivity Interval", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_susp_int,
      {"Suspension Interval", "wlan_mgt.tspec.susp_int",
-      FT_UINT32, BASE_DEC, NULL, 0, "Suspension Interval", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_srv_start,
      {"Service Start Time", "wlan_mgt.tspec.srv_start",
-      FT_UINT32, BASE_DEC, NULL, 0, "Service Start Time", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_min_data,
      {"Minimum Data Rate", "wlan_mgt.tspec.min_data",
-      FT_UINT32, BASE_DEC, NULL, 0, "Minimum Data Rate", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_mean_data,
      {"Mean Data Rate", "wlan_mgt.tspec.mean_data",
-      FT_UINT32, BASE_DEC, NULL, 0, "Mean Data Rate", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_peak_data,
      {"Peak Data Rate", "wlan_mgt.tspec.peak_data",
-      FT_UINT32, BASE_DEC, NULL, 0, "Peak Data Rate", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_burst_size,
      {"Burst Size", "wlan_mgt.tspec.burst_size",
-      FT_UINT32, BASE_DEC, NULL, 0, "Burst Size", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_delay_bound,
      {"Delay Bound", "wlan_mgt.tspec.delay_bound",
-      FT_UINT32, BASE_DEC, NULL, 0, "Delay Bound", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_min_phy,
      {"Minimum PHY Rate", "wlan_mgt.tspec.min_phy",
-      FT_UINT32, BASE_DEC, NULL, 0, "Minimum PHY Rate", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_surplus,
      {"Surplus Bandwidth Allowance", "wlan_mgt.tspec.surplus",
-      FT_UINT16, BASE_DEC, NULL, 0, "Surplus Bandwidth Allowance", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&tspec_medium,
      {"Medium Time", "wlan_mgt.tspec.medium",
-      FT_UINT16, BASE_DEC, NULL, 0, "Medium Time", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&ts_delay,
      {"Traffic Stream (TS) Delay", "wlan_mgt.ts_delay",
-      FT_UINT32, BASE_DEC, NULL, 0, "Traffic Stream (TS) Delay", HFILL }},
+      FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&hf_class_type,
      {"Classifier Type", "wlan_mgt.tclas.class_type", FT_UINT8, BASE_DEC,
-      VALS (classifier_type), 0, "Classifier Type", HFILL }},
+      VALS (classifier_type), 0, NULL, HFILL }},
 
     {&hf_class_mask,
      {"Classifier Mask", "wlan_mgt.tclas.class_mask", FT_UINT8, BASE_HEX,
-      NULL, 0, "Classifier Mask", HFILL }},
+      NULL, 0, NULL, HFILL }},
 
     {&hf_ether_type,
      {"Ethernet Type", "wlan_mgt.tclas.params.type", FT_UINT8, BASE_DEC,
@@ -11687,39 +11687,39 @@ proto_register_ieee80211 (void)
 
     {&hf_sched_srv_start,
      {"Service Start Time", "wlan_mgt.sched.srv_start",
-      FT_UINT32, BASE_HEX, NULL, 0, "Service Start Time", HFILL }},
+      FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_sched_srv_int,
      {"Service Interval", "wlan_mgt.sched.srv_int",
-      FT_UINT32, BASE_HEX, NULL, 0, "Service Interval", HFILL }},
+      FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_sched_spec_int,
      {"Specification Interval", "wlan_mgt.sched.spec_int",
-      FT_UINT16, BASE_HEX, NULL, 0, "Specification Interval", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&hf_action,
      {"Action", "wlan_mgt.fixed.action",
-      FT_UINT8, BASE_HEX, NULL, 0, "Action", HFILL }},
+      FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&cf_version,
      {"IP Version", "wlan_mgt.tclas.params.version",
-      FT_UINT8, BASE_DEC, NULL, 0, "IP Version", HFILL }},
+      FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&cf_ipv4_src,
      {"IPv4 Src Addr", "wlan_mgt.tclas.params.ipv4_src",
-      FT_IPv4, BASE_NONE, NULL, 0, "IPv4 Src Addr", HFILL }},
+      FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&cf_ipv4_dst,
      {"IPv4 Dst Addr", "wlan_mgt.tclas.params.ipv4_dst",
-      FT_IPv4, BASE_NONE, NULL, 0, "IPv4 Dst Addr", HFILL }},
+      FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&cf_src_port,
      {"Source Port", "wlan_mgt.tclas.params.src_port",
-      FT_UINT16, BASE_DEC, NULL, 0, "Source Port", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&cf_dst_port,
      {"Destination Port", "wlan_mgt.tclas.params.dst_port",
-      FT_UINT16, BASE_DEC, NULL, 0, "Destination Port", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&cf_dscp,
      {"IPv4 DSCP", "wlan_mgt.tclas.params.dscp",
@@ -11731,11 +11731,11 @@ proto_register_ieee80211 (void)
 
     {&cf_ipv6_src,
      {"IPv6 Src Addr", "wlan_mgt.tclas.params.ipv6_src",
-      FT_IPv6, BASE_NONE, NULL, 0, "IPv6 Src Addr", HFILL }},
+      FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&cf_ipv6_dst,
      {"IPv6 Dst Addr", "wlan_mgt.tclas.params.ipv6_dst",
-      FT_IPv6, BASE_NONE, NULL, 0, "IPv6 Dst Addr", HFILL }},
+      FT_IPv6, BASE_NONE, NULL, 0, NULL, HFILL }},
 
     {&cf_flow,
      {"Flow Label", "wlan_mgt.tclas.params.flow",
@@ -11743,7 +11743,7 @@ proto_register_ieee80211 (void)
 
     {&cf_tag_type,
      {"802.1Q Tag Type", "wlan_mgt.tclas.params.tag_type",
-      FT_UINT16, BASE_HEX, NULL, 0, "802.1Q Tag Type", HFILL }},
+      FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     {&cf_aruba,
      {"Aruba Type", "wlan_mgt.aruba_type",
@@ -11751,11 +11751,11 @@ proto_register_ieee80211 (void)
 
     {&cf_aruba_hb_seq,
      {"Aruba Heartbeat Sequence", "wlan_mgt.aruba_heartbeat_sequence",
-      FT_UINT64, BASE_DEC, NULL, 0, "Aruba Heartbeat Sequence", HFILL }},
+      FT_UINT64, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     {&cf_aruba_mtu,
      {"Aruba MTU Size", "wlan_mgt.aruba_mtu_size",
-      FT_UINT16, BASE_DEC, NULL, 0, "Aruba MTU Size", HFILL }},
+      FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
     /* Start: HT Control (+HTC) */
     {&hf_htc,
@@ -11824,7 +11824,7 @@ proto_register_ieee80211 (void)
   static hf_register_info aggregate_fields[] = {
     {&amsdu_msdu_header_text,
      {"MAC Service Data Unit (MSDU)",	"wlan_aggregate.msduheader", FT_UINT16,
-      BASE_DEC, 0, 0x0000, "MAC Service Data Unit (MSDU)", HFILL }}
+      BASE_DEC, 0, 0x0000, NULL, HFILL }}
   };
 
   static gint *tree_array[] = {
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index bbb007ea67..7024a4a7af 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -1539,22 +1539,22 @@ void proto_register_ieee802154(void)
 
         { &hf_ieee802154_nonask_phy_preamble,
         { "Preamble",                       "wpan-nonask-phy.preamble", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_nonask_phy_sfd,
         { "Start of Frame Delimiter",       "wpan-nonask-phy.sfd", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_nonask_phy_length,
         { "Frame Length",                   "wpan-nonask-phy.frame_length", FT_UINT8, BASE_HEX, NULL, IEEE802154_PHY_LENGTH_MASK,
-            "", HFILL }},
+            NULL, HFILL }},
     };
 
 
     static hf_register_info hf[] = {
         { &hf_ieee802154_frame_type,
         { "Frame Type",                     "wpan.frame_type", FT_UINT16, BASE_HEX, VALS(ieee802154_frame_types), IEEE802154_FCF_TYPE_MASK,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_security,
         { "Security Enabled",               "wpan.security", FT_BOOLEAN, 16, NULL, IEEE802154_FCF_SEC_EN,
@@ -1574,66 +1574,66 @@ void proto_register_ieee802154(void)
 
         { &hf_ieee802154_seqno,
         { "Sequence Number",                "wpan.seq_no", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_dst_addr_mode,
         { "Destination Addressing Mode",    "wpan.dst_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes), IEEE802154_FCF_DADDR_MASK,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_src_addr_mode,
         { "Source Addressing Mode",         "wpan.src_addr_mode", FT_UINT16, BASE_HEX, VALS(ieee802154_addr_modes), IEEE802154_FCF_SADDR_MASK,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_version,
         { "Frame Version",                  "wpan.version", FT_UINT16, BASE_DEC, NULL, IEEE802154_FCF_VERSION,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_dst_pan,
         { "Destination PAN",                "wpan.dst_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_dst_addr16,
         { "Destination",                    "wpan.dst_addr16", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_dst_addr64,
         { "Destination",                    "wpan.dst_addr64", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_src_panID,
         { "Source PAN",                     "wpan.src_pan", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_src_addr16,
         { "Source",                         "wpan.src_addr16", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_src_addr64,
         { "Source",                         "wpan.src_addr64", FT_UINT64, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_fcs,
         { "FCS",                            "wpan.fcs", FT_UINT16, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_rssi,
         { "RSSI",                           "wpan.rssi", FT_INT8, BASE_DEC, NULL, 0x0,
             "Received Signal Strength", HFILL }},
 
         { &hf_ieee802154_fcs_ok,
-        { "FCS Valid",                      "wpan.fcs_ok", FT_BOOLEAN, 8, NULL, 0x0,
-            "", HFILL }},
+        { "FCS Valid",                      "wpan.fcs_ok", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }},
 
         { &hf_ieee802154_correlation,
         { "LQI Correlation Value",          "wpan.correlation", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
             /*  Command Frame Specific Fields */
             /*--------------------------------*/
 
         { &hf_ieee802154_cmd_id,
         { "Command Identifier",         "wpan.cmd.id", FT_UINT8, BASE_HEX, VALS(ieee802154_cmd_names), 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
             /*  Capability Information Fields */
         { &hf_ieee802154_cmd_cinfo_alt_coord,
@@ -1667,11 +1667,11 @@ void proto_register_ieee802154(void)
 
         { &hf_ieee802154_cmd_asrsp_status,
         { "Association Status",         "wpan.cmd.asrsp.status", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ieee802154_cmd_disas_reason,
         { "Disassociation Reason",      "wpan.cmd.disas.reason", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
             /*  Coordinator Realignment fields */
         { &hf_ieee802154_cmd_coord_pan,
@@ -1737,11 +1737,11 @@ void proto_register_ieee802154(void)
             "The number of GTS descriptors present in this beacon frame.", HFILL }},
 
         { &hf_ieee802154_bcn_gts_permit,
-        { "GTS Permit",                 "wpan.bcn.gts.permit", FT_BOOLEAN, 8, NULL, 0x0,
+        { "GTS Permit",                 "wpan.bcn.gts.permit", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             "Whether the PAN coordinator is accepting GTS requests or not.", HFILL }},
 
         { &hf_ieee802154_bcn_gts_direction,
-        { "Direction",                  "wpan.bcn.gts.direction", FT_BOOLEAN, 8, NULL, 0x0,
+        { "Direction",                  "wpan.bcn.gts.direction", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             "A flag defining the direction of the GTS Slot.", HFILL }},
 
         { &hf_ieee802154_bcn_pending16,
diff --git a/epan/dissectors/packet-ieee8021ah.c b/epan/dissectors/packet-ieee8021ah.c
index 43f0dfe38d..eaa8eb0ba9 100644
--- a/epan/dissectors/packet-ieee8021ah.c
+++ b/epan/dissectors/packet-ieee8021ah.c
@@ -346,7 +346,7 @@ proto_register_ieee8021ah(void)
     static hf_register_info hf[] = {
 	{ &hf_ieee8021ah_priority, {
 	    "Priority", "ieee8021ah.priority", FT_UINT32, BASE_DEC,
-	    0, 0xE0000000, "Priority", HFILL }},
+	    0, 0xE0000000, NULL, HFILL }},
 	{ &hf_ieee8021ah_drop, {
 	    "DROP", "ieee8021ah.drop", FT_UINT32, BASE_DEC,
 	    0, 0x10000000, "Drop", HFILL }},
@@ -361,7 +361,7 @@ proto_register_ieee8021ah(void)
 	    0, 0x03000000, "Reserved2", HFILL }},
 	{ &hf_ieee8021ah_isid, {
 	    "I-SID", "ieee8021ah.isid", FT_UINT32, BASE_DEC,
-	    0, 0x00FFFFFF, "I-SID", HFILL }},
+	    0, 0x00FFFFFF, NULL, HFILL }},
 	{ &hf_ieee8021ah_c_daddr, {
 	    "C-Destination", "ieee8021ah.cdst", FT_ETHER, BASE_NONE,
 	    NULL, 0x0, "Customer Destination Address", HFILL }},
@@ -370,10 +370,10 @@ proto_register_ieee8021ah(void)
 	    NULL, 0x0, "Customer Source Address", HFILL }},
 	{ &hf_ieee8021ah_etype, {
 		"Type", "ieee8021ah.etype", FT_UINT16, BASE_HEX,
-		VALS(etype_vals), 0x0, "Type", HFILL }},
+		VALS(etype_vals), 0x0, NULL, HFILL }},
 	{ &hf_ieee8021ah_len, {
 		"Length", "ieee8021ah.len", FT_UINT16, BASE_DEC,
-		NULL, 0x0, "Length", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_ieee8021ah_trailer, {
 		"Trailer", "ieee8021ah.trailer", FT_BYTES, BASE_NONE,
 		NULL, 0x0, "802.1ah Trailer", HFILL }}
@@ -382,7 +382,7 @@ proto_register_ieee8021ah(void)
     static hf_register_info hf_1ad[] = {
 	{ &hf_ieee8021ad_priority, {
 		"Priority", "ieee8021ad.priority", FT_UINT16, BASE_DEC,
-		0, 0xE000, "Priority", HFILL }},
+		0, 0xE000, NULL, HFILL }},
 	{ &hf_ieee8021ad_cfi, {
 		"DEI", "ieee8021ad.dei", FT_UINT16, BASE_DEC,
 		0, 0x1000, "Drop Eligibility", HFILL }},
diff --git a/epan/dissectors/packet-ieee802a.c b/epan/dissectors/packet-ieee802a.c
index 284db8273c..94408fa8ff 100644
--- a/epan/dissectors/packet-ieee802a.c
+++ b/epan/dissectors/packet-ieee802a.c
@@ -154,11 +154,11 @@ proto_register_ieee802a(void)
 	static hf_register_info hf[] = {
 		{ &hf_ieee802a_oui,
 		{ "Organization Code",	"ieee802a.oui", FT_UINT24, BASE_HEX,
-			VALS(oui_vals), 0x0, "", HFILL }},
+			VALS(oui_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_ieee802a_pid,
 		{ "Protocol ID", "ieee802a.pid", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "", HFILL }}
+			NULL, 0x0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_ieee802a,
diff --git a/epan/dissectors/packet-ifcp.c b/epan/dissectors/packet-ifcp.c
index 4d73f50de4..8bd7d44b97 100644
--- a/epan/dissectors/packet-ifcp.c
+++ b/epan/dissectors/packet-ifcp.c
@@ -573,54 +573,54 @@ proto_register_ifcp (void)
     static hf_register_info hf[] = {
         { &hf_ifcp_protocol,
 	  { "Protocol", "fcencap.proto", FT_UINT8, BASE_DEC,
-	     VALS(fcencap_proto_vals), 0, "Protocol", HFILL }},
+	     VALS(fcencap_proto_vals), 0, NULL, HFILL }},
         { &hf_ifcp_protocol_c,
           {"Protocol (1's Complement)", "fcencap.protoc", FT_UINT8, BASE_DEC, NULL,
-           0, "Protocol (1's Complement)", HFILL}},
+           0, NULL, HFILL}},
         { &hf_ifcp_version,
-          {"Version", "fcencap.version", FT_UINT8, BASE_DEC, NULL, 0, "",
+          {"Version", "fcencap.version", FT_UINT8, BASE_DEC, NULL, 0, NULL,
            HFILL}},
         { &hf_ifcp_version_c,
           {"Version (1's Complement)", "fcencap.versionc", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_ifcp_encap_flags_c,
           {"iFCP Encapsulation Flags (1's Complement)", "ifcp.encap_flagsc", FT_UINT8, BASE_HEX,
-           NULL, 0xFC, "", HFILL}},
+           NULL, 0xFC, NULL, HFILL}},
         { &hf_ifcp_framelen,
           {"Frame Length (in Words)", "fcencap.framelen", FT_UINT16, BASE_DEC,
-           NULL, 0x03FF, "", HFILL}},
+           NULL, 0x03FF, NULL, HFILL}},
         { &hf_ifcp_framelen_c,
           {"Frame Length (1's Complement)", "fcencap.framelenc", FT_UINT16,
-           BASE_DEC, NULL, 0x03FF, "", HFILL}},
+           BASE_DEC, NULL, 0x03FF, NULL, HFILL}},
         { &hf_ifcp_tsec,
-          {"Time (secs)", "fcencap.tsec", FT_UINT32, BASE_DEC, NULL, 0, "",
+          {"Time (secs)", "fcencap.tsec", FT_UINT32, BASE_DEC, NULL, 0, NULL,
            HFILL}},
         { &hf_ifcp_tusec,
           {"Time (fraction)", "fcencap.tusec", FT_UINT32, BASE_DEC, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_encap_crc,
-          {"CRC", "fcencap.crc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL}},
+          {"CRC", "fcencap.crc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL}},
         { &hf_ifcp_sof,
           {"SOF", "ifcp.sof", FT_UINT8, BASE_HEX, VALS (&ifcp_sof_vals), 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_eof,
           {"EOF", "ifcp.eof", FT_UINT8, BASE_HEX, VALS (&ifcp_eof_vals), 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_sof_c,
           {"SOF Compliment", "ifcp.sof_c", FT_UINT8, BASE_HEX, NULL , 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_eof_c,
           {"EOF Compliment", "ifcp.eof_c", FT_UINT8, BASE_HEX, NULL , 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_ls_command_acc,
           {"Ls Command Acc", "ifcp.ls_command_acc", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_ifcp_common_flags, 
-	  {"Flags", "ifcp.common_flags", FT_UINT8, BASE_HEX , NULL, 0xfc, "", HFILL }},
+	  {"Flags", "ifcp.common_flags", FT_UINT8, BASE_HEX , NULL, 0xfc, NULL, HFILL }},
         { &hf_ifcp_common_flags_crcv, 
 	  {"CRCV", "ifcp.common_flags.crcv", FT_BOOLEAN, 8, TFS(&ifcp_common_flags_crcv_tfs), IFCP_COMMON_FLAGS_CRCV, "Is the CRC field valid?", HFILL }},
         { &hf_ifcp_flags, 
-	  {"iFCP Flags", "ifcp.flags", FT_UINT8, BASE_HEX , NULL, 0, "", HFILL }},
+	  {"iFCP Flags", "ifcp.flags", FT_UINT8, BASE_HEX , NULL, 0, NULL, HFILL }},
         { &hf_ifcp_flags_ses, 
 	  {"SES", "ifcp.flags.ses", FT_BOOLEAN, 8, TFS(&ifcp_flags_ses_tfs), IFCP_FLAGS_SES, "Is this a Session control frame", HFILL }},
         { &hf_ifcp_flags_trp, 
diff --git a/epan/dissectors/packet-igap.c b/epan/dissectors/packet-igap.c
index 1241bd43cd..d30e215027 100644
--- a/epan/dissectors/packet-igap.c
+++ b/epan/dissectors/packet-igap.c
@@ -274,17 +274,17 @@ proto_register_igap(void)
 
 	{ &hf_checksum,
 	  { "Checksum", "igap.checksum", FT_UINT16, BASE_HEX,
-	    NULL, 0, "Checksum", HFILL }
+	    NULL, 0, NULL, HFILL }
 	},
 
 	{ &hf_checksum_bad,
 	  { "Bad Checksum", "igap.checksum_bad", FT_BOOLEAN, BASE_NONE,
-	    NULL, 0, "Bad Checksum", HFILL }
+	    NULL, 0x0, NULL, HFILL }
 	},
 
 	{ &hf_maddr,
 	  { "Multicast group address", "igap.maddr", FT_IPv4, BASE_NONE,
-	    NULL, 0, "Multicast group address", HFILL }
+	    NULL, 0, NULL, HFILL }
 	},
 
 	{ &hf_version,
@@ -294,12 +294,12 @@ proto_register_igap(void)
 
 	{ &hf_subtype,
 	  { "Subtype", "igap.subtype", FT_UINT8, BASE_HEX,
-	    VALS(igap_subtypes), 0, "Subtype", HFILL }
+	    VALS(igap_subtypes), 0, NULL, HFILL }
 	},
 
 	{ &hf_challengeid,
 	  { "Challenge ID", "igap.challengeid", FT_UINT8, BASE_HEX,
-	    NULL, 0, "Challenge ID", HFILL }
+	    NULL, 0, NULL, HFILL }
 	},
 
 	{ &hf_asize,
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c
index 9c2a685b3f..d96acbd57d 100644
--- a/epan/dissectors/packet-igmp.c
+++ b/epan/dissectors/packet-igmp.c
@@ -1041,7 +1041,7 @@ proto_register_igmp(void)
 
 		{ &hf_version,
 			{ "IGMP Version", "igmp.version", FT_UINT8, BASE_DEC,
-			  NULL, 0, "IGMP Version", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_group_type,
 			{ "Type Of Group", "igmp.group_type", FT_UINT8, BASE_DEC,
@@ -1061,14 +1061,14 @@ proto_register_igmp(void)
 
 		{ &hf_checksum_bad,
 			{ "Bad Checksum", "igmp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-			  NULL, 0, "Bad IGMP Checksum", HFILL }},
+			  NULL, 0x0, "Bad IGMP Checksum", HFILL }},
 
 		{ &hf_identifier,
 			{ "Identifier", "igmp.identifier", FT_UINT32, BASE_DEC,
 			  NULL, 0, "IGMP V0 Identifier", HFILL }},
 
 		{ &hf_access_key,
-			{ "Access Key", "igmp.access_key", FT_BYTES, BASE_HEX,
+			{ "Access Key", "igmp.access_key", FT_BYTES, BASE_NONE,
 			  NULL, 0, "IGMP V0 Access Key", HFILL }},
 
 		{ &hf_max_resp,
@@ -1093,7 +1093,7 @@ proto_register_igmp(void)
 
 		{ &hf_saddr,
 			{ "Source Address", "igmp.saddr", FT_IPv4, BASE_NONE,
-			  NULL, 0, "Source Address", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_num_grp_recs,
 			{ "Num Group Records", "igmp.num_grp_recs", FT_UINT16, BASE_DEC,
@@ -1101,7 +1101,7 @@ proto_register_igmp(void)
 
 		{ &hf_record_type,
 			{ "Record Type", "igmp.record_type", FT_UINT8, BASE_DEC,
-			VALS(vs_record_type), 0, "Record Type", HFILL }},
+			VALS(vs_record_type), 0, NULL, HFILL }},
 
 		{ &hf_aux_data_len,
 			{ "Aux Data Len", "igmp.aux_data_len", FT_UINT8, BASE_DEC,
@@ -1109,10 +1109,10 @@ proto_register_igmp(void)
 
 		{ &hf_maddr,
 			{ "Multicast Address", "igmp.maddr", FT_IPv4, BASE_NONE,
-			  NULL, 0, "Multicast Address", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_aux_data,
-			{ "Aux Data", "igmp.aux_data", FT_BYTES, BASE_HEX,
+			{ "Aux Data", "igmp.aux_data", FT_BYTES, BASE_NONE,
 			  NULL, 0, "IGMP V3 Auxiliary Data", HFILL }},
 
 		{ &hf_max_resp_exp,
diff --git a/epan/dissectors/packet-image-gif.c b/epan/dissectors/packet-image-gif.c
index 363090b64a..1d495127e7 100644
--- a/epan/dissectors/packet-image-gif.c
+++ b/epan/dissectors/packet-image-gif.c
@@ -468,7 +468,7 @@ proto_register_gif(void)
 			{	"Screen width",
 				IMG_GIF ".screen.width",
 				FT_UINT16, BASE_DEC, NULL, 0x00,
-				"Screen width",
+				NULL,
 				HFILL
 			}
 		},
@@ -476,7 +476,7 @@ proto_register_gif(void)
 			{	"Screen height",
 				IMG_GIF ".screen.height",
 				FT_UINT16, BASE_DEC, NULL, 0x00,
-				"Screen height",
+				NULL,
 				HFILL
 			}
 		},
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c
index f9b8f14267..9906bde293 100644
--- a/epan/dissectors/packet-image-jfif.c
+++ b/epan/dissectors/packet-image-jfif.c
@@ -901,7 +901,7 @@ proto_register_jfif(void)
 			{	"Marker segment",
 				IMG_JFIF "marker_segment",
 				FT_NONE, BASE_NONE, NULL, 0x00,
-				"Marker segment",
+				NULL,
 				HFILL
 			}
 		},
@@ -1009,7 +1009,7 @@ proto_register_jfif(void)
 			{	"Start of Frame header",
 				IMG_JFIF ".sof",
 				FT_NONE, BASE_NONE, NULL, 0x00,
-				"Start of Frame header",
+				NULL,
 				HFILL
 			}
 		},
@@ -1049,8 +1049,7 @@ proto_register_jfif(void)
 			{	"Component identifier",
 				IMG_JFIF ".sof.c_i",
 				FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Assigns a unique label to the ith component in the sequence "
-				"of frame component specification parameters.",
+				"Assigns a unique label to the ith component in the sequence of frame component specification parameters.",
 				HFILL
 			}
 		},
@@ -1058,8 +1057,7 @@ proto_register_jfif(void)
 			{	"Horizontal sampling factor",
 				IMG_JFIF ".sof.h_i",
 				FT_UINT8, BASE_DEC, NULL, 0xF0,
-				"Specifies the relationship between the component horizontal "
-				"dimension and maximum image dimension X.",
+				"Specifies the relationship between the component horizontal dimension and maximum image dimension X.",
 				HFILL
 			}
 		},
@@ -1067,8 +1065,7 @@ proto_register_jfif(void)
 			{	"Vertical sampling factor",
 				IMG_JFIF ".sof.v_i",
 				FT_UINT8, BASE_DEC, NULL, 0x0F,
-				"Specifies the relationship between the component vertical "
-				"dimension and maximum image dimension Y.",				
+				"Specifies the relationship between the component vertical dimension and maximum image dimension Y.",				
 				HFILL
 			}
 		},
@@ -1076,10 +1073,7 @@ proto_register_jfif(void)
 			{	"Quantization table destination selector",
 				IMG_JFIF ".sof.tq_i",
 				FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Specifies one of four possible quantization table "
-				"destinations from which the quantization table to use "
-				"for dequantization of DCT coefficients of component Ci "
-				"is retrieved.",
+				"Specifies one of four possible quantization table destinations from which the quantization table to use for dequantization of DCT coefficients of component Ci is retrieved.",
 				HFILL
 			}
 		},
@@ -1089,7 +1083,7 @@ proto_register_jfif(void)
 			{	"Start of Segment header",
 				IMG_JFIF ".header.sos",
 				FT_NONE, BASE_NONE, NULL, 0x00,
-				"Start of Segment header",
+				NULL,
 				HFILL
 			}
 		},
@@ -1105,8 +1099,7 @@ proto_register_jfif(void)
 			{	"Scan component selector",
 				IMG_JFIF ".sos.component_selector",
 				FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Selects which of the Nf image components specified in the "
-				"frame parameters shall be the jth component in the scan.",
+				"Selects which of the Nf image components specified in the frame parameters shall be the jth component in the scan.",
 				HFILL
 			}
 		},
@@ -1114,10 +1107,7 @@ proto_register_jfif(void)
 			{	"DC entropy coding table destination selector",
 				IMG_JFIF ".sos.dc_entropy_selector",
 				FT_UINT8, BASE_DEC, NULL, 0xF0,
-				"Specifies one of four possible DC entropy coding table "
-				"destinations from which the entropy table needed "
-				"for decoding of the DC coefficients of component Csj "
-				"is retrieved.",
+				"Specifies one of four possible DC entropy coding table destinations from which the entropy table needed for decoding of the DC coefficients of component Csj is retrieved.",
 				HFILL
 			}
 		},
@@ -1125,10 +1115,7 @@ proto_register_jfif(void)
 			{	"AC entropy coding table destination selector",
 				IMG_JFIF ".sos.ac_entropy_selector",
 				FT_UINT8, BASE_DEC, NULL, 0x0F,
-				"Specifies one of four possible AC entropy coding table "
-				"destinations from which the entropy table needed "
-				"for decoding of the AC coefficients of component Csj "
-				"is retrieved.",
+				"Specifies one of four possible AC entropy coding table destinations from which the entropy table needed for decoding of the AC coefficients of component Csj is retrieved.",
 				HFILL
 			}
 		},
@@ -1136,12 +1123,7 @@ proto_register_jfif(void)
 			{	"Start of spectral or predictor selection",
 				IMG_JFIF ".sos.ss",
 				FT_UINT8, BASE_DEC, NULL, 0x00,
-				"In the DCT modes of operation, this parameter specifies the "
-				"first DCT coefficient in each block in zig-zag order which "
-				"shall be coded in the scan. This parameter shall be set to "
-				"zero for the sequential DCT processes. "
-				"In the lossless mode of operations this parameter is used "
-				"to select the predictor.",
+				"In the DCT modes of operation, this parameter specifies the first DCT coefficient in each block in zig-zag order which shall be coded in the scan. This parameter shall be set to zero for the sequential DCT processes. In the lossless mode of operations this parameter is used to select the predictor.",
 				HFILL
 			}
 		},
@@ -1149,11 +1131,7 @@ proto_register_jfif(void)
 			{	"End of spectral selection",
 				IMG_JFIF ".sos.se",
 				FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Specifies the last DCT coefficient in each block in zig-zag "
-				"order which shall be coded in the scan. This parameter shall "
-				"be set to 63 for the sequential DCT processes. "
-				"In the lossless mode of operations this parameter has no "
-				"meaning. It shall be set to zero.",
+				"Specifies the last DCT coefficient in each block in zig-zag order which shall be coded in the scan. This parameter shall be set to 63 for the sequential DCT processes. In the lossless mode of operations this parameter has no meaning. It shall be set to zero.",
 				HFILL
 			}
 		},
@@ -1161,13 +1139,7 @@ proto_register_jfif(void)
 			{	"Successive approximation bit position high",
 				IMG_JFIF ".sos.ah",
 				FT_UINT8, BASE_DEC, NULL, 0xF0,
-				"This parameter specifies the point transform used in the "
-				"preceding scan (i.e. successive approximation bit position "
-				"low in the preceding scan) for the band of coefficients "
-				"specified by Ss and Se. This parameter shall be set to zero "
-				"for the first scan of each band of coefficients. "
-				"In the lossless mode of operations this parameter has no "
-				"meaning. It shall be set to zero.",
+				"This parameter specifies the point transform used in the preceding scan (i.e. successive approximation bit position low in the preceding scan) for the band of coefficients specified by Ss and Se. This parameter shall be set to zero for the first scan of each band of coefficients. In the lossless mode of operations this parameter has no meaning. It shall be set to zero.",
 				HFILL
 			}
 		},
@@ -1175,12 +1147,7 @@ proto_register_jfif(void)
 			{	"Successive approximation bit position low or point transform",
 				IMG_JFIF ".sos.al",
 				FT_UINT8, BASE_DEC, NULL, 0x0F,
-				"In the DCT modes of operation this parameter specifies the "
-				"point transform, i.e. bit position low, used before coding "
-				"the band of coefficients specified by Ss and Se. "
-				"This parameter shall be set to zero for the sequential DCT "
-				"processes. In the lossless mode of operations, this "
-				"parameter specifies the point transform, Pt.",
+				"In the DCT modes of operation this parameter specifies the point transform, i.e. bit position low, used before coding the band of coefficients specified by Ss and Se. This parameter shall be set to zero for the sequential DCT processes. In the lossless mode of operations, this parameter specifies the point transform, Pt.",
 				HFILL
 			}
 		},
diff --git a/epan/dissectors/packet-image-png.c b/epan/dissectors/packet-image-png.c
index e70c47ed49..f036aa7cc4 100644
--- a/epan/dissectors/packet-image-png.c
+++ b/epan/dissectors/packet-image-png.c
@@ -310,98 +310,98 @@ proto_register_png(void)
 	static hf_register_info hf[] =
 	{
 	{ &hf_png_signature, {
-	  "PNG Signature", "png.signature", FT_BYTES, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  "PNG Signature", "png.signature", FT_BYTES, BASE_NONE,
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_chunk_type, {
 	  "Chunk", "png.chunk.type", FT_STRING, BASE_NONE,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_chunk_data, {
 	  "Data", "png.chunk.data", FT_NONE, BASE_NONE,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_chunk_len, {
 	  "Len", "png.chunk.len", FT_UINT32, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_chunk_crc, {
 	  "CRC", "png.chunk.crc", FT_UINT32, BASE_HEX,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_chunk_flag_anc, {
 	  "Ancillary", "png.chunk.flag.ancillary", FT_BOOLEAN, 32,
-	  TFS(&png_chunk_anc), 0x20000000, "", HFILL }},
+	  TFS(&png_chunk_anc), 0x20000000, NULL, HFILL }},
 	{ &hf_png_chunk_flag_priv, {
 	  "Private", "png.chunk.flag.private", FT_BOOLEAN, 32,
-	  TFS(&png_chunk_priv), 0x00200000, "", HFILL }},
+	  TFS(&png_chunk_priv), 0x00200000, NULL, HFILL }},
 	{ &hf_png_chunk_flag_stc, {
 	  "Safe To Copy", "png.chunk.flag.stc", FT_BOOLEAN, 32,
-	  TFS(&png_chunk_stc), 0x00000020, "", HFILL }},
+	  TFS(&png_chunk_stc), 0x00000020, NULL, HFILL }},
 	{ &hf_png_ihdr_width, {
 	  "Width", "png.ihdr.width", FT_UINT32, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_ihdr_height, {
 	  "Height", "png.ihdr.height", FT_UINT32, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_ihdr_bitdepth, {
 	  "Bit Depth", "png.ihdr.bitdepth", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_ihdr_colour_type, {
 	  "Colour Type", "png.ihdr.colour_type", FT_UINT8, BASE_DEC,
-	  VALS(colour_type_vals), 0, "", HFILL }},
+	  VALS(colour_type_vals), 0, NULL, HFILL }},
 	{ &hf_png_ihdr_compression_method, {
 	  "Compression Method", "png.ihdr.compression_method", FT_UINT8, BASE_DEC,
-	  VALS(compression_method_vals), 0, "", HFILL }},
+	  VALS(compression_method_vals), 0, NULL, HFILL }},
 	{ &hf_png_ihdr_filter_method, {
 	  "Filter Method", "png.ihdr.filter_method", FT_UINT8, BASE_DEC,
-	  VALS(filter_method_vals), 0, "", HFILL }},
+	  VALS(filter_method_vals), 0, NULL, HFILL }},
 	{ &hf_png_ihdr_interlace_method, {
 	  "Interlace Method", "png.ihdr.interlace_method", FT_UINT8, BASE_DEC,
-	  VALS(interlace_method_vals), 0, "", HFILL }},
+	  VALS(interlace_method_vals), 0, NULL, HFILL }},
 	{ &hf_png_text_keyword, {
 	  "Keyword", "png.text.keyword", FT_STRING, BASE_NONE,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_text_string, {
 	  "String", "png.text.string", FT_STRING, BASE_NONE,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_year, {
 	  "Year", "png.time.year", FT_UINT16, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_month, {
 	  "Month", "png.time.month", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_day, {
 	  "Day", "png.time.day", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_hour, {
 	  "Hour", "png.time.hour", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_minute, {
 	  "Minute", "png.time.minute", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_time_second, {
 	  "Second", "png.time.second", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_phys_horiz, {
 	  "Horizontal pixels per unit", "png.phys.horiz", FT_UINT32, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_phys_vert, {
 	  "Vertical pixels per unit", "png.phys.vert", FT_UINT32, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_phys_unit, {
 	  "Unit", "png.phys.unit", FT_UINT8, BASE_DEC,
-	  VALS(phys_unit_vals), 0, "", HFILL }},
+	  VALS(phys_unit_vals), 0, NULL, HFILL }},
 	{ &hf_png_bkgd_palette_index, {
 	  "Palette Index", "png.bkgd.palette_index", FT_UINT8, BASE_DEC,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_bkgd_greyscale, {
 	  "Greyscale", "png.bkgd.greyscale", FT_UINT16, BASE_HEX,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_bkgd_red, {
 	  "Red", "png.bkgd.red", FT_UINT16, BASE_HEX,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_bkgd_green, {
 	  "Green", "png.bkgd.green", FT_UINT16, BASE_HEX,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	{ &hf_png_bkgd_blue, {
 	  "Blue", "png.bkgd.blue", FT_UINT16, BASE_HEX,
-	  NULL, 0, "", HFILL }},
+	  NULL, 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] =
diff --git a/epan/dissectors/packet-imf.c b/epan/dissectors/packet-imf.c
index 0ac40a5538..649f537366 100644
--- a/epan/dissectors/packet-imf.c
+++ b/epan/dissectors/packet-imf.c
@@ -652,223 +652,223 @@ proto_register_imf(void)
       	"imf.MailboxList", HFILL }},
     { &hf_imf_sender,
       { "Sender", "imf.sender", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_reply_to,
       { "Reply-To", "imf.reply_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_to,
       { "To", "imf.to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_cc,
       { "Cc", "imf.cc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_bcc,
       { "Bcc", "imf.bcc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_message_id,
       { "Message-ID", "imf.message_id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_in_reply_to,
       { "In-Reply-To", "imf.in_reply_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_references,
       { "References", "imf.references", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_subject,
       { "Subject", "imf.subject", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_comments,
       { "Comments", "imf.comments", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_keywords,
       { "Keywords", "imf.keywords", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_date,
       { "Resent-Date", "imf.resent.date", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_from,
       { "Resent-From", "imf.resent.from", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_sender,
       { "Resent-Sender", "imf.resent.sender", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_to,
       { "Resent-To", "imf.resent.to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_cc,
       { "Resent-Cc", "imf.resent.cc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_bcc,
       { "Resent-Bcc", "imf.resent.bcc", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_resent_message_id,
       { "Resent-Message-ID", "imf.resent.message_id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_return_path,
       { "Return-Path", "imf.return_path", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_received,
       { "Received", "imf.received", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type,
       { "Content-Type", "imf.content.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type_type,
       { "Type", "imf.content.type.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_type_parameters,
       { "Parameters", "imf.content.type.parameters", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_description,
       { "Content-Description", "imf.content.description", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_id,
       { "Content-ID", "imf.content.id", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_content_transfer_encoding,
       { "Content-Transfer-Encoding", "imf.content.transfer_encoding", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mime_version,
       { "MIME-Version", "imf.mime_version", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_autoforwarded,
       { "Autoforwarded", "imf.autoforwarded", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_autosubmitted,
       { "Autosubmitted", "imf.autosubmitted", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_content_identifier,
       { "X400-Content-Identifier", "imf.x400_content_identifier", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_content_language,
       { "Content-Language", "imf.content_language", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_conversion,
 	{ "Conversion", "imf.conversion", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_conversion_with_loss,
 	{ "Conversion-With-Loss", "imf.conversion_with_loss", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_delivery_date,
 	{ "Delivery-Date", "imf.delivery_date", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_discarded_x400_ipms_extensions,
 	{ "Discarded-X400-IPMS-Extensions", "imf.discarded_x400_ipms_extensions", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_discarded_x400_mts_extensions,
       { "Discarded-X400-MTS-Extensions", "imf.discarded_x400_mts_extensions", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_dl_expansion_history,
 	{ "DL-Expansion-History", "imf.dl_expansion_history", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_deferred_delivery,
 	{ "Deferred-Delivery", "imf.deferred_delivery", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_expires,
 	{ "Expires", "imf.expires", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_importance,
       { "Importance", "imf.importance", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_incomplete_copy,
 	{ "Incomplete-Copy", "imf.incomplete_copy", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_latest_delivery_time,
       { "Latest-Delivery-Time", "imf.latest_delivery_time", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_message_type,
 	{ "Message-Type", "imf.message_type", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_original_encoded_information_types,
 	{ "Original-Encoded-Information-Types", "imf.original_encoded_information_types", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_originator_return_address,
 	{ "Originator-Return-Address", "imf.originator_return_address", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_priority,
 	{ "Priority", "imf.priority", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_reply_by,
 	{ "Reply-By", "imf.reply_by", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_sensitivity,
 	{ "Sensitivity", "imf.sensitivity", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_supersedes,
 	{ "Supersedes", "imf.supersedes", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_content_type,
 	{ "X400-Content-Type", "imf.x400_content_type", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_mts_identifier,
 	{ "X400-MTS-Identifier", "imf.x400_mts_identifier", FT_STRING, BASE_NONE, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
     { &hf_imf_x400_originator,
 	{ "X400-Originator", "imf.x400_originator", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_received,
 	{ "X400-Received", "imf.x400_received", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_x400_recipients,
 	{ "X400-Recipients", "imf.x400_recipients", FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_imf_delivered_to,
       { "Delivered-To", "imf.delivered_to", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_mailer,
       { "X-Mailer", "imf.ext.mailer", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_mimeole,
       { "X-MimeOLE", "imf.ext.mimeole", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_expiry_date,
       { "Expiry-Date", "imf.ext.expiry-date", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_tnef_correlator,
       { "X-MS-TNEF-Correlator", "imf.ext.tnef-correlator", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_uidl,
       { "X-UIDL", "imf.ext.uidl", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_ext_authentication_warning,
       { "X-Authentication-Warning", "imf.ext.authentication_warning", FT_STRING,  BASE_NONE,
-	NULL, 0x0, "", HFILL }},
+	NULL, 0x0, NULL, HFILL }},
     { &hf_imf_ext_virus_scanned,
       { "X-Virus-Scanned", "imf.ext.virus_scanned", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_thread_index,
       { "Thread-Index", "imf.thread-index", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension,
       { "Unknown-Extension", "imf.extension", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension_type,
       { "Type", "imf.extension.type", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_extension_value,
       { "Value", "imf.extension.value", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_display_name,
       { "Display-Name", "imf.display_name", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address,
       { "Address", "imf.address", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address_list,
       { "Address List", "imf.address_list", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_address_list_item,
       { "Item", "imf.address_list.item", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mailbox_list,
       { "Mailbox List", "imf.mailbox_list", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_mailbox_list_item,
       { "Item", "imf.mailbox_list.item", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_imf_message_text,
       { "Message-Text", "imf.message_text", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_imf,
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index e8bc2bfe97..884d2a73ca 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -9221,7 +9221,7 @@ void proto_register_inap(void) {
         "inap.ApplyChargingArg", HFILL }},
     { &hf_inap_ApplyChargingReportArg_PDU,
       { "ApplyChargingReportArg", "inap.ApplyChargingReportArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ApplyChargingReportArg", HFILL }},
     { &hf_inap_AssistRequestInstructionsArg_PDU,
       { "AssistRequestInstructionsArg", "inap.AssistRequestInstructionsArg",
@@ -9325,7 +9325,7 @@ void proto_register_inap(void) {
         "inap.FacilitySelectedAndAvailableArg", HFILL }},
     { &hf_inap_FurnishChargingInformationArg_PDU,
       { "FurnishChargingInformationArg", "inap.FurnishChargingInformationArg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.FurnishChargingInformationArg", HFILL }},
     { &hf_inap_HoldCallInNetworkArg_PDU,
       { "HoldCallInNetworkArg", "inap.HoldCallInNetworkArg",
@@ -9589,23 +9589,23 @@ void proto_register_inap(void) {
         "inap.IA5String_SIZE_1_512", HFILL }},
     { &hf_inap_conferenceTreatmentIndicator,
       { "conferenceTreatmentIndicator", "inap.conferenceTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callCompletionTreatmentIndicator,
       { "callCompletionTreatmentIndicator", "inap.callCompletionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_holdTreatmentIndicator,
       { "holdTreatmentIndicator", "inap.holdTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_ectTreatmentIndicator,
       { "ectTreatmentIndicator", "inap.ectTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_calledAddressValue,
       { "calledAddressValue", "inap.calledAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_gapOnService,
       { "gapOnService", "inap.gapOnService",
@@ -9629,11 +9629,11 @@ void proto_register_inap(void) {
         "inap.T_callingAddressAndService", HFILL }},
     { &hf_inap_callingAddressValue,
       { "callingAddressValue", "inap.callingAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_locationNumber,
       { "locationNumber", "inap.locationNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LocationNumber", HFILL }},
     { &hf_inap_eventTypeBCSM,
       { "eventTypeBCSM", "inap.eventTypeBCSM",
@@ -9653,63 +9653,63 @@ void proto_register_inap(void) {
         "inap.DpSpecificCriteria", HFILL }},
     { &hf_inap_bearerCap,
       { "bearerCap", "inap.bearerCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.T_bearerCap", HFILL }},
     { &hf_inap_tmr,
       { "tmr", "inap.tmr",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_broadbandBearerCap,
       { "broadbandBearerCap", "inap.broadbandBearerCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_minBroadbandBearerCapabilityLength_maxBroadbandBearerCapabilityLength", HFILL }},
     { &hf_inap_aALParameters,
       { "aALParameters", "inap.aALParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AALParameters", HFILL }},
     { &hf_inap_additionalATMCellRate,
       { "additionalATMCellRate", "inap.additionalATMCellRate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AdditionalATMCellRate", HFILL }},
     { &hf_inap_aESACalledParty,
       { "aESACalledParty", "inap.aESACalledParty",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AESACalledParty", HFILL }},
     { &hf_inap_aESACallingParty,
       { "aESACallingParty", "inap.aESACallingParty",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AESACallingParty", HFILL }},
     { &hf_inap_alternativeATMTrafficDescriptor,
       { "alternativeATMTrafficDescriptor", "inap.alternativeATMTrafficDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AlternativeATMTrafficDescriptor", HFILL }},
     { &hf_inap_aTMCellRate,
       { "aTMCellRate", "inap.aTMCellRate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ATMCellRate", HFILL }},
     { &hf_inap_cDVTDescriptor,
       { "cDVTDescriptor", "inap.cDVTDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CDVTDescriptor", HFILL }},
     { &hf_inap_cumulativeTransitDelay,
       { "cumulativeTransitDelay", "inap.cumulativeTransitDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CumulativeTransitDelay", HFILL }},
     { &hf_inap_endToEndTransitDelay,
       { "endToEndTransitDelay", "inap.endToEndTransitDelay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EndToEndTransitDelay", HFILL }},
     { &hf_inap_minAcceptableATMTrafficDescriptor,
       { "minAcceptableATMTrafficDescriptor", "inap.minAcceptableATMTrafficDescriptor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.MinAcceptableATMTrafficDescriptor", HFILL }},
     { &hf_inap_eventTypeCharging,
       { "eventTypeCharging", "inap.eventTypeCharging",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EventTypeCharging", HFILL }},
     { &hf_inap_componentInfo,
       { "componentInfo", "inap.componentInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_118", HFILL }},
     { &hf_inap_relayedComponent,
       { "relayedComponent", "inap.relayedComponent",
@@ -9721,7 +9721,7 @@ void proto_register_inap(void) {
         "inap.BasicGapCriteria", HFILL }},
     { &hf_inap_scfID,
       { "scfID", "inap.scfID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ScfID", HFILL }},
     { &hf_inap_counterID,
       { "counterID", "inap.counterID",
@@ -9745,7 +9745,7 @@ void proto_register_inap(void) {
         "inap.GapTreatment", HFILL }},
     { &hf_inap_DestinationRoutingAddress_item,
       { "CalledPartyNumber", "inap.CalledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_serviceAddressInformation,
       { "serviceAddressInformation", "inap.serviceAddressInformation",
@@ -9757,11 +9757,11 @@ void proto_register_inap(void) {
         "inap.BearerCapability", HFILL }},
     { &hf_inap_calledPartyNumber,
       { "calledPartyNumber", "inap.calledPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_callingPartyNumber,
       { "callingPartyNumber", "inap.callingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartyNumber", HFILL }},
     { &hf_inap_callingPartysCategory,
       { "callingPartysCategory", "inap.callingPartysCategory",
@@ -9769,15 +9769,15 @@ void proto_register_inap(void) {
         "inap.CallingPartysCategory", HFILL }},
     { &hf_inap_iPSSPCapabilities,
       { "iPSSPCapabilities", "inap.iPSSPCapabilities",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPSSPCapabilities", HFILL }},
     { &hf_inap_iPAvailable,
       { "iPAvailable", "inap.iPAvailable",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPAvailable", HFILL }},
     { &hf_inap_iSDNAccessRelatedInformation,
       { "iSDNAccessRelatedInformation", "inap.iSDNAccessRelatedInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ISDNAccessRelatedInformation", HFILL }},
     { &hf_inap_cGEncountered,
       { "cGEncountered", "inap.cGEncountered",
@@ -9785,7 +9785,7 @@ void proto_register_inap(void) {
         "inap.CGEncountered", HFILL }},
     { &hf_inap_serviceProfileIdentifier,
       { "serviceProfileIdentifier", "inap.serviceProfileIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServiceProfileIdentifier", HFILL }},
     { &hf_inap_terminalType,
       { "terminalType", "inap.terminalType",
@@ -9797,15 +9797,15 @@ void proto_register_inap(void) {
         "inap.Extensions", HFILL }},
     { &hf_inap_chargeNumber,
       { "chargeNumber", "inap.chargeNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ChargeNumber", HFILL }},
     { &hf_inap_servingAreaID,
       { "servingAreaID", "inap.servingAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServingAreaID", HFILL }},
     { &hf_inap_serviceInteractionIndicators,
       { "serviceInteractionIndicators", "inap.serviceInteractionIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ServiceInteractionIndicators", HFILL }},
     { &hf_inap_iNServiceCompatibilityIndication,
       { "iNServiceCompatibilityIndication", "inap.iNServiceCompatibilityIndication",
@@ -9821,11 +9821,11 @@ void proto_register_inap(void) {
         "inap.USIServiceIndicator", HFILL }},
     { &hf_inap_uSIInformation,
       { "uSIInformation", "inap.uSIInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.USIInformation", HFILL }},
     { &hf_inap_forwardGVNS,
       { "forwardGVNS", "inap.forwardGVNS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ForwardGVNS", HFILL }},
     { &hf_inap_createdCallSegmentAssociation,
       { "createdCallSegmentAssociation", "inap.createdCallSegmentAssociation",
@@ -9873,7 +9873,7 @@ void proto_register_inap(void) {
         "inap.T_collectedInfoSpecificInfo", HFILL }},
     { &hf_inap_calledPartynumber,
       { "calledPartynumber", "inap.calledPartynumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_analysedInfoSpecificInfo,
       { "analysedInfoSpecificInfo", "inap.analysedInfoSpecificInfo",
@@ -9885,7 +9885,7 @@ void proto_register_inap(void) {
         "inap.T_routeSelectFailureSpecificInfo", HFILL }},
     { &hf_inap_failureCause,
       { "failureCause", "inap.failureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oCalledPartyBusySpecificInfo,
       { "oCalledPartyBusySpecificInfo", "inap.oCalledPartyBusySpecificInfo",
@@ -9893,7 +9893,7 @@ void proto_register_inap(void) {
         "inap.T_oCalledPartyBusySpecificInfo", HFILL }},
     { &hf_inap_busyCause,
       { "busyCause", "inap.busyCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oNoAnswerSpecificInfo,
       { "oNoAnswerSpecificInfo", "inap.oNoAnswerSpecificInfo",
@@ -9901,7 +9901,7 @@ void proto_register_inap(void) {
         "inap.T_oNoAnswerSpecificInfo", HFILL }},
     { &hf_inap_cause,
       { "cause", "inap.cause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oAnswerSpecificInfo,
       { "oAnswerSpecificInfo", "inap.oAnswerSpecificInfo",
@@ -9909,7 +9909,7 @@ void proto_register_inap(void) {
         "inap.T_oAnswerSpecificInfo", HFILL }},
     { &hf_inap_backwardGVNS,
       { "backwardGVNS", "inap.backwardGVNS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.BackwardGVNS", HFILL }},
     { &hf_inap_oMidCallSpecificInfo,
       { "oMidCallSpecificInfo", "inap.oMidCallSpecificInfo",
@@ -9929,7 +9929,7 @@ void proto_register_inap(void) {
         "inap.T_oDisconnectSpecificInfo", HFILL }},
     { &hf_inap_releaseCause,
       { "releaseCause", "inap.releaseCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_tBusySpecificInfo,
       { "tBusySpecificInfo", "inap.tBusySpecificInfo",
@@ -9993,7 +9993,7 @@ void proto_register_inap(void) {
         "inap.T_oAbandon", HFILL }},
     { &hf_inap_abandonCause,
       { "abandonCause", "inap.abandonCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_tAbandon,
       { "tAbandon", "inap.tAbandon",
@@ -10005,7 +10005,7 @@ void proto_register_inap(void) {
         "inap.T_authorizeRouteFailure", HFILL }},
     { &hf_inap_authoriseRouteFailureCause,
       { "authoriseRouteFailureCause", "inap.authoriseRouteFailureCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_terminationAttemptAuthorized,
       { "terminationAttemptAuthorized", "inap.terminationAttemptAuthorized",
@@ -10017,7 +10017,7 @@ void proto_register_inap(void) {
         "inap.T_originationAttemptDenied", HFILL }},
     { &hf_inap_originationDeniedCause,
       { "originationDeniedCause", "inap.originationDeniedCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_terminationAttemptDenied,
       { "terminationAttemptDenied", "inap.terminationAttemptDenied",
@@ -10025,7 +10025,7 @@ void proto_register_inap(void) {
         "inap.T_terminationAttemptDenied", HFILL }},
     { &hf_inap_terminationDeniedCause,
       { "terminationDeniedCause", "inap.terminationDeniedCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_oModifyRequestSpecificInfo,
       { "oModifyRequestSpecificInfo", "inap.oModifyRequestSpecificInfo",
@@ -10057,15 +10057,15 @@ void proto_register_inap(void) {
         "inap.INTEGER", HFILL }},
     { &hf_inap_huntGroup,
       { "huntGroup", "inap.huntGroup",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING", HFILL }},
     { &hf_inap_routeIndex,
       { "routeIndex", "inap.routeIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING", HFILL }},
     { &hf_inap_sFBillingChargingCharacteristics,
       { "sFBillingChargingCharacteristics", "inap.sFBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SFBillingChargingCharacteristics", HFILL }},
     { &hf_inap_informationToSend,
       { "informationToSend", "inap.informationToSend",
@@ -10085,11 +10085,11 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_dialledNumber,
       { "dialledNumber", "inap.dialledNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_callingLineID,
       { "callingLineID", "inap.callingLineID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_addressAndService,
       { "addressAndService", "inap.addressAndService",
@@ -10101,19 +10101,19 @@ void proto_register_inap(void) {
         "inap.Duration", HFILL }},
     { &hf_inap_stopTime,
       { "stopTime", "inap.stopTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_callDiversionTreatmentIndicator,
       { "callDiversionTreatmentIndicator", "inap.callDiversionTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callOfferingTreatmentIndicator,
       { "callOfferingTreatmentIndicator", "inap.callOfferingTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_callWaitingTreatmentIndicator,
       { "callWaitingTreatmentIndicator", "inap.callWaitingTreatmentIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_inap_compoundCapCriteria,
       { "compoundCapCriteria", "inap.compoundCapCriteria",
@@ -10133,7 +10133,7 @@ void proto_register_inap(void) {
         "inap.T_both", HFILL }},
     { &hf_inap_GenericNumbers_item,
       { "GenericNumber", "inap.GenericNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericNumber", HFILL }},
     { &hf_inap_actionOnProfile,
       { "actionOnProfile", "inap.actionOnProfile",
@@ -10169,11 +10169,11 @@ void proto_register_inap(void) {
         "inap.AlternativeIdentities", HFILL }},
     { &hf_inap_sendingSideID,
       { "sendingSideID", "inap.sendingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LegType", HFILL }},
     { &hf_inap_receivingSideID,
       { "receivingSideID", "inap.receivingSideID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.LegType", HFILL }},
     { &hf_inap_MidCallControlInfo_item,
       { "MidCallControlInfo item", "inap.MidCallControlInfo_item",
@@ -10189,15 +10189,15 @@ void proto_register_inap(void) {
         "inap.T_midCallReportType", HFILL }},
     { &hf_inap_iNServiceControlCode,
       { "iNServiceControlCode", "inap.iNServiceControlCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iNServiceControlCodeLow,
       { "iNServiceControlCodeLow", "inap.iNServiceControlCodeLow",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iNServiceControlCodeHigh,
       { "iNServiceControlCodeHigh", "inap.iNServiceControlCodeHigh",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_messageType,
       { "messageType", "inap.messageType",
@@ -10217,7 +10217,7 @@ void proto_register_inap(void) {
         "inap.Interval", HFILL }},
     { &hf_inap_access,
       { "access", "inap.access",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_group,
       { "group", "inap.group",
@@ -10245,7 +10245,7 @@ void proto_register_inap(void) {
         "inap.INTEGER_0_255", HFILL }},
     { &hf_inap_callStopTimeValue,
       { "callStopTimeValue", "inap.callStopTimeValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_callConnectedElapsedTimeValue,
       { "callConnectedElapsedTimeValue", "inap.callConnectedElapsedTimeValue",
@@ -10253,7 +10253,7 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_releaseCauseValue,
       { "releaseCauseValue", "inap.releaseCauseValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_uSImonitorMode,
       { "uSImonitorMode", "inap.uSImonitorMode",
@@ -10265,7 +10265,7 @@ void proto_register_inap(void) {
         "inap.RequestedUTSI", HFILL }},
     { &hf_inap_lineID,
       { "lineID", "inap.lineID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_facilityGroupID,
       { "facilityGroupID", "inap.facilityGroupID",
@@ -10281,11 +10281,11 @@ void proto_register_inap(void) {
         "inap.RouteCountersAndValue", HFILL }},
     { &hf_inap_route,
       { "route", "inap.route",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Route", HFILL }},
     { &hf_inap_RouteList_item,
       { "Route", "inap.Route",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Route", HFILL }},
     { &hf_inap_miscCallInfo,
       { "miscCallInfo", "inap.miscCallInfo",
@@ -10317,31 +10317,31 @@ void proto_register_inap(void) {
         "inap.ConnectedNumberTreatmentInd", HFILL }},
     { &hf_inap_suppressCallDiversionNotification,
       { "suppressCallDiversionNotification", "inap.suppressCallDiversionNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_suppressCallTransferNotification,
       { "suppressCallTransferNotification", "inap.suppressCallTransferNotification",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_allowCdINNoPresentationInd,
       { "allowCdINNoPresentationInd", "inap.allowCdINNoPresentationInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_userDialogueDurationInd,
       { "userDialogueDurationInd", "inap.userDialogueDurationInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_overrideLineRestrictions,
       { "overrideLineRestrictions", "inap.overrideLineRestrictions",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_suppressVPNAPP,
       { "suppressVPNAPP", "inap.suppressVPNAPP",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_calledINNumberOverriding,
       { "calledINNumberOverriding", "inap.calledINNumberOverriding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_redirectServiceTreatmentInd,
       { "redirectServiceTreatmentInd", "inap.redirectServiceTreatmentInd",
@@ -10349,7 +10349,7 @@ void proto_register_inap(void) {
         "inap.T_redirectServiceTreatmentInd", HFILL }},
     { &hf_inap_redirectReason,
       { "redirectReason", "inap.redirectReason",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectReason", HFILL }},
     { &hf_inap_nonCUGCall,
       { "nonCUGCall", "inap.nonCUGCall",
@@ -10409,7 +10409,7 @@ void proto_register_inap(void) {
         "inap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_inap_local,
       { "local", "inap.local",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_minUSIServiceIndicatorLength_maxUSIServiceIndicatorLength", HFILL }},
     { &hf_inap_filteredCallTreatment,
       { "filteredCallTreatment", "inap.filteredCallTreatment",
@@ -10429,7 +10429,7 @@ void proto_register_inap(void) {
         "inap.FilteringCriteria", HFILL }},
     { &hf_inap_startTime,
       { "startTime", "inap.startTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DateAndTime", HFILL }},
     { &hf_inap_dpSpecificCommonParameters,
       { "dpSpecificCommonParameters", "inap.dpSpecificCommonParameters",
@@ -10437,15 +10437,15 @@ void proto_register_inap(void) {
         "inap.DpSpecificCommonParameters", HFILL }},
     { &hf_inap_dialledDigits,
       { "dialledDigits", "inap.dialledDigits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_callingPartyBusinessGroupID,
       { "callingPartyBusinessGroupID", "inap.callingPartyBusinessGroupID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartyBusinessGroupID", HFILL }},
     { &hf_inap_callingPartySubaddress,
       { "callingPartySubaddress", "inap.callingPartySubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingPartySubaddress", HFILL }},
     { &hf_inap_callingFacilityGroup,
       { "callingFacilityGroup", "inap.callingFacilityGroup",
@@ -10457,19 +10457,19 @@ void proto_register_inap(void) {
         "inap.FacilityGroupMember", HFILL }},
     { &hf_inap_originalCalledPartyID,
       { "originalCalledPartyID", "inap.originalCalledPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OriginalCalledPartyID", HFILL }},
     { &hf_inap_prefix,
       { "prefix", "inap.prefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_redirectingPartyID,
       { "redirectingPartyID", "inap.redirectingPartyID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectingPartyID", HFILL }},
     { &hf_inap_redirectionInformation,
       { "redirectionInformation", "inap.redirectionInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RedirectionInformation", HFILL }},
     { &hf_inap_routeList,
       { "routeList", "inap.routeList",
@@ -10477,19 +10477,19 @@ void proto_register_inap(void) {
         "inap.RouteList", HFILL }},
     { &hf_inap_travellingClassMark,
       { "travellingClassMark", "inap.travellingClassMark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.TravellingClassMark", HFILL }},
     { &hf_inap_featureCode,
       { "featureCode", "inap.featureCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.FeatureCode", HFILL }},
     { &hf_inap_accessCode,
       { "accessCode", "inap.accessCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AccessCode", HFILL }},
     { &hf_inap_carrier,
       { "carrier", "inap.carrier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Carrier", HFILL }},
     { &hf_inap_componentType,
       { "componentType", "inap.componentType",
@@ -10509,7 +10509,7 @@ void proto_register_inap(void) {
         "inap.DestinationRoutingAddress", HFILL }},
     { &hf_inap_alertingPattern,
       { "alertingPattern", "inap.alertingPattern",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AlertingPattern", HFILL }},
     { &hf_inap_iNServiceCompatibilityResponse,
       { "iNServiceCompatibilityResponse", "inap.iNServiceCompatibilityResponse",
@@ -10517,7 +10517,7 @@ void proto_register_inap(void) {
         "inap.INServiceCompatibilityResponse", HFILL }},
     { &hf_inap_correlationID,
       { "correlationID", "inap.correlationID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CorrelationID", HFILL }},
     { &hf_inap_callSegmentID,
       { "callSegmentID", "inap.callSegmentID",
@@ -10529,7 +10529,7 @@ void proto_register_inap(void) {
         "inap.LegID", HFILL }},
     { &hf_inap_aChBillingChargingCharacteristics,
       { "aChBillingChargingCharacteristics", "inap.aChBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AChBillingChargingCharacteristics", HFILL }},
     { &hf_inap_partyToCharge,
       { "partyToCharge", "inap.partyToCharge",
@@ -10537,11 +10537,11 @@ void proto_register_inap(void) {
         "inap.LegID", HFILL }},
     { &hf_inap_releaseIndication,
       { "releaseIndication", "inap.releaseIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_destinationNumberRoutingAddress,
       { "destinationNumberRoutingAddress", "inap.destinationNumberRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyNumber", HFILL }},
     { &hf_inap_displayInformation,
       { "displayInformation", "inap.displayInformation",
@@ -10549,7 +10549,7 @@ void proto_register_inap(void) {
         "inap.DisplayInformation", HFILL }},
     { &hf_inap_destinationIndex,
       { "destinationIndex", "inap.destinationIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.DestinationIndex", HFILL }},
     { &hf_inap_gapIndicators,
       { "gapIndicators", "inap.gapIndicators",
@@ -10557,7 +10557,7 @@ void proto_register_inap(void) {
         "inap.GapIndicators", HFILL }},
     { &hf_inap_registratorIdentifier,
       { "registratorIdentifier", "inap.registratorIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RegistratorIdentifier", HFILL }},
     { &hf_inap_gapCriteria,
       { "gapCriteria", "inap.gapCriteria",
@@ -10577,7 +10577,7 @@ void proto_register_inap(void) {
         "inap.RequestedInformationList", HFILL }},
     { &hf_inap_lastEventIndicator,
       { "lastEventIndicator", "inap.lastEventIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_requestedInformationTypeList,
       { "requestedInformationTypeList", "inap.requestedInformationTypeList",
@@ -10605,7 +10605,7 @@ void proto_register_inap(void) {
         "inap.ResourceID", HFILL }},
     { &hf_inap_numberingPlan,
       { "numberingPlan", "inap.numberingPlan",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.NumberingPlan", HFILL }},
     { &hf_inap_cutAndPaste,
       { "cutAndPaste", "inap.cutAndPaste",
@@ -10617,7 +10617,7 @@ void proto_register_inap(void) {
         "inap.ForwardingCondition", HFILL }},
     { &hf_inap_forwardCallIndicators,
       { "forwardCallIndicators", "inap.forwardCallIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ForwardCallIndicators", HFILL }},
     { &hf_inap_genericNumbers,
       { "genericNumbers", "inap.genericNumbers",
@@ -10625,27 +10625,27 @@ void proto_register_inap(void) {
         "inap.GenericNumbers", HFILL }},
     { &hf_inap_sDSSinformation,
       { "sDSSinformation", "inap.sDSSinformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SDSSinformation", HFILL }},
     { &hf_inap_calledDirectoryNumber,
       { "calledDirectoryNumber", "inap.calledDirectoryNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledDirectoryNumber", HFILL }},
     { &hf_inap_calledPartySubaddress,
       { "calledPartySubaddress", "inap.calledPartySubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartySubaddress", HFILL }},
     { &hf_inap_connectionIdentifier,
       { "connectionIdentifier", "inap.connectionIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.ConnectionIdentifier", HFILL }},
     { &hf_inap_genericIdentifier,
       { "genericIdentifier", "inap.genericIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericIdentifier", HFILL }},
     { &hf_inap_qOSParameter,
       { "qOSParameter", "inap.qOSParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.QoSParameter", HFILL }},
     { &hf_inap_bISDNParameters,
       { "bISDNParameters", "inap.bISDNParameters",
@@ -10653,7 +10653,7 @@ void proto_register_inap(void) {
         "inap.BISDNParameters", HFILL }},
     { &hf_inap_cug_Interlock,
       { "cug-Interlock", "inap.cug_Interlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CUG_Interlock", HFILL }},
     { &hf_inap_cug_OutgoingAccess,
       { "cug-OutgoingAccess", "inap.cug_OutgoingAccess",
@@ -10665,7 +10665,7 @@ void proto_register_inap(void) {
         "inap.T_resourceAddress", HFILL }},
     { &hf_inap_ipRoutingAddress,
       { "ipRoutingAddress", "inap.ipRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.IPRoutingAddress", HFILL }},
     { &hf_inap_ipAddressAndLegID,
       { "ipAddressAndLegID", "inap.ipAddressAndLegID",
@@ -10689,7 +10689,7 @@ void proto_register_inap(void) {
         "inap.CallSegmentID", HFILL }},
     { &hf_inap_genericName,
       { "genericName", "inap.genericName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericName", HFILL }},
     { &hf_inap_ipRelationInformation,
       { "ipRelationInformation", "inap.ipRelationInformation",
@@ -10733,7 +10733,7 @@ void proto_register_inap(void) {
         "inap.T_cSFailure", HFILL }},
     { &hf_inap_reason,
       { "reason", "inap.reason",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Reason", HFILL }},
     { &hf_inap_bCSMFailure,
       { "bCSMFailure", "inap.bCSMFailure",
@@ -10741,7 +10741,7 @@ void proto_register_inap(void) {
         "inap.T_bCSMFailure", HFILL }},
     { &hf_inap_assistingSSPIPRoutingAddress,
       { "assistingSSPIPRoutingAddress", "inap.assistingSSPIPRoutingAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AssistingSSPIPRoutingAddress", HFILL }},
     { &hf_inap_partyToConnect,
       { "partyToConnect", "inap.partyToConnect",
@@ -10749,11 +10749,11 @@ void proto_register_inap(void) {
         "inap.T_partyToConnect", HFILL }},
     { &hf_inap_eventSpecificInformationCharging,
       { "eventSpecificInformationCharging", "inap.eventSpecificInformationCharging",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.EventSpecificInformationCharging", HFILL }},
     { &hf_inap_bcsmEventCorrelationID,
       { "bcsmEventCorrelationID", "inap.bcsmEventCorrelationID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CorrelationID", HFILL }},
     { &hf_inap_eventSpecificInformationBCSM,
       { "eventSpecificInformationBCSM", "inap.eventSpecificInformationBCSM",
@@ -10761,11 +10761,11 @@ void proto_register_inap(void) {
         "inap.EventSpecificInformationBCSM", HFILL }},
     { &hf_inap_calledPartyBusinessGroupID,
       { "calledPartyBusinessGroupID", "inap.calledPartyBusinessGroupID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CalledPartyBusinessGroupID", HFILL }},
     { &hf_inap_holdcause,
       { "holdcause", "inap.holdcause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HoldCause", HFILL }},
     { &hf_inap_empty,
       { "empty", "inap.empty",
@@ -10773,39 +10773,39 @@ void proto_register_inap(void) {
         "inap.NULL", HFILL }},
     { &hf_inap_highLayerCompatibility,
       { "highLayerCompatibility", "inap.highLayerCompatibility",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.HighLayerCompatibility", HFILL }},
     { &hf_inap_additionalCallingPartyNumber,
       { "additionalCallingPartyNumber", "inap.additionalCallingPartyNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.AdditionalCallingPartyNumber", HFILL }},
     { &hf_inap_cCSS,
       { "cCSS", "inap.cCSS",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.CCSS", HFILL }},
     { &hf_inap_vPNIndicator,
       { "vPNIndicator", "inap.vPNIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.VPNIndicator", HFILL }},
     { &hf_inap_cNInfo,
       { "cNInfo", "inap.cNInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CNInfo", HFILL }},
     { &hf_inap_callReference,
       { "callReference", "inap.callReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallReference", HFILL }},
     { &hf_inap_routeingNumber,
       { "routeingNumber", "inap.routeingNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.RouteingNumber", HFILL }},
     { &hf_inap_callingGeodeticLocation,
       { "callingGeodeticLocation", "inap.callingGeodeticLocation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.CallingGeodeticLocation", HFILL }},
     { &hf_inap_globalCallReference,
       { "globalCallReference", "inap.globalCallReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GlobalCallReference", HFILL }},
     { &hf_inap_cug_Index,
       { "cug-Index", "inap.cug_Index",
@@ -10817,7 +10817,7 @@ void proto_register_inap(void) {
         "inap.CallSegmentID", HFILL }},
     { &hf_inap_incomingSignallingBufferCopy,
       { "incomingSignallingBufferCopy", "inap.incomingSignallingBufferCopy",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_actionIndicator,
       { "actionIndicator", "inap.actionIndicator",
@@ -10921,7 +10921,7 @@ void proto_register_inap(void) {
         "inap.ApplicationTimer", HFILL }},
     { &hf_inap_initialCallSegment,
       { "initialCallSegment", "inap.initialCallSegment",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Cause", HFILL }},
     { &hf_inap_callSegmentToRelease,
       { "callSegmentToRelease", "inap.callSegmentToRelease",
@@ -10933,7 +10933,7 @@ void proto_register_inap(void) {
         "inap.INTEGER_1_numOfCSs", HFILL }},
     { &hf_inap_forcedRelease,
       { "forcedRelease", "inap.forcedRelease",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_allCallSegments,
       { "allCallSegments", "inap.allCallSegments",
@@ -10993,11 +10993,11 @@ void proto_register_inap(void) {
         "inap.FacilityGroupMember", HFILL }},
     { &hf_inap_sCIBillingChargingCharacteristics,
       { "sCIBillingChargingCharacteristics", "inap.sCIBillingChargingCharacteristics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.SCIBillingChargingCharacteristics", HFILL }},
     { &hf_inap_nocharge,
       { "nocharge", "inap.nocharge",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_callProcessingOperation,
       { "callProcessingOperation", "inap.callProcessingOperation",
@@ -11041,15 +11041,15 @@ void proto_register_inap(void) {
         "inap.INTEGER_1_127", HFILL }},
     { &hf_inap_endOfReplyDigit,
       { "endOfReplyDigit", "inap.endOfReplyDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_cancelDigit,
       { "cancelDigit", "inap.cancelDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_startDigit,
       { "startDigit", "inap.startDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_firstDigitTimeOut,
       { "firstDigitTimeOut", "inap.firstDigitTimeOut",
@@ -11065,19 +11065,19 @@ void proto_register_inap(void) {
         "inap.ErrorTreatment", HFILL }},
     { &hf_inap_interruptableAnnInd,
       { "interruptableAnnInd", "inap.interruptableAnnInd",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_voiceInformation,
       { "voiceInformation", "inap.voiceInformation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_voiceBack,
       { "voiceBack", "inap.voiceBack",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_detectModem,
       { "detectModem", "inap.detectModem",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_collectedDigits,
       { "collectedDigits", "inap.collectedDigits",
@@ -11085,7 +11085,7 @@ void proto_register_inap(void) {
         "inap.CollectedDigits", HFILL }},
     { &hf_inap_iA5Information,
       { "iA5Information", "inap.iA5Information",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_messageID,
       { "messageID", "inap.messageID",
@@ -11125,23 +11125,23 @@ void proto_register_inap(void) {
         "inap.T_controlDigits", HFILL }},
     { &hf_inap_endOfRecordingDigit,
       { "endOfRecordingDigit", "inap.endOfRecordingDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_replayDigit,
       { "replayDigit", "inap.replayDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_restartRecordingDigit,
       { "restartRecordingDigit", "inap.restartRecordingDigit",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_1_2", HFILL }},
     { &hf_inap_restartAllowed,
       { "restartAllowed", "inap.restartAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_replayAllowed,
       { "replayAllowed", "inap.replayAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_inbandInfo,
       { "inbandInfo", "inap.inbandInfo",
@@ -11165,7 +11165,7 @@ void proto_register_inap(void) {
         "inap.IA5String_SIZE_b3__minMessageContentLength_b3__maxMessageContentLength", HFILL }},
     { &hf_inap_attributes,
       { "attributes", "inap.attributes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_b3__minAttributesLength_b3__maxAttributesLength", HFILL }},
     { &hf_inap_elementaryMessageIDs,
       { "elementaryMessageIDs", "inap.elementaryMessageIDs",
@@ -11189,7 +11189,7 @@ void proto_register_inap(void) {
         "inap.VariablePart", HFILL }},
     { &hf_inap_iPAddressValue,
       { "iPAddressValue", "inap.iPAddressValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_gapOnResource,
       { "gapOnResource", "inap.gapOnResource",
@@ -11213,27 +11213,27 @@ void proto_register_inap(void) {
         "inap.Integer4", HFILL }},
     { &hf_inap_number,
       { "number", "inap.number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_time,
       { "time", "inap.time",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_inap_date,
       { "date", "inap.date",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_inap_price,
       { "price", "inap.price",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_inap_disconnectFromIPForbidden,
       { "disconnectFromIPForbidden", "inap.disconnectFromIPForbidden",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_requestAnnouncementComplete,
       { "requestAnnouncementComplete", "inap.requestAnnouncementComplete",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_connectedParty,
       { "connectedParty", "inap.connectedParty",
@@ -11245,7 +11245,7 @@ void proto_register_inap(void) {
         "inap.CollectedInfo", HFILL }},
     { &hf_inap_digitsResponse,
       { "digitsResponse", "inap.digitsResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.Digits", HFILL }},
     { &hf_inap_iA5Response,
       { "iA5Response", "inap.iA5Response",
@@ -11253,15 +11253,15 @@ void proto_register_inap(void) {
         "inap.IA5String", HFILL }},
     { &hf_inap_modemdetected,
       { "modemdetected", "inap.modemdetected",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "inap.BOOLEAN", HFILL }},
     { &hf_inap_subscriberID,
       { "subscriberID", "inap.subscriberID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.GenericNumber", HFILL }},
     { &hf_inap_mailBoxID,
       { "mailBoxID", "inap.mailBoxID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "inap.MailBoxID", HFILL }},
     { &hf_inap_informationToRecord,
       { "informationToRecord", "inap.informationToRecord",
diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c
index 58e1249288..7388d47716 100644
--- a/epan/dissectors/packet-ip.c
+++ b/epan/dissectors/packet-ip.c
@@ -2832,59 +2832,59 @@ proto_register_icmp(void)
 
     { &hf_icmp_type,
       { "Type",		"icmp.type",		FT_UINT8, BASE_DEC,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_icmp_code,
       { "Code",		"icmp.code",		FT_UINT8, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_icmp_checksum,
       { "Checksum",	"icmp.checksum",	FT_UINT16, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_icmp_checksum_bad,
       { "Bad Checksum",	"icmp.checksum_bad",	FT_BOOLEAN, BASE_NONE,	NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
 
     { &hf_icmp_ident,
       {"Identifier", "icmp.ident",              FT_UINT16, BASE_HEX,    NULL, 0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_icmp_seq_num,
       {"Sequence number", "icmp.seq",           FT_UINT16, BASE_DEC_HEX,    NULL, 0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_icmp_mtu,
       {"MTU of next hop", "icmp.mtu",           FT_UINT16, BASE_DEC,    NULL, 0x0,
-       "", HFILL}},
+       NULL, HFILL}},
 
     { &hf_icmp_redir_gw,
       {"Gateway address", "icmp.redir_gw",      FT_IPv4, BASE_NONE,     NULL, 0x0,
-       "", HFILL }},
+       NULL, HFILL }},
 
     { &hf_icmp_mip_type,
       { "Extension Type", "icmp.mip.type",	FT_UINT8, BASE_DEC,
-	VALS(mip_extensions), 0x0,"", HFILL}},
+	VALS(mip_extensions), 0x0,NULL, HFILL}},
 
     { &hf_icmp_mip_length,
       { "Length", "icmp.mip.length",		FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_prefix_length,
       { "Prefix Length", "icmp.mip.prefixlength",  FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_seq,
       { "Sequence Number", "icmp.mip.seq",	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_life,
       { "Registration Lifetime", "icmp.mip.life",  FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_flags,
       { "Flags", "icmp.mip.flags",            FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_r,
       { "Registration Required", "icmp.mip.r", FT_BOOLEAN, 16, NULL, 32768,
@@ -2929,64 +2929,64 @@ proto_register_icmp(void)
 
     { &hf_icmp_mip_reserved,
       { "Reserved", "icmp.mip.reserved",     FT_UINT16, BASE_HEX, NULL, 0x003f,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_coa,
       { "Care-Of-Address", "icmp.mip.coa",    FT_IPv4, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mip_challenge,
       { "Challenge", "icmp.mip.challenge",    FT_BYTES, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
 
     { &hf_icmp_mpls,
       { "ICMP Extensions for MPLS",	"icmp.mpls",	FT_NONE, BASE_NONE,	NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
 
 	{ &hf_icmp_mpls_version,
 		{ "Version",		"icmp.mpls.version", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
     { &hf_icmp_mpls_reserved,
       { "Reserved",	"icmp.mpls.res",	FT_UINT16, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
 	{ &hf_icmp_mpls_checksum,
       { "Checksum",	"icmp.mpls.checksum",	FT_UINT16, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
 	{ &hf_icmp_mpls_checksum_bad,
       { "Bad Checksum",	"icmp.mpls.checksum_bad",	FT_BOOLEAN, BASE_NONE,	NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
 
 	{ &hf_icmp_mpls_length,
       { "Length",	"icmp.mpls.length",	FT_UINT16, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
 	{ &hf_icmp_mpls_class,
 		{ "Class",	"icmp.mpls.class", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_icmp_mpls_c_type,
 		{ "C-Type",	"icmp.mpls.ctype", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_icmp_mpls_label,
 		{ "Label",	"icmp.mpls.label", FT_UINT24, BASE_DEC, NULL, 0x00fffff0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_icmp_mpls_exp,
 		{ "Experimental",	"icmp.mpls.exp", FT_UINT24, BASE_DEC,
 			NULL, 0x0e,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_icmp_mpls_s,
 		{ "Stack bit",	"icmp.mpls.s", FT_BOOLEAN, 24, TFS(&flags_set_truth), 0x01,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_icmp_mpls_ttl,
 		{ "Time to live",	"icmp.mpls.ttl", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }}
+			NULL, HFILL }}
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c
index 9a8a219351..cb95fc5acc 100644
--- a/epan/dissectors/packet-ipdc.c
+++ b/epan/dissectors/packet-ipdc.c
@@ -367,25 +367,25 @@ proto_register_ipdc(void)
 		{ &hf_ipdc_payload_len,
 			{ "Payload length",	"ipdc.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Payload length", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_ipdc_protocol_id,
 			{ "Protocol ID",	"ipdc.protocol_id",
 			FT_UINT8, BASE_HEX, NULL, 0x0,
-			"Protocol ID", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_ipdc_trans_id_size,
 			{ "Transaction ID size",	"ipdc.trans_id_size",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Transaction ID size", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_ipdc_trans_id,
 			{ "Transaction ID",	"ipdc.trans_id",
-			FT_BYTES, BASE_HEX, NULL, 0x0,
-			"Transaction ID", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }
 		},
 
 		{ &hf_ipdc_message_code,
diff --git a/epan/dissectors/packet-ipfc.c b/epan/dissectors/packet-ipfc.c
index a4e4953876..1d9429875d 100644
--- a/epan/dissectors/packet-ipfc.c
+++ b/epan/dissectors/packet-ipfc.c
@@ -106,11 +106,11 @@ proto_register_ipfc (void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_ipfc_network_da,
-          {"Network DA", "ipfc.nh.da", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Network DA", "ipfc.nh.da", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_ipfc_network_sa,
-          {"Network SA", "ipfc.nh.sa", FT_STRING, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Network SA", "ipfc.nh.sa", FT_STRING, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c
index 32146e0939..b664c83e5a 100644
--- a/epan/dissectors/packet-ipmi-app.c
+++ b/epan/dissectors/packet-ipmi-app.c
@@ -1036,415 +1036,415 @@ ipmi_register_app(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_app_01_dev_id,
 			{ "Device ID",
-				"ipmi.app00.dev.id", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app00.dev.id", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_01_dev_prov_sdr,
 			{ "Device provides Device SDRs",
-				"ipmi.app00.dev.provides_dev_sdr", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.app00.dev.provides_dev_sdr", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_01_dev_rev,
 			{ "Device Revision (binary encoded)",
-				"ipmi.app00.dev.rev", FT_UINT8, BASE_HEX, NULL, 0x0f, "", HFILL }},
+				"ipmi.app00.dev.rev", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_01_dev_avail,
 			{ "Device availability",
-				"ipmi.app01.dev.avail", FT_BOOLEAN, 8, TFS(&tfs_01_dev_avail), 0x80, "", HFILL }},
+				"ipmi.app01.dev.avail", FT_BOOLEAN, 8, TFS(&tfs_01_dev_avail), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_01_fw_rev_maj,
 			{ "Major Firmware Revision (binary encoded)",
-				"ipmi.app01.fw.major", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.app01.fw.major", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_01_fw_rev_min,
 			{ "Minor Firmware Revision (BCD encoded)",
-				"ipmi.app01.fw.minor", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app01.fw.minor", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_version,
 			{ "IPMI version",
-				"ipmi.app01.ipmi.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.app01.ipmi.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_chassis,
 			{ "Chassis",
-				"ipmi.app01.ads.chassis", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.app01.ads.chassis", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_bridge,
 			{ "Bridge",
-				"ipmi.app01.ads.bridge", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.app01.ads.bridge", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_ipmb_ev_gen,
 			{ "Event Generator",
-				"ipmi.app01.ads.ipmb_ev_gen", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.app01.ads.ipmb_ev_gen", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_ipmb_ev_recv,
 			{ "Event Receiver",
-				"ipmi.app01.ads.ipmb_ev_recv", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.app01.ads.ipmb_ev_recv", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_fru,
 			{ "FRU Inventory",
-				"ipmi.app01.ads.fru", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.app01.ads.fru", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_sel,
 			{ "SEL",
-				"ipmi.app01.ads.sel", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.app01.ads.sel", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_sdr,
 			{ "SDR Repository",
-				"ipmi.app01.ads.sdr", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.app01.ads.sdr", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_01_ipmi_ads_sensor,
 			{ "Sensor",
-				"ipmi.app01.ads.sensor", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.app01.ads.sensor", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_app_01_manufacturer,
 			{ "Manufacturer ID",
-				"ipmi.app01.manufacturer", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.app01.manufacturer", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_01_product,
 			{ "Product ID",
-				"ipmi.app01.product", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app01.product", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_01_fw_aux,
 			{ "Auxiliary Firmware Revision Information",
-				"ipmi.app01.fw.aux", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app01.fw.aux", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_04_result,
 			{ "Self test result",
-				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, vals_04_result, 0, "", HFILL }},
+				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, vals_04_result, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail,
 			{ "Self-test error bitfield",
-				"ipmi.app04.fail", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app04.fail", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_sel,
 			{ "Cannot access SEL device",
-				"ipmi.app04.fail.sel", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x80, "", HFILL }},
+				"ipmi.app04.fail.sel", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_sdr,
 			{ "Cannot access SDR Repository",
-				"ipmi.app04.fail.sdr", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x40, "", HFILL }},
+				"ipmi.app04.fail.sdr", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_bmc_fru,
 			{ "Cannot access BMC FRU device",
-				"ipmi.app04.fail.bmc_fru", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x20, "", HFILL }},
+				"ipmi.app04.fail.bmc_fru", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_ipmb_sig,
 			{ "IPMB signal lines do not respond",
-				"ipmi.app04.fail.ipmb_sig", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x10, "", HFILL }},
+				"ipmi.app04.fail.ipmb_sig", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_sdr_empty,
 			{ "SDR Repository is empty",
-				"ipmi.app04.fail.sdr_empty", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x08, "", HFILL }},
+				"ipmi.app04.fail.sdr_empty", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_iua,
 			{ "Internal Use Area of BMC FRU corrupted",
-				"ipmi.app04.fail.iua", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x04, "", HFILL }},
+				"ipmi.app04.fail.iua", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_bb_fw,
 			{ "Controller update boot block firmware corrupted",
-				"ipmi.app04.fail.bb_fw", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x02, "", HFILL }},
+				"ipmi.app04.fail.bb_fw", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail_oper_fw,
 			{ "Controller operational firmware corrupted",
-				"ipmi.app04.fail.oper_fw", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x01, "", HFILL }},
+				"ipmi.app04.fail.oper_fw", FT_BOOLEAN, 8, TFS(&tfs_04_fail_unknown), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_05_devspec,
 			{ "Device-specific parameters",
-				"ipmi.app05.devspec", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app05.devspec", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_06_syspwr_set,
 			{ "System Power State",
-				"ipmi.app06.syspwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, "", HFILL }},
+				"ipmi.app06.syspwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_syspwr_enum,
 			{ "System Power State enumeration",
-				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, vals_06_syspwr, 0x7f, "", HFILL }},
+				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, vals_06_syspwr, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_set,
 			{ "Device Power State",
-				"ipmi.app06.devpwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, "", HFILL }},
+				"ipmi.app06.devpwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_enum,
 			{ "Device Power State enumeration",
-				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, vals_06_devpwr, 0x7f, "", HFILL }},
+				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, vals_06_devpwr, 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_07_syspwr_enum,
 			{ "ACPI System Power State",
-				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, vals_07_syspwr, 0x7f, "", HFILL }},
+				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, vals_07_syspwr, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_07_devpwr_enum,
 			{ "ACPI Device Power State",
-				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, vals_07_devpwr, 0x7f, "", HFILL }},
+				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, vals_07_devpwr, 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_08_guid,
 			{ "GUID",
-				"ipmi.app08.guid", FT_GUID, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app08.guid", FT_GUID, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_24_timer_use_dont_log,
 			{ "Don't log",
-				"ipmi.app24.timer_use.dont_log", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.app24.timer_use.dont_log", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_use_dont_stop,
 			{ "Don't stop timer on Set Watchdog command",
-				"ipmi.app24.timer_use.dont_stop", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.app24.timer_use.dont_stop", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_use_timer_use,
 			{ "Timer use",
-				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, "", HFILL }},
+				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, "", HFILL }},
+				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, "", HFILL }},
+				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_pretimeout,
 			{ "Pre-timeout interval",
-				"ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_24_expiration_flags_oem,
 			{ "OEM",
-				"ipmi.app24.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, "", HFILL }},
+				"ipmi.app24.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_24_expiration_flags_smsos,
 			{ "SMS/OS",
-				"ipmi.app24.exp_flags.sms_os", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x10, "", HFILL }},
+				"ipmi.app24.exp_flags.sms_os", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_24_expiration_flags_osload,
 			{ "OS Load",
-				"ipmi.app24.exp_flags.osload", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x08, "", HFILL }},
+				"ipmi.app24.exp_flags.osload", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_24_expiration_flags_biospost,
 			{ "BIOS/POST",
-				"ipmi.app24.exp_flags.biospost", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x04, "", HFILL }},
+				"ipmi.app24.exp_flags.biospost", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_24_expiration_flags_biosfrb2,
 			{ "BIOS FRB2",
-				"ipmi.app24.exp_flags.biosfrb2", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x02, "", HFILL }},
+				"ipmi.app24.exp_flags.biosfrb2", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_24_initial_countdown,
 			{ "Initial countdown value (100ms/count)",
-				"ipmi.app24.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.app24.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_25_timer_use_dont_log,
 			{ "Don't log",
-				"ipmi.app25.timer_use.dont_log", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.app25.timer_use.dont_log", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_use_started,
 			{ "Started",
-				"ipmi.app25.timer_use.started", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.app25.timer_use.started", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_use_timer_use,
 			{ "Timer user",
-				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, "", HFILL }},
+				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, "", HFILL }},
+				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, "", HFILL }},
+				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_pretimeout,
 			{ "Pre-timeout interval",
-				"ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_25_expiration_flags_oem,
 			{ "OEM",
-				"ipmi.app25.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, "", HFILL }},
+				"ipmi.app25.exp_flags.oem", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_25_expiration_flags_smsos,
 			{ "SMS/OS",
-				"ipmi.app25.exp_flags.sms_os", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x10, "", HFILL }},
+				"ipmi.app25.exp_flags.sms_os", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_25_expiration_flags_osload,
 			{ "OS Load",
-				"ipmi.app25.exp_flags.osload", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x08, "", HFILL }},
+				"ipmi.app25.exp_flags.osload", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_25_expiration_flags_biospost,
 			{ "BIOS/POST",
-				"ipmi.app25.exp_flags.biospost", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x04, "", HFILL }},
+				"ipmi.app25.exp_flags.biospost", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_25_expiration_flags_biosfrb2,
 			{ "BIOS FRB2",
-				"ipmi.app25.exp_flags.biosfrb2", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x02, "", HFILL }},
+				"ipmi.app25.exp_flags.biosfrb2", FT_BOOLEAN, 8, TFS(&tfs_24_exp_flags), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_25_initial_countdown,
 			{ "Initial countdown value (100ms/count)",
-				"ipmi.app25.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.app25.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_25_present_countdown,
 			{ "Present countdown value (100ms/count)",
-				"ipmi.app25.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.app25.initial_countdown", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_2e_byte1_oem2,
 			{ "OEM 2",
-				"ipmi.app2e.bmc_global_enables.oem2", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x80, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.oem2", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_oem1,
 			{ "OEM 1",
-				"ipmi.app2e.bmc_global_enables.oem1", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x40, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.oem1", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_oem0,
 			{ "OEM 0",
-				"ipmi.app2e.bmc_global_enables.oem0", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x20, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.oem0", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_sel,
 			{ "System Event Logging",
-				"ipmi.app2e.bmc_global_enables.sel", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x08, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.sel", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_emb,
 			{ "Event Message Buffer",
-				"ipmi.app2e.bmc_global_enables.emb", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x04, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.emb", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_emb_full_intr,
 			{ "Event Message Buffer Full Interrupt",
-				"ipmi.app2e.bmc_global_enables.emb_full_intr", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x02, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.emb_full_intr", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_2e_byte1_rmq_intr,
 			{ "Receive Message Queue Interrupt",
-				"ipmi.app2e.bmc_global_enables.rmq_intr", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x01, "", HFILL }},
+				"ipmi.app2e.bmc_global_enables.rmq_intr", FT_BOOLEAN, 8, TFS(&tfs_2e_enable), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_2f_byte1_oem2,
 			{ "OEM 2",
-				"ipmi.app2f.bmc_global_enables.oem2", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x80, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.oem2", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_oem1,
 			{ "OEM 1",
-				"ipmi.app2f.bmc_global_enables.oem1", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x40, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.oem1", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_oem0,
 			{ "OEM 0",
-				"ipmi.app2f.bmc_global_enables.oem0", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x20, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.oem0", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_sel,
 			{ "System Event Logging",
-				"ipmi.app2f.bmc_global_enables.sel", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x08, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.sel", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_emb,
 			{ "Event Message Buffer",
-				"ipmi.app2f.bmc_global_enables.emb", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x04, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.emb", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_emb_full_intr,
 			{ "Event Message Buffer Full Interrupt",
-				"ipmi.app2f.bmc_global_enables.emb_full_intr", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x02, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.emb_full_intr", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_2f_byte1_rmq_intr,
 			{ "Receive Message Queue Interrupt",
-				"ipmi.app2f.bmc_global_enables.rmq_intr", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x01, "", HFILL }},
+				"ipmi.app2f.bmc_global_enables.rmq_intr", FT_BOOLEAN, 8, TFS(&tfs_2f_enabled), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_30_byte1_oem2,
 			{ "OEM 2",
-				"ipmi.app30.byte1.oem2", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x80, "", HFILL }},
+				"ipmi.app30.byte1.oem2", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_30_byte1_oem1,
 			{ "OEM 1",
-				"ipmi.app30.byte1.oem1", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x40, "", HFILL }},
+				"ipmi.app30.byte1.oem1", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_30_byte1_oem0,
 			{ "OEM 0",
-				"ipmi.app30.byte1.oem0", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x20, "", HFILL }},
+				"ipmi.app30.byte1.oem0", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_30_byte1_wd_pretimeout,
 			{ "Watchdog pre-timeout interrupt flag",
-				"ipmi.app30.byte1.wd_pretimeout", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x08, "", HFILL }},
+				"ipmi.app30.byte1.wd_pretimeout", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_30_byte1_emb,
 			{ "Event Message Buffer",
-				"ipmi.app30.byte1.emb", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x02, "", HFILL }},
+				"ipmi.app30.byte1.emb", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_30_byte1_rmq,
 			{ "Receive Message Queue",
-				"ipmi.app30.byte1.rmq", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x01, "", HFILL }},
+				"ipmi.app30.byte1.rmq", FT_BOOLEAN, 8, TFS(&tfs_30_clear), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_31_byte1_oem2,
 			{ "OEM 2 data available",
-				"ipmi.app31.byte1.oem2", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.app31.byte1.oem2", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_31_byte1_oem1,
 			{ "OEM 1 data available",
-				"ipmi.app31.byte1.oem1", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.app31.byte1.oem1", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_31_byte1_oem0,
 			{ "OEM 0 data available",
-				"ipmi.app31.byte1.oem0", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.app31.byte1.oem0", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_31_byte1_wd_pretimeout,
 			{ "Watchdog pre-timeout interrupt occurred",
-				"ipmi.app31.byte1.wd_pretimeout", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.app31.byte1.wd_pretimeout", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_31_byte1_emb,
 			{ "Event Message Buffer Full",
-				"ipmi.app31.byte1.emb", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.app31.byte1.emb", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_31_byte1_rmq,
 			{ "Receive Message Available",
-				"ipmi.app31.byte1.rmq", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.app31.byte1.rmq", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_32_rq_chno,
 			{ "Channel",
-				"ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rq_state,
 			{ "Channel State",
-				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, vals_32_state, 0x03, "", HFILL }},
+				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, vals_32_state, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rs_chno,
 			{ "Channel",
-				"ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rs_state,
 			{ "Channel State",
-				"ipmi.app32.rs_state", FT_BOOLEAN, 8, TFS(&tfs_32_state), 0x01, "", HFILL }},
+				"ipmi.app32.rs_state", FT_BOOLEAN, 8, TFS(&tfs_32_state), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_app_34_track,
 			{ "Tracking",
-				"ipmi.app34.track", FT_UINT8, BASE_HEX, vals_34_track, 0xc0, "", HFILL }},
+				"ipmi.app34.track", FT_UINT8, BASE_HEX, vals_34_track, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_app_34_encrypt,
 			{ "Encryption required",
-				"ipmi.app34.encrypt", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.app34.encrypt", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_34_auth,
 			{ "Authentication required",
-				"ipmi.app34.auth", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.app34.auth", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_34_chan,
 			{ "Channel",
-				"ipmi.app34.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.app34.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_38_rq_ipmi20,
 			{ "Version compatibility",
-				"ipmi.app38.rq_ipmi20", FT_UINT8, BASE_DEC, &vals_38_ipmi20, 0x80, "", HFILL }},
+				"ipmi.app38.rq_ipmi20", FT_UINT8, BASE_DEC, &vals_38_ipmi20, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rq_chan,
 			{ "Channel",
-				"ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rq_priv,
 			{ "Requested privilege level",
-				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, "", HFILL }},
+				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_chan,
 			{ "Channel",
-				"ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_ipmi20,
 			{ "Version compatibility",
-				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, vals_38_ipmi20, 0x80, "", HFILL }},
+				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, vals_38_ipmi20, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_oem,
 			{ "OEM Proprietary authentication",
-				"ipmi.app38.rs_auth_oem", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x20, "", HFILL }},
+				"ipmi.app38.rs_auth_oem", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_straight,
 			{ "Straight password/key",
-				"ipmi.app38.rs_auth_straight", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x10, "", HFILL }},
+				"ipmi.app38.rs_auth_straight", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_md5,
 			{ "MD5",
-				"ipmi.app38.rs_auth_md5", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x04, "", HFILL }},
+				"ipmi.app38.rs_auth_md5", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_md2,
 			{ "MD2",
-				"ipmi.app38.rs_auth_md2", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x02, "", HFILL }},
+				"ipmi.app38.rs_auth_md2", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_none,
 			{ "No auth",
-				"ipmi.app38.rs_auth_none", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x01, "", HFILL }},
+				"ipmi.app38.rs_auth_none", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_kg,
 			{ "KG",
-				"ipmi.app38.rs_kg_status", FT_BOOLEAN, 8, TFS(&tfs_38_kg), 0x20, "", HFILL }},
+				"ipmi.app38.rs_kg_status", FT_BOOLEAN, 8, TFS(&tfs_38_kg), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_permsg,
 			{ "Per-message Authentication disabled",
-				"ipmi.app38.rs_permsg", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.app38.rs_permsg", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_userauth,
 			{ "User-level Authentication disabled",
-				"ipmi.app38.rs_userauth", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.app38.rs_userauth", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_user_nonnull,
 			{ "Non-null usernames enabled",
-				"ipmi.app38.rs_user_nonnull", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.app38.rs_user_nonnull", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_user_null,
 			{ "Null usernames enabled",
-				"ipmi.app38.rs_user_null", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.app38.rs_user_null", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_user_anon,
 			{ "Anonymous login enabled",
-				"ipmi.app38.rs_user_anon", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.app38.rs_user_anon", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_ipmi20_conn,
 			{ "IPMI v2.0",
-				"ipmi.app38.rs_ipmi20_conn", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.app38.rs_ipmi20_conn", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_ipmi15_conn,
 			{ "IPMI v1.5",
-				"ipmi.app38.rs_ipmi15_conn", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.app38.rs_ipmi15_conn", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_oem_iana,
 			{ "OEM ID",
-				"ipmi.app38.rs_oem_iana", FT_UINT24, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.app38.rs_oem_iana", FT_UINT24, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_oem_aux,
 			{ "OEM Auxiliary data",
-				"ipmi.app38.rs_oem_aux", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app38.rs_oem_aux", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_39_authtype,
 			{ "Authentication Type",
-				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, "", HFILL }},
+				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_39_user,
 			{ "User Name",
-				"ipmi.app39.user", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.app39.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_39_temp_session,
 			{ "Temporary Session ID",
-				"ipmi.app39.temp_session", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app39.temp_session", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_39_challenge,
 			{ "Challenge",
-				"ipmi.app39.challenge", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.app39.challenge", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3a_authtype,
 			{ "Authentication Type",
-				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, "", HFILL }},
+				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_privlevel,
 			{ "Requested Maximum Privilege Level",
-				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, "", HFILL }},
+				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authcode,
 			{ "Challenge string/Auth Code",
-				"ipmi.app3a.authcode", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3a.authcode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_outbound_seq,
 			{ "Initial Outbound Sequence Number",
-				"ipmi.app3a.outbound_seq", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3a.outbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authtype_session,
 			{ "Authentication Type for session",
-				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, "", HFILL }},
+				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_session_id,
 			{ "Session ID",
-				"ipmi.app3a.session_id", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3a.session_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_inbound_seq,
 			{ "Initial Inbound Sequence Number",
-				"ipmi.app3a.inbound_seq", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3a.inbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_maxpriv_session,
 			{ "Maximum Privilege Level for session",
-				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, "", HFILL }},
+				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3b_req_priv,
 			{ "Requested Privilege Level",
-				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, "", HFILL }},
+				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3b_new_priv,
 			{ "New Privilege Level",
-				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, "", HFILL }},
+				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3c_session_id,
 			{ "Session ID",
-				"ipmi.app3c.session_id", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3c.session_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3c_session_handle,
 			{ "Session handle",
-				"ipmi.app3c.session_handle", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.app3c.session_handle", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_ipmi_app_01_byte2,
diff --git a/epan/dissectors/packet-ipmi-chassis.c b/epan/dissectors/packet-ipmi-chassis.c
index 86aa876832..91bd033cc1 100644
--- a/epan/dissectors/packet-ipmi-chassis.c
+++ b/epan/dissectors/packet-ipmi-chassis.c
@@ -723,311 +723,311 @@ ipmi_register_chassis(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_chs_bo00_sip,
 			{ "Set In Progress",
-				"ipmi.bootopt00.sip", FT_UINT8, BASE_HEX, bo00_sip_vals, 0x03, "", HFILL }},
+				"ipmi.bootopt00.sip", FT_UINT8, BASE_HEX, bo00_sip_vals, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo01_spsel,
 			{ "Service Partition Selector",
-				"ipmi.bootopt01.spsel", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.bootopt01.spsel", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo02_request,
 			{ "Request BIOS to scan for specified service partition",
-				"ipmi.bootopt02.spscan.request", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.bootopt02.spscan.request", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo02_discovered,
 			{ "Service Partition discovered",
-				"ipmi.bootopt02.spscan.discovered", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.bootopt02.spscan.discovered", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo03_pef,
 			{ "Reset/power cycle caused by PEF",
-				"ipmi.bootopt03.bmcboot.pef", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x10, "", HFILL }},
+				"ipmi.bootopt03.bmcboot.pef", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo03_cctrl_timeout,
 			{ "Chassis Control command not received within 60s timeout",
-				"ipmi.bootopt03.bmcboot.cctrl_timeout", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x08, "", HFILL }},
+				"ipmi.bootopt03.bmcboot.cctrl_timeout", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo03_wd_timeout,
 			{ "Reset/power cycle caused by watchdog timeout",
-				"ipmi.bootopt03.bmcboot.wd_timeout", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x04, "", HFILL }},
+				"ipmi.bootopt03.bmcboot.wd_timeout", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo03_softreset,
 			{ "Pushbutton reset / soft reset",
-				"ipmi.bootopt03.bmcboot.softreset", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x02, "", HFILL }},
+				"ipmi.bootopt03.bmcboot.softreset", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo03_powerup,
 			{ "Power up via pushbutton or wake event",
-				"ipmi.bootopt03.bmcboot.powerup", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x01, "", HFILL }},
+				"ipmi.bootopt03.bmcboot.powerup", FT_BOOLEAN, 8, TFS(&bo03_dontclear_tfs), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_write_mask,
 			{ "Write mask",
-				"ipmi.bootopt04.write_mask", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.bootopt04.write_mask", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_bootinit_ack_oem,
 			{ "OEM",
-				"ipmi.bootopt04.bootinit_ack.oem", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x10, "", HFILL }},
+				"ipmi.bootopt04.bootinit_ack.oem", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_bootinit_ack_sms,
 			{ "SMS",
-				"ipmi.bootopt04.bootinit_ack.sms", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x08, "", HFILL }},
+				"ipmi.bootopt04.bootinit_ack.sms", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_bootinit_ack_os,
 			{ "OS / Service Partition",
-				"ipmi.bootopt04.bootinit_ack.os", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x04, "", HFILL }},
+				"ipmi.bootopt04.bootinit_ack.os", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_bootinit_ack_osloader,
 			{ "OS Loader",
-				"ipmi.bootopt04.bootinit_ack.osloader", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x02, "", HFILL }},
+				"ipmi.bootopt04.bootinit_ack.osloader", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo04_bootinit_ack_bios,
 			{ "BIOS/POST",
-				"ipmi.bootopt04.bootinit_ack.bios", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x01, "", HFILL }},
+				"ipmi.bootopt04.bootinit_ack.bios", FT_BOOLEAN, 8, TFS(&bo04_bootinit_ack_tfs), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bootflags_valid,
 			{ "Boot flags valid",
-				"ipmi.bootopt05.boot_flags_valid", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.bootopt05.boot_flags_valid", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_permanent,
 			{ "Permanency",
-				"ipmi.bootopt05.permanent", FT_BOOLEAN, 8, TFS(&bo05_permanent_tfs), 0x40, "", HFILL }},
+				"ipmi.bootopt05.permanent", FT_BOOLEAN, 8, TFS(&bo05_permanent_tfs), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_boottype,
 			{ "Boot type",
-				"ipmi.bootopt05.boottype", FT_BOOLEAN, 8, TFS(&bo05_boottype_tfs), 0x20, "", HFILL }},
+				"ipmi.bootopt05.boottype", FT_BOOLEAN, 8, TFS(&bo05_boottype_tfs), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_cmos_clear,
 			{ "CMOS Clear",
-				"ipmi.bootopt05.cmos_clear", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.bootopt05.cmos_clear", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_lock_kbd,
 			{ "Lock Keyboard",
-				"ipmi.bootopt05.lock_kbd", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.bootopt05.lock_kbd", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bootdev,
 			{ "Boot Device Selector",
-				"ipmi.bootopt05.bootdev", FT_UINT8, BASE_HEX, bo05_bootdev_vals, 0x3c, "", HFILL }},
+				"ipmi.bootopt05.bootdev", FT_UINT8, BASE_HEX, bo05_bootdev_vals, 0x3c, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_screen_blank,
 			{ "Screen Blank",
-				"ipmi.bootopt05.screen_blank", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.bootopt05.screen_blank", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_lockout_reset,
 			{ "Lock out Reset buttons",
-				"ipmi.bootopt05.lockout_reset", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.bootopt05.lockout_reset", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_lockout_poweroff,
 			{ "Lock out (power off / sleep request) via Power Button",
-				"ipmi.bootopt05.lockout_poweroff", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.bootopt05.lockout_poweroff", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_verbosity,
 			{ "BIOS verbosity",
-				"ipmi.bootopt05.bios_verbosity", FT_UINT8, BASE_HEX, bo05_bios_verbosity_vals, 0x60, "", HFILL }},
+				"ipmi.bootopt05.bios_verbosity", FT_UINT8, BASE_HEX, bo05_bios_verbosity_vals, 0x60, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_progress_traps,
 			{ "Force Progress Event Traps",
-				"ipmi.bootopt05.progress_traps", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.bootopt05.progress_traps", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_pwd_bypass,
 			{ "User password bypass",
-				"ipmi.bootopt05.pwd_bypass", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.bootopt05.pwd_bypass", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_lock_sleep,
 			{ "Lock Out Sleep Button",
-				"ipmi.bootopt05.lock_sleep", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.bootopt05.lock_sleep", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_console_redirection,
 			{ "Console redirection",
-				"ipmi.bootopt05.console_redirection", FT_UINT8, BASE_HEX, bo05_console_redir_vals, 0x03, "", HFILL }},
+				"ipmi.bootopt05.console_redirection", FT_UINT8, BASE_HEX, bo05_console_redir_vals, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_shared_override,
 			{ "BIOS Shared Mode Override",
-				"ipmi.bootopt05.bios_shared_override", FT_BOOLEAN, 8, TFS(&bo05_bios_shared_tfs), 0x08, "", HFILL }},
+				"ipmi.bootopt05.bios_shared_override", FT_BOOLEAN, 8, TFS(&bo05_bios_shared_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_bios_muxctl_override,
 			{ "BIOS Mux Control Override",
-				"ipmi.bootopt05.bios_muxctl_override", FT_UINT8, BASE_HEX, bo05_bios_muxctl_vals, 0x07, "", HFILL }},
+				"ipmi.bootopt05.bios_muxctl_override", FT_UINT8, BASE_HEX, bo05_bios_muxctl_vals, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo05_byte5,
 			{ "Data 5 (reserved)",
-				"ipmi.bootopt05.byte5", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.bootopt05.byte5", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo06_chan_num,
 			{ "Channel",
-				"ipmi.bootopt06.chan_num", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.bootopt06.chan_num", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo06_session_id,
 			{ "Session ID",
-				"ipmi.bootopt06.session_id", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.bootopt06.session_id", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo06_bootinfo_timestamp,
 			{ "Boot Info Timestamp",
-				"impi.bootopt06.bootinfo_timestamp", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"impi.bootopt06.bootinfo_timestamp", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo07_block_selector,
 			{ "Block selector",
-				"ipmi.bootopt07.block_selector", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.bootopt07.block_selector", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_bo07_block_data,
 			{ "Block data",
-				"ipmi.bootopt07.block_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.bootopt07.block_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_00_capflags_ppi,
 			{ "Power interlock",
-				"ipmi.ch00.cap.power_interlock", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x08, "", HFILL }},
+				"ipmi.ch00.cap.power_interlock", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_capflags_di,
 			{ "Diagnostic Interrupt",
-				"ipmi.ch00.cap.diag_int", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x04, "", HFILL }},
+				"ipmi.ch00.cap.diag_int", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_capflags_fpl,
 			{ "Front Panel Lockout",
-				"ipmi.ch00.cap.fpl", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x02, "", HFILL }},
+				"ipmi.ch00.cap.fpl", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_capflags_is,
 			{ "Intrusion sensor",
-				"ipmi.ch00.cap.intrusion", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x01, "", HFILL }},
+				"ipmi.ch00.cap.intrusion", FT_BOOLEAN, 8, TFS(&tfs_00_provided), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_fru_dev_addr,
 			{ "Chassis FRU Info Device Address",
-				"ipmi.ch00.fru_info", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch00.fru_info", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_sdr_dev_addr,
 			{ "Chassis SDR Device Address",
-				"ipmi.ch00.sdr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch00.sdr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_sel_dev_addr,
 			{ "Chassis SEL Device Address",
-				"ipmi.ch00.sel", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch00.sel", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_sm_dev_addr,
 			{ "Chassis System Management Device Address",
-				"ipmi.ch00.sm", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch00.sm", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_00_bridge_dev_addr,
 			{ "Chassis Bridge Device Address",
-				"ipmi.ch00.bridge", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch00.bridge", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_01_pwr_state_policy,
 			{ "Power Restore Policy",
-				"ipmi.ch01.cur_pwr.policy", FT_UINT8, BASE_HEX, vals_01_pwr_policy, 0x60, "", HFILL }},
+				"ipmi.ch01.cur_pwr.policy", FT_UINT8, BASE_HEX, vals_01_pwr_policy, 0x60, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_ctl_fault,
 			{ "Power Control Fault",
-				"ipmi.ch01.cur_pwr.ctl_fault", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.ch01.cur_pwr.ctl_fault", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_fault,
 			{ "Power Fault",
-				"ipmi.ch01.cur_pwr.fault", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.ch01.cur_pwr.fault", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_ilock,
 			{ "Interlock",
-				"ipmi.ch01.cur_pwr.interlock", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.ch01.cur_pwr.interlock", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_overload,
 			{ "Overload",
-				"ipmi.ch01.cur_pwr.overload", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.ch01.cur_pwr.overload", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_pwr_state_powered,
 			{ "Power is on",
-				"ipmi.ch01.cur_pwr.powered", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch01.cur_pwr.powered", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_last_event_via_ipmi,
 			{ "Last `Power is on' state was entered via IPMI command",
-				"ipmi.ch01.last.on_via_ipmi", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.ch01.last.on_via_ipmi", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_last_event_down_by_fault,
 			{ "Last power down caused by power fault",
-				"ipmi.ch01.last.down_by_fault", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.ch01.last.down_by_fault", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_last_event_interlock,
 			{ "Last power down caused by a power interlock being activated",
-				"ipmi.ch01.last.interlock", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.ch01.last.interlock", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_last_event_overload,
 			{ "Last power down caused by a power overload",
-				"ipmi.ch01.last.overload", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.ch01.last.overload", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_last_event_ac_failed,
 			{ "AC failed",
-				"ipmi.ch01.last.ac_failed", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch01.last.ac_failed", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_identsupp,
 			{ "Chassis Identify command and state info supported",
-				"ipmi.ch01.identsupp", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.ch01.identsupp", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_identstate,
 			{ "Chassis Identify state (if supported)",
-				"ipmi.ch01.identstate", FT_UINT8, BASE_HEX, vals_01_identstate, 0x30, "", HFILL }},
+				"ipmi.ch01.identstate", FT_UINT8, BASE_HEX, vals_01_identstate, 0x30, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_fan,
 			{ "Cooling/fan fault detected",
-				"ipmi.ch01.misc.fan", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.ch01.misc.fan", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_drive,
 			{ "Drive Fault",
-				"ipmi.ch01.misc.drive", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.ch01.misc.drive", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_fpl_active,
 			{ "Front Panel Lockout active",
-				"ipmi.ch01.misc.fpl_active", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.ch01.misc.fpl_active", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_misc_intrusion,
 			{ "Chassis intrusion active",
-				"ipmi.ch01.misc.intrusion", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch01.misc.intrusion", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_standby_allowed,
 			{ "Standby disable allowed",
-				"ipmi.ch01.fpb.standby_allowed", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.ch01.fpb.standby_allowed", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_diagintr_allowed,
 			{ "Diagnostic interrupt disable allowed",
-				"ipmi.ch01.fpb.diagintr_allowed", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.ch01.fpb.diagintr_allowed", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_reset_allowed,
 			{ "Reset disable allowed",
-				"ipmi.ch01.fpb.reset_allowed", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.ch01.fpb.reset_allowed", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_poweroff_allowed,
 			{ "Poweroff disable allowed",
-				"ipmi.ch01.fpb.poweroff_allowed", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.ch01.fpb.poweroff_allowed", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_standby_disabled,
 			{ "Standby disabled",
-				"ipmi.ch01.fpb.standby_disabled", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.ch01.fpb.standby_disabled", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_diagintr_disabled,
 			{ "Diagnostic interrupt disabled",
-				"ipmi.ch01.fpb.diagintr_disabled", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.ch01.fpb.diagintr_disabled", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_reset_disabled,
 			{ "Reset disabled",
-				"ipmi.ch01.fpb.reset_disabled", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.ch01.fpb.reset_disabled", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_01_fpb_poweroff_disabled,
 			{ "Poweroff disabled",
-				"ipmi.ch01.fpb.poweroff_disabled", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch01.fpb.poweroff_disabled", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_02_cctrl,
 			{ "Chassis Control",
-				"ipmi.ch02.chassis_control", FT_UINT8, BASE_HEX, vals_02_cctrl, 0x0f, "", HFILL }},
+				"ipmi.ch02.chassis_control", FT_UINT8, BASE_HEX, vals_02_cctrl, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_04_ival,
 			{ "Identify Interval in seconds",
-				"ipmi.ch04.interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.ch04.interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_04_perm_on,
 			{ "Turn on Identify indefinitely",
-				"ipmi.ch04.perm_on", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch04.perm_on", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_05_flags_fpl,
 			{ "Provides Front Panel Lockout",
-				"ipmi.ch05.flags.fpl", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.ch05.flags.fpl", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_flags_intrusion,
 			{ "Provides intrusion sensor",
-				"ipmi.ch05.flags.intrusion", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.ch05.flags.intrusion", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_fru_dev_addr,
 			{ "Chassis FRU Info Device Address",
-				"ipmi.ch05.fru_info", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch05.fru_info", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_sdr_dev_addr,
 			{ "Chassis SDR Device Address",
-				"ipmi.ch05.sdr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch05.sdr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_sel_dev_addr,
 			{ "Chassis SEL Device Address",
-				"ipmi.ch05.sel", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch05.sel", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_sm_dev_addr,
 			{ "Chassis System Management Device Address",
-				"ipmi.ch05.sm", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch05.sm", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_05_bridge_dev_addr,
 			{ "Chassis Bridge Device Address",
-				"ipmi.ch05.bridge", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch05.bridge", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_06_rq_policy,
 			{ "Power Restore Policy",
-				"ipmi.ch06.rq_policy", FT_UINT8, BASE_HEX, vals_06_policy, 0x07, "", HFILL }},
+				"ipmi.ch06.rq_policy", FT_UINT8, BASE_HEX, vals_06_policy, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_chs_06_rs_policy_support_powerup,
 			{ "Always powering up",
-				"ipmi.ch06.rs_support.powerup", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x04, "", HFILL }},
+				"ipmi.ch06.rs_support.powerup", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_chs_06_rs_policy_support_restore,
 			{ "Restoring previous state",
-				"ipmi.ch06.rs_support.restore", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x02, "", HFILL }},
+				"ipmi.ch06.rs_support.restore", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_chs_06_rs_policy_support_poweroff,
 			{ "Staying powered off",
-				"ipmi.ch06.rs_support.poweroff", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x01, "", HFILL }},
+				"ipmi.ch06.rs_support.poweroff", FT_BOOLEAN, 8, TFS(&tfs_06_supported), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_07_cause,
 			{ "Restart Cause",
-				"ipmi.ch07.cause", FT_UINT8, BASE_HEX, vals_07_cause, 0x0f, "", HFILL }},
+				"ipmi.ch07.cause", FT_UINT8, BASE_HEX, vals_07_cause, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_chs_07_chan,
 			{ "Channel",
-				"ipmi.ch07.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0, "", HFILL }},
+				"ipmi.ch07.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_08_valid,
 			{ "Validity",
-				"ipmi.ch08.valid", FT_BOOLEAN, 8, TFS(&tfs_08_valid), 0x80, "", HFILL }},
+				"ipmi.ch08.valid", FT_BOOLEAN, 8, TFS(&tfs_08_valid), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_08_selector,
 			{ "Boot option parameter selector",
-				"ipmi.ch08.selector", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.ch08.selector", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_chs_08_data,
 			{ "Boot option parameter data",
-				"ipmi.ch08.data", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.ch08.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_09_rq_param_select,
 			{ "Parameter selector",
-				"ipmi.ch09.rq_param_select", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.ch09.rq_param_select", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rq_set_select,
 			{ "Set Selector",
-				"ipmi.ch09.rq_set_select", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch09.rq_set_select", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rq_block_select,
 			{ "Block Selector",
-				"ipmi.ch09.rq_block_select", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.ch09.rq_block_select", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rs_param_version,
 			{ "Parameter Version",
-				"ipmi.ch09.rs_param_version", FT_UINT8, BASE_HEX, NULL, 0x0f, "", HFILL }},
+				"ipmi.ch09.rs_param_version", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rs_valid,
 			{ "Parameter Valid",
-				"ipmi.ch09.rs_valid", FT_BOOLEAN, 8, TFS(&tfs_09_valid), 0x80, "", HFILL }},
+				"ipmi.ch09.rs_valid", FT_BOOLEAN, 8, TFS(&tfs_09_valid), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rs_param_select,
 			{ "Parameter Selector",
-				"ipmi.ch09.rs_param_select", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.ch09.rs_param_select", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_chs_09_rs_param_data,
 			{ "Configuration parameter data",
-				"ipmi.ch09.rs_param_data", FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.ch09.rs_param_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_chs_0f_minpercnt,
 			{ "Minutes per count",
-				"ipmi.ch0f.minpercnt", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.ch0f.minpercnt", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_chs_0f_counter,
 			{ "Counter reading",
-				"ipmi.ch0f.counter", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.ch0f.counter", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index 9bd09a3630..0b0bfb5bf7 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -1659,625 +1659,625 @@ ipmi_register_picmg(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_picmg_led_function,
 			{ "LED Function",
-				"ipmi.led.function", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.led.function", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_led_on_duration,
 			{ "On-duration",
-				"ipmi.led.on_duration", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.led.on_duration", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_led_color,
 			{ "Color",
-				"ipmi.led.color", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, "", HFILL }},
+				"ipmi.led.color", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_linkinfo_grpid,
 			{ "Grouping ID",
-				"ipmi.linkinfo.grpid", FT_UINT32, BASE_DEC, NULL, 0xff000000, "", HFILL }},
+				"ipmi.linkinfo.grpid", FT_UINT32, BASE_DEC, NULL, 0xff000000, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_type_ext,
 			{ "Type extension",
-				"ipmi.linkinfo.type_ext", FT_UINT32, BASE_HEX, NULL, 0x00f00000, "", HFILL }},
+				"ipmi.linkinfo.type_ext", FT_UINT32, BASE_HEX, NULL, 0x00f00000, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_type,
 			{ "Type",
-				"ipmi.linkinfo.type", FT_UINT32, BASE_HEX, linkinfo_type_vals, 0x000ff000, "", HFILL }},
+				"ipmi.linkinfo.type", FT_UINT32, BASE_HEX, linkinfo_type_vals, 0x000ff000, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_ports,
 			{ "Ports",
-				"ipmi.linkinfo.ports", FT_UINT32, BASE_HEX, linkinfo_ports_vals, 0x00000f00, "", HFILL }},
+				"ipmi.linkinfo.ports", FT_UINT32, BASE_HEX, linkinfo_ports_vals, 0x00000f00, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_iface,
 			{ "Interface",
-				"ipmi.linkinfo.iface", FT_UINT32, BASE_HEX, linkinfo_iface_vals, 0x000000c0, "", HFILL }},
+				"ipmi.linkinfo.iface", FT_UINT32, BASE_HEX, linkinfo_iface_vals, 0x000000c0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_chan,
 			{ "Channel",
-				"ipmi.linkinfo.chan", FT_UINT32, BASE_DEC, NULL, 0x0000003f, "", HFILL }},
+				"ipmi.linkinfo.chan", FT_UINT32, BASE_DEC, NULL, 0x0000003f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_linkinfo_state,
 			{ "State",
-				"ipmi.picmg0e.state", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg0e.state", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_00_version,
 			{ "PICMG Extension Version",
-				"ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_00_max_fruid,
 			{ "Max FRU Device ID",
-				"ipmi.picmg00.max_fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg00.max_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_00_ipmc_fruid,
 			{ "FRU Device ID for IPMC",
-				"ipmi.picmg00.ipmc_fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg00.ipmc_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_01_rq_fruid,
 			{ "FRU ID",
-				"ipmi.picmg01.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_addr_key_type,
 			{ "Address Key Type",
-				"ipmi.picmg01.rq_addr_key_type", FT_UINT8, BASE_HEX, addr_key_type_vals, 0, "", HFILL }},
+				"ipmi.picmg01.rq_addr_key_type", FT_UINT8, BASE_HEX, addr_key_type_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_addr_key,
 			{ "Address Key",
-				"ipmi.picmg01.rq_addr_key", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rq_addr_key", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rq_site_type,
 			{ "Site Type",
-				"ipmi.picmg01.rq_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, "", HFILL }},
+				"ipmi.picmg01.rq_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_hwaddr,
 			{ "Hardware Address",
-				"ipmi.picmg01.rs_hwaddr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rs_hwaddr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_ipmbaddr,
 			{ "IPMB-0 Address",
-				"ipmi.picmg01.rs_ipmbaddr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rs_ipmbaddr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_rsrv,
 			{ "Reserved (shall be 0xFF)",
-				"ipmi.picmg01.rs_rsrv", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rs_rsrv", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_fruid,
 			{ "FRU ID",
-				"ipmi.picmg01.rs_fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rs_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_site_num,
 			{ "Site Number",
-				"ipmi.picmg01.rs_site_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg01.rs_site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_01_rs_site_type,
 			{ "Site Type",
-				"ipmi.picmg01.rs_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, "", HFILL }},
+				"ipmi.picmg01.rs_site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_04_fruid,
 			{ "FRU ID",
-				"ipmi.picmg04.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg04.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_04_cmd,
 			{ "Command",
-				"ipmi.picmg04.cmd", FT_UINT8, BASE_HEX, vals_04_cmd, 0, "", HFILL }},
+				"ipmi.picmg04.cmd", FT_UINT8, BASE_HEX, vals_04_cmd, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_05_fruid,
 			{ "FRU ID",
-				"ipmi.picmg05.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg05.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_05_led3,
 			{ "LED 3",
-				"ipmi.picmg05.led3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.picmg05.led3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_05_led2,
 			{ "LED 2",
-				"ipmi.picmg05.led2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.picmg05.led2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_05_led1,
 			{ "LED 1",
-				"ipmi.picmg05.led1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg05.led1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_05_blue_led,
 			{ "BLUE LED",
-				"ipmi.picmg05.blue_led", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.picmg05.blue_led", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_05_app_leds,
 			{ "Application-specific LED Count",
-				"ipmi.picmg05.app_leds", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg05.app_leds", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_06_fruid,
 			{ "FRU ID",
-				"ipmi.picmg06.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg06.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_ledid,
 			{ "LED ID",
-				"ipmi.picmg06.ledid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg06.ledid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_white,
 			{ "White",
-				"ipmi.picmg06.cap_white", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.picmg06.cap_white", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_orange,
 			{ "Orange",
-				"ipmi.picmg06.cap_orange", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.picmg06.cap_orange", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_amber,
 			{ "Amber",
-				"ipmi.picmg06.cap_amber", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.picmg06.cap_amber", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_green,
 			{ "Green",
-				"ipmi.picmg06.cap_green", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.picmg06.cap_green", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_red,
 			{ "Red",
-				"ipmi.picmg06.cap_red", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.picmg06.cap_red", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_cap_blue,
 			{ "Blue",
-				"ipmi.picmg06.cap_blue", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg06.cap_blue", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_default_local_color,
 			{ "Default LED Color in Local Control state",
-				"ipmi.picmg06.def_local", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, "", HFILL }},
+				"ipmi.picmg06.def_local", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_06_default_override_color,
 			{ "Default LED Color in Override state",
-				"ipmi.picmg06.def_override", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, "", HFILL }},
+				"ipmi.picmg06.def_override", FT_UINT8, BASE_HEX, led_color_vals, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_07_fruid,
 			{ "FRU ID",
-				"ipmi.picmg07.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg07.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_07_ledid,
 			{ "LED ID",
-				"ipmi.picmg07.ledid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg07.ledid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_08_fruid,
 			{ "FRU ID",
-				"ipmi.picmg08.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg08.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_08_ledid,
 			{ "LED ID",
-				"ipmi.picmg08.ledid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg08.ledid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_08_state_lamptest,
 			{ "Lamp Test",
-				"ipmi.picmg08.state_lamptest", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.picmg08.state_lamptest", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_08_state_override,
 			{ "Override",
-				"ipmi.picmg08.state_override", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg08.state_override", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_08_state_local,
 			{ "Local Control",
-				"ipmi.picmg08.state_local", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.picmg08.state_local", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_08_lamptest_duration,
 			{ "Lamp test duration",
-				"ipmi.picmg08.lamptest_duration", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg08.lamptest_duration", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_09_ipmba,
 			{ "IPMB-A State",
-				"ipmi.picmg09.ipmba", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg09.ipmba", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_09_ipmbb,
 			{ "IPMB-B State",
-				"ipmi.picmg09.ipmbb", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg09.ipmbb", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0a_fruid,
 			{ "FRU ID",
-				"ipmi.picmg0a.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0a.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0a_msk_d_locked,
 			{ "Deactivation-Locked bit",
-				"ipmi.picmg0a.msk_deactivation", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg0a.msk_deactivation", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0a_msk_locked,
 			{ "Locked bit",
-				"ipmi.picmg0a.msk_locked", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.picmg0a.msk_locked", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0a_d_locked,
 			{ "Deactivation-Locked bit",
-				"ipmi.picmg0a.deactivation", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x02, "", HFILL }},
+				"ipmi.picmg0a.deactivation", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0a_locked,
 			{ "Locked bit",
-				"ipmi.picmg0a.locked", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x01, "", HFILL }},
+				"ipmi.picmg0a.locked", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0b_fruid,
 			{ "FRU ID",
-				"ipmi.picmg0b.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0b.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0b_d_locked,
 			{ "Deactivation-Locked bit",
-				"ipmi.picmg0b.deactivation", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x02, "", HFILL }},
+				"ipmi.picmg0b.deactivation", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0b_locked,
 			{ "Locked bit",
-				"ipmi.picmg0b.locked", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x01, "", HFILL }},
+				"ipmi.picmg0b.locked", FT_BOOLEAN, 8, TFS(&set_clear_tfs), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0c_fruid,
 			{ "FRU ID",
-				"ipmi.picmg0c.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0c.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0c_cmd,
 			{ "Command",
-				"ipmi.picmg0c.cmd", FT_UINT8, BASE_HEX, vals_0c_cmd, 0, "", HFILL }},
+				"ipmi.picmg0c.cmd", FT_UINT8, BASE_HEX, vals_0c_cmd, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0d_fruid,
 			{ "FRU ID",
-				"ipmi.picmg0d.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0d.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0d_start,
 			{ "Search after record ID",
-				"ipmi.picmg0d.start", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0d.start", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0d_recordid,
 			{ "Record ID",
-				"ipmi.picmg0d.recordid", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg0d.recordid", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_0f_iface,
 			{ "Interface",
-				"ipmi.linkinfo.iface", FT_UINT8, BASE_HEX, linkinfo_iface_vals, 0x000000c0, "", HFILL }},
+				"ipmi.linkinfo.iface", FT_UINT8, BASE_HEX, linkinfo_iface_vals, 0x000000c0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_0f_chan,
 			{ "Channel",
-				"ipmi.linkinfo.chan", FT_UINT8, BASE_DEC, NULL, 0x0000003f, "", HFILL }},
+				"ipmi.linkinfo.chan", FT_UINT8, BASE_DEC, NULL, 0x0000003f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_10_fruid,
 			{ "FRU ID",
-				"ipmi.picmg10.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg10.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_10_nslots,
 			{ "Number of spanned slots",
-				"ipmi.picmg10.nslots", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg10.nslots", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_10_ipmc_loc,
 			{ "IPMC Location",
-				"ipmi.picmg10.ipmc_loc", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg10.ipmc_loc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_11_fruid,
 			{ "FRU ID",
-				"ipmi.picmg11.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg11.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_11_power_level,
 			{ "Power Level",
-				"ipmi.picmg11.power_level", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg11.power_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_11_set_to_desired,
 			{ "Set Present Levels to Desired",
-				"ipmi.picmg11.set_to_desired", FT_UINT8, BASE_HEX, vals_11_set, 0, "", HFILL }},
+				"ipmi.picmg11.set_to_desired", FT_UINT8, BASE_HEX, vals_11_set, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_12_fruid,
 			{ "FRU ID",
-				"ipmi.picmg12.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg12.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_pwr_type,
 			{ "Power Type",
-				"ipmi.picmg12.pwr_type", FT_UINT8, BASE_HEX, vals_12_pwr_type, 0, "", HFILL }},
+				"ipmi.picmg12.pwr_type", FT_UINT8, BASE_HEX, vals_12_pwr_type, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_dynamic,
 			{ "Dynamic Power Configuration",
-				"ipmi.picmg12.dynamic", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.picmg12.dynamic", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_pwr_lvl,
 			{ "Power Level",
-				"ipmi.picmg12.pwd_lvl", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.picmg12.pwd_lvl", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_delay,
 			{ "Delay to stable power",
-				"ipmi.picmg12.delay", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg12.delay", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_pwr_mult,
 			{ "Power multiplier",
-				"ipmi.picmg12.pwr_mult", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg12.pwr_mult", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_12_pwr_draw,
 			{ "Power draw",
-				"ipmi.picmg12.pwr_draw", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg12.pwr_draw", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_13_fruid,
 			{ "FRU ID",
-				"ipmi.picmg13.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg13.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_14_fruid,
 			{ "FRU ID",
-				"ipmi.picmg14.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg14.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_14_speed_min,
 			{ "Minimum Speed Level",
-				"ipmi.picmg14.speed_min", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg14.speed_min", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_14_speed_max,
 			{ "Maximum Speed Level",
-				"ipmi.picmg14.speed_max", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg14.speed_max", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_14_speed_norm,
 			{ "Normal Operating Level",
-				"ipmi.picmg14.speed_norm", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg14.speed_norm", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_14_local_control,
 			{ "Local Control Mode Supported",
-				"ipmi.picmg14.local_control", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.picmg14.local_control", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_15_fruid,
 			{ "FRU ID",
-				"ipmi.picmg15.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg15.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_15_fan_level,
 			{ "Fan Level",
-				"ipmi.picmg15.fan_level", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg15.fan_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_15_local_enable,
 			{ "Local Control Enable State",
-				"ipmi.picmg15.local_enable", FT_UINT8, BASE_HEX, enable_vals, 0, "", HFILL }},
+				"ipmi.picmg15.local_enable", FT_UINT8, BASE_HEX, enable_vals, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_16_fruid,
 			{ "FRU ID",
-				"ipmi.picmg16.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg16.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_16_override_level,
 			{ "Override Fan Level",
-				"ipmi.picmg16.override_level", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg16.override_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_16_local_level,
 			{ "Local Control Fan Level",
-				"ipmi.picmg16.local_level", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg16.local_level", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_16_local_enable,
 			{ "Local Control Enable State",
-				"ipmi.picmg16.local_enable", FT_UINT8, BASE_HEX, enabled_vals, 0, "", HFILL }},
+				"ipmi.picmg16.local_enable", FT_UINT8, BASE_HEX, enabled_vals, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_17_cmd,
 			{ "Command",
-				"ipmi.picmg17.cmd", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg17.cmd", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_17_resid,
 			{ "Bused Resource ID",
-				"ipmi.picmg17.resid", FT_UINT8, BASE_HEX, busresid_vals, 0, "", HFILL }},
+				"ipmi.picmg17.resid", FT_UINT8, BASE_HEX, busresid_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_17_status,
 			{ "Status",
-				"ipmi.picmg17.status", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg17.status", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_18_li_key_type,
 			{ "Link Info Key Type",
-				"ipmi.picmg18.li_key_type", FT_UINT8, BASE_HEX, vals_18_keytype, 0, "", HFILL }},
+				"ipmi.picmg18.li_key_type", FT_UINT8, BASE_HEX, vals_18_keytype, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_18_li_key,
 			{ "Link Info Key",
-				"ipmi.picmg18.li_key", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg18.li_key", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_18_link_num,
 			{ "Link Number",
-				"ipmi.picmg18.link_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg18.link_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_18_sensor_num,
 			{ "Sensor Number",
-				"ipmi.picmg18.sensor_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg18.sensor_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1b_addr_active,
 			{ "Active Shelf Manager IPMB Address",
-				"ipmi.picmg1b.addr_active", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg1b.addr_active", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1b_addr_backup,
 			{ "Backup Shelf Manager IPMB Address",
-				"ipmi.picmg1b.addr_backup", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg1b.addr_backup", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1c_fan_site_number,
 			{ "Fan Tray Site Number",
-				"ipmi.picmg1c.fan_site_number", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1c.fan_site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_fan_enable_state,
 			{ "Fan Enable state",
-				"ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, enable_vals, 0, "", HFILL }},
+				"ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, enable_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_fan_policy_timeout,
 			{ "Fan Policy Timeout",
-				"ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, "", HFILL }},
+				"ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_site_number,
 			{ "Site Number",
-				"ipmi.picmg1c.site_number", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1c.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_site_type,
 			{ "Site Type",
-				"ipmi.picmg1c.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, "", HFILL }},
+				"ipmi.picmg1c.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1d_fan_site_number,
 			{ "Fan Tray Site Number",
-				"ipmi.picmg1d.fan_site_number", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1d.fan_site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_site_number,
 			{ "Site Number",
-				"ipmi.picmg1d.site_number", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1d.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_site_type,
 			{ "Site Type",
-				"ipmi.picmg1d.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, "", HFILL }},
+				"ipmi.picmg1d.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_policy,
 			{ "Policy",
-				"ipmi.picmg1d.fan_enable_state", FT_UINT8, BASE_HEX, vals_1d_policy, 0, "", HFILL }},
+				"ipmi.picmg1d.fan_enable_state", FT_UINT8, BASE_HEX, vals_1d_policy, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1d_coverage,
 			{ "Coverage",
-				"ipmi.picmg1d.coverage", FT_UINT8, BASE_HEX, vals_1d_coverage, 0, "", HFILL }},
+				"ipmi.picmg1d.coverage", FT_UINT8, BASE_HEX, vals_1d_coverage, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1e_fruid,
 			{ "FRU ID",
-				"ipmi.picmg1e.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1e.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1e_cap_diagintr,
 			{ "Diagnostic interrupt",
-				"ipmi.picmg1e.cap_diagintr", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.picmg1e.cap_diagintr", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1e_cap_graceful_reboot,
 			{ "Graceful reboot",
-				"ipmi.picmg1e.cap_reboot", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.picmg1e.cap_reboot", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1e_cap_warm_reset,
 			{ "Warm Reset",
-				"ipmi.picmg1e.cap_warmreset", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg1e.cap_warmreset", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_1f_rq_fruid,
 			{ "FRU ID",
-				"ipmi.picmg1f.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1f.rq_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rq_op,
 			{ "Operation",
-				"ipmi.picmg1f.rq_op", FT_UINT8, BASE_HEX, vals_1f_op, 0, "", HFILL }},
+				"ipmi.picmg1f.rq_op", FT_UINT8, BASE_HEX, vals_1f_op, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rq_lockid,
 			{ "Lock ID",
-				"ipmi.picmg1f.rq_lockid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg1f.rq_lockid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rs_lockid,
 			{ "Lock ID",
-				"ipmi.picmg1f.rs_lockid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg1f.rs_lockid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1f_rs_tstamp,
 			{ "Last Commit Timestamp",
-				"ipmi.picmg1f.rs_tstamp", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg1f.rs_tstamp", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_20_fruid,
 			{ "FRU ID",
-				"ipmi.picmg20.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg20.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_20_lockid,
 			{ "Lock ID",
-				"ipmi.picmg20.lockid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg20.lockid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_20_offset,
 			{ "Offset to write",
-				"ipmi.picmg20.offset", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg20.offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_20_data,
 			{ "Data to write",
-				"ipmi.picmg20.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg20.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_20_count,
 			{ "Count written",
-				"ipmi.picmg20.count", FT_BYTES, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg20.count", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_21_addr_num,
 			{ "Address Number",
-				"ipmi.picmg21.addr_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.addr_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_tstamp,
 			{ "Shelf IP Address Last Change Timestamp",
-				"ipmi.picmg21.tstamp", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.tstamp", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_addr_count,
 			{ "Address Count",
-				"ipmi.picmg21.addr_count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.addr_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_site_type,
 			{ "Site Type",
-				"ipmi.picmg21.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, "", HFILL }},
+				"ipmi.picmg21.site_type", FT_UINT8, BASE_HEX, site_type_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_site_num,
 			{ "Site Number",
-				"ipmi.picmg21.site_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_max_unavail,
 			{ "Maximum Unavailable Time",
-				"ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_is_shm,
 			{ "Shelf Manager IP Address",
-				"ipmi.picmg21.is_shm", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.picmg21.is_shm", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_addr_type,
 			{ "Address Type",
-				"ipmi.picmg21.addr_type", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.picmg21.addr_type", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_ipaddr,
 			{ "IP Address",
-				"ipmi.picmg21.ip_addr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.ip_addr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_rmcpport,
 			{ "RMCP Port",
-				"ipmi.picmg21.rmcp_port", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg21.rmcp_port", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_22_feed_idx,
 			{ "Power Feed Index",
-				"ipmi.picmg22.feed_idx", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg22.feed_idx", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_22_update_cnt,
 			{ "Update Counter",
-				"ipmi.picmg22.update_cnt", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg22.update_cnt", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_22_pwr_alloc,
 			{ "Power Feed Allocation",
-				"ipmi.picmg22.pwr_alloc", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.picmg22.pwr_alloc", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_XX_comp7,
 			{ "Component 7",
-				"ipmi.hpm1.comp7", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.hpm1.comp7", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp6,
 			{ "Component 6",
-				"ipmi.hpm1.comp6", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.hpm1.comp6", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp5,
 			{ "Component 5",
-				"ipmi.hpm1.comp5", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.hpm1.comp5", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp4,
 			{ "Component 4",
-				"ipmi.hpm1.comp4", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.hpm1.comp4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp3,
 			{ "Component 3",
-				"ipmi.hpm1.comp3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.hpm1.comp3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp2,
 			{ "Component 2",
-				"ipmi.hpm1.comp2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.hpm1.comp2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp1,
 			{ "Component 1",
-				"ipmi.hpm1.comp1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.hpm1.comp1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_XX_comp0,
 			{ "Component 0",
-				"ipmi.hpm1.comp0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.hpm1.comp0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_2e_version,
 			{ "HPM.1 version",
-				"ipmi.picmg2e.hpm1_version", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg2e.hpm1_version", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_upgrade_undesirable,
 			{ "Firmware Upgrade Undesirable",
-				"ipmi.picmg2e.upgrade_undesirable", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.picmg2e.upgrade_undesirable", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_auto_rollback_override,
 			{ "Automatic Rollback Overridden",
-				"ipmi.picmg2e.auto_rollback_override", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.picmg2e.auto_rollback_override", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_ipmc_degraded,
 			{ "IPMC degraded during upgrade",
-				"ipmi.picmg2e.ipmc_degraded", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.picmg2e.ipmc_degraded", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_deferred_activate,
 			{ "Deferred Activation supported",
-				"ipmi.picmg2e.deferred_activate", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.picmg2e.deferred_activate", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_services_affected,
 			{ "Services affected by upgrade",
-				"ipmi.picmg2e.services_affected", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.picmg2e.services_affected", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_manual_rollback,
 			{ "Manual Rollback supported",
-				"ipmi.picmg2e.manual_rollback", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.picmg2e.manual_rollback", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_auto_rollback,
 			{ "Automatic Rollback supported",
-				"ipmi.picmg2e.auto_rollback", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.picmg2e.auto_rollback", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_self_test,
 			{ "Self-Test supported",
-				"ipmi.picmg2e.self_test", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.picmg2e.self_test", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_upgrade_tout,
 			{ "Upgrade timeout",
-				"ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, "", HFILL }},
+				"ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_selftest_tout,
 			{ "Self-test timeout",
-				"ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, "", HFILL }},
+				"ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_rollback_tout,
 			{ "Rollback timeout",
-				"ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, "", HFILL }},
+				"ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_inaccessibility_tout,
 			{ "Inaccessibility timeout",
-				"ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, "", HFILL }},
+				"ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_prop00_cold_reset,
 			{ "Payload cold reset required",
-				"ipmi.prop00.cold_reset", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.prop00.cold_reset", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop00_deferred_activation,
 			{ "Deferred firmware activation supported",
-				"ipmi.prop00.deferred_activation", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.prop00.deferred_activation", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop00_comparison,
 			{ "Firmware comparison supported",
-				"ipmi.prop00.firmware_comparison", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.prop00.firmware_comparison", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop00_preparation,
 			{ "Prepare Components action required",
-				"ipmi.prop00.preparation", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.prop00.preparation", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop00_rollback,
 			{ "Rollback/Backup support",
-				"ipmi.prop00.rollback", FT_UINT8, BASE_HEX, vals_prop00_rollback, 0x03, "", HFILL }},
+				"ipmi.prop00.rollback", FT_UINT8, BASE_HEX, vals_prop00_rollback, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop01_fw_major,
 			{ "Major Firmware Revision (binary encoded)",
-				"ipmi.prop01.fw_major", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.prop01.fw_major", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop01_fw_minor,
 			{ "Minor Firmware Revision (BCD encoded)",
-				"ipmi.prop01.fw_minor", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.prop01.fw_minor", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop01_fw_aux,
 			{ "Auxiliary Firmware Revision Information",
-				"ipmi.prop01.fw_aux", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.prop01.fw_aux", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_prop02_desc,
 			{ "Description string",
-				"ipmi.prop02.desc", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.prop02.desc", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_2f_comp_id,
 			{ "Component ID",
-				"ipmi.picmg2f.comp_id", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg2f.comp_id", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2f_comp_prop,
 			{ "Component property selector",
-				"ipmi.picmg2f.comp_prop", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg2f.comp_prop", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2f_prop_data,
 			{ "Unknown property data",
-				"ipmi.picmg2f.prop_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg2f.prop_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_31_action,
 			{ "Upgrade action",
-				"ipmi.picmg31.action", FT_UINT8, BASE_HEX, vals_31_action, 0, "", HFILL }},
+				"ipmi.picmg31.action", FT_UINT8, BASE_HEX, vals_31_action, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_32_block,
 			{ "Block Number",
-				"ipmi.picmg32.block", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg32.block", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_32_data,
 			{ "Data",
-				"ipmi.picmg32.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg32.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_32_sec_offs,
 			{ "Section Offset",
-				"ipmi.picmg32.sec_offs", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg32.sec_offs", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_32_sec_len,
 			{ "Section Length",
-				"ipmi.picmg32.sec_len", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg32.sec_len", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_33_comp_id,
 			{ "Component ID",
-				"ipmi.picmg33.comp_id", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg33.comp_id", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_33_img_len,
 			{ "Image Length",
-				"ipmi.picmg33.img_len", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg33.img_len", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_34_cmd,
 			{ "Command in progress",
-				"ipmi.picmg34.cmd", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg34.cmd", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_34_ccode,
 			{ "Last command completion code",
-				"ipmi.picmg34.ccode", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg34.ccode", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_34_percentage,
 			{ "Completion estimate",
-				"ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, "", HFILL }},
+				"ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_35_rollback_override,
 			{ "Rollback Override Policy",
-				"ipmi.picmg35.rollback_override", FT_UINT8, BASE_HEX, vals_35_override, 0, "", HFILL }},
+				"ipmi.picmg35.rollback_override", FT_UINT8, BASE_HEX, vals_35_override, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_36_result,
 			{ "Self test result",
-				"ipmi.picmg36.self_test_result", FT_UINT8, BASE_HEX, vals_36_result, 0, "", HFILL }},
+				"ipmi.picmg36.self_test_result", FT_UINT8, BASE_HEX, vals_36_result, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail,
 			{ "Self-test error bitfield",
-				"ipmi.picmg36.fail", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.picmg36.fail", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_sel,
 			{ "Cannot access SEL device",
-				"ipmi.picmg36.fail.sel", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x80, "", HFILL }},
+				"ipmi.picmg36.fail.sel", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_sdr,
 			{ "Cannot access SDR Repository",
-				"ipmi.picmg36.fail.sdr", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x40, "", HFILL }},
+				"ipmi.picmg36.fail.sdr", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_bmc_fru,
 			{ "Cannot access BMC FRU device",
-				"ipmi.picmg36.fail.bmc_fru", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x20, "", HFILL }},
+				"ipmi.picmg36.fail.bmc_fru", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_ipmb_sig,
 			{ "IPMB signal lines do not respond",
-				"ipmi.picmg36.fail.ipmb_sig", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x10, "", HFILL }},
+				"ipmi.picmg36.fail.ipmb_sig", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_sdr_empty,
 			{ "SDR Repository is empty",
-				"ipmi.picmg36.fail.sdr_empty", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x08, "", HFILL }},
+				"ipmi.picmg36.fail.sdr_empty", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_iua,
 			{ "Internal Use Area of BMC FRU corrupted",
-				"ipmi.picmg36.fail.iua", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x04, "", HFILL }},
+				"ipmi.picmg36.fail.iua", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_bb_fw,
 			{ "Controller update boot block firmware corrupted",
-				"ipmi.picmg36.fail.bb_fw", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x02, "", HFILL }},
+				"ipmi.picmg36.fail.bb_fw", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_picmg_36_fail_oper_fw,
 			{ "Controller operational firmware corrupted",
-				"ipmi.picmg36.fail.oper_fw", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x01, "", HFILL }},
+				"ipmi.picmg36.fail.oper_fw", FT_BOOLEAN, 8, TFS(&tfs_36_fail_unknown), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_37_percent,
 			{ "Estimated percentage complete",
-				"ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, "", HFILL }},
+				"ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipmi-se.c b/epan/dissectors/packet-ipmi-se.c
index 521bd00d5a..41aca6a203 100644
--- a/epan/dissectors/packet-ipmi-se.c
+++ b/epan/dissectors/packet-ipmi-se.c
@@ -2959,652 +2959,652 @@ ipmi_register_se(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_se_evt_rev,
 			{ "Event Message Revision",
-				"ipmi.evt.evmrev", FT_UINT8, BASE_HEX, evt_evm_rev_vals, 0, "", HFILL }},
+				"ipmi.evt.evmrev", FT_UINT8, BASE_HEX, evt_evm_rev_vals, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_sensor_type,
 			{ "Sensor Type",
-				"ipmi.evt.sensor_type", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.evt.sensor_type", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_sensor_num,
 			{ "Sensor #",
-				"ipmi.evt.sensor_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.evt.sensor_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_byte3,
 			{ "Event Dir/Type",
-				"ipmi.evt.byte3", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.evt.byte3", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_dir,
 			{ "Event Direction",
-				"ipmi.evt.evdir", FT_BOOLEAN, 8, TFS(&evt_evdir_tfs), 0x80, "", HFILL }},
+				"ipmi.evt.evdir", FT_BOOLEAN, 8, TFS(&evt_evdir_tfs), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_type,
 			{ "Event Type",
-				"ipmi.evt.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.evt.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data1,
 			{ "Event Data 1",
-				"ipmi.evt.data1", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.evt.data1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data1_b2,
 			{ "Byte 2",
-				"ipmi.evt.data1.b2", FT_UINT8, BASE_HEX, NULL, 0xc0, "", HFILL }},
+				"ipmi.evt.data1.b2", FT_UINT8, BASE_HEX, NULL, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data1_b3,
 			{ "Byte 3",
-				"ipmi.evt.data1.b3", FT_UINT8, BASE_HEX, NULL, 0x30, "", HFILL }},
+				"ipmi.evt.data1.b3", FT_UINT8, BASE_HEX, NULL, 0x30, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data1_offs,
 			{ "Offset",
-				"ipmi.evt.data1.offs", FT_UINT8, BASE_HEX, NULL, 0x0f, "", HFILL }},
+				"ipmi.evt.data1.offs", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data2,
 			{ "Event Data 2",
-				"ipmi.evt.data2", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.evt.data2", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_evt_data3,
 			{ "Event Data 3",
-				"ipmi.evt.data3", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.evt.data3", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_cp00_sip,
 			{ "Set In Progress",
-				"ipmi.cp00.sip", FT_UINT8, BASE_HEX, cp00_sip_vals, 0x03, "", HFILL }},
+				"ipmi.cp00.sip", FT_UINT8, BASE_HEX, cp00_sip_vals, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_se_cp01_alert_startup,
 			{ "PEF Alert Startup Delay disable",
-				"ipmi.cp01.alert_startup", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.cp01.alert_startup", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_cp01_startup,
 			{ "PEF Startup Delay disable",
-				"ipmi.cp01.startup", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.cp01.startup", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_cp01_event_msg,
 			{ "Enable Event Messages for PEF actions",
-				"ipmi.cp01.event_msg", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.cp01.event_msg", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_cp01_pef,
 			{ "Enable PEF",
-				"ipmi.cp01.pef", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.cp01.pef", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_diag_intr,
 			{ "Enable Diagnostic Interrupt",
-				"ipmi.cp02.diag_intr", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.cp02.diag_intr", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_oem_action,
 			{ "Enable OEM action",
-				"ipmi.cp02.oem_action", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.cp02.oem_action", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_pwr_cycle,
 			{ "Enable Power Cycle action",
-				"ipmi.cp02.pwr_cycle", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.cp02.pwr_cycle", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_reset,
 			{ "Enable Reset action",
-				"ipmi.cp02.reset", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.cp02.reset", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_pwr_down,
 			{ "Enable Power Down action",
-				"ipmi.cp02.pwr_down", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.cp02.pwr_down", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_cp02_alert,
 			{ "Enable Alert action",
-				"ipmi.cp02.alert", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.cp02.alert", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_cp03_startup,
 			{ "PEF Startup delay",
-				"ipmi.cp03.startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.cp03.startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp04_alert_startup,
 			{ "PEF Alert Startup delay",
-				"ipmi.cp04.alert_startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.cp04.alert_startup", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp05_num_evfilters,
 			{ "Number of Event Filters",
-				"ipmi.cp05.num_evfilters", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp05.num_evfilters", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp06_filter,
 			{ "Filter number (set selector)",
-				"ipmi.cp06.filter", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp06.filter", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp06_data,
 			{ "Filter data",
-				"ipmi.cp06.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp06.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp07_filter,
 			{ "Filter number (set selector)",
-				"ipmi.cp07.filter", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp07.filter", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp07_data,
 			{ "Filter data (byte 1)",
-				"ipmi.cp07.data", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp07.data", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp08_policies,
 			{ "Number of Alert Policy Entries",
-				"ipmi.cp08.policies", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp08.policies", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp09_entry,
 			{ "Entry number (set selector)",
-				"ipmi.cp09.entry", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp09.entry", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp09_data,
 			{ "Entry data",
-				"ipmi.cp09.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp09.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp10_useval,
 			{ "Used to fill the GUID field in PET Trap",
-				"ipmi.cp10.useval", FT_BOOLEAN, 8, TFS(&cp10_use_tfs), 0x01, "", HFILL }},
+				"ipmi.cp10.useval", FT_BOOLEAN, 8, TFS(&cp10_use_tfs), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_cp10_guid,
 			{ "GUID",
-				"ipmi.cp10.guid", FT_GUID, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp10.guid", FT_GUID, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp11_num_alertstr,
 			{ "Number of Alert Strings",
-				"ipmi.cp11.num_alertstr", FT_UINT8, BASE_DEC, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp11.num_alertstr", FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp12_byte1,
 			{ "Alert String Selector",
-				"ipmi.cp12.byte1", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp12.byte1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp12_alert_stringsel,
 			{ "Alert String Selector (set selector)",
-				"ipmi.cp12.alert_stringsel", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp12.alert_stringsel", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp12_evfilter,
 			{ "Filter Number",
-				"ipmi.cp12.evfilter", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp12.evfilter", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp12_alert_stringset,
 			{ "Set number for string",
-				"ipmi.cp12.alert_stringset", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp12.alert_stringset", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp13_stringsel,
 			{ "String selector (set selector)",
-				"ipmi.cp13.stringsel", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp13.stringsel", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp13_blocksel,
 			{ "Block selector",
-				"ipmi.cp13.blocksel", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.cp13.blocksel", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp13_string,
 			{ "String data",
-				"ipmi.cp13.string", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.cp13.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp14_num_gct,
 			{ "Number of Group Control Table entries",
-				"ipmi.cp14.num_gct", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.cp14.num_gct", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_gctsel,
 			{ "Group control table entry selector (set selector)",
-				"ipmi.cp15.gctsel", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.cp15.gctsel", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_force,
 			{ "Request/Force",
-				"ipmi.cp15.force", FT_BOOLEAN, 8, TFS(&cp15_rq_frc_tfs), 0x20, "", HFILL }},
+				"ipmi.cp15.force", FT_BOOLEAN, 8, TFS(&cp15_rq_frc_tfs), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_delayed,
 			{ "Immediate/Delayed",
-				"ipmi.cp15.delayed", FT_BOOLEAN, 8, TFS(&cp15_imm_delay_tfs), 0x10, "", HFILL }},
+				"ipmi.cp15.delayed", FT_BOOLEAN, 8, TFS(&cp15_imm_delay_tfs), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_channel,
 			{ "Channel",
-				"ipmi.cp15.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.cp15.channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_group,
 			{ "Group ID",
-				"ipmi.cp15.group_id", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.cp15.group_id", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_member_check,
 			{ "Member ID check disabled",
-				"ipmi.cp15.member_check", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.cp15.member_check", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_member_id,
 			{ "Member ID",
-				"ipmi.cp15_member_id", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.cp15_member_id", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_retries,
 			{ "Retries",
-				"ipmi.cp15.retries", FT_UINT8, BASE_DEC, NULL, 0x70, "", HFILL }},
+				"ipmi.cp15.retries", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }},
 		{ &hf_ipmi_se_cp15_operation,
 			{ "Operation",
-				"ipmi.cp15.operation", FT_UINT8, BASE_HEX, cp15_op_vals, 0x0f, "", HFILL }},
+				"ipmi.cp15.operation", FT_UINT8, BASE_HEX, cp15_op_vals, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_se_00_addr,
 			{ "Event Receiver slave address",
-				"ipmi.se00.addr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se00.addr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_00_lun,
 			{ "Event Receiver LUN",
-				"ipmi.se00.lun", FT_UINT8, BASE_HEX, NULL, 0x3, "", HFILL }},
+				"ipmi.se00.lun", FT_UINT8, BASE_HEX, NULL, 0x3, NULL, HFILL }},
 
 		{ &hf_ipmi_se_01_addr,
 			{ "Event Receiver slave address",
-				"ipmi.se01.addr", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se01.addr", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_01_lun,
 			{ "Event Receiver LUN",
-				"ipmi.se01.lun", FT_UINT8, BASE_HEX, NULL, 0x3, "", HFILL }},
+				"ipmi.se01.lun", FT_UINT8, BASE_HEX, NULL, 0x3, NULL, HFILL }},
 
 		{ &hf_ipmi_se_10_pef_version,
 			{ "PEF Version",
-				"ipmi.se10.pef_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.se10.pef_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_oem_filter,
 			{ "OEM Event Record Filtering supported",
-				"ipmi.se10.action.oem_filter", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.se10.action.oem_filter", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_diag_intr,
 			{ "Diagnostic Interrupt",
-				"ipmi.se10.action.diag_intr", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.se10.action.diag_intr", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_oem_action,
 			{ "OEM Action",
-				"ipmi.se10.action.oem_action", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.se10.action.oem_action", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_pwr_cycle,
 			{ "Power Cycle",
-				"ipmi.se10.action.pwr_cycle", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.se10.action.pwr_cycle", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_reset,
 			{ "Reset",
-				"ipmi.se10.action.reset", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.se10.action.reset", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_pwr_down,
 			{ "Power Down",
-				"ipmi.se10.action.pwr_down", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.se10.action.pwr_down", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_10_action_alert,
 			{ "Alert",
-				"ipmi.se10.action.alert", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.se10.action.alert", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_10_entries,
 			{ "Number of event filter table entries",
-				"ipmi.se10.entries", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se10.entries", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_11_rq_timeout,
 			{ "Timeout value",
-				"ipmi.se11.rq_timeout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se11.rq_timeout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_11_rs_timeout,
 			{ "Timeout value",
-				"ipmi.se11.rs_timeout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se11.rs_timeout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_12_byte1,
 			{ "Parameter selector",
-				"ipmi.se12.byte1", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se12.byte1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_12_param,
 			{ "Parameter selector",
-				"ipmi.se12.param", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.se12.param", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_12_data,
 			{ "Parameter data",
-				"ipmi.se12.data", FT_NONE, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se12.data", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_13_byte1,
 			{ "Parameter selector",
-				"ipmi.se13.byte1", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se13.byte1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_13_getrev,
 			{ "Get Parameter Revision only",
-				"ipmi.se13.getrev", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.se13.getrev", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_13_param,
 			{ "Parameter selector",
-				"ipmi.se13.param", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.se13.param", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_13_set,
 			{ "Set Selector",
-				"ipmi.se13.set", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se13.set", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_13_block,
 			{ "Block Selector",
-				"ipmi.se13.block", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se13.block", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_13_rev_present,
 			{ "Present",
-				"ipmi.se13.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.se13.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_se_13_rev_compat,
 			{ "Oldest forward-compatible",
-				"ipmi.se13.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.se13.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_13_data,
 			{ "Parameter data",
-				"ipmi.se13.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se13.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_14_processed_by,
 			{ "Set Record ID for last record processed by",
-				"ipmi.se14.processed_by", FT_BOOLEAN, 8, TFS(&tfs_14_processed), 0x01, "", HFILL }},
+				"ipmi.se14.processed_by", FT_BOOLEAN, 8, TFS(&tfs_14_processed), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_14_rid,
 			{ "Record ID",
-				"ipmi.se14.rid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se14.rid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_15_tstamp,
 			{ "Most recent addition timestamp",
-				"ipmi.se15.tstamp", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se15.tstamp", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_15_lastrec,
 			{ "Record ID for last record in SEL",
-				"ipmi.se15.lastrec", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se15.lastrec", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_15_proc_sw,
 			{ "Last SW Processed Event Record ID",
-				"ipmi.se15.proc_sw", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se15.proc_sw", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_15_proc_bmc,
 			{ "Last BMC Processed Event Record ID",
-				"ipmi.se15.proc_bmc", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se15.proc_bmc", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_16_chan,
 			{ "Channel",
-				"ipmi.se16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.se16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_16_op,
 			{ "Operation",
-				"ipmi.se16.op", FT_UINT8, BASE_HEX, vals_16_op, 0xc0, "", HFILL }},
+				"ipmi.se16.op", FT_UINT8, BASE_HEX, vals_16_op, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_se_16_dst,
 			{ "Destination",
-				"ipmi.se16.dst", FT_UINT8, BASE_HEX, NULL, 0x0f, "", HFILL }},
+				"ipmi.se16.dst", FT_UINT8, BASE_HEX, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_se_16_send_string,
 			{ "Send Alert String",
-				"ipmi.se16.send_string", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.se16.send_string", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_16_string_sel,
 			{ "String selector",
-				"ipmi.se16.string_sel", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.se16.string_sel", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_se_16_gen,
 			{ "Generator ID",
-				"ipmi.se16.gen", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se16.gen", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_16_status,
 			{ "Alert Immediate Status",
-				"ipmi.se16.status", FT_UINT8, BASE_HEX, vals_16_status, 0, "", HFILL }},
+				"ipmi.se16.status", FT_UINT8, BASE_HEX, vals_16_status, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_17_seq,
 			{ "Sequence Number",
-				"ipmi.se17.seq", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.seq", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_tstamp,
 			{ "Local Timestamp",
-				"ipmi.se17.tstamp", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se17.tstamp", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_evsrc,
 			{ "Event Source Type",
-				"ipmi.se17.evsrc", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.evsrc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_sensor_dev,
 			{ "Sensor Device",
-				"ipmi.se17.sensor_dev", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.sensor_dev", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_sensor_num,
 			{ "Sensor Number",
-				"ipmi.se17.sensor_num", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.sensor_num", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_evdata1,
 			{ "Event Data 1",
-				"ipmi.se17.evdata1", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.evdata1", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_evdata2,
 			{ "Event Data 2",
-				"ipmi.se17.evdata2", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.evdata2", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_17_evdata3,
 			{ "Event Data 3",
-				"ipmi.se17.evdata3", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se17.evdata3", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_20_rq_op,
 			{ "Operation",
-				"ipmi.se20.rq_op", FT_BOOLEAN, 8, TFS(&tfs_20_op), 0x01, "", HFILL }},
+				"ipmi.se20.rq_op", FT_BOOLEAN, 8, TFS(&tfs_20_op), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_num,
 			{ "Number of sensors in device for LUN",
-				"ipmi.se20.rs_num", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se20.rs_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_sdr,
 			{ "Total Number of SDRs in the device",
-				"ipmi.se20.rs_sdr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se20.rs_sdr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_population,
 			{ "Sensor population",
-				"ipmi.se20.rs_population", FT_BOOLEAN, 8, TFS(&tfs_20_pop), 0x80, "", HFILL }},
+				"ipmi.se20.rs_population", FT_BOOLEAN, 8, TFS(&tfs_20_pop), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_lun3,
 			{ "LUN3 has sensors",
-				"ipmi.se20.rs_lun3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.se20.rs_lun3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_lun2,
 			{ "LUN2 has sensors",
-				"ipmi.se20.rs_lun2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.se20.rs_lun2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_lun1,
 			{ "LUN1 has sensors",
-				"ipmi.se20.rs_lun1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.se20.rs_lun1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_lun0,
 			{ "LUN0 has sensors",
-				"ipmi.se20.rs_lun0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.se20.rs_lun0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_20_rs_change,
 			{ "Sensor Population Change Indicator",
-				"ipmi.se20.rs_change", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se20.rs_change", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_21_rid,
 			{ "Reservation ID",
-				"ipmi.se21.rid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.rid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_21_record,
 			{ "Record ID",
-				"ipmi.se21.record", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.record", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_21_offset,
 			{ "Offset into data",
-				"ipmi.se21.offset", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.offset", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_21_len,
 			{ "Bytes to read",
-				"ipmi.se21.len", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.len", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_21_next,
 			{ "Next record ID",
-				"ipmi.se21.next", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.next", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_21_recdata,
 			{ "Record data",
-				"ipmi.se21.recdata", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se21.recdata", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_22_resid,
 			{ "Reservation ID",
-				"ipmi.se22.resid", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se22.resid", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_23_rq_sensor,
 			{ "Sensor Number",
-				"ipmi.se23.rq_sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se23.rq_sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_23_rq_reading,
 			{ "Reading",
-				"ipmi.se23.rq_reading", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se23.rq_reading", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_23_rs_next_reading,
 			{ "Next reading",
-				"ipmi.se23.rs_next_reading", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se23.rs_next_reading", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_24_sensor,
 			{ "Sensor Number",
-				"ipmi.se24.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se24.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_24_mask,
 			{ "Reserved for future 'hysteresis mask'",
-				"ipmi.se24.mask", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se24.mask", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_24_hyst_pos,
 			{ "Positive-going hysteresis",
-				"ipmi.se24.hyst_pos", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se24.hyst_pos", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_24_hyst_neg,
 			{ "Negative-going hysteresis",
-				"ipmi.se24.hyst_neg", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se24.hyst_neg", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_25_sensor,
 			{ "Sensor Number",
-				"ipmi.se25.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se25.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_25_mask,
 			{ "Reserved for future 'hysteresis mask'",
-				"ipmi.se25.mask", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se25.mask", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_25_hyst_pos,
 			{ "Positive-going hysteresis",
-				"ipmi.se25.hyst_pos", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se25.hyst_pos", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_25_hyst_neg,
 			{ "Negative-going hysteresis",
-				"ipmi.se25.hyst_neg", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se25.hyst_neg", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_26_sensor,
 			{ "Sensor Number",
-				"ipmi.seXX.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_unr,
 			{ "Upper Non-Recoverable",
-				"ipmi.seXX.mask.unr", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.seXX.mask.unr", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_uc,
 			{ "Upper Critical",
-				"ipmi.seXX.mask.uc", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.seXX.mask.uc", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_unc,
 			{ "Upper Non-Critical",
-				"ipmi.seXX.mask.unc", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.seXX.mask.unc", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_lnr,
 			{ "Lower Non-Recoverable",
-				"ipmi.seXX.mask.lnr", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.seXX.mask.lnr", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_lc,
 			{ "Lower Critical",
-				"ipmi.seXX.mask.lc", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.seXX.mask.lc", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_m_lnc,
 			{ "Lower Non-Critical",
-				"ipmi.seXX.mask.lnc", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.seXX.mask.lnc", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_lnc,
 			{ "Lower Non-Critical Threshold",
-				"ipmi.seXX.lnc", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.lnc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_lc,
 			{ "Lower Critical Threshold",
-				"ipmi.seXX.lc", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.lc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_lnr,
 			{ "Lower Non-Recoverable Threshold",
-				"ipmi.seXX.lnr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.lnr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_unc,
 			{ "Upper Non-Critical Threshold",
-				"ipmi.seXX.unc", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.unc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_uc,
 			{ "Upper Critical Threshold",
-				"ipmi.seXX.uc", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.uc", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_thr_unr,
 			{ "Upper Non-Recoverable Threshold",
-				"ipmi.seXX.unr", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.seXX.unr", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_27_sensor,
 			{ "Sensor Number",
-				"ipmi.se27.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se27.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_se_XX_b1_7,
 			{ "Assertion for UNC (going high) / state bit 7",
-				"ipmi.seXX.a_7", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.seXX.a_7", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_6,
 			{ "Assertion for UNC (going low) / state bit 6",
-				"ipmi.seXX.a_6", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.seXX.a_6", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_5,
 			{ "Assertion for LNR (going high) / state bit 5",
-				"ipmi.seXX.a_5", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.seXX.a_5", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_4,
 			{ "Assertion for LNR (going low) / state bit 4",
-				"ipmi.seXX.a_4", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.seXX.a_4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_3,
 			{ "Assertion for LC (going high) / state bit 3",
-				"ipmi.seXX.a_3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.seXX.a_3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_2,
 			{ "Assertion for LC (going low) / state bit 2",
-				"ipmi.seXX.a_2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.seXX.a_2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_1,
 			{ "Assertion for LNC (going high) / state bit 1",
-				"ipmi.seXX.a_1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.seXX.a_1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b1_0,
 			{ "Assertion for LNC (going low) / state bit 0",
-				"ipmi.seXX.a_0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.seXX.a_0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_6,
 			{ "Reserved / Assertion for state bit 14",
-				"ipmi.seXX.a_14", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.seXX.a_14", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_5,
 			{ "Reserved / Assertion for state bit 13",
-				"ipmi.seXX.a_13", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.seXX.a_13", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_4,
 			{ "Reserved / Assertion for state bit 12",
-				"ipmi.seXX.a_12", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.seXX.a_12", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_3,
 			{ "Assertion for UNR (going high) / state bit 11",
-				"ipmi.seXX.a_11", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.seXX.a_11", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_2,
 			{ "Assertion for UNR (going low) / state bit 10",
-				"ipmi.seXX.a_10", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.seXX.a_10", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_1,
 			{ "Assertion for UC (going high) / state bit 9",
-				"ipmi.seXX.a_9", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.seXX.a_9", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b2_0,
 			{ "Assertion for UC (going low) / state bit 8",
-				"ipmi.seXX.a_8", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.seXX.a_8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_7,
 			{ "Deassertion for UNC (going high) / state bit 7",
-				"ipmi.seXX.d_7", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.seXX.d_7", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_6,
 			{ "Deassertion for UNC (going low) / state bit 6",
-				"ipmi.seXX.d_6", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.seXX.d_6", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_5,
 			{ "Deassertion for LNR (going high) / state bit 5",
-				"ipmi.seXX.d_5", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.seXX.d_5", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_4,
 			{ "Deassertion for LNR (going low) / state bit 4",
-				"ipmi.seXX.d_4", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.seXX.d_4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_3,
 			{ "Deassertion for LC (going high) / state bit 3",
-				"ipmi.seXX.d_3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.seXX.d_3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_2,
 			{ "Deassertion for LC (going low) / state bit 2",
-				"ipmi.seXX.d_2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.seXX.d_2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_1,
 			{ "Deassertion for LNC (going high) / state bit 1",
-				"ipmi.seXX.d_1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.seXX.d_1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b3_0,
 			{ "Deassertion for LNC (going low) / state bit 0",
-				"ipmi.seXX.d_0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.seXX.d_0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_6,
 			{ "Reserved / Deassertion for state bit 14",
-				"ipmi.seXX.d_14", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.seXX.d_14", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_5,
 			{ "Reserved / Deassertion for state bit 13",
-				"ipmi.seXX.d_13", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.seXX.d_13", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_4,
 			{ "Reserved / Deassertion for state bit 12",
-				"ipmi.seXX.d_12", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.seXX.d_12", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_3,
 			{ "Deassertion for UNR (going high) / state bit 11",
-				"ipmi.seXX.d_11", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.seXX.d_11", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_2,
 			{ "Deassertion for UNR (going low) / state bit 10",
-				"ipmi.seXX.d_10", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.seXX.d_10", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_1,
 			{ "Deassertion for UC (going high) / state bit 9",
-				"ipmi.seXX.d_9", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.seXX.d_9", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_XX_b4_0,
 			{ "Deassertion for UC (going low) / state bit 8",
-				"ipmi.seXX.d_8", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.seXX.d_8", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_se_28_sensor,
 			{ "Sensor Number",
-				"ipmi.se28.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se28.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_28_fl_evm,
 			{ "Event Messages",
-				"ipmi.se28.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_28_enable), 0x80, "", HFILL }},
+				"ipmi.se28.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_28_enable), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_28_fl_scan,			
 			{ "Scanning",
-				"ipmi.se28.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_28_enable), 0x40, "", HFILL }},
+				"ipmi.se28.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_28_enable), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_28_fl_action,
 			{ "Action",
-				"ipmi.se28.fl_action", FT_UINT8, BASE_HEX, vals_28_act, 0x30, "", HFILL }},
+				"ipmi.se28.fl_action", FT_UINT8, BASE_HEX, vals_28_act, 0x30, NULL, HFILL }},
 
 		{ &hf_ipmi_se_29_sensor,
 			{ "Sensor Number",
-				"ipmi.se29.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se29.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_29_fl_evm,
 			{ "Event Messages",
-				"ipmi.se29.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_29_enabled), 0x80, "", HFILL }},
+				"ipmi.se29.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_29_enabled), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_29_fl_scan,
 			{ "Scanning",
-				"ipmi.se29.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_29_enabled), 0x40, "", HFILL }},
+				"ipmi.se29.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_29_enabled), 0x40, NULL, HFILL }},
 
 		{ &hf_ipmi_se_2a_sensor,
 			{ "Sensor Number",
-				"ipmi.se2a.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2a.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2a_fl_sel,
 			{ "Re-arm Events",
-				"ipmi.se2a.fl_sel", FT_BOOLEAN, 8, TFS(&tfs_2a_sel), 0x80, "", HFILL }},
+				"ipmi.se2a.fl_sel", FT_BOOLEAN, 8, TFS(&tfs_2a_sel), 0x80, NULL, HFILL }},
 
 		{ &hf_ipmi_se_2b_sensor,
 			{ "Sensor Number",
-				"ipmi.se2b.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2b.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2b_fl_evm,
 			{ "Event Messages",
-				"ipmi.se2b.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_2b_enabled), 0x80, "", HFILL }},
+				"ipmi.se2b.fl_evm", FT_BOOLEAN, 8, TFS(&tfs_2b_enabled), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_2b_fl_scan,
 			{ "Sensor scanning",
-				"ipmi.se2b.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_2b_enabled), 0x40, "", HFILL }},
+				"ipmi.se2b.fl_scan", FT_BOOLEAN, 8, TFS(&tfs_2b_enabled), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_2b_fl_unavail,
 			{ "Reading/status unavailable",
-				"ipmi.se2b.fl_unavail", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.se2b.fl_unavail", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 
 		{ &hf_ipmi_se_2d_sensor,
 			{ "Sensor Number",
-				"ipmi.se2d.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2d.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_reading,
 			{ "Sensor Reading",
-				"ipmi.se2d.reading", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2d.reading", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_7,
 			{ "Reserved / State 7 asserted",
-				"ipmi.se2d.b1_7", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.se2d.b1_7", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_6,
 			{ "Reserved / State 6 asserted",
-				"ipmi.se2d.b1_6", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.se2d.b1_6", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_5,
 			{ "At or above UNR threshold / State 5 asserted",
-				"ipmi.se2d.b1_5", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.se2d.b1_5", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_4,
 			{ "At or above UC threshold / State 4 asserted",
-				"ipmi.se2d.b1_4", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.se2d.b1_4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_3,
 			{ "At or above UNC threshold / State 3 asserted",
-				"ipmi.se2d.b1_3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.se2d.b1_3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_2,
 			{ "At or below LNR threshold / State 2 asserted",
-				"ipmi.se2d.b1_2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.se2d.b1_2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_1,
 			{ "At or below LC threshold / State 1 asserted",
-				"ipmi.se2d.b1_1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.se2d.b1_1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b1_0,
 			{ "At or below LNC threshold / State 0 asserted",
-				"ipmi.se2d.b1_0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.se2d.b1_0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_6,
 			{ "Reserved / State 14 asserted",
-				"ipmi.se2d.b1_6", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.se2d.b1_6", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_5,
 			{ "Reserved / State 13 asserted",
-				"ipmi.se2d.b1_5", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.se2d.b1_5", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_4,
 			{ "Reserved / State 12 asserted",
-				"ipmi.se2d.b1_4", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.se2d.b1_4", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_3,
 			{ "Reserved / State 11 asserted",
-				"ipmi.se2d.b1_3", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.se2d.b1_3", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_2,
 			{ "Reserved / State 10 asserted",
-				"ipmi.se2d.b1_2", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.se2d.b1_2", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_1,
 			{ "Reserved / State 9 asserted",
-				"ipmi.se2d.b1_1", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.se2d.b1_1", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_se_2d_b2_0,
 			{ "Reserved / State 8 asserted",
-				"ipmi.se2d.b1_0", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.se2d.b1_0", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_se_2e_sensor,
 			{ "Sensor number",
-				"ipmi.se2e.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2e.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2e_stype,
 			{ "Sensor type",
-				"ipmi.se2e.stype", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se2e.stype", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2e_evtype,
 			{ "Event/Reading type",
-				"ipmi.se2e.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.se2e.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_se_2f_sensor,
 			{ "Sensor number",
-				"ipmi.se2f.sensor", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.se2f.sensor", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2f_stype,
 			{ "Sensor type",
-				"ipmi.se2f.stype", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.se2f.stype", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_se_2f_evtype,
 			{ "Event/Reading type",
-				"ipmi.se2f.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, "", HFILL }},
+				"ipmi.se2f.evtype", FT_UINT8, BASE_HEX, NULL, 0x7f, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_ipmi_se_evt_byte3,
diff --git a/epan/dissectors/packet-ipmi-session.c b/epan/dissectors/packet-ipmi-session.c
index 8147721a09..2310e2f8bf 100644
--- a/epan/dissectors/packet-ipmi-session.c
+++ b/epan/dissectors/packet-ipmi-session.c
@@ -270,40 +270,40 @@ proto_register_ipmi_session(void)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_session_authtype, {
 			"Authentication Type", "ipmi.session.authtype",
-			FT_UINT8, BASE_HEX, VALS(ipmi_authtype_vals), 0, "", HFILL }},
+			FT_UINT8, BASE_HEX, VALS(ipmi_authtype_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_session_payloadtype,{
 			"Payload Type", "ipmi.session.payloadtype",
-			FT_UINT8, BASE_HEX, VALS(ipmi_payload_vals), 0x3f, "", HFILL }},
+			FT_UINT8, BASE_HEX, VALS(ipmi_payload_vals), 0x3f, NULL, HFILL }},
 		{ &hf_ipmi_session_payloadtype_auth,{
 			"Authenticated","ipmi.session.payloadtype.auth",
-			FT_BOOLEAN,8,  TFS(&ipmi_payload_aut_val), 0x40, "", HFILL }},
+			FT_BOOLEAN,8,  TFS(&ipmi_payload_aut_val), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_session_payloadtype_enc,{
 			"Encryption","ipmi.session.payloadtype.enc",
-			FT_BOOLEAN,8,  TFS(&ipmi_payload_enc_val), 0x80, "", HFILL }},
+			FT_BOOLEAN,8,  TFS(&ipmi_payload_enc_val), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_session_oem_iana, {
 			"OEM IANA", "ipmi.session.oem.iana",
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_oem_payload_id, {
 			"OEM Payload ID", "ipmi.session.oem.payloadid",
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_sequence, {
 			"Session Sequence Number", "ipmi.session.sequence",
-			FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_id, {
 			"Session ID", "ipmi.session.id",
-			FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_authcode, {
 			"Authentication Code", "ipmi.session.authcode",
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_msg_len_1b, {
 			"Message Length", "ipmi.msg.len",
-			FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_msg_len_2b, {
 			"Message Length", "ipmi.msg.len",
-			FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+			FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_session_trailer, {
 			"IPMI Session Wrapper (trailer)", "ipmi.sess.trailer",
-			FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = { &ett_ipmi_session, &ett_ipmi_session_payloadtype };
diff --git a/epan/dissectors/packet-ipmi-storage.c b/epan/dissectors/packet-ipmi-storage.c
index a79a3fae3b..6decc1340e 100644
--- a/epan/dissectors/packet-ipmi-storage.c
+++ b/epan/dissectors/packet-ipmi-storage.c
@@ -756,344 +756,344 @@ ipmi_register_storage(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_stor_10_fruid,
 			{ "FRU ID",
-				"ipmi.st10.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st10.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_10_size,
 			{ "FRU Inventory area size",
-				"ipmi.st10.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st10.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_10_access,
 			{ "Device is accessed",
-				"ipmi.st10.access", FT_BOOLEAN, 8, TFS(&tfs_10_access), 0x01, "", HFILL }},
+				"ipmi.st10.access", FT_BOOLEAN, 8, TFS(&tfs_10_access), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_11_fruid,
 			{ "FRU ID",
-				"ipmi.st11.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st11.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_11_offset,
 			{ "Offset to read",
-				"ipmi.st11.offset", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st11.offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_11_count,
 			{ "Count to read",
-				"ipmi.st11.count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st11.count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_11_ret_count,
 			{ "Returned count",
-				"ipmi.st11.ret_count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st11.ret_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_11_data,
 			{ "Requested data",
-				"ipmi.st11.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st11.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_12_fruid,
 			{ "FRU ID",
-				"ipmi.st12.fruid", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st12.fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_12_offset,
 			{ "Offset to read",
-				"ipmi.st12.offset", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st12.offset", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_12_data,
 			{ "Requested data",
-				"ipmi.st12.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st12.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_12_ret_count,
 			{ "Returned count",
-				"ipmi.st12.ret_count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st12.ret_count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_20_sdr_version,
 			{ "SDR Version",
-				"ipmi.st20.sdr_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.st20.sdr_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_rec_count,
 			{ "Record Count",
-				"ipmi.st20.rec_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st20.rec_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_free_space,
 			{ "Free Space",
-				"ipmi.st20.free_space", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st20.free_space", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_ts_add,
 			{ "Most recent addition timestamp",
-				"ipmi.st20.ts_add", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st20.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_ts_erase,
 			{ "Most recent erase timestamp",
-				"ipmi.st20.ts_erase", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st20.ts_erase", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_overflow,
 			{ "Overflow",
-				"ipmi.st20.op_overflow", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.st20.op_overflow", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_update,
 			{ "SDR Repository Update",
-				"ipmi.st20.op_update", FT_UINT8, BASE_HEX, vals_20_update, 0x60, "", HFILL }},
+				"ipmi.st20.op_update", FT_UINT8, BASE_HEX, vals_20_update, 0x60, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_delete,
 			{ "Delete SDR",
-				"ipmi.st20.op_delete", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.st20.op_delete", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_partial_add,
 			{ "Partial Add SDR",
-				"ipmi.st20.op_partial_add", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.st20.op_partial_add", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_reserve,
 			{ "Reserve SDR Repository",
-				"ipmi.st20.op_reserve", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.st20.op_reserve", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_stor_20_op_allocinfo,
 			{ "Get SDR Repository Allocation Info",
-				"ipmi.st20.op_allocinfo", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.st20.op_allocinfo", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_21_units,
 			{ "Number of allocation units",
-				"ipmi.st21.units", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st21.units", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_21_size,
 			{ "Allocation unit size",
-				"ipmi.st21.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st21.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_21_free,
 			{ "Number of free units",
-				"ipmi.st21.free", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st21.free", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_21_largest,
 			{ "Largest free block (in units)",
-				"ipmi.st21.largest", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st21.largest", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_21_maxrec,
 			{ "Maximum record size (in units)",
-				"ipmi.st21.maxrec", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st21.maxrec", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_22_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st22.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st22.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_23_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st23.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st23.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_23_rec_id,
 			{ "Record ID",
-				"ipmi.st23.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st23.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_23_offset,
 			{ "Offset into record",
-				"ipmi.st23.offset", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st23.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_23_count,
 			{ "Bytes to read",
-				"ipmi.st23.count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st23.count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_23_next,
 			{ "Next Record ID",
-				"ipmi.st23.next", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st23.next", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_23_data,
 			{ "Record Data",
-				"ipmi.st23.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st23.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_24_data,
 			{ "SDR Data",
-				"ipmi.st24.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st24.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_24_added_rec_id,
 			{ "Record ID for added record",
-				"ipmi.st23.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st23.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_25_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st25.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st25.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_rec_id,
 			{ "Record ID",
-				"ipmi.st25.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st25.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_offset,
 			{ "Offset into record",
-				"ipmi.st25.offset", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st25.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_inprogress,
 			{ "In progress",
-				"ipmi.st25.inprogress", FT_UINT8, BASE_HEX, vals_25_inprogress, 0x0f, "", HFILL }},
+				"ipmi.st25.inprogress", FT_UINT8, BASE_HEX, vals_25_inprogress, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_data,
 			{ "SDR Data",
-				"ipmi.st25.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st25.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_25_added_rec_id,
 			{ "Record ID for added record",
-				"ipmi.st25.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st25.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_26_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st26.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st26.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_26_rec_id,
 			{ "Record ID",
-				"ipmi.st26.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st26.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_26_del_rec_id,
 			{ "Deleted Record ID",
-				"ipmi.st26.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st26.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_27_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st27.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st27.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_27_clr,
 			{ "Confirmation (should be CLR)",
-				"ipmi.st27.clr", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.st27.clr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_27_action,
 			{ "Action",
-				"ipmi.st27.action", FT_UINT8, BASE_HEX, vals_27_action, 0, "", HFILL }},
+				"ipmi.st27.action", FT_UINT8, BASE_HEX, vals_27_action, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_27_status,
 			{ "Erasure Status",
-				"ipmi.st27.status", FT_UINT8, BASE_HEX, vals_27_status, 0x0f, "", HFILL }},
+				"ipmi.st27.status", FT_UINT8, BASE_HEX, vals_27_status, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_28_time,
 			{ "Time",
-				"ipmi.st28.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st28.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_29_time,
 			{ "Time",
-				"ipmi.st29.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st29.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_2c_init_agent,
 			{ "Initialization agent",
-				"ipmi.st2c.init_agent", FT_BOOLEAN, 8, TFS(&tfs_2c_init_agent), 0x01, "", HFILL }},
+				"ipmi.st2c.init_agent", FT_BOOLEAN, 8, TFS(&tfs_2c_init_agent), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_stor_2c_init_state,
 			{ "Initialization",
-				"ipmi.st2c.init_state", FT_BOOLEAN, 8, TFS(&tfs_2c_init_state), 0x01, "", HFILL }},
+				"ipmi.st2c.init_state", FT_BOOLEAN, 8, TFS(&tfs_2c_init_state), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_40_sel_version,
 			{ "SEL Version",
-				"ipmi.st40.sel_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.st40.sel_version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_entries,
 			{ "Entries",
-				"ipmi.st40.rec_count", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st40.rec_count", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_free_space,
 			{ "Free Space",
-				"ipmi.st40.free_space", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st40.free_space", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_ts_add,
 			{ "Most recent addition timestamp",
-				"ipmi.st40.ts_add", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st40.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_ts_erase,
 			{ "Most recent erase timestamp",
-				"ipmi.st40.ts_erase", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st40.ts_erase", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_op_overflow,
 			{ "Overflow",
-				"ipmi.st40.op_overflow", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.st40.op_overflow", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_op_delete,
 			{ "Delete SEL",
-				"ipmi.st40.op_delete", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.st40.op_delete", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_op_partial_add,
 			{ "Partial Add SEL Entry",
-				"ipmi.st40.op_partial_add", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.st40.op_partial_add", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_op_reserve,
 			{ "Reserve SEL",
-				"ipmi.st40.op_reserve", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.st40.op_reserve", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_stor_40_op_allocinfo,
 			{ "Get SEL Allocation Info",
-				"ipmi.st40.op_allocinfo", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.st40.op_allocinfo", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_41_units,
 			{ "Number of allocation units",
-				"ipmi.st41.units", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st41.units", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_41_size,
 			{ "Allocation unit size",
-				"ipmi.st41.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st41.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_41_free,
 			{ "Number of free units",
-				"ipmi.st41.free", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st41.free", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_41_largest,
 			{ "Largest free block (in units)",
-				"ipmi.st41.largest", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st41.largest", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_41_maxrec,
 			{ "Maximum record size (in units)",
-				"ipmi.st41.maxrec", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st41.maxrec", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_42_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st42.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st42.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_43_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st43.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st43.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_43_rec_id,
 			{ "Record ID",
-				"ipmi.st43.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st43.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_43_offset,
 			{ "Offset into record",
-				"ipmi.st43.offset", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st43.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_43_count,
 			{ "Bytes to read",
-				"ipmi.st43.count", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st43.count", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_43_next,
 			{ "Next Record ID",
-				"ipmi.st43.next", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st43.next", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_43_data,
 			{ "Record Data",
-				"ipmi.st43.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st43.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_44_data,
 			{ "SDR Data",
-				"ipmi.st44.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st44.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_44_added_rec_id,
 			{ "Record ID for added record",
-				"ipmi.st43.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st43.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_45_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st45.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st45.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_rec_id,
 			{ "Record ID",
-				"ipmi.st45.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st45.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_offset,
 			{ "Offset into record",
-				"ipmi.st45.offset", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st45.offset", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_inprogress,
 			{ "In progress",
-				"ipmi.st45.inprogress", FT_UINT8, BASE_HEX, vals_45_inprogress, 0x0f, "", HFILL }},
+				"ipmi.st45.inprogress", FT_UINT8, BASE_HEX, vals_45_inprogress, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_data,
 			{ "Record Data",
-				"ipmi.st45.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st45.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_45_added_rec_id,
 			{ "Record ID for added record",
-				"ipmi.st45.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st45.added_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_46_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st46.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st46.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_46_rec_id,
 			{ "Record ID",
-				"ipmi.st46.rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st46.rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_46_del_rec_id,
 			{ "Deleted Record ID",
-				"ipmi.st46.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st46.del_rec_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_47_rsrv_id,
 			{ "Reservation ID",
-				"ipmi.st47.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st47.rsrv_id", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_47_clr,
 			{ "Confirmation (should be CLR)",
-				"ipmi.st47.clr", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.st47.clr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_47_action,
 			{ "Action",
-				"ipmi.st47.action", FT_UINT8, BASE_HEX, vals_47_action, 0, "", HFILL }},
+				"ipmi.st47.action", FT_UINT8, BASE_HEX, vals_47_action, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_47_status,
 			{ "Erasure Status",
-				"ipmi.st47.status", FT_UINT8, BASE_HEX, vals_47_status, 0x0f, "", HFILL }},
+				"ipmi.st47.status", FT_UINT8, BASE_HEX, vals_47_status, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_48_time,
 			{ "Time",
-				"ipmi.st48.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st48.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_49_time,
 			{ "Time",
-				"ipmi.st49.time", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st49.time", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_5a_log_type,
 			{ "Log type",
-				"ipmi.st5a.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, "", HFILL }},
+				"ipmi.st5a.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_ts_add,
 			{ "Last addition timestamp",
-				"ipmi.st5a.ts_add", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st5a.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_num_entries,
 			{ "Number of entries in MCA Log",
-				"ipmi.st5a.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st5a.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_iana,
 			{ "OEM IANA",
-				"ipmi.st5a.iana", FT_UINT24, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5a.iana", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_bytes,
 			{ "Log status bytes",
-				"ipmi.st5a.bytes", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5a.bytes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5a_unknown,
 			{ "Unknown log format (cannot parse data)",
-				"ipmi.st5a.unknown", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5a.unknown", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_stor_5b_log_type,
 			{ "Log type",
-				"ipmi.st5b.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, "", HFILL }},
+				"ipmi.st5b.log_type", FT_UINT8, BASE_HEX, log_type_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_ts_add,
 			{ "Last addition timestamp",
-				"ipmi.st5b.ts_add", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st5b.ts_add", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_num_entries,
 			{ "Number of entries in MCA Log",
-				"ipmi.st5b.num_entries", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.st5b.num_entries", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_iana,
 			{ "OEM IANA",
-				"ipmi.st5b.iana", FT_UINT24, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5b.iana", FT_UINT24, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_bytes,
 			{ "Log status bytes",
-				"ipmi.st5b.bytes", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5b.bytes", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_stor_5b_unknown,
 			{ "Unknown log format (cannot parse data)",
-				"ipmi.st5b.unknown", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.st5b.unknown", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipmi-transport.c b/epan/dissectors/packet-ipmi-transport.c
index a49fec6f8a..df8db494d1 100644
--- a/epan/dissectors/packet-ipmi-transport.c
+++ b/epan/dissectors/packet-ipmi-transport.c
@@ -2185,898 +2185,898 @@ ipmi_register_transport(gint proto_ipmi)
 	static hf_register_info hf[] = {
 		{ &hf_ipmi_trn_lan00_sip,
 			{ "Set In Progress",
-				"ipmi.lan00.sip", FT_UINT8, BASE_HEX, lan00_sip_vals, 0x03, "", HFILL }},
+				"ipmi.lan00.sip", FT_UINT8, BASE_HEX, lan00_sip_vals, 0x03, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lanXX_oem,
 			{ "OEM Proprietary",
-				"ipmi.lanXX.oem", FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+				"ipmi.lanXX.oem", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_lanXX_passwd,
 			{ "Straight password/key",
-				"ipmi.lanXX.passwd", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.lanXX.passwd", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_trn_lanXX_md5,
 			{ "MD5",
-				"ipmi.lanXX.md5", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.lanXX.md5", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_lanXX_md2,
 			{ "MD2",
-				"ipmi.lanXX.md2", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.lanXX.md2", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_lanXX_none,
 			{ "None",
-				"ipmi.lanXX.none", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.lanXX.none", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan03_ip,
 			{ "IP Address",
-				"ipmi.lan03.ip", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan03.ip", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan04_ipsrc,
 			{ "IP Address Source",
-				"ipmi.lan04.ipsrc", FT_UINT8, BASE_HEX, lan04_ipsrc_vals, 0x0f, "", HFILL }},
+				"ipmi.lan04.ipsrc", FT_UINT8, BASE_HEX, lan04_ipsrc_vals, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan05_ether,
 			{ "MAC Address",
-				"ipmi.lan05.mac", FT_ETHER, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan05.mac", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan06_subnet,
 			{ "Subnet Mask",
-				"ipmi.lan06.subnet", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan06.subnet", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan07_ttl,
 			{ "Time-to-live",
-				"ipmi.lan07.ttl", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.lan07.ttl", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan07_flags,
 			{ "Flags",
-				"ipmi.lan07.flags", FT_UINT8, BASE_HEX, NULL, 0xe0, "", HFILL }},
+				"ipmi.lan07.flags", FT_UINT8, BASE_HEX, NULL, 0xe0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan07_precedence,
 			{ "Precedence",
-				"ipmi.lan07.precedence", FT_UINT8, BASE_DEC, NULL, 0xe0, "", HFILL }},
+				"ipmi.lan07.precedence", FT_UINT8, BASE_DEC, NULL, 0xe0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan07_tos,
 			{ "Type of service",
-				"ipmi.lan07.tos", FT_UINT8, BASE_HEX, NULL, 0x1e, "", HFILL }},
+				"ipmi.lan07.tos", FT_UINT8, BASE_HEX, NULL, 0x1e, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan08_rmcp_port,
 			{ "Primary RMCP Port Number",
-				"ipmi.lan08.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.lan08.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan09_rmcp_port,
 			{ "Secondary RMCP Port Number",
-				"ipmi.lan09.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.lan09.rmcp_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan10_responses,
 			{ "ARP responses",
-				"ipmi.lan10.responses", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.lan10.responses", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan10_gratuitous,
 			{ "Gratuitous ARPs",
-				"ipmi.lan10.gratuitous", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.lan10.gratuitous", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan11_arp_interval,
 			{ "Gratuitous ARP interval",
-				"ipmi.lan10.arp_interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0, "", HFILL }},
+				"ipmi.lan10.arp_interval", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan12_def_gw_ip,
 			{ "Default Gateway Address",
-				"ipmi.lan12.def_gw_ip", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan12.def_gw_ip", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan13_def_gw_mac,
 			{ "Default Gateway MAC Address",
-				"ipmi.lan13.def_gw_mac", FT_ETHER, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan13.def_gw_mac", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan14_bkp_gw_ip,
 			{ "Backup Gateway Address",
-				"ipmi.lan14.bkp_gw_ip", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan14.bkp_gw_ip", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan15_bkp_gw_mac,
 			{ "Backup Gateway MAC Address",
-				"ipmi.lan15.bkp_gw_mac", FT_ETHER, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan15.bkp_gw_mac", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan16_comm_string,
 			{ "Community String",
-				"ipmi.lan16.comm_string", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan16.comm_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan17_num_dst,
 			{ "Number of Destinations",
-				"ipmi.lan17.num_dst", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.lan17.num_dst", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan18_dst_selector,
 			{ "Destination Selector",
-				"ipmi.lan18.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.lan18.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_ack,
 			{ "Alert Acknowledged",
-				"ipmi.lan18.ack", FT_BOOLEAN, 8, TFS(&lan18_ack_tfs), 0x80, "", HFILL }},
+				"ipmi.lan18.ack", FT_BOOLEAN, 8, TFS(&lan18_ack_tfs), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_dst_type,
 			{ "Destination Type",
-				"ipmi.lan18.dst_type", FT_UINT8, BASE_HEX, lan18_dst_type_vals, 0x07, "", HFILL }},
+				"ipmi.lan18.dst_type", FT_UINT8, BASE_HEX, lan18_dst_type_vals, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_tout,
 			{ "Timeout/Retry Interval",
-				"ipmi.lan18.tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, "", HFILL }},
+				"ipmi.lan18.tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan18_retries,
 			{ "Retries",
-				"ipmi.lan18.retries", FT_UINT8, BASE_DEC, NULL, 0x07, "", HFILL }},
+				"ipmi.lan18.retries", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan19_dst_selector,
 			{ "Destination Selector",
-				"ipmi.lan19.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.lan19.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_addr_format,
 			{ "Address Format",
-				"ipmi.lan19.addr_format", FT_UINT8, BASE_HEX, lan19_af_vals, 0xf0, "", HFILL }},
+				"ipmi.lan19.addr_format", FT_UINT8, BASE_HEX, lan19_af_vals, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_address,
 			{ "Address (format unknown)",
-				"ipmi.lan19.address", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.lan19.address", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_gw_sel,
 			{ "Gateway selector",
-				"ipmi.lan19.gw_sel", FT_BOOLEAN, 8, TFS(&lan19_gw_sel_tfs), 0x01, "", HFILL }},
+				"ipmi.lan19.gw_sel", FT_BOOLEAN, 8, TFS(&lan19_gw_sel_tfs), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_ip,
 			{ "Alerting IP Address",
-				"ipmi.lan19.ip", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan19.ip", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan19_mac,
 			{ "Alerting MAC Address",
-				"ipmi.lan19.mac", FT_ETHER, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.lan19.mac", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan20_vlan_id_enable,
 			{ "VLAN ID Enable",
-				"ipmi.lan20.vlan_id_enable", FT_BOOLEAN, 16, TFS(&lan20_enable_tfs), 0x8000, "", HFILL }},
+				"ipmi.lan20.vlan_id_enable", FT_BOOLEAN, 16, TFS(&lan20_enable_tfs), 0x8000, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan20_vlan_id,
 			{ "VLAN ID",
-				"ipmi.lan20.vlan_id", FT_UINT16, BASE_HEX, NULL, 0x0fff, "", HFILL }},
+				"ipmi.lan20.vlan_id", FT_UINT16, BASE_HEX, NULL, 0x0fff, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan21_vlan_prio,
 			{ "VLAN Priority",
-				"ipmi.lan21.vlan_prio", FT_UINT8, BASE_DEC, NULL, 0x07, "", HFILL }},
+				"ipmi.lan21.vlan_prio", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan22_num_cs_entries,
 			{ "Number of Cipher Suite Entries",
-				"ipmi.lan22.num_cs_entries", FT_UINT8, BASE_DEC, NULL, 0x1f, "", HFILL }},
+				"ipmi.lan22.num_cs_entries", FT_UINT8, BASE_DEC, NULL, 0x1f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan23_cs_entry,
 			{ "Cipher Suite ID",
-				"ipmi.lan23.cs_entry", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.lan23.cs_entry", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan24_priv,
 			{ "Maximum Privilege Level",
-				"ipmi.lan24.priv", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.lan24.priv", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_lan25_dst_selector,
 			{ "Destination Selector",
-				"ipmi.lan25.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.lan25.dst_selector", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_addr_format,
 			{ "Address Format",
-				"ipmi.lan25.addr_format", FT_UINT8, BASE_HEX, lan25_af_vals, 0xf0, "", HFILL }},
+				"ipmi.lan25.addr_format", FT_UINT8, BASE_HEX, lan25_af_vals, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_address,
 			{ "Address (format unknown)",
-				"ipmi.lan25.address", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.lan25.address", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_uprio,
 			{ "User priority",
-				"ipmi.lan25.uprio", FT_UINT16, BASE_DEC, NULL, 0xe000, "", HFILL }},
+				"ipmi.lan25.uprio", FT_UINT16, BASE_DEC, NULL, 0xe000, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_cfi,
 			{ "CFI",
-				"ipmi.lan25.cfi", FT_BOOLEAN, 16, NULL, 0x1000, "", HFILL }},
+				"ipmi.lan25.cfi", FT_BOOLEAN, 16, NULL, 0x1000, NULL, HFILL }},
 		{ &hf_ipmi_trn_lan25_vlan_id,
 			{ "VLAN ID",
-				"ipmi.lan25.vlan_id", FT_UINT16, BASE_HEX, NULL, 0x0fff, "", HFILL }},
+				"ipmi.lan25.vlan_id", FT_UINT16, BASE_HEX, NULL, 0x0fff, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_serial03_connmode,
 			{ "Connection Mode",
-				"ipmi.serial03.connmode", FT_BOOLEAN, 8, TFS(&serial03_connmode_tfs), 0x80, "", HFILL }},
+				"ipmi.serial03.connmode", FT_BOOLEAN, 8, TFS(&serial03_connmode_tfs), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial03_terminal,
 			{ "Terminal Mode",
-				"ipmi.serial03.terminal", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.serial03.terminal", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial03_ppp,
 			{ "PPP Mode",
-				"ipmi.serial03.ppp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial03.ppp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial03_basic,
 			{ "Basic Mode",
-				"ipmi.serial03.basic", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial03.basic", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial04_timeout,
 			{ "Session Inactivity Timeout",
-				"ipmi.serial04.timeout", FT_UINT8, BASE_CUSTOM, serial04_timeout_fmt, 0x0f, "", HFILL }},
+				"ipmi.serial04.timeout", FT_UINT8, BASE_CUSTOM, serial04_timeout_fmt, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cbcp_callback,
 			{ "CBCP Callback",
-				"ipmi.serial05.cbcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial05.cbcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_ipmi_callback,
 			{ "IPMI Callback",
-				"ipmi.serial05.ipmi", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial05.ipmi", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_list,
 			{ "Callback to list of possible numbers",
-				"ipmi.serial05.cb_list", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, "", HFILL }},
+				"ipmi.serial05.cb_list", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_user,
 			{ "Callback to user-specifiable number",
-				"ipmi.serial05.cb_user", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.serial05.cb_user", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_prespec,
 			{ "Callback to pre-specified number",
-				"ipmi.serial05.cb_prespec", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial05.cb_prespec", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_no_cb,
 			{ "No callback",
-				"ipmi.serial05.no_cb", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial05.no_cb", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_dest1,
 			{ "Callback destination 1",
-				"ipmi.serial05.cb_dest1", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial05.cb_dest1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_dest2,
 			{ "Callback destination 2",
-				"ipmi.serial05.cb_dest2", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial05.cb_dest2", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial05_cb_dest3,
 			{ "Callback destination 3",
-				"ipmi.serial05.cb_dest3", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial05.cb_dest3", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial06_inactivity,
 			{ "Session Inactivity Timeout",
-				"ipmi.serial06.inactivity", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial06.inactivity", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial06_dcd,
 			{ "Close on DCD Loss",
-				"ipmi.serial06.dcd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial06.dcd", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_flowctl,
 			{ "Flow Control",
-				"ipmi.serial07.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, "", HFILL }},
+				"ipmi.serial07.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_dtrhangup,
 			{ "DTR Hang-up",
-				"ipmi.serial07.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, "", HFILL }},
+				"ipmi.serial07.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial07_bitrate,
 			{ "Bit rate",
-				"ipmi.serial07.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, "", HFILL }},
+				"ipmi.serial07.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_esc_powerup,
 			{ "Power-up/wakeup via ESC-^",
-				"ipmi.serial08.esc_powerup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40, "", HFILL }},
+				"ipmi.serial08.esc_powerup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_esc_reset,
 			{ "Hard reset via ESC-R-ESC-r-ESC-R",
-				"ipmi.serial08.esc_reset", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, "", HFILL }},
+				"ipmi.serial08.esc_reset", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_switch_authcap,
 			{ "Baseboard-to-BMC switch on Get Channel Auth Capabilities",
-				"ipmi.serial08.switch_authcap", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x10, "", HFILL }},
+				"ipmi.serial08.switch_authcap", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_switch_rmcp,
 			{ "Switch to BMC on IPMI-RMCP pattern",
-				"ipmi.serial08.switch_rmcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, "", HFILL }},
+				"ipmi.serial08.switch_rmcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_esc_switch1,
 			{ "BMC-to-Baseboard switch via ESC-Q",
-				"ipmi.serial08.esc_switch1", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.serial08.esc_switch1", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_esc_switch2,
 			{ "Baseboard-to-BMC switch via ESC-(",
-				"ipmi.serial08.esc_switch2", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial08.esc_switch2", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_switch_dcdloss,
 			{ "Switch to BMC on DCD loss",
-				"ipmi.serial08.switch_dcdloss", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial08.switch_dcdloss", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_sharing,
 			{ "Serial Port Sharing",
-				"ipmi.serial08.sharing", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, "", HFILL }},
+				"ipmi.serial08.sharing", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_ping_callback,
 			{ "Serial/Modem Connection Active during callback",
-				"ipmi.serial08.ping_callback", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.serial08.ping_callback", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_ping_direct,
 			{ "Serial/Modem Connection Active during direct call",
-				"ipmi.serial08.ping_direct", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial08.ping_direct", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial08_ping_retry,
 			{ "Retry Serial/Modem Connection Active",
-				"ipmi.serial08.ping_retry", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial08.ping_retry", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial09_ring_duration,
 			{ "Ring Duration",
-				"ipmi.serial09.ring_duration", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_1based, 0x3f, "", HFILL }},
+				"ipmi.serial09.ring_duration", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_1based, 0x3f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial09_ring_dead,
 			{ "Ring Dead Time",
-				"ipmi.serial09.ring_dead", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0x0f, "", HFILL }},
+				"ipmi.serial09.ring_dead", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial10_set_sel,
 			{ "Set selector (16-byte block #)",
-				"ipmi.serial10.set_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial10.set_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial10_init_str,
 			{ "Modem Init String",
-				"ipmi.serial10.init_str", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial10.init_str", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial11_esc_seq,
 			{ "Modem Escape Sequence",
-				"ipmi.serial11.esc_seq", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial11.esc_seq", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial12_hangup_seq,
 			{ "Modem Hang-up Sequence",
-				"ipmi.serial12.hangup_seq", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial12.hangup_seq", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial13_dial_cmd,
 			{ "Modem Dial Command",
-				"ipmi.serial13.dial_cmd", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial13.dial_cmd", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial14_page_blackout,
 			{ "Page Blackout Interval (minutes)",
-				"ipmi.serial14.page_blackout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial14.page_blackout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial15_comm_string,
 			{ "Community String",
-				"ipmi.serial15.comm_string", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial15.comm_string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial16_ndest,
 			{ "Number of non-volatile Alert Destinations",
-				"ipmi.serial16.ndest", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial16.ndest", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_dest_sel,
 			{ "Destination Selector",
-				"ipmi.serial17.dest_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial17.dest_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_ack,
 			{ "Alert Acknowledge",
-				"ipmi.serial17.ack", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.serial17.ack", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_dest_type,
 			{ "Destination Type",
-				"ipmi.serial17.dest_type", FT_UINT8, BASE_HEX, serial17_dest_type_vals, 0x0f, "", HFILL }},
+				"ipmi.serial17.dest_type", FT_UINT8, BASE_HEX, serial17_dest_type_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_ack_timeout,
 			{ "Alert Acknowledge Timeout",
-				"ipmi.serial17.ack_timeout", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial17.ack_timeout", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_alert_retries,
 			{ "Alert retries",
-				"ipmi.serial17.alert_retries", FT_UINT8, BASE_DEC, NULL, 0x70, "", HFILL }},
+				"ipmi.serial17.alert_retries", FT_UINT8, BASE_DEC, NULL, 0x70, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_call_retries,
 			{ "Call retries",
-				"ipmi.serial17.call_retries", FT_UINT8, BASE_DEC, NULL, 0x07, "", HFILL }},
+				"ipmi.serial17.call_retries", FT_UINT8, BASE_DEC, NULL, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_alert_ack_timeout,
 			{ "Alert Acknowledge Timeout",
-				"ipmi.serial17.alert_ack_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, "", HFILL }},
+				"ipmi.serial17.alert_ack_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_dialstr_sel,
 			{ "Dial String Selector",
-				"ipmi.serial17.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.serial17.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_tap_sel,
 			{ "TAP Account Selector",
-				"ipmi.serial17.tap_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial17.tap_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_ipaddr_sel,
 			{ "Destination IP Address Selector",
-				"ipmi.serial17.ipaddr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.serial17.ipaddr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_ppp_sel,
 			{ "PPP Account Set Selector",
-				"ipmi.serial17.ppp_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial17.ppp_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial17_unknown,
 			{ "Destination-specific (format unknown)",
-				"ipmi.serial17.unknown", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial17.unknown", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial18_call_retry,
 			{ "Call Retry Interval",
-				"ipmi.serial18.call_retry", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial18.call_retry", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_destsel,
 			{ "Destination selector",
-				"ipmi.serial19.destsel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial19.destsel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_flowctl,
 			{ "Flow Control",
-				"ipmi.serial19.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, "", HFILL }},
+				"ipmi.serial19.flowctl", FT_UINT8, BASE_HEX, serialXX_flowctl_vals, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_dtrhangup,
 			{ "DTR Hang-up",
-				"ipmi.serial19.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, "", HFILL }},
+				"ipmi.serial19.dtrhangup", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_stopbits,
 			{ "Stop bits",
-				"ipmi.serial19.stopbits", FT_BOOLEAN, 8, TFS(&serial19_stopbits_tfs), 0x10, "", HFILL }},
+				"ipmi.serial19.stopbits", FT_BOOLEAN, 8, TFS(&serial19_stopbits_tfs), 0x10, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_charsize,
 			{ "Character size",
-				"ipmi.serial19.charsize", FT_BOOLEAN, 8, TFS(&serial19_charsize_tfs), 0x08, "", HFILL }},
+				"ipmi.serial19.charsize", FT_BOOLEAN, 8, TFS(&serial19_charsize_tfs), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_parity,
 			{ "Parity",
-				"ipmi.serial19.parity", FT_UINT8, BASE_HEX, serial19_parity_vals, 0x07, "", HFILL }},
+				"ipmi.serial19.parity", FT_UINT8, BASE_HEX, serial19_parity_vals, 0x07, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial19_bitrate,
 			{ "Bit rate",
-				"ipmi.serial19.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, "", HFILL }},
+				"ipmi.serial19.bitrate", FT_UINT8, BASE_HEX, serialXX_bitrate_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial20_num_dial_strings,
 			{ "Number of Dial Strings",
-				"ipmi.serial20.num_dial_strings", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial20.num_dial_strings", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial21_dialsel,
 			{ "Dial String Selector",
-				"ipmi.serial21.dialsel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial21.dialsel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial21_blockno,
 			{ "Block number",
-				"ipmi.serial21.blockno", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial21.blockno", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial21_dialstr,
 			{ "Dial string",
-				"ipmi.serial21.dialstr", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial21.dialstr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial22_num_ipaddrs,
 			{ "Number of Alert Destination IP Addresses",
-				"ipmi.serial22.num_ipaddrs", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial22.num_ipaddrs", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial23_destsel,
 			{ "Destination IP Address selector",
-				"ipmi.serial23.destsel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial23.destsel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial23_ipaddr,
 			{ "Destination IP Address",
-				"ipmi.serial23.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial23.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial24_num_tap_accounts,
 			{ "Number of TAP Accounts",
-				"ipmi.serial24.num_tap_accounts", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial24.num_tap_accounts", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial25_tap_acct,
 			{ "TAP Account Selector",
-				"ipmi.serial25.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial25.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial25_dialstr_sel,
 			{ "Dial String Selector",
-				"ipmi.serial25.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.serial25.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial25_tapsrv_sel,
 			{ "TAP Service Settings Selector",
-				"ipmi.serial25.tapsrv_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial25.tapsrv_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial26_tap_acct,
 			{ "TAP Account Selector",
-				"ipmi.serial26.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial26.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial26_tap_passwd,
 			{ "TAP Password",
-				"ipmi.serial26.tap_passwd", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial26.tap_passwd", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial27_tap_acct,
 			{ "TAP Account Selector",
-				"ipmi.serial27.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial27.tap_acct", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial27_tap_pager_id,
 			{ "TAP Pager ID String",
-				"ipmi.serial27.tap_pager_id", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial27.tap_pager_id", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_tapsrv_sel,
 			{ "TAP Service Settings Selector",
-				"ipmi.serial28.tapsrv_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial28.tapsrv_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_confirm,
 			{ "TAP Confirmation",
-				"ipmi.serial28.confirm", FT_UINT8, BASE_HEX, serial28_confirm_vals, 0x03, "", HFILL }},
+				"ipmi.serial28.confirm", FT_UINT8, BASE_HEX, serial28_confirm_vals, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_srvtype,
 			{ "TAP 'SST' Service Type",
-				"ipmi.serial28.srvtype", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial28.srvtype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_ctrl_esc,
 			{ "TAP Control-character escaping mask",
-				"ipmi.serial28.ctrl_esc", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial28.ctrl_esc", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t2,
 			{ "TAP T2",
-				"ipmi.serial28.tap_t2", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0xf0, "", HFILL }},
+				"ipmi.serial28.tap_t2", FT_UINT8, BASE_CUSTOM, ipmi_fmt_500ms_0based, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t1,
 			{ "TAP T1",
-				"ipmi.serial28.tap_t1", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0x0f, "", HFILL }},
+				"ipmi.serial28.tap_t1", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t4,
 			{ "TAP T4",
-				"ipmi.serial28.tap_t4", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, "", HFILL }},
+				"ipmi.serial28.tap_t4", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t3,
 			{ "TAP T3",
-				"ipmi.serial28.tap_t3", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, "", HFILL }},
+				"ipmi.serial28.tap_t3", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t6,
 			{ "IPMI T6",
-				"ipmi.serial28.ipmi_t6", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, "", HFILL }},
+				"ipmi.serial28.ipmi_t6", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_0based, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_t5,
 			{ "TAP T5",
-				"ipmi.serial28.tap_t5", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, "", HFILL }},
+				"ipmi.serial28.tap_t5", FT_UINT8, BASE_CUSTOM, ipmi_fmt_2s_0based, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_n2,
 			{ "TAP N2",
-				"ipmi.serial28.tap_n2", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.serial28.tap_n2", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_n1,
 			{ "TAP N1",
-				"ipmi.serial28.tap_n1", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial28.tap_n1", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_n4,
 			{ "IPMI N4",
-				"ipmi.serial28.ipmi_n4", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.serial28.ipmi_n4", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial28_n3,
 			{ "TAP N3",
-				"ipmi.serial28.tap_n3", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial28.tap_n3", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_op,
 			{ "Parameter Operation",
-				"ipmi.serial29.op", FT_UINT8, BASE_HEX, serial29_op_vals, 0xc0, "", HFILL }},
+				"ipmi.serial29.op", FT_UINT8, BASE_HEX, serial29_op_vals, 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_lineedit,
 			{ "Line Editing",
-				"ipmi.serial29.lineedit", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, "", HFILL }},
+				"ipmi.serial29.lineedit", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x20, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_deletectl,
 			{ "Delete control",
-				"ipmi.serial29.deletectl", FT_UINT8, BASE_HEX, serial29_delete_vals, 0x0c, "", HFILL }},
+				"ipmi.serial29.deletectl", FT_UINT8, BASE_HEX, serial29_delete_vals, 0x0c, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_echo,
 			{ "Echo",
-				"ipmi.serial29.echo", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial29.echo", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_handshake,
 			{ "Handshake",
-				"ipmi.serial29.handshake", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial29.handshake", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_o_newline,
 			{ "Output newline sequence",
-				"ipmi.serial29.o_newline", FT_UINT8, BASE_HEX, serial29_o_nl_vals, 0xf0, "", HFILL }},
+				"ipmi.serial29.o_newline", FT_UINT8, BASE_HEX, serial29_o_nl_vals, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial29_i_newline,
 			{ "Input newline sequence",
-				"ipmi.serial29.i_newline", FT_UINT8, BASE_HEX, serial29_i_nl_vals, 0x0f, "", HFILL }},
+				"ipmi.serial29.i_newline", FT_UINT8, BASE_HEX, serial29_i_nl_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_snooping,
 			{ "System Negotiation Snooping",
-				"ipmi.serial30.snooping", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.serial30.snooping", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_snoopctl,
 			{ "Snoop ACCM Control",
-				"ipmi.serial30.snoopctl", FT_UINT8, BASE_HEX, serial30_snoopctl_vals, 0x03, "", HFILL }},
+				"ipmi.serial30.snoopctl", FT_UINT8, BASE_HEX, serial30_snoopctl_vals, 0x03, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_negot_ctl,
 			{ "BMC negotiates link parameters",
-				"ipmi.serial30.negot_ctl", FT_UINT8, BASE_HEX, serial30_negoctl_vals, 0x30, "", HFILL }},
+				"ipmi.serial30.negot_ctl", FT_UINT8, BASE_HEX, serial30_negoctl_vals, 0x30, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_use_xmit_accm,
 			{ "Filtering incoming chars",
-				"ipmi.serial30.filter", FT_BOOLEAN, 8, TFS(&serial30_filter_tfs), 0x04, "", HFILL }},
+				"ipmi.serial30.filter", FT_BOOLEAN, 8, TFS(&serial30_filter_tfs), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_xmit_addr_comp,
 			{ "Transmit with Address and Ctl Field Compression",
-				"ipmi.serial30.xmit_addr_comp", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.serial30.xmit_addr_comp", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_xmit_proto_comp,
 			{ "Transmit with Protocol Field Compression",
-				"ipmi.serial30.xmit_proto_comp", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.serial30.xmit_proto_comp", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_ipaddr,
 			{ "IP Address negotiation",
-				"ipmi.serial30.ipaddr", FT_UINT8, BASE_HEX, serial30_ipaddr_val, 0x18, "", HFILL }},
+				"ipmi.serial30.ipaddr", FT_UINT8, BASE_HEX, serial30_ipaddr_val, 0x18, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_accm,
 			{ "ACCM Negotiation",
-				"ipmi.serial30.accm", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.serial30.accm", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_addr_comp,
 			{ "Address and Ctl Field Compression",
-				"ipmi.serial30.addr_comp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.serial30.addr_comp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial30_proto_comp,
 			{ "Protocol Field Compression",
-				"ipmi.serial30.proto_comp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.serial30.proto_comp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial31_port,
 			{ "Primary RMCP Port Number",
-				"ipmi.serial31.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.serial31.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial32_port,
 			{ "Secondary RMCP Port Number",
-				"ipmi.serial32.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.serial32.port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial33_auth_proto,
 			{ "PPP Link Authentication Protocol",
-				"ipmi.serial33.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, "", HFILL }},
+				"ipmi.serial33.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial34_chap_name,
 			{ "CHAP Name",
-				"ipmi.serial34.chap_name", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial34.chap_name", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial35_recv_accm,
 			{ "Receive ACCM",
-				"ipmi.serial35.recv_accm", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial35.recv_accm", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial35_xmit_accm,
 			{ "Transmit ACCM",
-				"ipmi.serial35.xmit_accm", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial35.xmit_accm", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial36_snoop_accm,
 			{ "Snoop Receive ACCM",
-				"ipmi.serial36.snoop_accm", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial36.snoop_accm", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial37_num_ppp,
 			{ "Number of PPP Accounts",
-				"ipmi.serial37.num_ppp", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial37.num_ppp", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial38_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial38.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial38.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial38_dialstr_sel,
 			{ "Dial String Selector",
-				"ipmi.serial38.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial38.dialstr_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial39_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial39.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial39.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial39_ipaddr,
 			{ "IP Address",
-				"ipmi.serial39.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial39.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial40_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial40.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial40.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial40_username,
 			{ "User Name",
-				"ipmi.serial40.username", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial40.username", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial41_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial41.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial41.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial41_userdomain,
 			{ "User Domain",
-				"ipmi.serial41.userdomain", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial41.userdomain", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial42_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial42.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial42.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial42_userpass,
 			{ "User Password",
-				"ipmi.serial42.userpass", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial42.userpass", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial43_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial43.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial43.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial43_auth_proto,
 			{ "Link Auth Type",
-				"ipmi.serial43.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, "", HFILL }},
+				"ipmi.serial43.auth_proto", FT_UINT8, BASE_HEX, serialXX_proto_vals, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial44_acct_sel,
 			{ "PPP Account Selector",
-				"ipmi.serial44.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial44.acct_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial44_hold_time,
 			{ "Connection Hold Time",
-				"ipmi.serial44.hold_time", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, "", HFILL }},
+				"ipmi.serial44.hold_time", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial45_src_ipaddr,
 			{ "Source IP Address",
-				"ipmi.serial45.src_ipaddr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial45.src_ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial45_dst_ipaddr,
 			{ "Destination IP Address",
-				"ipmi.serial45.dst_ipaddr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial45.dst_ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial46_tx_bufsize,
 			{ "Transmit Buffer Size",
-				"ipmi.serial46.tx_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial46.tx_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial47_rx_bufsize,
 			{ "Receive Buffer Size",
-				"ipmi.serial47.rx_size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial47.rx_size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial48_ipaddr,
 			{ "Remote Console IP Address",
-				"ipmi.serial48.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial48.ipaddr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial49_blockno,
 			{ "Block number",
-				"ipmi.serial49.blockno", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial49.blockno", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial49_dialstr,
 			{ "Dial string",
-				"ipmi.serial49.dialstr", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.serial49.dialstr", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial50_115200,
 			{ "115200",
-				"ipmi.serial50.115200", FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+				"ipmi.serial50.115200", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial50_57600,
 			{ "57600",
-				"ipmi.serial50.57600", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.serial50.57600", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial50_38400,
 			{ "38400",
-				"ipmi.serial50.38400", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.serial50.38400", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial50_19200,
 			{ "19200",
-				"ipmi.serial50.19200", FT_BOOLEAN, 8, NULL, 0x02, "", HFILL }},
+				"ipmi.serial50.19200", FT_BOOLEAN, 8, NULL, 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial50_9600,
 			{ "9600",
-				"ipmi.serial50.9600", FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+				"ipmi.serial50.9600", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_port_assoc_sel,
 			{ "Serial Port Association Entry",
-				"ipmi.serial51.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial51.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_ipmi_channel,
 			{ "IPMI Channel",
-				"ipmi.serial51.ipmi_channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0xf0, "", HFILL }},
+				"ipmi.serial51.ipmi_channel", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_conn_num,
 			{ "Connector number",
-				"ipmi.serial51.conn_num", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial51.conn_num", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_ipmi_sharing,
 			{ "Used with IPMI Serial Port Sharing",
-				"ipmi.serial51.ipmi_sharing", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.serial51.ipmi_sharing", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_ipmi_sol,
 			{ "Used with IPMI Serial-over-LAN",
-				"ipmi.serial51.ipmi_sol", FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+				"ipmi.serial51.ipmi_sol", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial51_chan_num,
 			{ "Serial controller channel number",
-				"ipmi.serial51.chan_num", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.serial51.chan_num", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial52_port_assoc_sel,
 			{ "Serial Port Association Entry",
-				"ipmi.serial52.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial52.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial52_conn_name,
 			{ "Connector Name",
-				"ipmi.serial52_conn_name", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial52_conn_name", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial53_port_assoc_sel,
 			{ "Serial Port Association Entry",
-				"ipmi.serial53.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.serial53.port_assoc_sel", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_serial53_chan_name,
 			{ "Channel Name",
-				"ipmi.serial52_chan_name", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.serial52_chan_name", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_01_chan,
 			{ "Channel",
-				"ipmi.tr01.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr01.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_01_param,
 			{ "Parameter Selector",
-				"ipmi.tr01.param", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr01.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_01_param_data,
 			{ "Parameter data",
-				"ipmi.tr01.param_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr01.param_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_02_getrev,
 			{ "Get parameter revision only",
-				"ipmi.tr02.getrev", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.tr02.getrev", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_chan,
 			{ "Channel",
-				"ipmi.tr02.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr02.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_param,
 			{ "Parameter selector",
-				"ipmi.tr02.param", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr02.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_set,
 			{ "Set selector",
-				"ipmi.tr02.set", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr02.set", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_block,
 			{ "Block selector",
-				"ipmi.tr02.block", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr02.block", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_rev_present,
 			{ "Present parameter revision",
-				"ipmi.tr02.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.tr02.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_rev_compat,
 			{ "Oldest forward-compatible",
-				"ipmi.tr02.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.tr02.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_02_param_data,
 			{ "Parameter data",
-				"ipmi.tr02.param_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr02.param_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_03_chan,
 			{ "Channel",
-				"ipmi.tr03.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr03.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_03_arp_resp,
 			{ "BMC-generated ARP responses",
-				"ipmi.tr03.arp_resp", FT_BOOLEAN, 8, TFS(&tfs_03_suspend), 0x02, "", HFILL }},
+				"ipmi.tr03.arp_resp", FT_BOOLEAN, 8, TFS(&tfs_03_suspend), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_03_gratuitous_arp,
 			{ "Gratuitous ARPs",
-				"ipmi.tr03.gratuitous_arp", FT_BOOLEAN, 8, TFS(&tfs_03_suspend), 0x01, "", HFILL }},
+				"ipmi.tr03.gratuitous_arp", FT_BOOLEAN, 8, TFS(&tfs_03_suspend), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_03_status_arp_resp,
 			{ "ARP Response status",
-				"ipmi.tr03.status_arp_resp", FT_BOOLEAN, 8, TFS(&tfs_03_arp_status), 0x02, "", HFILL }},
+				"ipmi.tr03.status_arp_resp", FT_BOOLEAN, 8, TFS(&tfs_03_arp_status), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_03_status_gratuitous_arp,
 			{ "Gratuitous ARP status",
-				"ipmi.tr03.status_gratuitous_arp", FT_BOOLEAN, 8, TFS(&tfs_03_arp_status), 0x01, "", HFILL }},
+				"ipmi.tr03.status_gratuitous_arp", FT_BOOLEAN, 8, TFS(&tfs_03_arp_status), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_04_chan,
 			{ "Channel",
-				"ipmi.tr04.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr04.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_clear,
 			{ "Statistics",
-				"ipmi.tr04.clear", FT_BOOLEAN, 8, TFS(&tfs_04_clear), 0x01, "", HFILL }},
+				"ipmi.tr04.clear", FT_BOOLEAN, 8, TFS(&tfs_04_clear), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_ippkts,
 			{ "Received IP Packets",
-				"ipmi.tr04.rx_ippkts", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_ippkts", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_iphdr_err,
 			{ "Received IP Header Errors",
-				"ipmi.tr04.rx_iphdr_err", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_iphdr_err", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_ipaddr_err,
 			{ "Received IP Address Errors",
-				"ipmi.tr04.rx_ipaddr_err", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_ipaddr_err", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_ippkts_frag,
 			{ "Received Fragmented IP Packets",
-				"ipmi.tr04.rx_ippkts_frag", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_ippkts_frag", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_tx_ippkts,
 			{ "Transmitted IP Packets",
-				"ipmi.tr04.tx_ippkts", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.tx_ippkts", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_udppkts,
 			{ "Received UDP Packets",
-				"ipmi.tr04.rx_udppkts", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_udppkts", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_validrmcp,
 			{ "Received Valid RMCP Packets",
-				"ipmi.tr04.rx_validrmcp", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_validrmcp", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_rx_udpproxy,
 			{ "Received UDP Proxy Packets",
-				"ipmi.tr04.rx_udpproxy", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.rx_udpproxy", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_04_dr_udpproxy,
 			{ "Dropped UDP Proxy Packets",
-				"ipmi.tr04.dr_udpproxy", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr04.dr_udpproxy", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_10_chan,
 			{ "Channel",
-				"ipmi.tr10.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr10.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_10_param,
 			{ "Parameter Selector",
-				"ipmi.tr10.param", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr10.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_10_param_data,
 			{ "Parameter data",
-				"ipmi.tr10.param_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr10.param_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_11_getrev,
 			{ "Get parameter revision only",
-				"ipmi.tr11.getrev", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.tr11.getrev", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_chan,
 			{ "Channel",
-				"ipmi.tr11.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr11.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_param,
 			{ "Parameter selector",
-				"ipmi.tr11.param", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr11.param", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_set,
 			{ "Set selector",
-				"ipmi.tr11.set", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr11.set", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_block,
 			{ "Block selector",
-				"ipmi.tr11.block", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr11.block", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_rev_present,
 			{ "Present parameter revision",
-				"ipmi.tr11.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+				"ipmi.tr11.rev.present", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_rev_compat,
 			{ "Oldest forward-compatible",
-				"ipmi.tr11.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.tr11.rev.compat", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_11_param_data,
 			{ "Parameter data",
-				"ipmi.tr11.param_data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr11.param_data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_12_chan,
 			{ "Channel",
-				"ipmi.tr12.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr12.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_mux_setting,
 			{ "Mux Setting",
-				"ipmi.tr12.mux_setting", FT_UINT8, BASE_HEX, vals_12_mux, 0x0f, "", HFILL }},
+				"ipmi.tr12.mux_setting", FT_UINT8, BASE_HEX, vals_12_mux, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_sw_to_sys,
 			{ "Requests to switch to system",
-				"ipmi.tr12.sw_to_sys", FT_BOOLEAN, 8, TFS(&tfs_12_blocked), 0x80, "", HFILL }},
+				"ipmi.tr12.sw_to_sys", FT_BOOLEAN, 8, TFS(&tfs_12_blocked), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_sw_to_bmc,
 			{ "Requests to switch to BMC",
-				"ipmi.tr12.sw_to_bmc", FT_BOOLEAN, 8, TFS(&tfs_12_blocked), 0x40, "", HFILL }},
+				"ipmi.tr12.sw_to_bmc", FT_BOOLEAN, 8, TFS(&tfs_12_blocked), 0x40, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_alert,
 			{ "Alert in progress",
-				"ipmi.tr12.alert", FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+				"ipmi.tr12.alert", FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_msg,
 			{ "IPMI/OEM messaging active",
-				"ipmi.tr12.msg", FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+				"ipmi.tr12.msg", FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_req,
 			{ "Request",
-				"ipmi.tr12.req", FT_BOOLEAN, 8, TFS(&tfs_12_req), 0x02, "", HFILL }},
+				"ipmi.tr12.req", FT_BOOLEAN, 8, TFS(&tfs_12_req), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_12_mux_state,
 			{ "Mux set to",
-				"ipmi.tr12.mux_state", FT_BOOLEAN, 8, TFS(&tfs_12_mux_state), 0x01, "", HFILL }},
+				"ipmi.tr12.mux_state", FT_BOOLEAN, 8, TFS(&tfs_12_mux_state), 0x01, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_13_chan,
 			{ "Channel",
-				"ipmi.tr13.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr13.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_13_code1,
 			{ "Last code",
-				"ipmi.tr13.code1", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr13.code1", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_13_code2,
 			{ "2nd code",
-				"ipmi.tr13.code2", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr13.code2", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_13_code3,
 			{ "3rd code",
-				"ipmi.tr13.code3", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr13.code3", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_13_code4,
 			{ "4th code",
-				"ipmi.tr13.code4", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr13.code4", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_13_code5,
 			{ "5th code",
-				"ipmi.tr13.code5", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr13.code5", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_14_chan,
 			{ "Channel",
-				"ipmi.tr14.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr14.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_14_block,
 			{ "Block number",
-				"ipmi.tr14.block", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr14.block", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_14_data,
 			{ "Block data",
-				"ipmi.tr14.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr14.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_15_chan,
 			{ "Channel",
-				"ipmi.tr15.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr15.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_15_block,
 			{ "Block number",
-				"ipmi.tr15.block", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr15.block", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_15_data,
 			{ "Block data",
-				"ipmi.tr15.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr15.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_16_chan,
 			{ "Channel",
-				"ipmi.tr16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr16.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_16_src_port,
 			{ "Source Port",
-				"ipmi.tr16.src_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.tr16.src_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_16_dst_port,
 			{ "Destination Port",
-				"ipmi.tr16.dst_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, "", HFILL }},
+				"ipmi.tr16.dst_port", FT_UINT16, BASE_CUSTOM, ipmi_fmt_udpport, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_16_src_addr,
 			{ "Source IP Address",
-				"ipmi.tr16.src_addr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr16.src_addr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_16_dst_addr,
 			{ "Destination IP Address",
-				"ipmi.tr16.dst_addr", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }},
+				"ipmi.tr16.dst_addr", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_16_bytes,
 			{ "Bytes to send",
-				"ipmi.tr16.bytes", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr16.bytes", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_17_chan,
 			{ "Channel",
-				"ipmi.tr17.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr17.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_17_clear,
 			{ "Clear buffer",
-				"ipmi.tr17.clear", FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+				"ipmi.tr17.clear", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 		{ &hf_ipmi_trn_17_block_num,
 			{ "Block number",
-				"ipmi.tr17.block_num", FT_UINT8, BASE_CUSTOM, tr17_fmt_blockno, 0x7f, "", HFILL }},
+				"ipmi.tr17.block_num", FT_UINT8, BASE_CUSTOM, tr17_fmt_blockno, 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_trn_17_size,
 			{ "Number of received bytes",
-				"ipmi.tr17.size", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.tr17.size", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_17_data,
 			{ "Block Data",
-				"ipmi.tr17.data", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+				"ipmi.tr17.data", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_18_state,
 			{ "Session state",
-				"ipmi.tr18.state", FT_UINT8, BASE_HEX, vals_18_state, 0x0f, "", HFILL }},
+				"ipmi.tr18.state", FT_UINT8, BASE_HEX, vals_18_state, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_18_ipmi_ver,
 			{ "IPMI Version",
-				"ipmi.tr18.ipmi_ver", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, "", HFILL }},
+				"ipmi.tr18.ipmi_ver", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_19_chan,
 			{ "Channel",
-				"ipmi.tr19.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr19.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_trn_19_dest_sel,
 			{ "Destination selector",
-				"ipmi.tr19.dest_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+				"ipmi.tr19.dest_sel", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_XX_cap_cbcp,
 			{ "CBCP callback",
-				"ipmi.trXX.cap_cbcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.trXX.cap_cbcp", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_cap_ipmi,
 			{ "IPMI callback",
-				"ipmi.trXX.cap_ipmi", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.trXX.cap_ipmi", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_cbcp_from_list,
 			{ "Callback to one from list of numbers",
-				"ipmi.trXX.cbcp_from_list", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, "", HFILL }},
+				"ipmi.trXX.cbcp_from_list", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x08, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_cbcp_user,
 			{ "Callback to user-specified number",
-				"ipmi.trXX.cbcp_user", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, "", HFILL }},
+				"ipmi.trXX.cbcp_user", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x04, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_cbcp_prespec,
 			{ "Callback to pre-specified number",
-				"ipmi.trXX.cbcp_prespec", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, "", HFILL }},
+				"ipmi.trXX.cbcp_prespec", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x02, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_cbcp_nocb,
 			{ "No callback",
-				"ipmi.trXX.cbcp_nocb", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, "", HFILL }},
+				"ipmi.trXX.cbcp_nocb", FT_BOOLEAN, 8, TFS(&tfs_enabled_disabled), 0x01, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_dst1,
 			{ "Callback destination 1",
-				"ipmi.trXX.dst1", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.trXX.dst1", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_dst2,
 			{ "Callback destination 2",
-				"ipmi.trXX.dst2", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.trXX.dst2", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_trn_XX_dst3,
 			{ "Callback destination 3",
-				"ipmi.trXX.dst3", FT_UINT8, BASE_DEC, NULL, 0, "", HFILL }},
+				"ipmi.trXX.dst3", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_1a_user,
 			{ "User ID",
-				"ipmi.tr1a.user", FT_UINT8, BASE_DEC, NULL, 0x3f, "", HFILL }},
+				"ipmi.tr1a.user", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL }},
 		{ &hf_ipmi_trn_1a_chan,
 			{ "Channel",
-				"ipmi.tr1a.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr1a.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_trn_1b_user,
 			{ "User ID",
-				"ipmi.tr1b.user", FT_UINT8, BASE_DEC, NULL, 0x3f, "", HFILL }},
+				"ipmi.tr1b.user", FT_UINT8, BASE_DEC, NULL, 0x3f, NULL, HFILL }},
 		{ &hf_ipmi_trn_1b_chan,
 			{ "Channel",
-				"ipmi.tr1b.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, "", HFILL }},
+				"ipmi.tr1b.chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipmi.c b/epan/dissectors/packet-ipmi.c
index 7f76d1c879..43ab44e9f3 100644
--- a/epan/dissectors/packet-ipmi.c
+++ b/epan/dissectors/packet-ipmi.c
@@ -1398,24 +1398,24 @@ void
 proto_register_ipmi(void)
 {
 	static hf_register_info	hf[] = {
-		{ &hf_ipmi_message, { "Message", "ipmi.message", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_session_handle, { "Session handle", "ipmi.session_handle", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_broadcast, { "Broadcast message", "ipmi.header.broadcast", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_trg, { "Target Address", "ipmi.header.target", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
-		{ &hf_ipmi_header_trg_lun, { "Target LUN", "ipmi.header.trg_lun", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL }},
-		{ &hf_ipmi_header_netfn, { "NetFN", "ipmi.header.netfn", FT_UINT8, BASE_HEX, NULL, 0xfc, "", HFILL }},
-		{ &hf_ipmi_header_crc, { "Header Checksum", "ipmi.header.crc", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_src, { "Source Address", "ipmi.header.source", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_src_lun, { "Source LUN", "ipmi.header.src_lun", FT_UINT8, BASE_HEX, NULL, 0x03, "", HFILL }},
-		{ &hf_ipmi_header_sequence, { "Sequence Number", "ipmi.header.sequence", FT_UINT8, BASE_HEX, NULL, 0xfc, "", HFILL }},
-		{ &hf_ipmi_header_command, { "Command", "ipmi.header.command", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_completion, { "Completion Code", "ipmi.header.completion", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_header_sig, { "Signature", "ipmi.header.signature", FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_data_crc, { "Data checksum", "ipmi.data.crc", FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_response_to, { "Response to", "ipmi.response_to", FT_FRAMENUM, BASE_DEC, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_response_in, { "Response in", "ipmi.response_in", FT_FRAMENUM, BASE_DEC, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_response_time, { "Responded in", "ipmi.response_time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &hf_ipmi_bad_checksum, { "Bad checksum", "ipmi.bad_checksum", FT_BOOLEAN, 8, NULL, 0, "", HFILL }}
+		{ &hf_ipmi_message, { "Message", "ipmi.message", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_session_handle, { "Session handle", "ipmi.session_handle", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_broadcast, { "Broadcast message", "ipmi.header.broadcast", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_trg, { "Target Address", "ipmi.header.target", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		{ &hf_ipmi_header_trg_lun, { "Target LUN", "ipmi.header.trg_lun", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL }},
+		{ &hf_ipmi_header_netfn, { "NetFN", "ipmi.header.netfn", FT_UINT8, BASE_HEX, NULL, 0xfc, NULL, HFILL }},
+		{ &hf_ipmi_header_crc, { "Header Checksum", "ipmi.header.crc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_src, { "Source Address", "ipmi.header.source", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_src_lun, { "Source LUN", "ipmi.header.src_lun", FT_UINT8, BASE_HEX, NULL, 0x03, NULL, HFILL }},
+		{ &hf_ipmi_header_sequence, { "Sequence Number", "ipmi.header.sequence", FT_UINT8, BASE_HEX, NULL, 0xfc, NULL, HFILL }},
+		{ &hf_ipmi_header_command, { "Command", "ipmi.header.command", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_completion, { "Completion Code", "ipmi.header.completion", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_header_sig, { "Signature", "ipmi.header.signature", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_data_crc, { "Data checksum", "ipmi.data.crc", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_response_to, { "Response to", "ipmi.response_to", FT_FRAMENUM, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_response_in, { "Response in", "ipmi.response_in", FT_FRAMENUM, BASE_DEC, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_response_time, { "Responded in", "ipmi.response_time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_ipmi_bad_checksum, { "Bad checksum", "ipmi.bad_checksum", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_ipmi,
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c
index 9848b0b800..3cc52a716f 100644
--- a/epan/dissectors/packet-ipp.c
+++ b/epan/dissectors/packet-ipp.c
@@ -687,7 +687,7 @@ proto_register_ipp(void)
         static hf_register_info hf[] = {
                 { &hf_ipp_timestamp,
                   { "Time", "ipp.timestamp", FT_ABSOLUTE_TIME, BASE_NONE,
-                    NULL, 0, "", HFILL }},
+                    NULL, 0, NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_ipp,
diff --git a/epan/dissectors/packet-ipsec-tcp.c b/epan/dissectors/packet-ipsec-tcp.c
index 1a351dca48..c040ebdca9 100644
--- a/epan/dissectors/packet-ipsec-tcp.c
+++ b/epan/dissectors/packet-ipsec-tcp.c
@@ -190,35 +190,35 @@ proto_register_tcpencap(void)
 
 		{ &hf_tcpencap_unknown,
 		{ "Unknown trailer",      "tcpencap.unknown", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_zero,
 		{ "All zero",      "tcpencap.zero", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_seq,
 		{ "Sequence number",      "tcpencap.seq", FT_UINT16, BASE_HEX, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_esp_zero,
 		{ "ESP zero",      "tcpencap.espzero", FT_UINT16, BASE_HEX, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_ike_direction,
 		{ "ISAKMP traffic direction",      "tcpencap.ikedirection", FT_UINT16, BASE_HEX, VALS(tcpencap_ikedir_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_magic,
 		{ "Magic number",      "tcpencap.magic", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_proto,
 		{ "Protocol",      "tcpencap.proto", FT_UINT8, BASE_HEX, VALS(tcpencap_proto_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tcpencap_magic2,
 		{ "Magic 2",      "tcpencap.magic2", FT_BYTES, BASE_NONE, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-ipsec.c b/epan/dissectors/packet-ipsec.c
index 44246eb9c8..200be05112 100644
--- a/epan/dissectors/packet-ipsec.c
+++ b/epan/dissectors/packet-ipsec.c
@@ -2624,7 +2624,7 @@ proto_register_ipsec(void)
       { "AH SPI", "ah.spi", FT_UINT32, BASE_HEX, NULL, 0x0,
         "IP Authentication Header Security Parameters Index", HFILL }},
     { &hf_ah_iv,
-      { "AH ICV", "ah.icv", FT_BYTES, BASE_HEX, NULL, 0x0,
+      { "AH ICV", "ah.icv", FT_BYTES, BASE_NONE, NULL, 0x0,
         "IP Authentication Header Integrity Check Value", HFILL }},
     { &hf_ah_sequence,
       { "AH Sequence", "ah.sequence", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -2645,8 +2645,8 @@ proto_register_ipsec(void)
       { "ESP Next Header", "esp.protocol", FT_UINT8, BASE_HEX, NULL, 0x0,
         "IP Encapsulating Security Payload Next Header", HFILL }},
     { &hf_esp_iv,
-      { "ESP IV", "esp.iv", FT_BYTES, BASE_HEX, NULL, 0x0,
-        "IP Encapsulating Security Payload ", HFILL }}
+      { "ESP IV", "esp.iv", FT_BYTES, BASE_NONE, NULL, 0x0,
+        "IP Encapsulating Security Payload", HFILL }}
   };
 
   static hf_register_info hf_ipcomp[] = {
diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c
index c7d81a50ba..33f24d51a5 100644
--- a/epan/dissectors/packet-ipsi-ctl.c
+++ b/epan/dissectors/packet-ipsi-ctl.c
@@ -240,7 +240,7 @@ void proto_register_ipsictl(void)
       	"IPSICTL Field1", HFILL }},
     { &hf_ipsictl_data,
       { "Data",	"ipsictl.data", 
-	FT_BYTES,	BASE_HEX,	NULL,	0x0,
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
       	"IPSICTL data", HFILL }},
   };
 
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 132f2a491c..498848637d 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -1558,25 +1558,25 @@ proto_register_ipv6(void)
   static hf_register_info hf[] = {
     { &hf_ipv6_version,
       { "Version",		"ipv6.version",
-				FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }},
+				FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }},
     { &hf_ip_version,
       { "This field makes the filter \"ip.version == 6\" possible",		"ip.version",
-				FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }},
+				FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }},
     { &hf_ipv6_class,
       { "Traffic class",	"ipv6.class",
-				FT_UINT32, BASE_HEX, NULL, 0x0FF00000, "", HFILL }},
+				FT_UINT32, BASE_HEX, NULL, 0x0FF00000, NULL, HFILL }},
     { &hf_ipv6_flow,
       { "Flowlabel",		"ipv6.flow",
-				FT_UINT32, BASE_HEX, NULL, 0x000FFFFF, "", HFILL }},
+				FT_UINT32, BASE_HEX, NULL, 0x000FFFFF, NULL, HFILL }},
     { &hf_ipv6_plen,
       { "Payload length",	"ipv6.plen",
-				FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+				FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ipv6_nxt,
       { "Next header",		"ipv6.nxt",
-				FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+				FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ipv6_hlim,
       { "Hop limit",		"ipv6.hlim",
-				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+				FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ipv6_src,
       { "Source",		"ipv6.src",
 				FT_IPv6, BASE_NONE, NULL, 0x0,
@@ -1611,19 +1611,19 @@ proto_register_ipv6(void)
 				FT_UINT8, BASE_DEC, NULL, 0x0,
 				"PadN Option", HFILL }},
     { &hf_ipv6_dst_opt,
-      { "Destination Option ",	"ipv6.dst_opt",
+      { "Destination Option",	"ipv6.dst_opt",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Destination Option", HFILL }},
+				NULL, HFILL }},
     { &hf_ipv6_hop_opt,
       { "Hop-by-Hop Option",	"ipv6.hop_opt",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Hop-by-Hop Option", HFILL }},
+				NULL, HFILL }},
     { &hf_ipv6_unk_hdr,
       { "Unknown Extension Header",	"ipv6.unknown_hdr",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"Unknown Extension Header", HFILL }},
+				NULL, HFILL }},
     { &hf_ipv6_routing_hdr_opt,
-      { "Routing Header, Type ","ipv6.routing_hdr",
+      { "Routing Header, Type","ipv6.routing_hdr",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
 				"Routing Header Option", HFILL }},
     { &hf_ipv6_routing_hdr_type,
@@ -1678,12 +1678,12 @@ proto_register_ipv6(void)
     { &hf_ipv6_fragment,
       { "IPv6 Fragment",	"ipv6.fragment",
 				FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-				"IPv6 Fragment", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_fragments,
       { "IPv6 Fragments",	"ipv6.fragments",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"IPv6 Fragments", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_reassembled_in,
       { "Reassembled IPv6 in frame", "ipv6.reassembled_in",
@@ -1692,55 +1692,55 @@ proto_register_ipv6(void)
 
     /* Mobile IPv6 */
     { &hf_ipv6_mipv6_type,
-      { "Option Type ",		"ipv6.mipv6_type",
+      { "Option Type",		"ipv6.mipv6_type",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
     { &hf_ipv6_mipv6_length,
-      { "Option Length ",	"ipv6.mipv6_length",
+      { "Option Length",	"ipv6.mipv6_length",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
     { &hf_ipv6_mipv6_home_address,
-      { "Home Address ",	"ipv6.mipv6_home_address",
-				FT_IPv6, BASE_HEX, NULL, 0x0,
-				"", HFILL }},
+      { "Home Address",	"ipv6.mipv6_home_address",
+				FT_IPv6, BASE_NONE, NULL, 0x0,
+				NULL, HFILL }},
 
     /* SHIM6 */
     { &hf_ipv6_shim6,
-      { "SHIM6 ",		"ipv6.shim6",
+      { "SHIM6",		"ipv6.shim6",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_nxt,
       { "Next Header",		"ipv6.shim6.nxt",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_len,
       { "Header Ext Length", 	"ipv6.shim6.len",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_p,
       { "P Bit", 		"ipv6.shim6.p",
 				FT_BOOLEAN, 8, NULL, SHIM6_BITMASK_P,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_ct,
       { "Context Tag", 		"ipv6.shim6.ct",
 				FT_NONE, BASE_NONE, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_type,
       { "Message Type", 	"ipv6.shim6.type",
 				FT_UINT8, BASE_DEC,
 				VALS(shimctrlvals), SHIM6_BITMASK_TYPE,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_proto,
       { "Protocol", 		"ipv6.shim6.proto",
 				FT_UINT8, BASE_DEC,
 				VALS(shim6_protocol), SHIM6_BITMASK_PROTOCOL,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_checksum,
       { "Checksum", 		"ipv6.shim6.checksum",
@@ -1754,27 +1754,27 @@ proto_register_ipv6(void)
     { &hf_ipv6_shim6_checksum_good,
       { "Good Checksum",		"ipv6.shim6.checksum_good",
 				FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_inonce,
       { "Initiator Nonce", 	"ipv6.shim6.inonce",
 				FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_rnonce,
       { "Responder Nonce", 	"ipv6.shim6.rnonce",
 				FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_precvd,
       { "Probes Received", 	"ipv6.shim6.precvd",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_psent,
       { "Probes Sent", 		"ipv6.shim6.psent",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_psrc,
       { "Source Address",	"ipv6.shim6.psrc",
@@ -1809,7 +1809,7 @@ proto_register_ipv6(void)
     { &hf_ipv6_shim6_reap,
       { "REAP State", 		"ipv6.shim6.reap",
 				FT_UINT8, BASE_DEC, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_opt_type,
       { "Option Type", 		"ipv6.shim6.opt.type",
@@ -1822,8 +1822,7 @@ proto_register_ipv6(void)
 				FT_BOOLEAN, 8,
 				TFS(&tfs_yes_no),
 				SHIM6_BITMASK_CRITICAL,
-				"TRUE : option is critical, "
-				"FALSE: option is not critical",
+				"TRUE : option is critical, FALSE: option is not critical",
 				HFILL }},
 
     { &hf_ipv6_shim6_opt_len,
@@ -1845,7 +1844,7 @@ proto_register_ipv6(void)
     { &hf_ipv6_shim6_opt_loclist,
       { "Locator List Generation", "ipv6.shim6.opt.loclist",
 				FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
     { &hf_ipv6_shim6_locator,
       { "Locator",		"ipv6.shim6.locator",
@@ -1879,7 +1878,7 @@ proto_register_ipv6(void)
     { &hf_ipv6_shim6_opt_fii,
       { "Forked Instance Identifier", "ipv6.shim6.opt.fii",
 				FT_UINT32, BASE_DEC_HEX, NULL, 0x0,
-				"", HFILL }},
+				NULL, HFILL }},
 
 #ifdef TEST_FINALHDR
     { &hf_ipv6_final,
diff --git a/epan/dissectors/packet-ipvs-syncd.c b/epan/dissectors/packet-ipvs-syncd.c
index 15e9fa1bd1..80eb88737e 100644
--- a/epan/dissectors/packet-ipvs-syncd.c
+++ b/epan/dissectors/packet-ipvs-syncd.c
@@ -249,79 +249,79 @@ proto_register_ipvs_syncd(void)
 	static hf_register_info hf[] = {
 		{ &hf_conn_count,
 			{ "Connection Count", "ipvs.conncount", FT_UINT8, BASE_DEC,
-			  NULL, 0, "Connection Count", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_syncid,
 			{ "Synchronization ID", "ipvs.syncid", FT_UINT8, BASE_DEC,
-			  NULL, 0, "Synchronization ID", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_size,
 			{ "Size", "ipvs.size", FT_UINT16, BASE_DEC,
-			  NULL, 0, "Size", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_resv8,
 			{ "Reserved", "ipvs.resv8", FT_UINT8, BASE_HEX,
-			  NULL, 0, "Reserved", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_proto,
 			{ "Protocol", "ipvs.proto", FT_UINT8, BASE_HEX,
-			  VALS(&proto_strings), 0, "Protocol", HFILL }},
+			  VALS(&proto_strings), 0, NULL, HFILL }},
 
 		{ &hf_cport,
 			{ "Client Port", "ipvs.cport", FT_UINT16, BASE_DEC,
-			  NULL, 0, "Client Port", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_vport,
 			{ "Virtual Port", "ipvs.vport", FT_UINT16, BASE_DEC,
-			  NULL, 0, "Virtual Port", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_dport,
 			{ "Destination Port", "ipvs.dport", FT_UINT16, BASE_DEC,
-			  NULL, 0, "Destination Port", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_caddr,
-			{ "Client Address", "ipvs.caddr", FT_IPv4, BASE_HEX,
-			  NULL, 0, "Client Address", HFILL }},
+			{ "Client Address", "ipvs.caddr", FT_IPv4, BASE_NONE,
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_vaddr,
-			{ "Virtual Address", "ipvs.vaddr", FT_IPv4, BASE_HEX,
-			  NULL, 0, "Virtual Address", HFILL }},
+			{ "Virtual Address", "ipvs.vaddr", FT_IPv4, BASE_NONE,
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_daddr,
-			{ "Destination Address", "ipvs.daddr", FT_IPv4, BASE_HEX,
-			  NULL, 0, "Destination Address", HFILL }},
+			{ "Destination Address", "ipvs.daddr", FT_IPv4, BASE_NONE,
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_flags,
 			{ "Flags", "ipvs.flags", FT_UINT16, BASE_HEX,
-			  NULL, 0, "Flags", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_state,
 			{ "State", "ipvs.state", FT_UINT16, BASE_HEX,
-			  VALS(&state_strings), 0, "State", HFILL }},
+			  VALS(&state_strings), 0, NULL, HFILL }},
 	
 		{ &hf_in_seq_init,
 			{ "Input Sequence (Initial)", "ipvs.in_seq.initial", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Input Sequence (Initial)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 		{ &hf_in_seq_delta,
 			{ "Input Sequence (Delta)", "ipvs.in_seq.delta", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Input Sequence (Delta)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 		{ &hf_in_seq_pdelta,
 			{ "Input Sequence (Previous Delta)", "ipvs.in_seq.pdelta", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Input Sequence (Previous Delta)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 		{ &hf_out_seq_init,
 			{ "Output Sequence (Initial)", "ipvs.out_seq.initial", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Output Sequence (Initial)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 		{ &hf_out_seq_delta,
 			{ "Output Sequence (Delta)", "ipvs.out_seq.delta", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Output Sequence (Delta)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 		{ &hf_out_seq_pdelta,
 			{ "Output Sequence (Previous Delta)", "ipvs.out_seq.pdelta", FT_UINT32, 
-				BASE_HEX, NULL, 0, "Output Sequence (Previous Delta)", HFILL }},
+				BASE_HEX, NULL, 0, NULL, HFILL }},
 	
 
 
diff --git a/epan/dissectors/packet-ipx.c b/epan/dissectors/packet-ipx.c
index 1ce2f0a337..edf18aa8ff 100644
--- a/epan/dissectors/packet-ipx.c
+++ b/epan/dissectors/packet-ipx.c
@@ -1311,132 +1311,132 @@ proto_register_ipx(void)
 	static hf_register_info hf_ipx[] = {
 		{ &hf_ipx_checksum,
 		{ "Checksum",		"ipx.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_src,
-		{ "Source Address",	"ipx.src", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Source Address",	"ipx.src", FT_STRING, BASE_NONE, NULL, 0x0,
 		  "Source IPX Address  \"network.node\"", HFILL }},
 
 		{ &hf_ipx_dst,
-		{ "Destination Address",	"ipx.dst", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Destination Address",	"ipx.dst", FT_STRING, BASE_NONE, NULL, 0x0,
 		  "Destination IPX Address  \"network.node\"", HFILL }},
 		{ &hf_ipx_addr,
-		{ "Src/Dst Address",	"ipx.addr", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Src/Dst Address",	"ipx.addr", FT_STRING, BASE_NONE, NULL, 0x0,
 		  "Source or Destination IPX Address  \"network.node\"", HFILL }},
 
 		{ &hf_ipx_len,
 		{ "Length",		"ipx.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_hops,
 		{ "Transport Control (Hops)", "ipx.hops", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_packet_type,
 		{ "Packet Type",	"ipx.packet_type", FT_UINT8, BASE_HEX, VALS(ipx_packet_type_vals),
 			0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_dnet,
 		{ "Destination Network","ipx.dst.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_dnode,
 		{ "Destination Node",	"ipx.dst.node", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_dsocket,
 		{ "Destination Socket",	"ipx.dst.socket", FT_UINT16, BASE_HEX,
 			VALS(ipx_socket_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_snet,
 		{ "Source Network","ipx.src.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_snode,
 		{ "Source Node",	"ipx.src.node", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_ssocket,
 		{ "Source Socket",	"ipx.src.socket", FT_UINT16, BASE_HEX,
 			VALS(ipx_socket_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_net,
 		{ "Source or Destination Network","ipx.net", FT_IPXNET, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_node,
 		{ "Source or Destination Node", "ipx.node", FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ipx_socket,
 		{ "Source or Destination Socket", "ipx.socket", FT_UINT16, BASE_HEX,
 			VALS(ipx_socket_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	};
 
 	static hf_register_info hf_spx[] = {
 		{ &hf_spx_connection_control,
 		{ "Connection Control",		"spx.ctl",
 		  FT_UINT8,	BASE_HEX,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_connection_control_sys,
 		{ "System Packet",		"spx.ctl.sys",
 		  FT_BOOLEAN,	8,	NULL,	SPX_SYS_PACKET,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_connection_control_send_ack,
 		{ "Send Ack",		"spx.ctl.send_ack",
 		  FT_BOOLEAN,	8,	NULL,	SPX_SEND_ACK,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_connection_control_attn,
 		{ "Attention",		"spx.ctl.attn",
 		  FT_BOOLEAN,	8,	NULL,	SPX_ATTN,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_connection_control_eom,
 		{ "End of Message",	"spx.ctl.eom",
 		  FT_BOOLEAN,	8,	NULL,	SPX_EOM,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_datastream_type,
 		{ "Datastream type",	       	"spx.type",
 		  FT_UINT8,	BASE_HEX,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_src_id,
 		{ "Source Connection ID",	"spx.src",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_dst_id,
 		{ "Destination Connection ID",	"spx.dst",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_seq_nr,
 		{ "Sequence Number",		"spx.seq",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_ack_nr,
 		{ "Acknowledgment Number",	"spx.ack",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_all_nr,
 		{ "Allocation Number",		"spx.alloc",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spx_rexmt_frame,
 		{ "Retransmitted Frame Number",	"spx.rexmt_frame",
 		  FT_FRAMENUM,	BASE_NONE,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 	};
 
 	static hf_register_info hf_ipxrip[] = {
@@ -1467,12 +1467,12 @@ proto_register_ipx(void)
 		{ &hf_msg_conn,
 		{ "Connection Number",			"ipxmsg.conn",
 		  FT_UINT8,	BASE_DEC,	NULL,	0x0,
-		  "Connection Number", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_msg_sigchar,
 		{ "Signature Char",			"ipxmsg.sigchar",
 		  FT_UINT8,	BASE_DEC,	VALS(ipxmsg_sigchar_vals),	0x0,
-		  "Signature Char", HFILL }}
+		  NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ipxwan.c b/epan/dissectors/packet-ipxwan.c
index 3871570bd9..2bbb9cc628 100644
--- a/epan/dissectors/packet-ipxwan.c
+++ b/epan/dissectors/packet-ipxwan.c
@@ -368,81 +368,81 @@ proto_register_ipxwan(void)
 	static hf_register_info hf[] = {
 	    { &hf_ipxwan_identifier,
 	      { "Identifier",	"ipxwan.identifier",
-		FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_packet_type,
 	      { "Packet Type", "ipxwan.packet_type",
-	        FT_UINT8, BASE_DEC, VALS(ipxwan_packet_type_vals), 0x0, "",
+	        FT_UINT8, BASE_DEC, VALS(ipxwan_packet_type_vals), 0x0, NULL,
 	        HFILL }},
 
 	    { &hf_ipxwan_node_id,
 	      { "Node ID", "ipxwan.node_id", FT_UINT32,
-	         BASE_HEX, NULL, 0x0, "", HFILL }},
+	         BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_sequence_number,
 	      { "Sequence Number", "ipxwan.sequence_number", FT_UINT8,
-	         BASE_DEC, NULL, 0x0, "", HFILL }},
+	         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_num_options,
 	      { "Number of Options", "ipxwan.num_options", FT_UINT8,
-	         BASE_DEC, NULL, 0x0, "", HFILL }},
+	         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_option_num,
 	      { "Option Number", "ipxwan.option_num", FT_UINT8,
-	         BASE_HEX, VALS(ipxwan_option_num_vals), 0x0, "", HFILL }},
+	         BASE_HEX, VALS(ipxwan_option_num_vals), 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_accept_option,
 	      { "Accept Option", "ipxwan.accept_option", FT_UINT8,
-	         BASE_DEC, VALS(ipxwan_accept_option_vals), 0x0, "", HFILL }},
+	         BASE_DEC, VALS(ipxwan_accept_option_vals), 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_option_data_len,
 	      { "Option Data Length", "ipxwan.option_data_len", FT_UINT16,
-	         BASE_DEC, NULL, 0x0, "", HFILL }},
+	         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_routing_type,
 	      { "Routing Type", "ipxwan.routing_type", FT_UINT8,
-	         BASE_DEC, VALS(ipxwan_routing_type_vals), 0x0, "", HFILL }},
+	         BASE_DEC, VALS(ipxwan_routing_type_vals), 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_wan_link_delay,
 	      { "WAN Link Delay", "ipxwan.rip_sap_info_exchange.wan_link_delay",
-	         FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+	         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_common_network_number,
 	      { "Common Network Number", "ipxwan.rip_sap_info_exchange.common_network_number",
-	         FT_IPXNET, BASE_NONE, NULL, 0x0, "", HFILL }},
+	         FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_router_name,
 	      { "Router Name", "ipxwan.rip_sap_info_exchange.router_name",
-	         FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+	         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_delay,
 	      { "Delay", "ipxwan.nlsp_information.delay",
-	         FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+	         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_throughput,
 	      { "Throughput", "ipxwan.nlsp_information.throughput",
-	         FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+	         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_request_size,
 	      { "Request Size", "ipxwan.nlsp_raw_throughput_data.request_size",
-	         FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+	         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_delta_time,
 	      { "Delta Time", "ipxwan.nlsp_raw_throughput_data.delta_time",
-	         FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+	         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_extended_node_id,
 	      { "Extended Node ID", "ipxwan.extended_node_id",
-	         FT_IPXNET, BASE_NONE, NULL, 0x0, "", HFILL }},
+	         FT_IPXNET, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_node_number,
 	      { "Node Number", "ipxwan.node_number",
-	         FT_ETHER, BASE_NONE, NULL, 0x0, "", HFILL }},
+	         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_ipxwan_compression_type,
 	      { "Compression Type", "ipxwan.compression.type",
 	         FT_UINT8, BASE_DEC, VALS(ipxwan_compression_type_vals), 0x0,
-	         "", HFILL }},
+	         NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_ipxwan,
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 1f7270b589..92800780de 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -3709,11 +3709,11 @@ proto_register_isakmp(void)
   static hf_register_info hf[] = {
     { &hf_isakmp_icookie,
       { "Initiator cookie", "isakmp.icookie",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "ISAKMP Initiator Cookie", HFILL }},
     { &hf_isakmp_rcookie,
       { "Responder cookie", "isakmp.rcookie",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "ISAKMP Responder Cookie", HFILL }},
     { &hf_isakmp_nextpayload,
       { "Next payload", "isakmp.nextpayload",
@@ -3749,7 +3749,7 @@ proto_register_isakmp(void)
         "ISAKMP Domain of Interpretation", HFILL }},
     { &hf_isakmp_sa_situation,
       { "Situation", "isakmp.sa.situation",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
+        FT_BYTES, BASE_NONE, NULL, 0x0,
         "ISAKMP SA Situation", HFILL }},
     { &hf_isakmp_prop_number,
       { "Proposal number", "isakmp.prop.number",
@@ -3823,18 +3823,18 @@ proto_register_isakmp(void)
             FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
     { &hf_isakmp_fragment_overlap,
             {"Message fragment overlap", "msg.fragment.overlap",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_isakmp_fragment_overlap_conflicts,
             {"Message fragment overlapping with conflicting data",
             "msg.fragment.overlap.conflicts",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_isakmp_fragment_multiple_tails,
             {"Message has multiple tail fragments",
             "msg.fragment.multiple_tails",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_isakmp_fragment_too_long_fragment,
             {"Message fragment too long", "msg.fragment.too_long_fragment",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_isakmp_fragment_error,
             {"Message defragmentation error", "msg.fragment.error",
             FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
@@ -3842,13 +3842,13 @@ proto_register_isakmp(void)
             {"Reassembled in", "msg.reassembled.in",
             FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
     { &hf_isakmp_certificate_authority,
-      { "Certificate Authority Distinguished Name", "ike.cert_authority_dn", FT_UINT32, BASE_DEC, NULL, 0x0, "Certificate Authority Distinguished Name", HFILL }
+      { "Certificate Authority Distinguished Name", "ike.cert_authority_dn", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
     { &hf_isakmp_v2_certificate_authority,
-      { "Certificate Authority", "ike.cert_authority", FT_BYTES, BASE_HEX, NULL, 0x0, "SHA-1 hash of the Certificate Authority", HFILL }
+      { "Certificate Authority", "ike.cert_authority", FT_BYTES, BASE_NONE, NULL, 0x0, "SHA-1 hash of the Certificate Authority", HFILL }
     },
     { &hf_isakmp_nat_keepalive,
-      { "NAT Keepalive", "ike.nat_keepalive", FT_NONE, BASE_HEX, NULL, 0x0, "NAT Keepalive packet", HFILL }
+      { "NAT Keepalive", "ike.nat_keepalive", FT_NONE, BASE_NONE, NULL, 0x0, "NAT Keepalive packet", HFILL }
     },
   };
 
diff --git a/epan/dissectors/packet-iscsi.c b/epan/dissectors/packet-iscsi.c
index 300e727b08..7058d19428 100644
--- a/epan/dissectors/packet-iscsi.c
+++ b/epan/dissectors/packet-iscsi.c
@@ -2399,7 +2399,7 @@ proto_register_iscsi(void)
 
 	{ &hf_iscsi_AHS,
 	  { "AHS", "iscsi.ahs",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Additional header segment", HFILL }
 	},
 	{ &hf_iscsi_AHS_length,
@@ -2410,7 +2410,7 @@ proto_register_iscsi(void)
 	{ &hf_iscsi_AHS_read_data_length,
 	  { "Bidirectional Read Data Length", "iscsi.ahs.bidir.length",
 	    FT_UINT32, BASE_DEC, NULL, 0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_AHS_type,
 	  { "AHS Type", "iscsi.ahs.type",
@@ -2419,52 +2419,52 @@ proto_register_iscsi(void)
 	},
 	{ &hf_iscsi_AHS_extended_cdb,
 	  { "AHS Extended CDB", "iscsi.ahs.extended_cdb",
-	    FT_BYTES, BASE_HEX, NULL, 0,
-	    "", HFILL }
+	    FT_BYTES, BASE_NONE, NULL, 0,
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_AHS_blob,
 	  { "Unknown AHS blob", "iscsi.ahs.unknown_blob",
-	    FT_BYTES, BASE_HEX, NULL, 0,
-	    "", HFILL }
+	    FT_BYTES, BASE_NONE, NULL, 0,
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_Padding,
 	  { "Padding", "iscsi.padding",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Padding to 4 byte boundary", HFILL }
 	},
 	{ &hf_iscsi_ping_data,
 	  { "PingData", "iscsi.pingdata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Ping Data", HFILL }
 	},
 	{ &hf_iscsi_immediate_data,
 	  { "ImmediateData", "iscsi.immediatedata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Immediate Data", HFILL }
 	},
 	{ &hf_iscsi_write_data,
 	  { "WriteData", "iscsi.writedata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Write Data", HFILL }
 	},
 	{ &hf_iscsi_read_data,
 	  { "ReadData", "iscsi.readdata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Read Data", HFILL }
 	},
 	{ &hf_iscsi_error_pdu_data,
 	  { "ErrorPDUData", "iscsi.errorpdudata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Error PDU Data", HFILL }
 	},
 	{ &hf_iscsi_async_event_data,
 	  { "AsyncEventData", "iscsi.asynceventdata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Async Event Data", HFILL }
 	},
 	{ &hf_iscsi_vendor_specific_data,
 	  { "VendorSpecificData", "iscsi.vendorspecificdata",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Vendor Specific Data", HFILL }
 	},
 	{ &hf_iscsi_HeaderDigest32,
@@ -2474,7 +2474,7 @@ proto_register_iscsi(void)
 	},
 	{ &hf_iscsi_DataDigest,
 	  { "DataDigest", "iscsi.datadigest",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Data Digest", HFILL }
 	},
 	{ &hf_iscsi_DataDigest32,
@@ -2485,7 +2485,7 @@ proto_register_iscsi(void)
 	{ &hf_iscsi_Opcode,
 	  { "Opcode", "iscsi.opcode",
 	    FT_UINT8, BASE_HEX, VALS(iscsi_opcodes), 0,
-	    "Opcode", HFILL }
+	    NULL, HFILL }
 	},
 /* #ifdef DRAFT08 */
 	{ &hf_iscsi_X,
@@ -2546,7 +2546,7 @@ proto_register_iscsi(void)
 	},
 	{ &hf_iscsi_LUN,
 	  { "LUN", "iscsi.lun",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Logical Unit Number", HFILL }
 	},
 	{ &hf_iscsi_InitiatorTaskTag,
@@ -2703,7 +2703,7 @@ proto_register_iscsi(void)
 /* #else */
 	{ &hf_iscsi_ISID,
 	  { "ISID", "iscsi.isid",
-	    FT_BYTES, BASE_HEX, NULL, 0,
+	    FT_BYTES, BASE_NONE, NULL, 0,
 	    "Initiator part of session identifier", HFILL }
 	},
 /* #ifdef DRAFT09 */
@@ -2804,7 +2804,7 @@ proto_register_iscsi(void)
 	},
 	{ &hf_iscsi_KeyValue,
 	  { "KeyValue", "iscsi.keyvalue",
-	    FT_STRING, 0, NULL, 0,
+	    FT_STRING, BASE_NONE, NULL, 0,
 	    "Key/value pair", HFILL }
 	},
 	{ &hf_iscsi_Text_F,
@@ -2830,7 +2830,7 @@ proto_register_iscsi(void)
 	{ &hf_iscsi_TaskManagementFunction_Response,
 	  { "Response", "iscsi.taskmanfun.response",
 	    FT_UINT8, BASE_HEX, VALS(iscsi_task_management_responses), 0,
-	    "Response", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_TaskManagementFunction_ReferencedTaskTag,
 	  { "ReferencedTaskTag", "iscsi.taskmanfun.referencedtasktag",
@@ -2860,12 +2860,12 @@ proto_register_iscsi(void)
 	{ &hf_iscsi_Time2Wait,
 	  { "Time2Wait", "iscsi.time2wait",
 	    FT_UINT16, BASE_HEX, NULL, 0,
-	    "Time2Wait", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_Time2Retain,
 	  { "Time2Retain", "iscsi.time2retain",
 	    FT_UINT16, BASE_HEX, NULL, 0,
-	    "Time2Retain", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_iscsi_DesiredDataLength,
 	  { "DesiredDataLength", "iscsi.desireddatalength",
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c
index 6f28c4cbcf..82f1d24c10 100644
--- a/epan/dissectors/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
@@ -187,7 +187,7 @@ proto_register_isdn(void)
 	static hf_register_info hf[] = {
 		{ &hf_isdn_channel,
 		{ "Channel",	"isdn.channel", FT_UINT8, BASE_DEC,
-		  VALS(channel_vals), 0x0, "", HFILL }},
+		  VALS(channel_vals), 0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_isdn,
diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c
index 66cd024e19..d544dd7891 100644
--- a/epan/dissectors/packet-isis-hello.c
+++ b/epan/dissectors/packet-isis-hello.c
@@ -949,52 +949,52 @@ void
 isis_register_hello(int proto_isis) {
 	static hf_register_info hf[] = {
 		{ &hf_isis_hello_circuit_reserved,
-		{ "Circuit type              ", "isis.hello.circuit_type",
-			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Circuit type", "isis.hello.circuit_type",
+			FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_source_id,
-		{ "SystemID{ Sender of PDU } ", "isis.hello.source_id",
-			FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "SystemID{ Sender of PDU }", "isis.hello.source_id",
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_holding_timer,
-		{ "Holding timer             ", "isis.hello.holding_timer",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Holding timer", "isis.hello.holding_timer",
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_pdu_length,
-		{ "PDU length                ", "isis.hello.pdu_length",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "PDU length", "isis.hello.pdu_length",
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_priority_reserved,
-		 { "Priority                 ", "isis.hello.priority",
-			FT_UINT8, BASE_DEC, NULL, ISIS_HELLO_P_RESERVED_MASK, "", HFILL }},
+		 { "Priority", "isis.hello.priority",
+			FT_UINT8, BASE_DEC, NULL, ISIS_HELLO_P_RESERVED_MASK, NULL, HFILL }},
 
 		{ &hf_isis_hello_lan_id,
-		{ "SystemID{ Designated IS } ", "isis.hello.lan_id",
-			FT_BYTES, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "SystemID{ Designated IS }", "isis.hello.lan_id",
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_local_circuit_id,
-		{ "Local circuit ID          ", "isis.hello.local_circuit_id",
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Local circuit ID", "isis.hello.local_circuit_id",
+			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_ipv4_int_addr,
-		{ "IPv4 interface address    ", "isis.hello.clv_ipv4_int_addr",
-			FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "IPv4 interface address", "isis.hello.clv_ipv4_int_addr",
+			FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_ipv6_int_addr,
-		{ "IPv6 interface address    ", "isis.hello.clv_ipv6_int_addr",
-			FT_IPv6, BASE_NONE, NULL, 0x0, "", HFILL }},
+		{ "IPv6 interface address", "isis.hello.clv_ipv6_int_addr",
+			FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_ptp_adj,
-		{ "Point-to-point Adjacency  ", "isis.hello.clv_ptp_adj",
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		{ "Point-to-point Adjacency", "isis.hello.clv_ptp_adj",
+			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_mt,
-		{ "MT-ID                     ", "isis.hello.clv_mt",
-			FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "MT-ID", "isis.hello.clv_mt",
+			FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_restart_flags,
-		{ "Restart Signaling Flags   ", "isis.hello.clv_restart_flags",
-			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "Restart Signaling Flags", "isis.hello.clv_restart_flags",
+			FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_hello_clv_restart_flags_rr,
 		{ "Restart Request", "isis.hello.clv_restart_flags.rr",
@@ -1018,7 +1018,7 @@ isis_register_hello(int proto_isis) {
 
 		{ &hf_isis_hello_clv_restart_neighbor,
 		{ "Restarting Neighbor ID", "isis.hello.clv_restart.neighbor",
-			FT_BYTES, BASE_DEC, NULL, 0x0, 
+			FT_BYTES, BASE_NONE, NULL, 0x0, 
 			"The System ID of the restarting neighbor", HFILL }}
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 1f14a7b849..705f1b2b9c 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -1920,51 +1920,51 @@ isis_register_lsp(int proto_isis) {
 	static hf_register_info hf[] = {
 		{ &hf_isis_lsp_pdu_length,
 		{ "PDU length",		"isis.lsp.pdu_length", FT_UINT16,
-		  BASE_DEC, NULL, 0x0, "", HFILL }},
+		  BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_remaining_life,
 		{ "Remaining lifetime",	"isis.lsp.remaining_life", FT_UINT16,
-		  BASE_DEC, NULL, 0x0, "", HFILL }},
+		  BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_lsp_id,
 		{ "LSP-ID", "isis.lsp.lsp_id", FT_STRING,
-		  BASE_NONE, NULL, 0x0, "", HFILL }},
+		  BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_hostname,
 		{ "Hostname", "isis.lsp.hostname", FT_STRING,
-		  BASE_NONE, NULL, 0x0, "", HFILL }},
+		  BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_sequence_number,
 		{ "Sequence number",           "isis.lsp.sequence_number",
-		  FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		  FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_checksum,
 		{ "Checksum",		"isis.lsp.checksum",FT_UINT16,
-		  BASE_HEX, NULL, 0x0, "", HFILL }},
+		  BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		  
 		{ &hf_isis_lsp_checksum_good,
 		{ "Good Checksum", "isis.lsp.checksum_good", FT_BOOLEAN, BASE_NONE,
-			NULL, 0, "Good IS-IS LSP Checksum", HFILL }},
+			NULL, 0x0, "Good IS-IS LSP Checksum", HFILL }},
 
 		{ &hf_isis_lsp_checksum_bad,
 		{ "Bad Checksum", "isis.lsp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-			NULL, 0, "Bad IS-IS LSP Checksum", HFILL }},
+			NULL, 0x0, "Bad IS-IS LSP Checksum", HFILL }},
 
 		{ &hf_isis_lsp_clv_ipv4_int_addr,
 		{ "IPv4 interface address", "isis.lsp.clv_ipv4_int_addr", FT_IPv4,
-		   BASE_NONE, NULL, 0x0, "", HFILL }},
+		   BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_clv_ipv6_int_addr,
 		{ "IPv6 interface address", "isis.lsp.clv_ipv6_int_addr", FT_IPv6,
-		   BASE_NONE, NULL, 0x0, "", HFILL }},
+		   BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_clv_te_router_id,
 		{ "Traffic Engineering Router ID", "isis.lsp.clv_te_router_id", FT_IPv4,
-		   BASE_NONE, NULL, 0x0, "", HFILL }},
+		   BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_clv_mt,
-		{ "MT-ID                     ", "isis.lsp.clv_mt",
-			FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		{ "MT-ID", "isis.lsp.clv_mt",
+			FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_isis_lsp_p,
 		{ "Partition Repair",	"isis.lsp.partition_repair", FT_BOOLEAN, 8,
@@ -1974,7 +1974,7 @@ isis_register_lsp(int proto_isis) {
 		{ &hf_isis_lsp_att,
 		{ "Attachment",	"isis.lsp.att", FT_UINT8, BASE_DEC,
 			NULL, ISIS_LSP_ATT_MASK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_isis_lsp_hippity,
 		{ "Overload bit",	"isis.lsp.overload", FT_BOOLEAN, 8,
@@ -1984,7 +1984,7 @@ isis_register_lsp(int proto_isis) {
 		{ &hf_isis_lsp_is_type,
 		{ "Type of Intermediate System",	"isis.lsp.is_type", FT_UINT8, BASE_DEC,
 			VALS(isis_lsp_istype_vals), ISIS_LSP_IS_TYPE_MASK,
-			"", HFILL }}
+			NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_isis_lsp,
diff --git a/epan/dissectors/packet-isis-snp.c b/epan/dissectors/packet-isis-snp.c
index 7c6bcd53c0..767ee9a94a 100644
--- a/epan/dissectors/packet-isis-snp.c
+++ b/epan/dissectors/packet-isis-snp.c
@@ -578,7 +578,7 @@ isis_register_psnp(int proto_isis) {
 	static hf_register_info hf[] = {
 		{ &hf_isis_psnp_pdu_length,
 		{ "PDU length",		"isis.psnp.pdu_length", FT_UINT16,
-		  BASE_DEC, NULL, 0x0, "", HFILL }},
+		  BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_isis_psnp,
diff --git a/epan/dissectors/packet-isis.c b/epan/dissectors/packet-isis.c
index bbfec8227b..a020255078 100644
--- a/epan/dissectors/packet-isis.c
+++ b/epan/dissectors/packet-isis.c
@@ -267,34 +267,34 @@ proto_register_isis(void) {
   static hf_register_info hf[] = {
     { &hf_isis_irpd,
       { "Intra Domain Routing Protocol Discriminator",	"isis.irpd",
-        FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }},
+        FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, NULL, HFILL }},
 
     { &hf_isis_header_length,
-      { "PDU Header Length  ", "isis.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "PDU Header Length", "isis.len", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_isis_version,
-      { "Version (==1)      ", "isis.version", FT_UINT8,
-         BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Version (==1)", "isis.version", FT_UINT8,
+         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_isis_system_id_length,
-      { "System ID Length   ", "isis.sysid_len",
-        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "System ID Length", "isis.sysid_len",
+        FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_isis_type,
-      { "PDU Type           ", "isis.type", FT_UINT8, BASE_DEC,
-        VALS(isis_vals), 0xff, "", HFILL }},
+      { "PDU Type", "isis.type", FT_UINT8, BASE_DEC,
+        VALS(isis_vals), 0xff, NULL, HFILL }},
 
     { &hf_isis_version2,
-      { "Version2 (==1)     ", "isis.version2", FT_UINT8, BASE_DEC, NULL,
-        0x0, "", HFILL }},
+      { "Version2 (==1)", "isis.version2", FT_UINT8, BASE_DEC, NULL,
+        0x0, NULL, HFILL }},
 
     { &hf_isis_reserved,
-      { "Reserved (==0)     ", "isis.reserved", FT_UINT8, BASE_DEC, NULL,
-        0x0, "", HFILL }},
+      { "Reserved (==0)", "isis.reserved", FT_UINT8, BASE_DEC, NULL,
+        0x0, NULL, HFILL }},
 
     { &hf_isis_max_area_adr,
-      { "Max.AREAs: (0==3)  ", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL,
-      0x0, "", HFILL }},
+      { "Max.AREAs: (0==3)", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL,
+      0x0, NULL, HFILL }},
 
     };
     /*
diff --git a/epan/dissectors/packet-isl.c b/epan/dissectors/packet-isl.c
index 1462f07ffc..05a6188ecd 100644
--- a/epan/dissectors/packet-isl.c
+++ b/epan/dissectors/packet-isl.c
@@ -332,11 +332,11 @@ proto_register_isl(void)
 {
   static hf_register_info hf[] = {
 	{ &hf_isl_dst,
-	{ "Destination",	"isl.dst", FT_BYTES, BASE_HEX, NULL, 0x0,
+	{ "Destination",	"isl.dst", FT_BYTES, BASE_NONE, NULL, 0x0,
 		"Destination Address", HFILL }},
 	{ &hf_isl_type,
 	{ "Type",		"isl.type", FT_UINT8, BASE_DEC,
-		VALS(type_vals), 0xF0, "Type", HFILL }},
+		VALS(type_vals), 0xF0, NULL, HFILL }},
 	{ &hf_isl_user_eth,
 	{ "User",		"isl.user_eth", FT_UINT8, BASE_DEC,
 		VALS(ether_user_vals), 0x0F, "Priority (for Ethernet)", HFILL }},
@@ -351,7 +351,7 @@ proto_register_isl(void)
 		"Source or Destination Hardware Address", HFILL }},
 	{ &hf_isl_len,
 	{ "Length",		"isl.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 	{ &hf_isl_hsa,
 	{ "HSA",		"isl.hsa", FT_UINT24, BASE_HEX, NULL, 0x0,
 		"High bits of source address", HFILL }},
@@ -372,7 +372,7 @@ proto_register_isl(void)
 		0xFFFE, "Source Virtual LAN ID", HFILL }},
 	{ &hf_isl_explorer,
 	{ "Explorer",		"isl.explorer", FT_BOOLEAN, 16,
-		TFS(&explorer_tfs), 0x0001, "Explorer", HFILL }},
+		TFS(&explorer_tfs), 0x0001, NULL, HFILL }},
 	{ &hf_isl_dst_route_descriptor,
 	{ "Destination route descriptor",	"isl.dst_route_desc",
 		FT_UINT16, BASE_HEX, NULL, 0x0,
diff --git a/epan/dissectors/packet-ismacryp.c b/epan/dissectors/packet-ismacryp.c
index 28b7c94ae0..461996b64f 100644
--- a/epan/dissectors/packet-ismacryp.c
+++ b/epan/dissectors/packet-ismacryp.c
@@ -775,11 +775,11 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }},
 		
 		{ &hf_ismacryp_iv,
-		  { "IV", "ismacryp.iv", FT_BYTES, BASE_HEX, NULL, 0x0, /* variable length */
+		  { "IV", "ismacryp.iv", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_delta_iv,
-		  { "Delta IV", "ismacryp.delta_iv", FT_BYTES, BASE_HEX, NULL, 0x0, /* variable length */
+		  { "Delta IV", "ismacryp.delta_iv", FT_BYTES, BASE_NONE, NULL, 0x0, /* variable length */
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_key_indicator,
@@ -807,7 +807,7 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_cts_flag,
-		  { "CTS flag", "ismacryp.cts_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "CTS flag", "ismacryp.cts_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_dts_delta,
@@ -815,11 +815,11 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_dts_flag,
-		  { "DTS flag", "ismacryp.dts_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "DTS flag", "ismacryp.dts_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 				 
 		{ &hf_ismacryp_rap_flag,
-		  { "RAP flag", "ismacryp.rap_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "RAP flag", "ismacryp.rap_flag", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_stream_state,
@@ -827,11 +827,11 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_au_is_encrypted,
-		  { "AU_is_encrypted flag", "ismacryp.au_is_encrypted", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "AU_is_encrypted flag", "ismacryp.au_is_encrypted", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 		
 		{ &hf_ismacryp_slice_start,
-		  { "Slice_start flag", "ismacryp.slice_start", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "Slice_start flag", "ismacryp.slice_start", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_slice_end,
@@ -839,7 +839,7 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_padding_bitcount,
-		  { "Padding_bitcount bits", "ismacryp.padding_bitcount", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "Padding_bitcount bits", "ismacryp.padding_bitcount", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_ismacryp_padding,
@@ -847,11 +847,11 @@ void proto_register_ismacryp (void)
 		    NULL, HFILL }}, 
 		
 		{ &hf_ismacryp_reserved_bits,
-		  { "Reserved bits", "ismacryp.reserved", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "Reserved bits", "ismacryp.reserved", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 		 
 		{ &hf_ismacryp_unused_bits,
-		  { "Unused bits", "ismacryp.unused", FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+		  { "Unused bits", "ismacryp.unused", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }}
 	};
 	
diff --git a/epan/dissectors/packet-ismp.c b/epan/dissectors/packet-ismp.c
index ef92c960c4..46bb899ba6 100644
--- a/epan/dissectors/packet-ismp.c
+++ b/epan/dissectors/packet-ismp.c
@@ -557,282 +557,282 @@ proto_register_ismp(void)
 		{ &hf_ismp_version,
 			{ "Version",           "ismp.version",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_message_type,
 			{ "Message Type", "ismp.msgtype",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_seq_num,
 			{ "Sequence Number", "ismp.seqnum",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_code_length,
 			{ "Auth Code Length", "ismp.codelen",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		}, 
 		{ &hf_ismp_auth_data,
 			{ "Auth Data", "ismp.authdata",
-			FT_BYTES, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_version,
 			{ "Version", "ismp.edp.version",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_module_ip,
 			{ "Module IP Address", "ismp.edp.modip",
 			FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_module_mac,
 			{ "Module MAC Address", "ismp.edp.modmac",
 			FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_module_port,
 			{ "Module Port (ifIndex num)", "ismp.edp.modport",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_chassis_mac,
 			{ "Chassis MAC Address", "ismp.edp.chassismac",
 			FT_ETHER, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_chassis_ip,
 			{ "Chassis IP Address", "ismp.edp.chassisip",
 			FT_IPv4, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_device_type,
 			{ "Device Type", "ismp.edp.devtype",
 			FT_UINT16, BASE_DEC, edp_device_types, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_module_rev,
 			{ "Module Firmware Revision", "ismp.edp.rev",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_options,
 			{ "Device Options", "ismp.edp.opts",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_unused1,
 			{ "Unused", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UNUSED1,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_sfssup,
 			{ "SFS Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_SFSSUP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_lsp,
 			{ "LSP Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_LSP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_flood,
 			{ "Flood Path Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_FLOOD,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_resolve,
 			{ "Resolve Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_RESOLVE,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_unused2,
 			{ "Unused", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UNUSED2,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_tagflood,
 			{ "Tagged Flood Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_TAGFLOOD,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_calltap,
 			{ "Call Tap Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_CALLTAP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_conmsg,
 			{ "Connection Message Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_CONMSG,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_redun,
 			{ "Redundant Access Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_REDUN,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_isolated,
 			{ "Isolated Switch", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_ISOLATED,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_switch,
 			{ "Uplink Switch", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_SWITCH,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_core,
 			{ "Uplink Core", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_CORE,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_port,
 			{ "Uplink Port", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_PORT,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_sfs_option_uplink_flood,
 			{ "Uplink Flood Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SFS_OPTION_UPLINK_FLOOD,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_ssr,
 			{ "SSR Type Device", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_SSR,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_igmp,
 			{ "IGMP Active", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_IGMP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_rip,
 			{ "RIP Active", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_RIP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_bgp,
 			{ "BGP Active", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_BGP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_ospf,
 			{ "OSPF Active", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_OSPF,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_dvmrp,
 			{ "DVMRP Active", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_DVMRP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_8021q,
 			{ "802.1Q Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_8021Q,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_gvrp,
 			{ "GVRP Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_GVRP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_gmrp,
 			{ "GMRP Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_GMRP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_igmp_snoop,
 			{ "IGMP Snooping Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_IGMP_SNOOP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_route,
 			{ "Route Bridging", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_ROUTE,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_trans,
 			{ "Transparent Bridging", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_TRANS,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_rtr_option_level1,
 			{ "Level 1 Functionality", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_RTR_OPTION_LEVEL1,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_8021q,
 			{ "802.1Q Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_8021Q,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_gvrp,
 			{ "GVRP Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_GVRP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_gmrp,
 			{ "GMRP Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_GMRP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_igmp,
 			{ "IGMP Snooping Support", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_IGMP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_route,
 			{ "Route Bridging", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_ROUTE,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_trans,
 			{ "Transparent Bridging", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_TRANS,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_switch_option_level1,
 			{ "Level 1 Functionality", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_SWITCH_OPTION_LEVEL1,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_dhcp,
 			{ "DHCP Enabled", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_DHCP,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_dns,
 			{ "DNS Enabled", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_DNS,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_end_station_option_ad,
 			{ "Active Directory Enabled", "ismp.edp.opts",
 			FT_BOOLEAN, 32, TFS(&is_set), EDP_END_STATION_OPTION_AD,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_num_neighbors,
 			{ "Number of Known Neighbors", "ismp.edp.maccount",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_neighbors,
 			{ "Neighbors", "ismp.edp.nbrs",
 			FT_BYTES, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_num_tuples,
 			{ "Number of Tuples", "ismp.edp.numtups",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_ismp_edp_tuples,
 			{ "Number of Tuples", "ismp.edp.tups",
 			FT_BYTES, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-isns.c b/epan/dissectors/packet-isns.c
index 30807b8155..a7bdcfeddf 100644
--- a/epan/dissectors/packet-isns.c
+++ b/epan/dissectors/packet-isns.c
@@ -1485,32 +1485,32 @@ void proto_register_isns(void)
 	    "iSNS Flags" ,HFILL}
 	},
 	{ &hf_isns_client,
-	  { "Client    ","isns.flags.client",
+	  { "Client","isns.flags.client",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_client), ISNS_FLAGS_CLIENT,
 	    "iSNS Client" ,HFILL}
 	},
 	{ &hf_isns_server,
-	  { "Server    ","isns.flags.server",
+	  { "Server","isns.flags.server",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_server), ISNS_FLAGS_SERVER,
 	    "iSNS Server" ,HFILL}
 	},
 	{ &hf_isns_auth,
-	  { "Auth      ","isns.flags.authentication_block",
+	  { "Auth","isns.flags.authentication_block",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_auth), ISNS_FLAGS_AUTH,
 	    "is iSNS Authentication Block present?" ,HFILL}
 	},
 	{ &hf_isns_replace,
-	  { "Replace   ","isns.flags.replace",
+	  { "Replace","isns.flags.replace",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_replace), ISNS_FLAGS_REPLACE,
 	    "iSNS Replace" ,HFILL}
 	},
 	{ &hf_isns_last_pdu,
-	  { "Last PDU  ","isns.flags.lastpdu",
+	  { "Last PDU","isns.flags.lastpdu",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_last_pdu), ISNS_FLAGS_LAST_PDU,
 	    "iSNS Last PDU" ,HFILL}
 	},
 	{ &hf_isns_first_pdu,
-	  { "First PDU ","isns.flags.firstpdu",
+	  { "First PDU","isns.flags.firstpdu",
 	    FT_BOOLEAN, 16, TFS(&isns_flag_first_pdu), ISNS_FLAGS_FIRST_PDU,
 	    "iSNS First PDU",HFILL }
 	},
@@ -1543,7 +1543,7 @@ void proto_register_isns(void)
 	{ &hf_isns_iscsi_node_type,
 	  { "iSCSI Node Type","isns.iscsi.node_type",
 	    FT_UINT32, BASE_HEX, NULL, 0,
-	    "iSCSI Node Type", HFILL }
+	    NULL, HFILL }
 	},
 
 	{ &hf_isns_esi_port,
@@ -1573,48 +1573,48 @@ void proto_register_isns(void)
 	{ &hf_isns_port_type,
 	  { "Port Type","isns.port.port_type",
 	    FT_BOOLEAN, 16, TFS(&isns_port_type), 0x01, /* bit 15 (or bit 1 of a 16bit word) */
-	    "Port Type",HFILL }
+	    NULL,HFILL }
 	},
 
 	{ &hf_isns_psb,
 	  { "Portal Security Bitmap","isns.psb",
 	    FT_UINT32, BASE_HEX, NULL, 0,
-	    "Portal Security Bitmap", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_isns_psb_tunnel_mode,
-	  { "Tunnel Mode     ","isns.psb.tunnel",
+	  { "Tunnel Mode","isns.psb.tunnel",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_tunnel_mode),     0x0040, /* bit 25 */
 	    "Tunnel Mode Preferred",HFILL }
 	},
 	{ &hf_isns_psb_transport_mode,
-	  { "Transport Mode  ","isns.psb.transport",
+	  { "Transport Mode","isns.psb.transport",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_transport_mode),  0x0020, /* bit 26 */
-	    "Transport Mode",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_psb_pfs,
-	  { "PFS             ","isns.psb.pfs",
+	  { "PFS","isns.psb.pfs",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_pfs),        0x0010, /* bit 27 */
-	    "PFS",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_psb_aggressive_mode,
-	  { "Aggressive Mode ","isns.psb.aggressive_mode",
+	  { "Aggressive Mode","isns.psb.aggressive_mode",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_aggressive_mode), 0x0008, /* bit 28 */
-	    "Aggressive Mode",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_psb_main_mode,
-	  { "Main Mode       ","isns.psb.main_mode",
+	  { "Main Mode","isns.psb.main_mode",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_main_mode),  0x0004, /* bit 29 */
-	    "Main Mode",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_psb_ike_ipsec,
-	  { "IKE/IPSec       ","isns.psb.ike_ipsec",
+	  { "IKE/IPSec","isns.psb.ike_ipsec",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_ike_ipsec),  0x0002, /* bit 30 */
-	    "IKE/IPSec",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_psb_bitmap,
-	  { "Bitmap          ","isns.psb.bitmap",
+	  { "Bitmap","isns.psb.bitmap",
 	    FT_BOOLEAN, 32, TFS(&isns_psb_bitmap),     0x0001, /* bit 31 */
-	    "Bitmap",HFILL }
+	    NULL,HFILL }
 	},
 
 
@@ -1622,64 +1622,64 @@ void proto_register_isns(void)
 	{ &hf_isns_scn_bitmap,
 	  { "iSCSI SCN Bitmap","isns.scn_bitmap",
 	    FT_UINT32, BASE_HEX, NULL, 0,
-	    "iSCSI SCN Bitmap", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_isns_scn_bitmap_initiator_and_self_information_only,
 	  { "Initiator And Self Information Only","isns.scn_bitmap.initiator_and_self_information_only",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_initiator_and_self_information_only),     0x0080, /* bit 24 */
-	    "Initiator And Self Information Only",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_target_and_self_information_only,
 	  { "Target And Self Information Only","isns.scn_bitmap.target_and_self_information_only",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_target_and_self_information_only),     0x0040, /* bit 25 */
-	    "Target And Self Information Only",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_management_registration_scn,
 	  { "Management Registration/SCN","isns.scn_bitmap.management_registration_scn",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_management_registration_scn),     0x0020, /* bit 26 */
-	    "Management Registration/SCN",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_object_removed,
 	  { "Object Removed","isns.scn_bitmap.object_removed",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_object_removed),     0x0010, /* bit 27 */
-	    "Object Removed",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_object_added,
 	  { "Object Added","isns.scn_bitmap.object_added",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_object_added),     0x0008, /* bit 28 */
-	    "Object Added",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_object_updated,
 	  { "Object Updated","isns.scn_bitmap.object_updated",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_object_updated),     0x0004, /* bit 29 */
-	    "Object Updated",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_dd_dds_member_removed,
 	  { "DD/DDS Member Removed (Mgmt Reg/SCN only)","isns.scn_bitmap.dd_dds_member_removed",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_dd_dds_member_removed),     0x0002, /* bit 30 */
-	    "DD/DDS Member Removed (Mgmt Reg/SCN only)",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_scn_bitmap_dd_dds_member_added,
 	  { "DD/DDS Member Added (Mgmt Reg/SCN only)","isns.scn_bitmap.dd_dds_member_added",
 	    FT_BOOLEAN, 32, TFS(&isns_scn_bitmap_dd_dds_member_added),     0x0001, /* bit 31 */
-	    "DD/DDS Member Added (Mgmt Reg/SCN only)",HFILL }
+	    NULL,HFILL }
 	},
 
 
 	{ &hf_isns_isnt_control,
-	  { "Control   ","isns.isnt.control",
+	  { "Control","isns.isnt.control",
 	    FT_BOOLEAN, 32, TFS(&isns_isnt_control),  0x0004, /* bit 29 */
-	    "Control",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_isnt_initiator,
-	  { "Initiator ","isns.isnt.initiator",
+	  { "Initiator","isns.isnt.initiator",
 	    FT_BOOLEAN, 32, TFS(&isns_isnt_initiator),  0x0002, /* bit 30 */
-	    "Initiator",HFILL }
+	    NULL,HFILL }
 	},
 	{ &hf_isns_isnt_target,
-	  { "Target    ","isns.isnt.target",
+	  { "Target","isns.isnt.target",
 	    FT_BOOLEAN, 32, TFS(&isns_isnt_target),     0x0001, /* bit 31 */
-	    "Target",HFILL }
+	    NULL,HFILL }
 	},
 
 
@@ -1757,7 +1757,7 @@ void proto_register_isns(void)
 	{ &hf_isns_proxy_iscsi_name,
 	  { "Proxy iSCSI Name","isns.proxy_iscsi_name",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-	    "Proxy iSCSI Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_fc4_descriptor,
 	  { "FC4 Descriptor","isns.fc4_descriptor",
@@ -1832,7 +1832,7 @@ void proto_register_isns(void)
 	{ &hf_isns_pg_iscsi_name,
 	  { "PG iSCSI Name","isns.pg_iscsi_name",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-	    "PG iSCSI Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_pg_portal_ip_addr,
 	  { "PG Portal IP Address","isns.pg_portal.ip_address",
@@ -1842,112 +1842,112 @@ void proto_register_isns(void)
 	{ &hf_isns_pg_index,
 	  { "PG Index","isns.pg_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "PG Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_pg_next_index,
 	  { "PG Next Index","isns.pg_next_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "PG Next Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_dd_id_next_id,
 	  { "DD ID Next ID","isns.index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "DD ID Next ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_member_iscsi_index,
 	  { "Member iSCSI Index","isns.member_iscsi_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Member iSCSI Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_member_portal_index,
 	  { "Member Portal Index","isns.member_portal_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Member Portal Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_member_fc_port_name,
 	  { "Member FC Port Name","isns.member_fc_port_name",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Member FC Port Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_vendor_oui,
 	  { "Vendor OUI","isns.index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Vendor OUI", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_preferred_id,
 	  { "Preferred ID","isns.preferred_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Preferred ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_dd_set_id,
 	  { "DD Set ID","isns.dd_set_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "DD Set ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_dd_id,
 	  { "DD ID","isns.dd_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "DD ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_port_id,
 	  { "Port ID","isns.port_id",
 	    FT_UINT24, BASE_HEX, NULL, 0x0,
-	    "Port ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_hard_address,
 	  { "Hard Address","isns.hard_address",
 	    FT_UINT24, BASE_HEX, NULL, 0x0,
-	    "Hard Address", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_wwnn_token,
 	  { "WWNN Token","isns.wwnn_token",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "WWNN Token", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_fc_port_name_wwpn,
 	  { "FC Port Name WWPN","isns.fc_port_name_wwpn",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "FC Port Name WWPN", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_fc_node_name_wwnn,
 	  { "FC Node Name WWNN","isns.fc_node_name_wwnn",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "FC Node Name WWNN", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_node_ipa,
 	  { "Node IPA","isns.node_ipa",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "Node IPA", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_fabric_port_name,
 	  { "Fabric Port Name","isns.fabric_port_name",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "Fabric Port Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_permanent_port_name,
 	  { "Permanent Port Name","isns.permanent_port_name",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "Permanent Port Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_switch_name,
 	  { "Switch Name","isns.switch_name",
 	    FT_UINT64, BASE_HEX, NULL, 0x0,
-	    "Switch Name", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_dd_set_next_id,
 	  { "DD Set Next ID","isns.dd_set_next_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "DD Set Next ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_assigned_id,
 	  { "Assigned ID","isns.assigned_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Assigned ID", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_node_index,
 	  { "Node Index","isns.node.index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Node Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_node_next_index,
 	  { "Node Next Index","isns.node.next_index",
@@ -1957,17 +1957,17 @@ void proto_register_isns(void)
 	{ &hf_isns_portal_index,
 	  { "Portal Index","isns.portal.index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Portal Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_portal_next_index,
 	  { "Portal Next Index","isns.portal.next_index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Portal Next Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_entity_index,
 	  { "Entity Index","isns.entity.index",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "Entity Index", HFILL }},
+	    NULL, HFILL }},
 
 	{ &hf_isns_entity_next_index,
 	  { "Entity Next Index","isns.entity.next_index",
@@ -1996,8 +1996,8 @@ void proto_register_isns(void)
 
 	{ &hf_isns_payload,
           { "Payload", "isns.payload",
-            FT_BYTES, BASE_HEX, NULL, 0,
-            "Payload" ,HFILL}
+            FT_BYTES, BASE_NONE, NULL, 0,
+            NULL ,HFILL}
 	}
     };
 
diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c
index 1ad7904312..385be7bf8a 100644
--- a/epan/dissectors/packet-isup.c
+++ b/epan/dissectors/packet-isup.c
@@ -8287,7 +8287,7 @@ proto_register_bicc(void)
 		{ &hf_bicc_cic,
 			{ "Call identification Code (CIC)",           "bicc.cic",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			  "", HFILL }},
+			  NULL, HFILL }},
 	};
 
 /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-isup_thin.c b/epan/dissectors/packet-isup_thin.c
index c328c8d75c..70a994f9ce 100644
--- a/epan/dissectors/packet-isup_thin.c
+++ b/epan/dissectors/packet-isup_thin.c
@@ -225,7 +225,7 @@ proto_register_isup_thin(void)
 		{ &hf_isup_thin_count_type,
 			{ "Count Type", 		"isup_thin.count.type",
 			FT_UINT8, BASE_DEC,VALS(isup_thin_count_type_vals), 0x80,
-			"Count Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_count,
 			{ "Message length (counted according to bit 0) including the Message Header","isup_thin.count",
@@ -235,47 +235,47 @@ proto_register_isup_thin(void)
 		{ &hf_isup_thin_message_class,
 			{ "Message Class","isup_thin.message.class",
 			FT_UINT8, BASE_DEC,NULL, 0xfc,
-			"Message Class", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_version,
 			{ "Version","isup_thin.count.version",
 			FT_UINT16, BASE_DEC,NULL, 0x0380,
-			"Version", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_message_type,
 			{ "Message Type", 		"isup_thin.message.type",
 			FT_UINT8, BASE_DEC,VALS(isup_thin_message_type_vals), 0x7f,
-			"Message Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_serv_ind,
 			{ "Service Indicator","isup_thin.servind",
 			FT_UINT8, BASE_DEC,NULL, 0xf0,
-			"Service Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_subservind,
 			{ "Sub Service Field (Network Indicator)","isup_thin.subservind",
 			FT_UINT8, BASE_DEC,NULL, 0x0c,
-			"Sub Service Field (Network Indicator)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_priority,
 			{ "Priority","isup_thin.priority",
 			FT_UINT8, BASE_DEC,NULL, 0x03,
-			"Priority", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_sls,
 			{ "Signalling Link Selection","isup_thin.sls",
 			FT_UINT8, BASE_DEC,NULL, 0x0,
-			"Signalling Link Selection", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_opc,
 			{ "Originating Point Code","isup_thin.opc",
 			FT_UINT32, BASE_DEC,NULL, 0x0,
-			"Originating Point Code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_dpc,
 			{ "Destination Point Code","isup_thin.dpc",
 			FT_UINT32, BASE_DEC,NULL, 0x0,
-			"Destination Point Code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_isup_thin_oam_message_name_code,
 			{ "Message Name Code","isup_thin.oam.message.name",
@@ -290,7 +290,7 @@ proto_register_isup_thin(void)
 		{ &hf_isup_thin_isup_length,
 			{ "ISUP message length","isup_thin.isup.message.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"ISUP message length", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-iua.c b/epan/dissectors/packet-iua.c
index 69be0378ba..f5ab067361 100644
--- a/epan/dissectors/packet-iua.c
+++ b/epan/dissectors/packet-iua.c
@@ -903,38 +903,38 @@ proto_register_iua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_int_interface_id,      { "Integer interface identifier", "iua.int_interface_identifier",  FT_UINT32,  BASE_HEX,  NULL,                           0x0,            "", HFILL } },
-    { &hf_text_interface_id,     { "Text interface identifier",    "iua.text_interface_identifier", FT_STRING,  BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_info_string,           { "Info string",                  "iua.info_string",               FT_STRING,  BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_dlci_zero_bit,         { "Zero bit",                     "iua.dlci_zero_bit",             FT_BOOLEAN, 8,         NULL,                           ZERO_BIT_MASK,  "", HFILL } },
-    { &hf_dlci_spare_bit,        { "Spare bit",                    "iua.dlci_spare_bit",            FT_BOOLEAN, 8,         NULL,                           SPARE_BIT_MASK, "", HFILL } },
-    { &hf_dlci_sapi,             { "SAPI",                         "iua.dlci_sapi",                 FT_UINT8,   BASE_HEX,  NULL,                           SAPI_MASK,      "", HFILL } },
-    { &hf_dlci_one_bit,          { "One bit",                      "iua.dlci_one_bit",              FT_BOOLEAN, 8,         NULL,                           ONE_BIT_MASK,   "", HFILL } },
-    { &hf_dlci_tei,              { "TEI",                          "iua.dlci_tei",                  FT_UINT8,   BASE_HEX,  NULL,                           TEI_MASK,       "", HFILL } },
-    { &hf_dlci_spare,            { "Spare",                        "iua.dlci_spare",                FT_UINT16,  BASE_HEX,  NULL,                           0x0,            "", HFILL } },
-    { &hf_diag_info,             { "Diagnostic information",       "iua.diagnostic_information",    FT_BYTES,   BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_interface_range_start, { "Start",                        "iua.interface_range_start",     FT_UINT32,  BASE_DEC,  NULL,                           0x0,            "", HFILL } },
-    { &hf_interface_range_end,   { "End",                          "iua.interface_range_end",       FT_UINT32,  BASE_DEC,  NULL,                           0x0,            "", HFILL } },
-    { &hf_heartbeat_data,        { "Heartbeat data",               "iua.heartbeat_data",            FT_BYTES,   BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_asp_reason,            { "Reason",                       "iua.asp_reason",                FT_UINT32,  BASE_HEX,  VALS(asp_reason_values),        0x0,            "", HFILL } },
-    { &hf_traffic_mode_type,     { "Traffic mode type",            "iua.traffic_mode_type",         FT_UINT32,  BASE_HEX,  VALS(traffic_mode_type_values), 0x0,            "", HFILL } },
-    { &hf_error_code,            { "Error code",                   "iua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_values),        0x0,            "", HFILL } },
-    { &hf_error_code_ig,         { "Error code",                   "iua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_ig_values),     0x0,            "", HFILL } },
-    { &hf_status_type,           { "Status type",                  "iua.status_type",               FT_UINT16,  BASE_DEC,  VALS(status_type_values),       0x0,            "", HFILL } },
-    { &hf_status_id,             { "Status identification",        "iua.status_identification",     FT_UINT16,  BASE_DEC,  NULL,                           0x0,            "", HFILL } },
-    { &hf_release_reason,        { "Reason",                       "iua.release_reason",            FT_UINT32,  BASE_HEX,  VALS(release_reason_values),    0x0,            "", HFILL } },
-    { &hf_tei_status,            { "TEI status",                   "iua.tei_status",                FT_UINT32,  BASE_HEX,  VALS(tei_status_values),        0x0,            "", HFILL } },
-    { &hf_asp_id,                { "ASP identifier",               "iua.asp_identifier",            FT_UINT32,  BASE_HEX,  NULL,                           0x0,            "", HFILL } },
-    { &hf_parameter_tag,         { "Parameter Tag",                "iua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_values),     0x0,            "", HFILL } },
-    { &hf_parameter_tag_ig,      { "Parameter Tag",                "iua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_ig_values),  0x0,            "", HFILL } },
-    { &hf_parameter_length,      { "Parameter length",             "iua.parameter_length",          FT_UINT16,  BASE_DEC,  NULL,                           0x0,            "", HFILL } },
-    { &hf_parameter_value,       { "Parameter value",              "iua.parameter_value",           FT_BYTES,   BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_parameter_padding,     { "Parameter padding",            "iua.parameter_padding",         FT_BYTES,   BASE_NONE, NULL,                           0x0,            "", HFILL } },
-    { &hf_version,               { "Version",                      "iua.version",                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),  0x0,            "", HFILL } },
-    { &hf_reserved,              { "Reserved",                     "iua.reserved",                  FT_UINT8,   BASE_HEX,  NULL,                           0x0,            "", HFILL } },
-    { &hf_message_class,         { "Message class",                "iua.message_class",             FT_UINT8,   BASE_DEC,  VALS(message_class_values),     0x0,            "", HFILL } },
-    { &hf_message_type,          { "Message Type",                 "iua.message_type",              FT_UINT8,   BASE_DEC,  NULL,                           0x0,            "", HFILL } },
-    { &hf_message_length,        { "Message length",               "iua.message_length",            FT_UINT32,  BASE_DEC,  NULL,                           0x0,            "", HFILL } },
+    { &hf_int_interface_id,      { "Integer interface identifier", "iua.int_interface_identifier",  FT_UINT32,  BASE_HEX,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_text_interface_id,     { "Text interface identifier",    "iua.text_interface_identifier", FT_STRING,  BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_info_string,           { "Info string",                  "iua.info_string",               FT_STRING,  BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_dlci_zero_bit,         { "Zero bit",                     "iua.dlci_zero_bit",             FT_BOOLEAN, 8,         NULL,                           ZERO_BIT_MASK,  NULL, HFILL } },
+    { &hf_dlci_spare_bit,        { "Spare bit",                    "iua.dlci_spare_bit",            FT_BOOLEAN, 8,         NULL,                           SPARE_BIT_MASK, NULL, HFILL } },
+    { &hf_dlci_sapi,             { "SAPI",                         "iua.dlci_sapi",                 FT_UINT8,   BASE_HEX,  NULL,                           SAPI_MASK,      NULL, HFILL } },
+    { &hf_dlci_one_bit,          { "One bit",                      "iua.dlci_one_bit",              FT_BOOLEAN, 8,         NULL,                           ONE_BIT_MASK,   NULL, HFILL } },
+    { &hf_dlci_tei,              { "TEI",                          "iua.dlci_tei",                  FT_UINT8,   BASE_HEX,  NULL,                           TEI_MASK,       NULL, HFILL } },
+    { &hf_dlci_spare,            { "Spare",                        "iua.dlci_spare",                FT_UINT16,  BASE_HEX,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_diag_info,             { "Diagnostic information",       "iua.diagnostic_information",    FT_BYTES,   BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_interface_range_start, { "Start",                        "iua.interface_range_start",     FT_UINT32,  BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_interface_range_end,   { "End",                          "iua.interface_range_end",       FT_UINT32,  BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_heartbeat_data,        { "Heartbeat data",               "iua.heartbeat_data",            FT_BYTES,   BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_asp_reason,            { "Reason",                       "iua.asp_reason",                FT_UINT32,  BASE_HEX,  VALS(asp_reason_values),        0x0,            NULL, HFILL } },
+    { &hf_traffic_mode_type,     { "Traffic mode type",            "iua.traffic_mode_type",         FT_UINT32,  BASE_HEX,  VALS(traffic_mode_type_values), 0x0,            NULL, HFILL } },
+    { &hf_error_code,            { "Error code",                   "iua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_values),        0x0,            NULL, HFILL } },
+    { &hf_error_code_ig,         { "Error code",                   "iua.error_code",                FT_UINT32,  BASE_DEC,  VALS(error_code_ig_values),     0x0,            NULL, HFILL } },
+    { &hf_status_type,           { "Status type",                  "iua.status_type",               FT_UINT16,  BASE_DEC,  VALS(status_type_values),       0x0,            NULL, HFILL } },
+    { &hf_status_id,             { "Status identification",        "iua.status_identification",     FT_UINT16,  BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_release_reason,        { "Reason",                       "iua.release_reason",            FT_UINT32,  BASE_HEX,  VALS(release_reason_values),    0x0,            NULL, HFILL } },
+    { &hf_tei_status,            { "TEI status",                   "iua.tei_status",                FT_UINT32,  BASE_HEX,  VALS(tei_status_values),        0x0,            NULL, HFILL } },
+    { &hf_asp_id,                { "ASP identifier",               "iua.asp_identifier",            FT_UINT32,  BASE_HEX,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_parameter_tag,         { "Parameter Tag",                "iua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_values),     0x0,            NULL, HFILL } },
+    { &hf_parameter_tag_ig,      { "Parameter Tag",                "iua.parameter_tag",             FT_UINT16,  BASE_DEC,  VALS(parameter_tag_ig_values),  0x0,            NULL, HFILL } },
+    { &hf_parameter_length,      { "Parameter length",             "iua.parameter_length",          FT_UINT16,  BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_parameter_value,       { "Parameter value",              "iua.parameter_value",           FT_BYTES,   BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_parameter_padding,     { "Parameter padding",            "iua.parameter_padding",         FT_BYTES,   BASE_NONE, NULL,                           0x0,            NULL, HFILL } },
+    { &hf_version,               { "Version",                      "iua.version",                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),  0x0,            NULL, HFILL } },
+    { &hf_reserved,              { "Reserved",                     "iua.reserved",                  FT_UINT8,   BASE_HEX,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_message_class,         { "Message class",                "iua.message_class",             FT_UINT8,   BASE_DEC,  VALS(message_class_values),     0x0,            NULL, HFILL } },
+    { &hf_message_type,          { "Message Type",                 "iua.message_type",              FT_UINT8,   BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
+    { &hf_message_length,        { "Message length",               "iua.message_length",            FT_UINT32,  BASE_DEC,  NULL,                           0x0,            NULL, HFILL } },
    };
   /* Setup protocol subtree array */
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 84220f455e..3e62219684 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -928,7 +928,7 @@ void proto_register_iuup(void) {
         { &hf_iuup_spare_c0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xc0,NULL,HFILL}},
         { &hf_iuup_spare_e0, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xe0,NULL,HFILL}},
         { &hf_iuup_spare_ff, { "Spare", "iuup.spare", FT_UINT8, BASE_HEX, NULL,0xff,NULL,HFILL}},
-        { &hf_iuup_spare_bytes, { "Spare", "iuup.spare", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}},
+        { &hf_iuup_spare_bytes, { "Spare", "iuup.spare", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}},
         
         { &hf_iuup_delay, { "Delay", "iuup.delay", FT_UINT32, BASE_HEX, NULL,0x0,NULL,HFILL}},
         { &hf_iuup_advance, { "Advance", "iuup.advance", FT_UINT32, BASE_HEX, NULL,0x0,NULL,HFILL}},
@@ -937,7 +937,7 @@ void proto_register_iuup(void) {
         { &hf_iuup_init_ti, { "TI", "iuup.ti", FT_UINT8, BASE_DEC, VALS(iuup_ti_vals),0x10,"Timing Information",HFILL}},
         { &hf_iuup_init_subflows_per_rfci, { "Subflows", "iuup.subflows", FT_UINT8, BASE_DEC, NULL,0x0e,"Number of Subflows",HFILL}},
         { &hf_iuup_init_chain_ind, { "Chain Indicator", "iuup.chain_ind", FT_UINT8, BASE_DEC, VALS(iuup_init_chain_ind_vals),0x01,NULL,HFILL}},
-        { &hf_iuup_payload, { "Payload Data", "iuup.payload_data", FT_BYTES, BASE_HEX, NULL,0x00,NULL,HFILL}},
+        { &hf_iuup_payload, { "Payload Data", "iuup.payload_data", FT_BYTES, BASE_NONE, NULL,0x00,NULL,HFILL}},
 
 
         { &hf_iuup_mode_versions, { "Iu UP Mode Versions Supported", "iuup.support_mode", FT_UINT16, BASE_HEX, NULL,0x0,NULL,HFILL}},
@@ -960,7 +960,7 @@ void proto_register_iuup(void) {
         { &hf_iuup_mode_versions_a[15], { "Version  1", "iuup.support_mode.version1", FT_UINT16, BASE_HEX, VALS(iuup_mode_version_support),0x0001,NULL,HFILL}}, 
 
         { &hf_iuup_num_rfci_ind, { "Number of RFCI Indicators", "iuup.p", FT_UINT8, BASE_HEX, NULL,0x3f,NULL,HFILL}},
-        { &hf_iuup_init_rfci_ind, { "RFCI Initialization", "iuup.rfci.init", FT_BYTES, BASE_HEX, NULL,0x0,NULL,HFILL}},
+        { &hf_iuup_init_rfci_ind, { "RFCI Initialization", "iuup.rfci.init", FT_BYTES, BASE_NONE, NULL,0x0,NULL,HFILL}},
 
         HFS_RFCI(0),HFS_RFCI(1),HFS_RFCI(2),HFS_RFCI(3),HFS_RFCI(4),HFS_RFCI(5),HFS_RFCI(6),HFS_RFCI(7),
         HFS_RFCI(8),HFS_RFCI(9),HFS_RFCI(10),HFS_RFCI(11),HFS_RFCI(12),HFS_RFCI(13),HFS_RFCI(14),HFS_RFCI(15),
diff --git a/epan/dissectors/packet-iwarp-ddp-rdmap.c b/epan/dissectors/packet-iwarp-ddp-rdmap.c
index 1c92c38052..a6dcbd28e7 100644
--- a/epan/dissectors/packet-iwarp-ddp-rdmap.c
+++ b/epan/dissectors/packet-iwarp-ddp-rdmap.c
@@ -690,15 +690,15 @@ proto_register_iwarp_ddp_rdmap(void)
 				NULL, HFILL} },
 		{ &hf_iwarp_ddp_rsvdulp, {
 				"Reserved for use by the ULP", "iwarp_ddp.rsvdulp",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_ddp_stag, {
 				"(Data Sink) Steering Tag", "iwarp_ddp.stag",
-				FT_BYTES, BASE_DEC, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_ddp_to, {
 				"(Data Sink) Tagged offset", "iwarp_ddp.tagged_offset",
-				FT_BYTES, BASE_DEC, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_ddp_qn, {
 				"Queue number", "iwarp_ddp.qn",
@@ -737,7 +737,7 @@ proto_register_iwarp_ddp_rdmap(void)
 				"RDMA OpCode Field", HFILL} },
 		{ &hf_iwarp_rdma_reserved, {
 				"Reserved", "iwarp_rdma.reserved",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_inval_stag, {
 				"Invalidate STag", "iwarp_rdma.inval_stag",
@@ -769,7 +769,7 @@ proto_register_iwarp_ddp_rdmap(void)
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_srcto, {
 				"Data Source Tagged Offset", "iwarp_rdma.srcto",
-				FT_BYTES, BASE_DEC, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_term_ctrl, {
 				"Terminate Control", "iwarp_rdma.term_ctrl",
@@ -840,15 +840,15 @@ proto_register_iwarp_ddp_rdmap(void)
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_term_ddp_seg_len, {
 				"DDP Segment Length", "iwarp_rdma.term_ddp_seg_len",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_term_ddp_h, {
 				"Terminated DDP Header", "iwarp_rdma.term_ddp_h",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} },
 		{ &hf_iwarp_rdma_term_rdma_h, {
 				"Terminated RDMA Header", "iwarp_rdma.term_rdma_h",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL} }
 	};
 
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c
index 0a65d61297..01e37a22e1 100644
--- a/epan/dissectors/packet-iwarp-mpa.c
+++ b/epan/dissectors/packet-iwarp-mpa.c
@@ -929,11 +929,11 @@ void proto_register_mpa(void)
 					NULL, HFILL } },
 			{ &hf_mpa_key_req, {
 					"ID Req frame", "iwarp_mpa.key.req",
-					FT_BYTES, BASE_HEX, NULL, 0x0,
+					FT_BYTES, BASE_NONE, NULL, 0x0,
 					NULL, HFILL } },
 			{ &hf_mpa_key_rep, {
 					"ID Rep frame", "iwarp_mpa.key.rep",
-					FT_BYTES, BASE_HEX, NULL, 0x0,
+					FT_BYTES, BASE_NONE, NULL, 0x0,
 					NULL, HFILL } },
 			{ &hf_mpa_flag_m, {
 					"Marker flag", "iwarp_mpa.marker_flag",
@@ -961,7 +961,7 @@ void proto_register_mpa(void)
 					NULL, HFILL } },
 			{ &hf_mpa_private_data, {
 					"Private data", "iwarp_mpa.privatedata",
-					FT_BYTES, BASE_HEX, NULL, 0x0,
+					FT_BYTES, BASE_NONE, NULL, 0x0,
 					NULL, HFILL } },
 			{ &hf_mpa_ulpdu_length, {
 					"ULPDU length", "iwarp_mpa.ulpdulength",
@@ -969,7 +969,7 @@ void proto_register_mpa(void)
 					NULL, HFILL } },
 			{ &hf_mpa_pad, {
 					"Padding", "iwarp_mpa.pad",
-					FT_BYTES, BASE_HEX, NULL, 0x0,
+					FT_BYTES, BASE_NONE, NULL, 0x0,
 					NULL, HFILL } },
 			{ &hf_mpa_crc, {
 					"CRC", "iwarp_mpa.crc",
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c
index 648e23b1b8..56fe225683 100644
--- a/epan/dissectors/packet-jpeg.c
+++ b/epan/dissectors/packet-jpeg.c
@@ -162,109 +162,109 @@ proto_register_jpeg(void)
 			"Main Header",
 			"jpeg.main_hdr",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_ts, { 
 			"Type Specific",
 			"jpeg.main_hdr.ts",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_offs, { 
 			"Fragment Offset",
 			"jpeg.main_hdr.offset",
 			FT_UINT24, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_type, { 
 			"Type",
 			"jpeg.main_hdr.type",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_q, { 
 			"Q",
 			"jpeg.main_hdr.q",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_width, { 
 			"Width",
 			"jpeg.main_hdr.width",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_main_hdr_height, { 
 			"Height",
 			"jpeg.main_hdr.height",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_restart_hdr, { 
 			"Restart Marker Header",
 			"jpeg.restart_hdr",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_restart_hdr_interval, { 
 			"Restart Interval",
 			"jpeg.restart_hdr.interval",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_restart_hdr_f, { 
 			"F",
 			"jpeg.restart_hdr.f",
 			FT_UINT16, BASE_DEC, NULL, 0x8000,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_restart_hdr_l, { 
 			"L",
 			"jpeg.restart_hdr.l",
 			FT_UINT16, BASE_DEC, NULL, 0x4000,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_restart_hdr_count, { 
 			"Restart Count",
 			"jpeg.restart_hdr.count",
 			FT_UINT16, BASE_DEC, NULL, 0x3FFF,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_qtable_hdr, { 
 			"Quantization Table Header",
 			"jpeg.qtable_hdr",
 			FT_NONE, BASE_NONE, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_qtable_hdr_mbz, { 
 			"MBZ",
 			"jpeg.qtable_hdr.mbz",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_qtable_hdr_prec, { 
 			"Precision",
 			"jpeg.qtable_hdr.precision",
 			FT_UINT8, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_qtable_hdr_length, { 
 			"Length",
 			"jpeg.qtable_hdr.length",
 			FT_UINT16, BASE_DEC, NULL, 0,
-			"", HFILL 
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_qtable_hdr_data, { 
 			"Quantization Table Data",
 			"jpeg.qtable_hdr.data",
-			FT_BYTES, BASE_DEC, NULL, 0,
-			"", HFILL 
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL 
 		}},
 		{ &hf_rtp_jpeg_payload, { 
 			"Payload",
 			"jpeg.payload",
-			FT_BYTES, BASE_DEC, NULL, 0,
-			"", HFILL 
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL 
 		}},
 	};
 
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c
index fec2898842..9f83db95f5 100644
--- a/epan/dissectors/packet-k12.c
+++ b/epan/dissectors/packet-k12.c
@@ -418,14 +418,14 @@ void
 proto_register_k12(void)
 {
     static hf_register_info hf[] = {
-	{ &hf_k12_port_id, { "Port Id", "k12.port_id", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
-	{ &hf_k12_port_name, { "Port Name", "k12.port_name", FT_STRING, BASE_NONE, NULL, 0x0,"", HFILL }},
-	{ &hf_k12_stack_file, { "Stack file used", "k12.stack_file", FT_STRING, BASE_NONE, NULL, 0x0,"", HFILL }},
-	{ &hf_k12_port_type, { "Port type", "k12.input_type", FT_UINT32, BASE_HEX, VALS(k12_port_types), 0x0,"", HFILL }},
-	{ &hf_k12_ts, { "Timeslot mask", "k12.ds0.ts", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
-	{ &hf_k12_atm_vp, { "ATM VPI", "atm.vpi", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
-        { &hf_k12_atm_vc, { "ATM VCI", "atm.vci", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
-        { &hf_k12_atm_cid, { "AAL2 CID", "aal2.cid", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }}
+	{ &hf_k12_port_id, { "Port Id", "k12.port_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+	{ &hf_k12_port_name, { "Port Name", "k12.port_name", FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL }},
+	{ &hf_k12_stack_file, { "Stack file used", "k12.stack_file", FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL }},
+	{ &hf_k12_port_type, { "Port type", "k12.input_type", FT_UINT32, BASE_HEX, VALS(k12_port_types), 0x0,NULL, HFILL }},
+	{ &hf_k12_ts, { "Timeslot mask", "k12.ds0.ts", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+	{ &hf_k12_atm_vp, { "ATM VPI", "atm.vpi", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+        { &hf_k12_atm_vc, { "ATM VCI", "atm.vci", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+        { &hf_k12_atm_cid, { "AAL2 CID", "aal2.cid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}
 	};
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-kadm5.c b/epan/dissectors/packet-kadm5.c
index d300427736..80971f29d6 100644
--- a/epan/dissectors/packet-kadm5.c
+++ b/epan/dissectors/packet-kadm5.c
@@ -122,7 +122,7 @@ proto_register_kadm5(void)
 	static hf_register_info hf[] = {
 		{ &hf_kadm5_procedure_v2, {
 		    "V2 Procedure", "kadm5.procedure_v2", FT_UINT32, BASE_DEC,
-		    VALS(kadm5_v2_proc_vals), 0, "V2 Procedure", HFILL }},
+		    VALS(kadm5_v2_proc_vals), 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-kdp.c b/epan/dissectors/packet-kdp.c
index ec9d92bea4..23ef5bb7be 100644
--- a/epan/dissectors/packet-kdp.c
+++ b/epan/dissectors/packet-kdp.c
@@ -241,95 +241,95 @@ void proto_register_kdp(void) {
   static hf_register_info hf[] = {
     { &hf_kdp_version,
       {"KDP version", "kdp.version",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_headerlen,
       {"KDP header len", "kdp.headerlen",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_flags,
       {"KDP flags", "kdp.flags",
-       FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_drop_flag,
       {"KDP DROP Flag", "kdp.flags.drop",
-       FT_BOOLEAN, 8, NULL, KDP_DROP_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_DROP_FLAG, NULL, HFILL}
     },
     { &hf_kdp_syn_flag,
       {"KDP SYN Flag", "kdp.flags.syn",
-       FT_BOOLEAN, 8, NULL, KDP_SYN_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_SYN_FLAG, NULL, HFILL}
     },
     { &hf_kdp_ack_flag,
       {"KDP ACK Flag", "kdp.flags.ack",
-       FT_BOOLEAN, 8, NULL, KDP_ACK_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_ACK_FLAG, NULL, HFILL}
     },
     { &hf_kdp_rst_flag,
       {"KDP RST Flag", "kdp.flags.rst",
-       FT_BOOLEAN, 8, NULL, KDP_RST_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_RST_FLAG, NULL, HFILL}
     },
     { &hf_kdp_bcst_flag,
       {"KDP BCST Flag", "kdp.flags.bcst",
-       FT_BOOLEAN, 8, NULL, KDP_BCST_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_BCST_FLAG, NULL, HFILL}
     },
     { &hf_kdp_dup_flag,
       {"KDP DUP Flag", "kdp.flags.dup",
-       FT_BOOLEAN, 8, NULL, KDP_DUP_FLAG, "", HFILL}
+       FT_BOOLEAN, 8, NULL, KDP_DUP_FLAG, NULL, HFILL}
     },
     { &hf_kdp_errors,
       {"KDP errors", "kdp.errors",
-       FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}
+       FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_destflowid,
       { "DestFlowID", "kdp.destflowid",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_srcflowid,
       { "SrcFlowID", "kdp.srcflowid",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_sequence,
       { "Sequence", "kdp.sequence",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_ack,
       { "Ack", "kdp.ack",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_maxsegmentsize,
       { "MaxSegmentSize", "kdp.maxsegmentsize",
-	FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_optionnumber,
       { "Option Number", "kdp.optionnumber",
-	FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_optionlen,
       { "Option Len", "kdp.option",
-	FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_option1,
       { "Option1 - Max Window", "kdp.option1",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_option2,
       { "Option2 - TCP Fraction", "kdp.option2",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_fragment,
       { "Fragment", "kdp.fragment",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_fragtotal,
       { "FragTotal", "kdp.fragtotal",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_body,
       { "Encrypted Body", "kdp.body",
-	FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL}
+	FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL}
     },
     { &hf_kdp_xml_body,
       { "XML Body", "kdp.body",
-	FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}
+	FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}
     }
   };
 
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c
index 766637a6d7..850a24b5f6 100644
--- a/epan/dissectors/packet-kerberos.c
+++ b/epan/dissectors/packet-kerberos.c
@@ -4760,13 +4760,13 @@ proto_register_kerberos(void)
 	    "Type", "kerberos.transited.type", FT_UINT32, BASE_DEC,
 	    VALS(krb5_transited_types), 0, "Transited Type", HFILL }},
 	{ &hf_krb_transitedcontents, {
-	    "Contents", "kerberos.transited.contents", FT_BYTES, BASE_HEX,
+	    "Contents", "kerberos.transited.contents", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Transited Contents string", HFILL }},
 	{ &hf_krb_keytype, {
 	    "Key type", "kerberos.keytype", FT_UINT32, BASE_DEC,
 	    VALS(krb5_encryption_types), 0, "Key Type", HFILL }},
 	{ &hf_krb_keyvalue, {
-	    "Key value", "kerberos.keyvalue", FT_BYTES, BASE_HEX,
+	    "Key value", "kerberos.keyvalue", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Key value (encryption key)", HFILL }},
 	{ &hf_krb_adtype, {
 	    "Type", "kerberos.adtype", FT_UINT32, BASE_DEC,
@@ -4775,10 +4775,10 @@ proto_register_kerberos(void)
 	    "Type", "kerberos.IF_RELEVANT.type", FT_UINT32, BASE_DEC,
 	    VALS(krb5_ad_types), 0, "IF-RELEVANT Data Type", HFILL }},
 	{ &hf_krb_advalue, {
-	    "Data", "kerberos.advalue", FT_BYTES, BASE_HEX,
+	    "Data", "kerberos.advalue", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Authentication Data", HFILL }},
 	{ &hf_krb_IF_RELEVANT_value, {
-	    "Data", "kerberos.IF_RELEVANT.value", FT_BYTES, BASE_HEX,
+	    "Data", "kerberos.IF_RELEVANT.value", FT_BYTES, BASE_NONE,
 	    NULL, 0, "IF_RELEVANT Data", HFILL }},
 	{ &hf_krb_etype, {
 	    "Encryption type", "kerberos.etype", FT_INT32, BASE_DEC,
@@ -4797,10 +4797,10 @@ proto_register_kerberos(void)
 	    VALS(krb5_lr_types), 0, "Type of lastreq value", HFILL }},
 	{ &hf_krb_address_ip, {
 	    "IP Address", "kerberos.addr_ip", FT_IPv4, BASE_NONE,
-	    NULL, 0, "IP Address", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_address_ipv6, {
 	    "IPv6 Address", "kerberos.addr_ipv6", FT_IPv6, BASE_NONE,
-	    NULL, 0, "IPv6 Address", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_address_netbios, {
 	    "NetBIOS Address", "kerberos.addr_nb", FT_STRING, BASE_NONE,
 	    NULL, 0, "NetBIOS Address and type", HFILL }},
@@ -4889,16 +4889,16 @@ proto_register_kerberos(void)
 	    "MSG Type", "kerberos.msg.type", FT_UINT32, BASE_DEC,
 	    VALS(krb5_msg_types), 0, "Kerberos Message Type", HFILL }},
 	{ &hf_krb_APOptions, {
-	    "APOptions", "kerberos.apoptions", FT_BYTES, BASE_HEX,
+	    "APOptions", "kerberos.apoptions", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Kerberos APOptions bitstring", HFILL }},
 	{ &hf_krb_APOptions_use_session_key, {
 	    "Use Session Key", "kerberos.apoptions.use_session_key", FT_BOOLEAN, 32,
-	    TFS(&krb5_apoptions_use_session_key), 0x40000000, "", HFILL }},
+	    TFS(&krb5_apoptions_use_session_key), 0x40000000, NULL, HFILL }},
 	{ &hf_krb_APOptions_mutual_required, {
 	    "Mutual required", "kerberos.apoptions.mutual_required", FT_BOOLEAN, 32,
-	    TFS(&krb5_apoptions_mutual_required), 0x20000000, "", HFILL }},
+	    TFS(&krb5_apoptions_mutual_required), 0x20000000, NULL, HFILL }},
 	{ &hf_krb_KDCOptions, {
-	    "KDCOptions", "kerberos.kdcoptions", FT_BYTES, BASE_HEX,
+	    "KDCOptions", "kerberos.kdcoptions", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Kerberos KDCOptions bitstring", HFILL }},
 	{ &hf_krb_TicketFlags, {
 	    "Ticket Flags", "kerberos.ticketflags", FT_NONE, BASE_NONE,
@@ -5012,73 +5012,73 @@ proto_register_kerberos(void)
 	    "Authenticator vno", "kerberos.authenticator_vno", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Version Number for the Authenticator", HFILL }},
 	{ &hf_krb_encrypted_authenticator_data, {
-	    "Authenticator data", "kerberos.authenticator.data", FT_BYTES, BASE_HEX,
+	    "Authenticator data", "kerberos.authenticator.data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Data content of an encrypted authenticator", HFILL }},
 	{ &hf_krb_encrypted_EncKrbCredPart, {
-	    "enc EncKrbCredPart", "kerberos.EncKrbCredPart.encrypted", FT_BYTES, BASE_HEX,
+	    "enc EncKrbCredPart", "kerberos.EncKrbCredPart.encrypted", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Encrypted EncKrbCredPart blob", HFILL }},
 	{ &hf_krb_encrypted_PA_ENC_TIMESTAMP, {
-	    "enc PA_ENC_TIMESTAMP", "kerberos.PA_ENC_TIMESTAMP.encrypted", FT_BYTES, BASE_HEX,
+	    "enc PA_ENC_TIMESTAMP", "kerberos.PA_ENC_TIMESTAMP.encrypted", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Encrypted PA-ENC-TIMESTAMP blob", HFILL }},
 	{ &hf_krb_encrypted_enc_authorization_data, {
-	    "enc-authorization-data", "kerberos.enc_authorization_data.encrypted", FT_BYTES, BASE_HEX,
-	    NULL, 0, "", HFILL }},
+	    "enc-authorization-data", "kerberos.enc_authorization_data.encrypted", FT_BYTES, BASE_NONE,
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_PAC_LOGON_INFO, {
-	    "PAC_LOGON_INFO", "kerberos.PAC_LOGON_INFO", FT_BYTES, BASE_HEX,
+	    "PAC_LOGON_INFO", "kerberos.PAC_LOGON_INFO", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_LOGON_INFO structure", HFILL }},
 	{ &hf_krb_PAC_CREDENTIAL_TYPE, {
-	    "PAC_CREDENTIAL_TYPE", "kerberos.PAC_CREDENTIAL_TYPE", FT_BYTES, BASE_HEX,
+	    "PAC_CREDENTIAL_TYPE", "kerberos.PAC_CREDENTIAL_TYPE", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_CREDENTIAL_TYPE structure", HFILL }},
 	{ &hf_krb_PAC_SERVER_CHECKSUM, {
-	    "PAC_SERVER_CHECKSUM", "kerberos.PAC_SERVER_CHECKSUM", FT_BYTES, BASE_HEX,
+	    "PAC_SERVER_CHECKSUM", "kerberos.PAC_SERVER_CHECKSUM", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_SERVER_CHECKSUM structure", HFILL }},
 	{ &hf_krb_PAC_PRIVSVR_CHECKSUM, {
-	    "PAC_PRIVSVR_CHECKSUM", "kerberos.PAC_PRIVSVR_CHECKSUM", FT_BYTES, BASE_HEX,
+	    "PAC_PRIVSVR_CHECKSUM", "kerberos.PAC_PRIVSVR_CHECKSUM", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_PRIVSVR_CHECKSUM structure", HFILL }},
 	{ &hf_krb_PAC_CLIENT_INFO_TYPE, {
-	    "PAC_CLIENT_INFO_TYPE", "kerberos.PAC_CLIENT_INFO_TYPE", FT_BYTES, BASE_HEX,
+	    "PAC_CLIENT_INFO_TYPE", "kerberos.PAC_CLIENT_INFO_TYPE", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_CLIENT_INFO_TYPE structure", HFILL }},
 	{ &hf_krb_PAC_CONSTRAINED_DELEGATION, {
-	    "PAC_CONSTRAINED_DELEGATION", "kerberos.PAC_CONSTRAINED_DELEGATION", FT_BYTES, BASE_HEX,
+	    "PAC_CONSTRAINED_DELEGATION", "kerberos.PAC_CONSTRAINED_DELEGATION", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PAC_CONSTRAINED_DELEGATION structure", HFILL }},
 	{ &hf_krb_PAC_UPN_DNS_INFO, {
-	    "UPN_DNS_INFO", "kerberos.PAC_UPN_DNS_INFO", FT_BYTES, BASE_HEX,
+	    "UPN_DNS_INFO", "kerberos.PAC_UPN_DNS_INFO", FT_BYTES, BASE_NONE,
 	    NULL, 0, "UPN_DNS_INFO structure", HFILL }},
 	{ &hf_krb_checksum_checksum, {
-	    "checksum", "kerberos.checksum.checksum", FT_BYTES, BASE_HEX,
+	    "checksum", "kerberos.checksum.checksum", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Kerberos Checksum", HFILL }},
 	{ &hf_krb_ENC_PRIV, {
-	    "enc PRIV", "kerberos.ENC_PRIV", FT_BYTES, BASE_HEX,
+	    "enc PRIV", "kerberos.ENC_PRIV", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Encrypted PRIV blob", HFILL }},
 	{ &hf_krb_encrypted_Ticket_data, {
-	    "enc-part", "kerberos.ticket.data", FT_BYTES, BASE_HEX,
+	    "enc-part", "kerberos.ticket.data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "The encrypted part of a ticket", HFILL }},
 	{ &hf_krb_encrypted_AP_REP_data, {
-	    "enc-part", "kerberos.aprep.data", FT_BYTES, BASE_HEX,
+	    "enc-part", "kerberos.aprep.data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "The encrypted part of AP-REP", HFILL }},
 	{ &hf_krb_encrypted_KDC_REP_data, {
-	    "enc-part", "kerberos.kdcrep.data", FT_BYTES, BASE_HEX,
+	    "enc-part", "kerberos.kdcrep.data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "The encrypted part of KDC-REP", HFILL }},
 	{ &hf_krb_PA_DATA_value, {
-	    "Value", "kerberos.padata.value", FT_BYTES, BASE_HEX,
+	    "Value", "kerberos.padata.value", FT_BYTES, BASE_NONE,
 	    NULL, 0, "Content of the PADATA blob", HFILL }},
 	{ &hf_krb_etype_info_salt, {
-	    "Salt", "kerberos.etype_info.salt", FT_BYTES, BASE_HEX,
-	    NULL, 0, "Salt", HFILL }},
+	    "Salt", "kerberos.etype_info.salt", FT_BYTES, BASE_NONE,
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_etype_info2_salt, {
-	    "Salt", "kerberos.etype_info2.salt", FT_BYTES, BASE_HEX,
-	    NULL, 0, "Salt", HFILL }},
+	    "Salt", "kerberos.etype_info2.salt", FT_BYTES, BASE_NONE,
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_etype_info2_s2kparams, {
-	    "Salt", "kerberos.etype_info.s2kparams", FT_BYTES, BASE_HEX,
+	    "Salt", "kerberos.etype_info.s2kparams", FT_BYTES, BASE_NONE,
 	    NULL, 0, "S2kparams", HFILL }},
 	{ &hf_krb_SAFE_BODY_user_data, {
-	    "User Data", "kerberos.SAFE_BODY.user_data", FT_BYTES, BASE_HEX,
+	    "User Data", "kerberos.SAFE_BODY.user_data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "SAFE BODY userdata field", HFILL }},
 	{ &hf_krb_PRIV_BODY_user_data, {
-	    "User Data", "kerberos.PRIV_BODY.user_data", FT_BYTES, BASE_HEX,
+	    "User Data", "kerberos.PRIV_BODY.user_data", FT_BYTES, BASE_NONE,
 	    NULL, 0, "PRIV BODY userdata field", HFILL }},
 	{ &hf_krb_pac_signature_signature, {
-	    "Signature", "kerberos.pac.signature.signature", FT_BYTES, BASE_HEX,
+	    "Signature", "kerberos.pac.signature.signature", FT_BYTES, BASE_NONE,
 	    NULL, 0, "A PAC signature blob", HFILL }},
 	{ &hf_krb_PA_DATA_type, {
 	    "Type", "kerberos.padata.type", FT_UINT32, BASE_DEC,
@@ -5090,106 +5090,106 @@ proto_register_kerberos(void)
 	    "Tkt-vno", "kerberos.tkt_vno", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Version number for the Ticket format", HFILL }},
 	{ &hf_krb_KrbCredInfo, {
-	    "KrbCredInfo", "kerberos.KrbCredInfo", FT_NONE, BASE_DEC,
+	    "KrbCredInfo", "kerberos.KrbCredInfo", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos KrbCredInfo", HFILL }},
 	{ &hf_krb_HostAddress, {
-	    "HostAddress", "kerberos.hostaddress", FT_NONE, BASE_DEC,
+	    "HostAddress", "kerberos.hostaddress", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos HostAddress sequence", HFILL }},
 	{ &hf_krb_s_address, {
-	    "S-Address", "kerberos.s_address", FT_NONE, BASE_DEC,
+	    "S-Address", "kerberos.s_address", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is the Senders address", HFILL }},
 	{ &hf_krb_r_address, {
-	    "R-Address", "kerberos.r_address", FT_NONE, BASE_DEC,
+	    "R-Address", "kerberos.r_address", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is the Recipient address", HFILL }},
 	{ &hf_krb_key, {
-	    "key", "kerberos.key", FT_NONE, BASE_DEC,
+	    "key", "kerberos.key", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos EncryptionKey sequence", HFILL }},
 	{ &hf_krb_subkey, {
-	    "Subkey", "kerberos.subkey", FT_NONE, BASE_DEC,
+	    "Subkey", "kerberos.subkey", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos subkey", HFILL }},
 	{ &hf_krb_seq_number, {
 	    "Seq Number", "kerberos.seq_number", FT_UINT32, BASE_DEC,
 	    NULL, 0, "This is a Kerberos sequence number", HFILL }},
 	{ &hf_krb_AuthorizationData, {
-	    "AuthorizationData", "kerberos.AuthorizationData", FT_NONE, BASE_DEC,
+	    "AuthorizationData", "kerberos.AuthorizationData", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos AuthorizationData sequence", HFILL }},
 	{ &hf_krb_EncTicketPart, {
-	    "EncTicketPart", "kerberos.EncTicketPart", FT_NONE, BASE_DEC,
+	    "EncTicketPart", "kerberos.EncTicketPart", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos EncTicketPart sequence", HFILL }},
 	{ &hf_krb_EncAPRepPart, {
-	    "EncAPRepPart", "kerberos.EncAPRepPart", FT_NONE, BASE_DEC,
+	    "EncAPRepPart", "kerberos.EncAPRepPart", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos EncAPRepPart sequence", HFILL }},
 	{ &hf_krb_EncKrbPrivPart, {
-	    "EncKrbPrivPart", "kerberos.EncKrbPrivPart", FT_NONE, BASE_DEC,
+	    "EncKrbPrivPart", "kerberos.EncKrbPrivPart", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos EncKrbPrivPart sequence", HFILL }},
 	{ &hf_krb_EncKrbCredPart, {
-	    "EncKrbCredPart", "kerberos.EncKrbCredPart", FT_NONE, BASE_DEC,
+	    "EncKrbCredPart", "kerberos.EncKrbCredPart", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos EncKrbCredPart sequence", HFILL }},
 	{ &hf_krb_EncKDCRepPart, {
-	    "EncKDCRepPart", "kerberos.EncKDCRepPart", FT_NONE, BASE_DEC,
+	    "EncKDCRepPart", "kerberos.EncKDCRepPart", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos EncKDCRepPart sequence", HFILL }},
 	{ &hf_krb_LastReq, {
-	    "LastReq", "kerberos.LastReq", FT_NONE, BASE_DEC,
+	    "LastReq", "kerberos.LastReq", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a LastReq sequence", HFILL }},
 	{ &hf_krb_Authenticator, {
-	    "Authenticator", "kerberos.Authenticator", FT_NONE, BASE_DEC,
+	    "Authenticator", "kerberos.Authenticator", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a decrypted Kerberos Authenticator sequence", HFILL }},
 	{ &hf_krb_Checksum, {
-	    "Checksum", "kerberos.Checksum", FT_NONE, BASE_DEC,
+	    "Checksum", "kerberos.Checksum", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos Checksum sequence", HFILL }},
 	{ &hf_krb_HostAddresses, {
-	    "HostAddresses", "kerberos.hostaddresses", FT_NONE, BASE_DEC,
+	    "HostAddresses", "kerberos.hostaddresses", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of Kerberos HostAddress sequences", HFILL }},
 	{ &hf_krb_IF_RELEVANT, {
-	    "IF_RELEVANT", "kerberos.if_relevant", FT_NONE, BASE_DEC,
+	    "IF_RELEVANT", "kerberos.if_relevant", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of IF-RELEVANT sequences", HFILL }},
 	{ &hf_krb_etypes, {
-	    "Encryption Types", "kerberos.etypes", FT_NONE, BASE_DEC,
+	    "Encryption Types", "kerberos.etypes", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of Kerberos encryption types", HFILL }},
 	{ &hf_krb_KrbCredInfos, {
-	    "Sequence of KrbCredInfo", "kerberos.KrbCredInfos", FT_NONE, BASE_DEC,
+	    "Sequence of KrbCredInfo", "kerberos.KrbCredInfos", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of KrbCredInfo", HFILL }},
 	{ &hf_krb_sq_tickets, {
-	    "Tickets", "kerberos.sq.tickets", FT_NONE, BASE_DEC,
+	    "Tickets", "kerberos.sq.tickets", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of Kerberos Tickets", HFILL }},
 	{ &hf_krb_LastReqs, {
-	    "LastReqs", "kerberos.LastReqs", FT_NONE, BASE_DEC,
+	    "LastReqs", "kerberos.LastReqs", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a list of LastReq structures", HFILL }},
 	{ &hf_krb_sname, {
-	    "Server Name", "kerberos.sname", FT_NONE, BASE_DEC,
+	    "Server Name", "kerberos.sname", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is the name part server's identity", HFILL }},
 	{ &hf_krb_pname, {
-	    "Delegated Principal Name", "kerberos.pname", FT_NONE, BASE_DEC,
+	    "Delegated Principal Name", "kerberos.pname", FT_NONE, BASE_NONE,
 	    NULL, 0, "Identity of the delegated principal", HFILL }},
 	{ &hf_krb_cname, {
-	    "Client Name", "kerberos.cname", FT_NONE, BASE_DEC,
+	    "Client Name", "kerberos.cname", FT_NONE, BASE_NONE,
 	    NULL, 0, "The name part of the client principal identifier", HFILL }},
 	{ &hf_krb_authenticator_enc, {
-	    "Authenticator", "kerberos.authenticator", FT_NONE, BASE_DEC,
+	    "Authenticator", "kerberos.authenticator", FT_NONE, BASE_NONE,
 	    NULL, 0, "Encrypted authenticator blob", HFILL }},
 	{ &hf_krb_CRED_enc, {
-	    "EncKrbCredPart", "kerberos.encrypted_cred", FT_NONE, BASE_DEC,
+	    "EncKrbCredPart", "kerberos.encrypted_cred", FT_NONE, BASE_NONE,
 	    NULL, 0, "Encrypted Cred blob", HFILL }},
 	{ &hf_krb_ticket_enc, {
-	    "enc-part", "kerberos.ticket.enc_part", FT_NONE, BASE_DEC,
+	    "enc-part", "kerberos.ticket.enc_part", FT_NONE, BASE_NONE,
 	    NULL, 0, "The structure holding the encrypted part of a ticket", HFILL }},
 	{ &hf_krb_AP_REP_enc, {
-	    "enc-part", "kerberos.aprep.enc_part", FT_NONE, BASE_DEC,
+	    "enc-part", "kerberos.aprep.enc_part", FT_NONE, BASE_NONE,
 	    NULL, 0, "The structure holding the encrypted part of AP-REP", HFILL }},
 	{ &hf_krb_KDC_REP_enc, {
-	    "enc-part", "kerberos.kdcrep.enc_part", FT_NONE, BASE_DEC,
+	    "enc-part", "kerberos.kdcrep.enc_part", FT_NONE, BASE_NONE,
 	    NULL, 0, "The structure holding the encrypted part of KDC-REP", HFILL }},
 	{ &hf_krb_e_data, {
-	    "e-data", "kerberos.e_data", FT_NONE, BASE_DEC,
+	    "e-data", "kerberos.e_data", FT_NONE, BASE_NONE,
 	    NULL, 0, "The e-data blob", HFILL }},
 	{ &hf_krb_padata, {
-	    "padata", "kerberos.padata", FT_NONE, BASE_DEC,
+	    "padata", "kerberos.padata", FT_NONE, BASE_NONE,
 	    NULL, 0, "Sequence of preauthentication data", HFILL }},
 	{ &hf_krb_ticket, {
-	    "Ticket", "kerberos.ticket", FT_NONE, BASE_DEC,
+	    "Ticket", "kerberos.ticket", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos Ticket", HFILL }},
 	{ &hf_krb_TransitedEncoding, {
-	    "TransitedEncoding", "kerberos.TransitedEncoding", FT_NONE, BASE_DEC,
+	    "TransitedEncoding", "kerberos.TransitedEncoding", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos TransitedEncoding sequence", HFILL }},
 	{ &hf_krb_PA_PAC_REQUEST_flag, {
 	    "PAC Request", "kerberos.pac_request.flag", FT_UINT32, BASE_DEC,
@@ -5220,52 +5220,52 @@ proto_register_kerberos(void)
 	    NULL, 0, "UPN flags", HFILL }},
 	{ &hf_krb_pac_upn_dns_offset, {
 	    "DNS Offset", "kerberos.pac.upn.dns_offset", FT_UINT16, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_pac_upn_dns_len, {
 	    "DNS Len", "kerberos.pac.upn.dns_len", FT_UINT16, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_pac_upn_upn_offset, {
 	    "UPN Offset", "kerberos.pac.upn.upn_offset", FT_UINT16, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_pac_upn_upn_len, {
 	    "UPN Len", "kerberos.pac.upn.upn_len", FT_UINT16, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_pac_upn_upn_name, {
 	    "UPN Name", "kerberos.pac.upn.upn_name", FT_STRING, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_pac_upn_dns_name, {
 	    "DNS Name", "kerberos.pac.upn.dns_name", FT_STRING, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 	{ &hf_krb_e_checksum, {
-	    "e-checksum", "kerberos.e_checksum", FT_NONE, BASE_DEC,
+	    "e-checksum", "kerberos.e_checksum", FT_NONE, BASE_NONE,
 	    NULL, 0, "This is a Kerberos e-checksum", HFILL }},
 	{ &hf_krb_gssapi_len, {
 	    "Length", "kerberos.gssapi.len", FT_UINT32, BASE_DEC,
 	    NULL, 0, "Length of GSSAPI Bnd field", HFILL }},
 	{ &hf_krb_gssapi_bnd, {
-	    "Bnd", "kerberos.gssapi.bdn", FT_BYTES, BASE_HEX,
+	    "Bnd", "kerberos.gssapi.bdn", FT_BYTES, BASE_NONE,
 	    NULL, 0, "GSSAPI Bnd field", HFILL }},
 	{ &hf_krb_gssapi_c_flag_deleg, {
 	    "Deleg", "kerberos.gssapi.checksum.flags.deleg", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_deleg), KRB5_GSS_C_DELEG_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_mutual, {
 	    "Mutual", "kerberos.gssapi.checksum.flags.mutual", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_mutual), KRB5_GSS_C_MUTUAL_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_replay, {
 	    "Replay", "kerberos.gssapi.checksum.flags.replay", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_replay), KRB5_GSS_C_REPLAY_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_sequence, {
 	    "Sequence", "kerberos.gssapi.checksum.flags.sequence", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_sequence), KRB5_GSS_C_SEQUENCE_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_conf, {
 	    "Conf", "kerberos.gssapi.checksum.flags.conf", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_conf), KRB5_GSS_C_CONF_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_integ, {
 	    "Integ", "kerberos.gssapi.checksum.flags.integ", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, "", HFILL }},
+	    TFS(&tfs_gss_flags_integ), KRB5_GSS_C_INTEG_FLAG, NULL, HFILL }},
 	{ &hf_krb_gssapi_c_flag_dce_style, {
 	    "DCE-style", "kerberos.gssapi.checksum.flags.dce-style", FT_BOOLEAN, 32,
-	    TFS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, "", HFILL }},
+	    TFS(&tfs_gss_flags_dce_style), KRB5_GSS_C_DCE_STYLE, NULL, HFILL }},
 	{ &hf_krb_gssapi_dlgopt, {
 	    "DlgOpt", "kerberos.gssapi.dlgopt", FT_UINT16, BASE_DEC,
 	    NULL, 0, "GSSAPI DlgOpt", HFILL }},
diff --git a/epan/dissectors/packet-kerberos4.c b/epan/dissectors/packet-kerberos4.c
index 56d03e6ec0..d2e3248f66 100644
--- a/epan/dissectors/packet-kerberos4.c
+++ b/epan/dissectors/packet-kerberos4.c
@@ -369,31 +369,31 @@ proto_register_krb4(void)
     { &hf_krb4_byte_order,
       { "Byte Order", "krb4.byte_order",
         FT_UINT8, BASE_HEX, VALS(byte_order_vals), 0x01,
-        "Byte Order", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_name,
       { "Name", "krb4.name",
         FT_STRINGZ, BASE_NONE, NULL, 0x00,
-        "Name", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_instance,
       { "Instance", "krb4.instance",
         FT_STRINGZ, BASE_NONE, NULL, 0x00,
-        "Instance", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_realm,
       { "Realm", "krb4.realm",
         FT_STRINGZ, BASE_NONE, NULL, 0x00,
-        "Realm", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_time_sec,
       { "Time Sec", "krb4.time_sec",
         FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-        "Time Sec", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_exp_date,
       { "Exp Date", "krb4.exp_date",
         FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-        "Exp Date", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_req_date,
       { "Req Date", "krb4.req_date",
         FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-        "Req Date", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_lifetime,
       { "Lifetime", "krb4.lifetime",
         FT_UINT8, BASE_DEC, NULL, 0x00,
@@ -401,11 +401,11 @@ proto_register_krb4(void)
     { &hf_krb4_s_name,
       { "Service Name", "krb4.s_name",
         FT_STRINGZ, BASE_NONE, NULL, 0x00,
-        "Service Name", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_s_instance,
       { "Service Instance", "krb4.s_instance",
         FT_STRINGZ, BASE_NONE, NULL, 0x00,
-        "Service Instance", HFILL }},
+        NULL, HFILL }},
     { &hf_krb4_kvno,
       { "Kvno", "krb4.kvno",
         FT_UINT8, BASE_DEC, NULL, 0x00,
@@ -424,19 +424,19 @@ proto_register_krb4(void)
         "Length of request", HFILL }},
     { &hf_krb4_ticket_blob,
       { "Ticket Blob", "krb4.ticket.blob",
-        FT_BYTES, BASE_HEX, NULL, 0x00,
+        FT_BYTES, BASE_NONE, NULL, 0x00,
         "Ticket blob", HFILL }},
     { &hf_krb4_request_blob,
       { "Request Blob", "krb4.request.blob",
-        FT_BYTES, BASE_HEX, NULL, 0x00,
-        "Request Blob", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x00,
+        NULL, HFILL }},
     { &hf_krb4_encrypted_blob,
       { "Encrypted Blob", "krb4.encrypted_blob",
-        FT_BYTES, BASE_HEX, NULL, 0x00,
+        FT_BYTES, BASE_NONE, NULL, 0x00,
         "Encrypted blob", HFILL }},
     { &hf_krb4_unknown_transarc_blob,
       { "Unknown Transarc Blob", "krb4.unknown_transarc_blob",
-        FT_BYTES, BASE_HEX, NULL, 0x00,
+        FT_BYTES, BASE_NONE, NULL, 0x00,
         "Unknown blob only present in Transarc packets", HFILL }},
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-kingfisher.c b/epan/dissectors/packet-kingfisher.c
index 3d6600f5df..d1c273ce14 100644
--- a/epan/dissectors/packet-kingfisher.c
+++ b/epan/dissectors/packet-kingfisher.c
@@ -378,15 +378,15 @@ proto_register_kingfisher( void )
 {
     static hf_register_info hf[] =
     {
-            { &hf_kingfisher_version,       { "Version", "kingfisher.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_system,        { "System Identifier", "kingfisher.system", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_length,        { "Length", "kingfisher.length", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_from,          { "From RTU", "kingfisher.from", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_target,        { "Target RTU", "kingfisher.target", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_via,           { "Via RTU", "kingfisher.via", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_message,       { "Message Number", "kingfisher.message", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL } },
-            { &hf_kingfisher_function,      { "Function Code", "kingfisher.function", FT_UINT8, BASE_DEC, VALS( function_code_vals ), 0x0, "", HFILL } },
-            { &hf_kingfisher_checksum,      { "Checksum", "kingfisher.checksum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL } },
+            { &hf_kingfisher_version,       { "Version", "kingfisher.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_system,        { "System Identifier", "kingfisher.system", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_length,        { "Length", "kingfisher.length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_from,          { "From RTU", "kingfisher.from", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_target,        { "Target RTU", "kingfisher.target", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_via,           { "Via RTU", "kingfisher.via", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_message,       { "Message Number", "kingfisher.message", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+            { &hf_kingfisher_function,      { "Function Code", "kingfisher.function", FT_UINT8, BASE_DEC, VALS( function_code_vals ), 0x0, NULL, HFILL } },
+            { &hf_kingfisher_checksum,      { "Checksum", "kingfisher.checksum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL } },
     };
 
     static gint *ett[] = { 
diff --git a/epan/dissectors/packet-kink.c b/epan/dissectors/packet-kink.c
index 573507ab73..4c108d7482 100644
--- a/epan/dissectors/packet-kink.c
+++ b/epan/dissectors/packet-kink.c
@@ -948,7 +948,7 @@ proto_register_kink(void) {
       	"the reserved of kink", HFILL }},
     { &hf_kink_checkSum,
       { "Checksum",       "kink.checkSum", 
-	FT_BYTES,	BASE_DEC,	NULL,	0x0,
+	FT_BYTES,	BASE_NONE,	NULL,	0x0,
       	"the checkSum of kink", HFILL }},
     { &hf_kink_next_payload,
       { "Next Payload",       "kink.nextPayload", 
diff --git a/epan/dissectors/packet-klm.c b/epan/dissectors/packet-klm.c
index 631470e134..da23fcce3b 100644
--- a/epan/dissectors/packet-klm.c
+++ b/epan/dissectors/packet-klm.c
@@ -206,10 +206,10 @@ proto_register_klm(void)
 	static hf_register_info hf[] = {
 		{ &hf_klm_procedure_v1, {
 			"V1 Procedure", "klm.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(klm1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(klm1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_klm_exclusive, {
 			"exclusive", "klm.exclusive", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_exclusive), 0, "Exclusive lock", HFILL }},
+			TFS(&tfs_exclusive), 0x0, "Exclusive lock", HFILL }},
 
 		{ &hf_klm_lock, {
 			"lock", "klm.lock", FT_NONE, BASE_NONE,
@@ -233,7 +233,7 @@ proto_register_klm(void)
 
 		{ &hf_klm_stats, {
 			"stats", "klm.stats", FT_UINT32, BASE_DEC,
-			VALS(names_klm_stats), 0, "stats", HFILL }},
+			VALS(names_klm_stats), 0, NULL, HFILL }},
 
 		{ &hf_klm_holder, {
 			"holder", "klm.holder", FT_NONE, BASE_NONE,
@@ -241,7 +241,7 @@ proto_register_klm(void)
 
 		{ &hf_klm_block, {
 			"block", "klm.block", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_block), 0, "Block", HFILL }},
+			TFS(&tfs_block), 0x0, "Block", HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 4f6179c207..93f9e39c1b 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -302,22 +302,22 @@ proto_register_kpasswd(void)
 	static hf_register_info hf[] = {
 	{ &hf_kpasswd_message_len,
 	  	{ "Message Length", "kpasswd.message_len", FT_UINT16, BASE_DEC,
-		NULL, 0, "Message Length", HFILL }},
+		NULL, 0, NULL, HFILL }},
 	{ &hf_kpasswd_ap_req_len,
 	  	{ "AP_REQ Length", "kpasswd.ap_req_len", FT_UINT16, BASE_DEC,
 		NULL, 0, "Length of AP_REQ data", HFILL }},
 	{ &hf_kpasswd_version,
 	  	{ "Version", "kpasswd.version", FT_UINT16, BASE_HEX,
-		VALS(vers_vals), 0, "Version", HFILL }},
+		VALS(vers_vals), 0, NULL, HFILL }},
 	{ &hf_kpasswd_result,
 	  	{ "Result", "kpasswd.result", FT_UINT16, BASE_DEC,
-		VALS(kpasswd_result_types), 0, "Result", HFILL }},
+		VALS(kpasswd_result_types), 0, NULL, HFILL }},
 	{ &hf_kpasswd_result_string,
 	  	{ "Result String", "kpasswd.result_string", FT_STRING, BASE_NONE,
-		NULL, 0, "Result String", HFILL }},
+		NULL, 0, NULL, HFILL }},
 	{ &hf_kpasswd_newpassword,
 	  	{ "New Password", "kpasswd.new_password", FT_STRING, BASE_NONE,
-		NULL, 0, "New Password", HFILL }},
+		NULL, 0, NULL, HFILL }},
 	{ &hf_kpasswd_ap_req_data,
 		{ "AP_REQ", "kpasswd.ap_req", FT_NONE, BASE_NONE,
 		NULL, 0, "AP_REQ structure", HFILL }},
@@ -325,7 +325,7 @@ proto_register_kpasswd(void)
 		{ "KRB-PRIV", "kpasswd.krb_priv", FT_NONE, BASE_NONE,
 		NULL, 0, "KRB-PRIV message", HFILL }},
 	{ &hf_kpasswd_ChangePasswdData, {
-	    "ChangePasswdData", "kpasswd.ChangePasswdData", FT_NONE, BASE_DEC,
+	    "ChangePasswdData", "kpasswd.ChangePasswdData", FT_NONE, BASE_NONE,
 	    NULL, 0, "Change Password Data structure", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-l2tp.c b/epan/dissectors/packet-l2tp.c
index d795318510..79f8549359 100644
--- a/epan/dissectors/packet-l2tp.c
+++ b/epan/dissectors/packet-l2tp.c
@@ -1947,7 +1947,7 @@ proto_register_l2tp(void)
 
 		{ &hf_l2tp_offset_bit,
 		{ "Offset bit", "l2tp.offset_bit", FT_BOOLEAN, 16, TFS(&l2tp_offset_bit_truth), 0x0200,
-			"Offset bit", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_priority,
 		{ "Priority", "l2tp.priority", FT_BOOLEAN, 16, TFS(&l2tp_priority_truth), 0x0100,
@@ -1955,39 +1955,38 @@ proto_register_l2tp(void)
 
 		{ &hf_l2tp_version,
 		{ "Version", "l2tp.version", FT_UINT16, BASE_DEC, NULL, 0x000f,
-			"Version", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_length,
 		{ "Length","l2tp.length", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_tunnel,
 		{ "Tunnel ID","l2tp.tunnel", FT_UINT16, BASE_DEC, NULL, 0x0, /* Probably should be FT_BYTES */
-			"Tunnel ID", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_session,
 		{ "Session ID","l2tp.session", FT_UINT16, BASE_DEC, NULL, 0x0, /* Probably should be FT_BYTES */
-			"Session ID", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_Ns,
 		{ "Ns","l2tp.Ns", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_Nr,
 		{ "Nr","l2tp.Nr", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_offset,
 		{ "Offset","l2tp.offset", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Number of octest past the L2TP header at which the"
-				"payload data starts.", HFILL }},
+			"Number of octest past the L2TP header at which thepayload data starts.", HFILL }},
 
 		{ &hf_l2tp_avp_mandatory,
-		{ "Mandatory", "l2tp.avp.mandatory", FT_BOOLEAN, BASE_NONE, NULL, 0,
+		{ "Mandatory", "l2tp.avp.mandatory", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Mandatory AVP", HFILL }},
 
 		{ &hf_l2tp_avp_hidden,
-		{ "Hidden", "l2tp.avp.hidden", FT_BOOLEAN, BASE_NONE, NULL, 0,
+		{ "Hidden", "l2tp.avp.hidden", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 			"Hidden AVP", HFILL }},
 
 		{ &hf_l2tp_avp_length,
@@ -2004,31 +2003,31 @@ proto_register_l2tp(void)
 
 		{ &hf_l2tp_tie_breaker,
 		{ "Tie Breaker", "l2tp.tie_breaker", FT_UINT64, BASE_HEX, NULL, 0,
-			"Tie Breaker", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_sid,
 		{ "Session ID","l2tp.sid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Session ID", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_ccid,
 		{ "Control Connection ID","l2tp.ccid", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Control Connection ID", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_res,
 		{ "Reserved","l2tp.res", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"Reserved", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_cookie,
-		{ "Cookie","lt2p.cookie", FT_BYTES, BASE_HEX, NULL, 0x0,
-			"Cookie", HFILL }},
+		{ "Cookie","lt2p.cookie", FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 
 		{ &hf_l2tp_l2_spec_def,
 		{ "Default L2-Specific Sublayer","lt2p.l2_spec_def", FT_NONE, BASE_NONE, NULL, 0x0,
-			"Default L2-Specific Sublayer", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_l2_spec_atm,
 		{ "ATM-Specific Sublayer","lt2p.l2_spec_atm", FT_NONE, BASE_NONE, NULL, 0x0,
-			"ATM-Specific Sublayer", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_l2_spec_s,
 		{ "S-bit","lt2p.l2_spec_s", FT_BOOLEAN, 8, NULL, 0x40,
@@ -2052,7 +2051,7 @@ proto_register_l2tp(void)
 
 		{ &hf_l2tp_l2_spec_sequence,
 		{ "Sequence Number","lt2p.l2_spec_sequence", FT_UINT24, BASE_DEC, NULL, 0x0,
-			"Sequence Number", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_l2tp_cisco_avp_type,
 		{ "Type", "l2tp.avp.ciscotype", FT_UINT16, BASE_DEC, VALS(cisco_avp_type_vals), 0,
diff --git a/epan/dissectors/packet-lanforge.c b/epan/dissectors/packet-lanforge.c
index 28ccd8ab2f..8baed81a57 100644
--- a/epan/dissectors/packet-lanforge.c
+++ b/epan/dissectors/packet-lanforge.c
@@ -233,15 +233,15 @@ void proto_register_lanforge(void)
 	  { 
 	      "Timestamp nsecs", "LANforge.ts-nsecs", 
 	      FT_UINT32, BASE_DEC, NULL, 0x0, 
-	      "Timestamp nsecs", HFILL
+	      NULL, HFILL
 	  }
 	},
 
 	{ &hf_lanforge_timestamp,
 	  { 
 	      "Timestamp", "LANforge.timestamp", 
-	      FT_ABSOLUTE_TIME, BASE_HEX, NULL, 0x0,
-	      "Timestamp", HFILL
+	      FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
+	      NULL, HFILL
 	  }
 	}
     };
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 7747614ec9..85e22e7457 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -185,39 +185,39 @@ proto_register_lapb(void)
 
 	{ &hf_lapb_n_r,
 	    { "N(R)", "lapb.control.n_r", FT_UINT8, BASE_DEC,
-	      NULL, XDLC_N_R_MASK, "", HFILL }},
+	      NULL, XDLC_N_R_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_n_s,
 	    { "N(S)", "lapb.control.n_s", FT_UINT8, BASE_DEC,
-	      NULL, XDLC_N_S_MASK, "", HFILL }},
+	      NULL, XDLC_N_S_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_p,
 	    { "Poll", "lapb.control.p", FT_BOOLEAN, 8,
-	      TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+	      TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 
 	{ &hf_lapb_f,
 	    { "Final", "lapb.control.f", FT_BOOLEAN, 8,
-	      TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+	      TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 
 	{ &hf_lapb_s_ftype,
 	    { "Supervisory frame type", "lapb.control.s_ftype", FT_UINT8, BASE_HEX,
-	      VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
+	      VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_u_modifier_cmd,
 	    { "Command", "lapb.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
-	      VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
+	      VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_u_modifier_resp,
 	    { "Response", "lapb.control.u_modifier_resp", FT_UINT8, BASE_HEX,
-	      VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
+	      VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_ftype_i,
 	    { "Frame type", "lapb.control.ftype", FT_UINT8, BASE_HEX,
-	      VALS(ftype_vals), XDLC_I_MASK, "", HFILL }},
+	      VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
 
 	{ &hf_lapb_ftype_s_u,
 	    { "Frame type", "lapb.control.ftype", FT_UINT8, BASE_HEX,
-	      VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+	      VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_lapb,
diff --git a/epan/dissectors/packet-lapdm.c b/epan/dissectors/packet-lapdm.c
index 907caa78c0..fa29b162a5 100644
--- a/epan/dissectors/packet-lapdm.c
+++ b/epan/dissectors/packet-lapdm.c
@@ -430,19 +430,19 @@ proto_register_lapdm(void)
 
         { &hf_lapdm_fragment_overlap,
         { "Message fragment overlap", "lapdm.fragment.overlap", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "LAPDm Message fragment overlaps with other fragment(s)", HFILL }},
+        NULL, 0x0, "LAPDm Message fragment overlaps with other fragment(s)", HFILL }},
 
         { &hf_lapdm_fragment_overlap_conflicts,
         { "Message fragment overlapping with conflicting data", "lapdm.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "LAPDm Message fragment overlaps with conflicting data", HFILL }},
+        NULL, 0x0, "LAPDm Message fragment overlaps with conflicting data", HFILL }},
 
         { &hf_lapdm_fragment_multiple_tails,
         { "Message has multiple tail fragments", "lapdm.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "LAPDm Message fragment has multiple tail fragments", HFILL }},
+        NULL, 0x0, "LAPDm Message fragment has multiple tail fragments", HFILL }},
 
         { &hf_lapdm_fragment_too_long_fragment,
         { "Message fragment too long", "lapdm.fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "LAPDm Message fragment data goes beyond the packet end", HFILL }},
+        NULL, 0x0, "LAPDm Message fragment data goes beyond the packet end", HFILL }},
 
         { &hf_lapdm_fragment_error,
         { "Message defragmentation error", "lapdm.fragment.error", FT_FRAMENUM, BASE_NONE,
diff --git a/epan/dissectors/packet-laplink.c b/epan/dissectors/packet-laplink.c
index d073b1d0f4..2a4092f8c2 100644
--- a/epan/dissectors/packet-laplink.c
+++ b/epan/dissectors/packet-laplink.c
@@ -207,7 +207,7 @@ proto_register_laplink(void)
 		},
 		{ &hf_laplink_tcp_data,
 			{ "Unknown TCP data", "laplink.tcp_data",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
 			"TCP data", HFILL }
 		},
 	};
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index dfd791d690..1bee19622d 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -4372,7 +4372,7 @@ void proto_register_ldap(void) {
 	  	{ &hf_ldap_sasl_buffer_length,
 		  { "SASL Buffer Length",	"ldap.sasl_buffer_length",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"SASL Buffer Length", HFILL }},
+			NULL, HFILL }},
 	    { &hf_ldap_response_in,
 	      { "Response In", "ldap.response_in",
 	        FT_FRAMENUM, BASE_DEC, NULL, 0x0,
@@ -4394,37 +4394,37 @@ void proto_register_ldap(void) {
     { &hf_mscldap_netlogon_version,
       { "Version", "mscldap.netlogon.version",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "Version", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_netlogon_ipaddress_family,
       { "Family", "mscldap.netlogon.ipaddress.family",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Family", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_netlogon_ipaddress_ipv4,
       { "IPv4", "mscldap.netlogon.ipaddress.ipv4",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "IP Address", HFILL }},
 
 	{ &hf_mscldap_netlogon_ipaddress_port,
       { "Port", "mscldap.netlogon.ipaddress.port",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "Port", HFILL }},
+        NULL, HFILL }},
 
 	{ &hf_mscldap_netlogon_ipaddress,
       { "IP Address","mscldap.netlogon.ipaddress",
 		FT_IPv4, BASE_NONE, NULL, 0x0,
-			"Domain Controller IP Address ", HFILL }},
+			"Domain Controller IP Address", HFILL }},
 
     { &hf_mscldap_netlogon_lm_token,
       { "LM Token", "mscldap.netlogon.lm_token",
         FT_UINT16, BASE_HEX, NULL, 0x0,
-        "LM Token", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_netlogon_nt_token,
       { "NT Token", "mscldap.netlogon.nt_token",
         FT_UINT16, BASE_HEX, NULL, 0x0,
-        "NT Token", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_netlogon_flags,
       { "Flags", "mscldap.netlogon.flags",
@@ -4438,13 +4438,13 @@ void proto_register_ldap(void) {
 	
 	{ &hf_mscldap_domain_guid,
       { "Domain GUID", "mscldap.domain.guid",
-        FT_BYTES, BASE_HEX, NULL, 0x0,
-        "Domain GUID", HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0,
+        NULL, HFILL }},
 
     { &hf_mscldap_forest,
       { "Forest", "mscldap.forest",
         FT_STRING, BASE_NONE, NULL, 0x0,
-        "Forest", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_domain,
       { "Domain", "mscldap.domain",
@@ -4454,7 +4454,7 @@ void proto_register_ldap(void) {
     { &hf_mscldap_hostname,
       { "Hostname", "mscldap.hostname",
         FT_STRING, BASE_NONE, NULL, 0x0,
-        "Hostname", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_nb_domain,
       { "NetBios Domain", "mscldap.nb_domain",
@@ -4464,7 +4464,7 @@ void proto_register_ldap(void) {
     { &hf_mscldap_nb_hostname,
       { "NetBios Hostname", "mscldap.nb_hostname",
         FT_STRING, BASE_NONE, NULL, 0x0,
-        "NetBios Hostname", HFILL }},
+        NULL, HFILL }},
 
     { &hf_mscldap_username,
       { "Username", "mscldap.username",
@@ -4484,47 +4484,47 @@ void proto_register_ldap(void) {
     { &hf_ldap_sid,
       { "Sid", "ldap.sid",
         FT_STRING, BASE_NONE, NULL, 0x0,
-        "Sid", HFILL }},
+        NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_v5cs,
       { "V5CS", "mscldap.ntver.searchflags.v5cs", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_v5cs), 0x00000010, "", HFILL }},
+        TFS(&tfs_ntver_v5cs), 0x00000010, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_v5ip,
       { "V5IP", "mscldap.ntver.searchflags.v5ip", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_v5ip), 0x00000008, "", HFILL }},
+        TFS(&tfs_ntver_v5ip), 0x00000008, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_v5ex,
       { "V5EX", "mscldap.ntver.searchflags.v5ex", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_v5ex), 0x00000004, "", HFILL }},
+        TFS(&tfs_ntver_v5ex), 0x00000004, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_v5,
       { "V5", "mscldap.ntver.searchflags.v5", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_v5), 0x00000002, "", HFILL }},
+        TFS(&tfs_ntver_v5), 0x00000002, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_v1,
       { "V1", "mscldap.ntver.searchflags.v1", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_v1), 0x00000001, "", HFILL }},
+        TFS(&tfs_ntver_v1), 0x00000001, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_gc,
       { "GC", "mscldap.ntver.searchflags.gc", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_gc), 0x80000000, "", HFILL }},
+        TFS(&tfs_ntver_gc), 0x80000000, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_local,
       { "Local", "mscldap.ntver.searchflags.local", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_local), 0x40000000, "", HFILL }},
+        TFS(&tfs_ntver_local), 0x40000000, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_ip,
       { "IP", "mscldap.ntver.searchflags.ip", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_ip), 0x20000000, "", HFILL }},
+        TFS(&tfs_ntver_ip), 0x20000000, NULL, HFILL }},
 	
 	{ &hf_mscldap_ntver_flags_pdc,
       { "PDC", "mscldap.ntver.searchflags.pdc", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_pdc), 0x10000000, "", HFILL }},
+        TFS(&tfs_ntver_pdc), 0x10000000, NULL, HFILL }},
 
 	{ &hf_mscldap_ntver_flags_nt4,
       { "NT4", "mscldap.ntver.searchflags.nt4", FT_BOOLEAN, 32,
-        TFS(&tfs_ntver_nt4), 0x01000000, "", HFILL }},
+        TFS(&tfs_ntver_nt4), 0x01000000, NULL, HFILL }},
 
 	{ &hf_mscldap_netlogon_flags_pdc,
       { "PDC", "mscldap.netlogon.flags.pdc", FT_BOOLEAN, 32,
@@ -4588,34 +4588,34 @@ void proto_register_ldap(void) {
 
     { &hf_ldap_guid,
       { "GUID", "ldap.guid", FT_GUID, BASE_NONE,
-        NULL, 0, "GUID", HFILL }},
+        NULL, 0, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_CREATE_CHILD, 
-	  { "Create Child", "ldap.AccessMask.ADS_CREATE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CREATE_CHILD_tfs), LDAP_ACCESSMASK_ADS_CREATE_CHILD, "", HFILL }},
+	  { "Create Child", "ldap.AccessMask.ADS_CREATE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CREATE_CHILD_tfs), LDAP_ACCESSMASK_ADS_CREATE_CHILD, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_DELETE_CHILD, 
-	  { "Delete Child", "ldap.AccessMask.ADS_DELETE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_CHILD_tfs), LDAP_ACCESSMASK_ADS_DELETE_CHILD, "", HFILL }},
+	  { "Delete Child", "ldap.AccessMask.ADS_DELETE_CHILD", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_CHILD_tfs), LDAP_ACCESSMASK_ADS_DELETE_CHILD, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_LIST, 
-	  { "List", "ldap.AccessMask.ADS_LIST", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_tfs), LDAP_ACCESSMASK_ADS_LIST, "", HFILL }},
+	  { "List", "ldap.AccessMask.ADS_LIST", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_tfs), LDAP_ACCESSMASK_ADS_LIST, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_SELF_WRITE, 
-	  { "Self Write", "ldap.AccessMask.ADS_SELF_WRITE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_SELF_WRITE_tfs), LDAP_ACCESSMASK_ADS_SELF_WRITE, "", HFILL }},
+	  { "Self Write", "ldap.AccessMask.ADS_SELF_WRITE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_SELF_WRITE_tfs), LDAP_ACCESSMASK_ADS_SELF_WRITE, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_READ_PROP, 
-	  { "Read Prop", "ldap.AccessMask.ADS_READ_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_READ_PROP_tfs), LDAP_ACCESSMASK_ADS_READ_PROP, "", HFILL }},
+	  { "Read Prop", "ldap.AccessMask.ADS_READ_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_READ_PROP_tfs), LDAP_ACCESSMASK_ADS_READ_PROP, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_WRITE_PROP, 
-	  { "Write Prop", "ldap.AccessMask.ADS_WRITE_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_WRITE_PROP_tfs), LDAP_ACCESSMASK_ADS_WRITE_PROP, "", HFILL }},
+	  { "Write Prop", "ldap.AccessMask.ADS_WRITE_PROP", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_WRITE_PROP_tfs), LDAP_ACCESSMASK_ADS_WRITE_PROP, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_DELETE_TREE, 
-	  { "Delete Tree", "ldap.AccessMask.ADS_DELETE_TREE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_TREE_tfs), LDAP_ACCESSMASK_ADS_DELETE_TREE, "", HFILL }},
+	  { "Delete Tree", "ldap.AccessMask.ADS_DELETE_TREE", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_DELETE_TREE_tfs), LDAP_ACCESSMASK_ADS_DELETE_TREE, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_LIST_OBJECT, 
-	  { "List Object", "ldap.AccessMask.ADS_LIST_OBJECT", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_OBJECT_tfs), LDAP_ACCESSMASK_ADS_LIST_OBJECT, "", HFILL }},
+	  { "List Object", "ldap.AccessMask.ADS_LIST_OBJECT", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_LIST_OBJECT_tfs), LDAP_ACCESSMASK_ADS_LIST_OBJECT, NULL, HFILL }},
 
     { &hf_ldap_AccessMask_ADS_CONTROL_ACCESS, 
-	  { "Control Access", "ldap.AccessMask.ADS_CONTROL_ACCESS", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CONTROL_ACCESS_tfs), LDAP_ACCESSMASK_ADS_CONTROL_ACCESS, "", HFILL }},
+	  { "Control Access", "ldap.AccessMask.ADS_CONTROL_ACCESS", FT_BOOLEAN, 32, TFS(&ldap_AccessMask_ADS_CONTROL_ACCESS_tfs), LDAP_ACCESSMASK_ADS_CONTROL_ACCESS, NULL, HFILL }},
 
 
 /*--- Included file: packet-ldap-hfarr.c ---*/
@@ -4762,7 +4762,7 @@ void proto_register_ldap(void) {
         "ldap.SET_OF_AttributeValue", HFILL }},
     { &hf_ldap_vals_item,
       { "AttributeValue", "ldap.AttributeValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.AttributeValue", HFILL }},
     { &hf_ldap_resultCode,
       { "resultCode", "ldap.resultCode",
@@ -4794,11 +4794,11 @@ void proto_register_ldap(void) {
         "ldap.ControlType", HFILL }},
     { &hf_ldap_criticality,
       { "criticality", "ldap.criticality",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ldap.BOOLEAN", HFILL }},
     { &hf_ldap_controlValue,
       { "controlValue", "ldap.controlValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.T_controlValue", HFILL }},
     { &hf_ldap_version,
       { "version", "ldap.version",
@@ -4814,7 +4814,7 @@ void proto_register_ldap(void) {
         "ldap.AuthenticationChoice", HFILL }},
     { &hf_ldap_simple,
       { "simple", "ldap.simple",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.Simple", HFILL }},
     { &hf_ldap_sasl,
       { "sasl", "ldap.sasl",
@@ -4822,11 +4822,11 @@ void proto_register_ldap(void) {
         "ldap.SaslCredentials", HFILL }},
     { &hf_ldap_ntlmsspNegotiate,
       { "ntlmsspNegotiate", "ldap.ntlmsspNegotiate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.T_ntlmsspNegotiate", HFILL }},
     { &hf_ldap_ntlmsspAuth,
       { "ntlmsspAuth", "ldap.ntlmsspAuth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.T_ntlmsspAuth", HFILL }},
     { &hf_ldap_mechanism,
       { "mechanism", "ldap.mechanism",
@@ -4834,7 +4834,7 @@ void proto_register_ldap(void) {
         "ldap.Mechanism", HFILL }},
     { &hf_ldap_credentials,
       { "credentials", "ldap.credentials",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.Credentials", HFILL }},
     { &hf_ldap_bindResponse_resultCode,
       { "resultCode", "ldap.resultCode",
@@ -4846,7 +4846,7 @@ void proto_register_ldap(void) {
         "ldap.T_bindResponse_matchedDN", HFILL }},
     { &hf_ldap_serverSaslCreds,
       { "serverSaslCreds", "ldap.serverSaslCreds",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.ServerSaslCreds", HFILL }},
     { &hf_ldap_baseObject,
       { "baseObject", "ldap.baseObject",
@@ -4870,7 +4870,7 @@ void proto_register_ldap(void) {
         "ldap.INTEGER_0_maxInt", HFILL }},
     { &hf_ldap_typesOnly,
       { "typesOnly", "ldap.typesOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ldap.BOOLEAN", HFILL }},
     { &hf_ldap_filter,
       { "filter", "ldap.filter",
@@ -4958,7 +4958,7 @@ void proto_register_ldap(void) {
         "ldap.AssertionValue", HFILL }},
     { &hf_ldap_dnAttributes,
       { "dnAttributes", "ldap.dnAttributes",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ldap.T_dnAttributes", HFILL }},
     { &hf_ldap_objectName,
       { "objectName", "ldap.objectName",
@@ -5014,7 +5014,7 @@ void proto_register_ldap(void) {
         "ldap.RelativeLDAPDN", HFILL }},
     { &hf_ldap_deleteoldrdn,
       { "deleteoldrdn", "ldap.deleteoldrdn",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ldap.BOOLEAN", HFILL }},
     { &hf_ldap_newSuperior,
       { "newSuperior", "ldap.newSuperior",
@@ -5030,7 +5030,7 @@ void proto_register_ldap(void) {
         "ldap.LDAPOID", HFILL }},
     { &hf_ldap_requestValue,
       { "requestValue", "ldap.requestValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.T_requestValue", HFILL }},
     { &hf_ldap_extendedResponse_resultCode,
       { "resultCode", "ldap.resultCode",
@@ -5042,7 +5042,7 @@ void proto_register_ldap(void) {
         "ldap.ResponseName", HFILL }},
     { &hf_ldap_response,
       { "response", "ldap.response",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_size,
       { "size", "ldap.size",
@@ -5050,7 +5050,7 @@ void proto_register_ldap(void) {
         "ldap.INTEGER", HFILL }},
     { &hf_ldap_cookie,
       { "cookie", "ldap.cookie",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_SortKeyList_item,
       { "SortKeyList item", "ldap.SortKeyList_item",
@@ -5066,7 +5066,7 @@ void proto_register_ldap(void) {
         "ldap.MatchingRuleId", HFILL }},
     { &hf_ldap_reverseOrder,
       { "reverseOrder", "ldap.reverseOrder",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ldap.BOOLEAN", HFILL }},
     { &hf_ldap_sortResult,
       { "sortResult", "ldap.sortResult",
@@ -5082,19 +5082,19 @@ void proto_register_ldap(void) {
         "ldap.INTEGER", HFILL }},
     { &hf_ldap_userIdentity,
       { "userIdentity", "ldap.userIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_oldPasswd,
       { "oldPasswd", "ldap.oldPasswd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_newPasswd,
       { "newPasswd", "ldap.newPasswd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_genPasswd,
       { "genPasswd", "ldap.genPasswd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ldap.OCTET_STRING", HFILL }},
     { &hf_ldap_cancelID,
       { "cancelID", "ldap.cancelID",
diff --git a/epan/dissectors/packet-ldp.c b/epan/dissectors/packet-ldp.c
index fe6b5c7162..4b08f3e755 100644
--- a/epan/dissectors/packet-ldp.c
+++ b/epan/dissectors/packet-ldp.c
@@ -2679,10 +2679,10 @@ proto_register_ldp(void)
   static hf_register_info hf[] = {
     { &hf_ldp_req,
       /* Change the following to the type you need */
-      { "Request", "ldp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Request", "ldp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_rsp,
-      { "Response", "ldp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Response", "ldp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_version,
       { "Version", "ldp.hdr.version", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP Version Number", HFILL }},
@@ -2691,7 +2691,7 @@ proto_register_ldp(void)
       { "PDU Length", "ldp.hdr.pdu_len", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP PDU Length", HFILL }},
 
     { &hf_ldp_lsr,
-      { "LSR ID", "ldp.hdr.ldpid.lsr", FT_IPv4, BASE_HEX, NULL, 0x0, "LDP Label Space Router ID", HFILL }},
+      { "LSR ID", "ldp.hdr.ldpid.lsr", FT_IPv4, BASE_NONE, NULL, 0x0, "LDP Label Space Router ID", HFILL }},
 
     { &hf_ldp_ls_id,
       { "Label Space ID", "ldp.hdr.ldpid.lsid", FT_UINT16, BASE_DEC, NULL, 0, "LDP Label Space ID", HFILL }},
@@ -2739,13 +2739,13 @@ proto_register_ldp(void)
       { "Reserved", "ldp.msg.tlv.hello.res", FT_UINT16, BASE_HEX, NULL, 0x3FFF, "Hello Common Parameters Reserved Field", HFILL }},
 
     { &hf_ldp_tlv_ipv4_taddr,
-      { "IPv4 Transport Address", "ldp.msg.tlv.ipv4.taddr", FT_IPv4, BASE_DEC, NULL, 0x0, "IPv4 Transport Address", HFILL }},
+      { "IPv4 Transport Address", "ldp.msg.tlv.ipv4.taddr", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_config_seqno,
       { "Configuration Sequence Number", "ldp.msg.tlv.hello.cnf_seqno", FT_UINT32, BASE_DEC, NULL, 0x0, "Hello Configuration Sequence Number", HFILL }},
 
     { &hf_ldp_tlv_ipv6_taddr,
-      { "IPv6 Transport Address", "ldp.msg.tlv.ipv6.taddr", FT_IPv6, BASE_DEC, NULL, 0x0, "IPv6 Transport Address", HFILL }},
+      { "IPv6 Transport Address", "ldp.msg.tlv.ipv6.taddr", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_fec_wc,
       { "FEC Element Type", "ldp.msg.tlv.fec.type", FT_UINT8, BASE_DEC, VALS(fec_types), 0x0, "Forwarding Equivalence Class Element Types", HFILL }},
@@ -2766,13 +2766,13 @@ proto_register_ldp(void)
       { "Address Family", "ldp.msg.tlv.addrl.addr_family", FT_UINT16, BASE_DEC, VALS(afn_vals), 0x0, "Address Family List", HFILL }},
 
     { &hf_ldp_tlv_addrl_addr,
-      { "Address", "ldp.msg.tlv.addrl.addr", FT_STRING, BASE_NONE, NULL, 0x0, "Address", HFILL }},
+      { "Address", "ldp.msg.tlv.addrl.addr", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_hc_value,
       { "Hop Count Value", "ldp.msg.tlv.hc.value", FT_UINT8, BASE_DEC, NULL, 0x0, "Hop Count", HFILL }},
 
     { &hf_ldp_tlv_pv_lsrid,
-      { "LSR Id", "ldp.msg.tlv.pv.lsrid", FT_IPv4, BASE_DEC, NULL, 0x0, "Path Vector LSR Id", HFILL }},
+      { "LSR Id", "ldp.msg.tlv.pv.lsrid", FT_IPv4, BASE_NONE, NULL, 0x0, "Path Vector LSR Id", HFILL }},
 
     { &hf_ldp_tlv_sess_ver,
       { "Session Protocol Version", "ldp.msg.tlv.sess.ver", FT_UINT16, BASE_DEC, NULL, 0x0, "Common Session Parameters Protocol Version", HFILL }},
@@ -2794,7 +2794,7 @@ proto_register_ldp(void)
       { "Session Max PDU Length", "ldp.msg.tlv.sess.mxpdu", FT_UINT16, BASE_DEC, NULL, 0x0, "Common Session Parameters Max PDU Length", HFILL }},
 
     { &hf_ldp_tlv_sess_rxlsr,
-      { "Session Receiver LSR Identifier", "ldp.msg.tlv.sess.rxlsr", FT_IPv4, BASE_DEC, NULL, 0x0, "Common Session Parameters LSR Identifier", HFILL }},
+      { "Session Receiver LSR Identifier", "ldp.msg.tlv.sess.rxlsr", FT_IPv4, BASE_NONE, NULL, 0x0, "Common Session Parameters LSR Identifier", HFILL }},
 
     { &hf_ldp_tlv_sess_rxls,
       { "Session Receiver Label Space Identifier", "ldp.msg.tlv.sess.rxlsr", FT_UINT16, BASE_DEC, NULL, 0x0, "Common Session Parameters Receiver Label Space Identifier", HFILL }},
@@ -2809,16 +2809,16 @@ proto_register_ldp(void)
       { "Directionality", "ldp.msg.tlv.sess.atm.dir", FT_BOOLEAN, 8, TFS(&tlv_atm_dirbit), 0x02, "Label Directionality", HFILL }},
 
     { &hf_ldp_tlv_sess_atm_minvpi,
-      { "Minimum VPI", "ldp.msg.tlv.sess.atm.minvpi", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "Minimum VPI", HFILL }},
+      { "Minimum VPI", "ldp.msg.tlv.sess.atm.minvpi", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_sess_atm_minvci,
-      { "Minimum VCI", "ldp.msg.tlv.sess.atm.minvci", FT_UINT16, BASE_DEC, NULL, 0x0, "Minimum VCI", HFILL }},
+      { "Minimum VCI", "ldp.msg.tlv.sess.atm.minvci", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_sess_atm_maxvpi,
-      { "Maximum VPI", "ldp.msg.tlv.sess.atm.maxvpi", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "Maximum VPI", HFILL }},
+      { "Maximum VPI", "ldp.msg.tlv.sess.atm.maxvpi", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_sess_atm_maxvci,
-      { "Maximum VCI", "ldp.msg.tlv.sess.atm.maxvci", FT_UINT16, BASE_DEC, NULL, 0x0, "Maximum VCI", HFILL }},
+      { "Maximum VCI", "ldp.msg.tlv.sess.atm.maxvci", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_sess_fr_merge,
       { "Session Frame Relay Merge Parameter", "ldp.msg.tlv.sess.fr.merge", FT_UINT8, BASE_DEC, VALS(tlv_fr_merge_vals), 0xC0, "Merge Frame Relay Session Parameters", HFILL }},
@@ -2833,10 +2833,10 @@ proto_register_ldp(void)
       { "Number of DLCI bits", "ldp.msg.tlv.sess.fr.len", FT_UINT16, BASE_DEC, VALS(tlv_fr_len_vals), 0x0180, "DLCI Number of bits", HFILL }},
 
     { &hf_ldp_tlv_sess_fr_mindlci,
-      { "Minimum DLCI", "ldp.msg.tlv.sess.fr.mindlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, "Minimum DLCI", HFILL }},
+      { "Minimum DLCI", "ldp.msg.tlv.sess.fr.mindlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_sess_fr_maxdlci,
-      { "Maximum DLCI", "ldp.msg.tlv.sess.fr.maxdlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, "Maximum DLCI", HFILL }},
+      { "Maximum DLCI", "ldp.msg.tlv.sess.fr.maxdlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_ft_sess_flags,
       { "Flags", "ldp.msg.tlv.ft_sess.flags", FT_UINT16, BASE_HEX, NULL, 0x0, "FT Session Flags", HFILL }},
@@ -2860,16 +2860,16 @@ proto_register_ldp(void)
       { "L bit", "ldp.msg.tlv.ft_sess.flag_l", FT_BOOLEAN, 16, TFS(&tlv_ft_l), 0x1, "Learn From network Flag", HFILL }},
 
     { &hf_ldp_tlv_ft_sess_res,
-      { "Reserved", "ldp.msg.tlv.ft_sess.res", FT_UINT16, BASE_HEX, NULL, 0x0, "Reserved", HFILL }},
+      { "Reserved", "ldp.msg.tlv.ft_sess.res", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_ft_sess_reconn_to,
       { "Reconnect Timeout", "ldp.msg.tlv.ft_sess.reconn_to", FT_UINT32, BASE_DEC, NULL, 0x0, "FT Reconnect Timeout", HFILL }},
 
     { &hf_ldp_tlv_ft_sess_recovery_time,
-      { "Recovery Time", "ldp.msg.tlv.ft_sess.recovery_time", FT_UINT32, BASE_DEC, NULL, 0x0, "Recovery Time", HFILL }},
+      { "Recovery Time", "ldp.msg.tlv.ft_sess.recovery_time", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_ft_ack_sequence_num,
-      { "FT ACK Sequence Number", "ldp.msg.tlv.ft_ack.sequence_num", FT_UINT32, BASE_HEX, NULL, 0x0, "FT ACK Sequence Number", HFILL }},
+      { "FT ACK Sequence Number", "ldp.msg.tlv.ft_ack.sequence_num", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_lbl_req_msg_id,
       { "Label Request Message ID", "ldp.tlv.lbl_req_msg_id", FT_UINT32, BASE_HEX, NULL, 0x0, "Label Request Message to be aborted", HFILL }},
@@ -2878,10 +2878,10 @@ proto_register_ldp(void)
       { "Vendor ID", "ldp.msg.tlv.vendor_id", FT_UINT32, BASE_HEX, NULL, 0, "IEEE 802 Assigned Vendor ID", HFILL }},
 
     { &hf_ldp_tlv_experiment_id,
-      { "Experiment ID", "ldp.msg.tlv.experiment_id", FT_UINT32, BASE_HEX, NULL, 0, "Experiment ID", HFILL }},
+      { "Experiment ID", "ldp.msg.tlv.experiment_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 
     { &hf_ldp_tlv_generic_label,
-      { "Generic Label", "ldp.msg.tlv.generic.label", FT_UINT32, BASE_HEX, NULL, 0x000FFFFF, "Generic Label", HFILL }},
+      { "Generic Label", "ldp.msg.tlv.generic.label", FT_UINT32, BASE_HEX, NULL, 0x000FFFFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_atm_label_vbits,
       { "V-bits", "ldp.msg.tlv.atm.label.vbits", FT_UINT8, BASE_HEX, VALS(tlv_atm_vbits_vals), 0x30, "ATM Label V Bits", HFILL }},
@@ -2899,7 +2899,7 @@ proto_register_ldp(void)
       { "DLCI", "ldp.msg.tlv.fr.label.dlci", FT_UINT24, BASE_DEC, NULL, 0x7FFFFF, "FRAME RELAY Label DLCI", HFILL }},
 
     { &hf_ldp_tlv_ft_protect_sequence_num,
-      { "FT Sequence Number", "ldp.msg.tlv.ft_protect.sequence_num", FT_UINT32, BASE_HEX, NULL, 0x0, "FT Sequence Number", HFILL }},
+      { "FT Sequence Number", "ldp.msg.tlv.ft_protect.sequence_num", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_status_ebit,
       { "E Bit", "ldp.msg.tlv.status.ebit", FT_BOOLEAN, 8, TFS(&tlv_status_ebit), 0x80, "Fatal Error Bit", HFILL }},
@@ -2908,7 +2908,7 @@ proto_register_ldp(void)
       { "F Bit", "ldp.msg.tlv.status.fbit", FT_BOOLEAN, 8, TFS(&tlv_status_fbit), 0x40, "Forward Bit", HFILL }},
 
     { &hf_ldp_tlv_status_data,
-      { "Status Data", "ldp.msg.tlv.status.data", FT_UINT32, BASE_HEX, VALS(tlv_status_data), 0x3FFFFFFF, "Status Data", HFILL }},
+      { "Status Data", "ldp.msg.tlv.status.data", FT_UINT32, BASE_HEX, VALS(tlv_status_data), 0x3FFFFFFF, NULL, HFILL }},
 
     { &hf_ldp_tlv_status_msg_id,
       { "Message ID", "ldp.msg.tlv.status.msg.id", FT_UINT32, BASE_HEX, NULL, 0x0, "Identifies peer message to which Status TLV refers", HFILL }},
@@ -2917,7 +2917,7 @@ proto_register_ldp(void)
       { "Message Type", "ldp.msg.tlv.status.msg.type", FT_UINT16, BASE_HEX, VALS(ldp_message_types), 0x0, "Type of peer message to which Status TLV refers", HFILL }},
 
     { &hf_ldp_tlv_extstatus_data,
-      { "Extended Status Data", "ldp.msg.tlv.extstatus.data", FT_UINT32, BASE_HEX, NULL, 0x0, "Extended Status Data", HFILL }},
+      { "Extended Status Data", "ldp.msg.tlv.extstatus.data", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_ldp_tlv_returned_version,
       { "Returned PDU Version", "ldp.msg.tlv.returned.version", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP Version Number", HFILL }},
@@ -2926,7 +2926,7 @@ proto_register_ldp(void)
       { "Returned PDU Length", "ldp.msg.tlv.returned.pdu_len", FT_UINT16, BASE_DEC, NULL, 0x0, "LDP PDU Length", HFILL }},
 
     { &hf_ldp_tlv_returned_lsr,
-      { "Returned PDU LSR ID", "ldp.msg.tlv.returned.ldpid.lsr", FT_IPv4, BASE_DEC, NULL, 0x0, "LDP Label Space Router ID", HFILL }},
+      { "Returned PDU LSR ID", "ldp.msg.tlv.returned.ldpid.lsr", FT_IPv4, BASE_NONE, NULL, 0x0, "LDP Label Space Router ID", HFILL }},
 
     { &hf_ldp_tlv_returned_ls_id,
       { "Returned PDU Label Space ID", "ldp.msg.tlv.returned.ldpid.lsid", FT_UINT16, BASE_HEX, NULL, 0x0, "LDP Label Space ID", HFILL }},
@@ -2944,7 +2944,7 @@ proto_register_ldp(void)
       { "Returned Message ID", "ldp.msg.tlv.returned.msg.id", FT_UINT32, BASE_HEX, NULL, 0x0, "LDP Message ID", HFILL }},
 
     { &hf_ldp_tlv_mac,
-      { "MAC address", "ldp.msg.tlv.mac", FT_ETHER, BASE_NONE, NULL, 0x0, "MAC address", HFILL}},
+      { "MAC address", "ldp.msg.tlv.mac", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     {&hf_ldp_tlv_fec_vc_controlword,
      {"C-bit", "ldp.msg.tlv.fec.vc.controlword", FT_BOOLEAN, 8, TFS(&fec_vc_cbit), 0x80, "Control Word Present", HFILL }},
@@ -2977,7 +2977,7 @@ proto_register_ldp(void)
      {"Number of Cells", "ldp.msg.tlv.fec.vc.intparam.maxatm", FT_UINT16, BASE_DEC, NULL, 0x0, "VC FEC Interface Param Max ATM Concat Cells", HFILL }},
 
     { &hf_ldp_tlv_fec_vc_intparam_desc,
-      { "Description", "ldp.msg.tlv.fec.vc.intparam.desc", FT_STRING, BASE_DEC, NULL, 0, "VC FEC Interface Description", HFILL }},
+      { "Description", "ldp.msg.tlv.fec.vc.intparam.desc", FT_STRING, BASE_NONE, NULL, 0, "VC FEC Interface Description", HFILL }},
 
     { &hf_ldp_tlv_fec_vc_intparam_cepbytes,
      {"Payload Bytes", "ldp.msg.tlv.fec.vc.intparam.cepbytes", FT_UINT16, BASE_DEC, NULL, 0x0, "VC FEC Interface Param CEP/TDM Payload Bytes", HFILL }},
@@ -3062,36 +3062,36 @@ proto_register_ldp(void)
 
 
     { &hf_ldp_tlv_lspid_act_flg,
-      { "Action Indicator Flag", "ldp.msg.tlv.lspid.actflg", FT_UINT16, BASE_HEX, VALS(ldp_act_flg_vals), 0x000F, "Action Indicator Flag", HFILL}},
+      { "Action Indicator Flag", "ldp.msg.tlv.lspid.actflg", FT_UINT16, BASE_HEX, VALS(ldp_act_flg_vals), 0x000F, NULL, HFILL}},
 
     { &hf_ldp_tlv_lspid_cr_lsp,
-      { "Local CR-LSP ID", "ldp.msg.tlv.lspid.locallspid", FT_UINT16, BASE_HEX, NULL, 0x0, "Local CR-LSP ID", HFILL}},
+      { "Local CR-LSP ID", "ldp.msg.tlv.lspid.locallspid", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_lspid_ldpid,
-      { "Ingress LSR Router ID", "ldp.msg.tlv.lspid.lsrid", FT_IPv4, BASE_DEC, NULL, 0x0, "Ingress LSR Router ID", HFILL}},
+      { "Ingress LSR Router ID", "ldp.msg.tlv.lspid.lsrid", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_er_hop_loose,
-      { "Loose route bit", "ldp.msg.tlv.er_hop.loose", FT_UINT24, BASE_HEX, VALS(ldp_loose_vals), 0x800000, "Loose route bit", HFILL}},
+      { "Loose route bit", "ldp.msg.tlv.er_hop.loose", FT_UINT24, BASE_HEX, VALS(ldp_loose_vals), 0x800000, NULL, HFILL}},
 
     { &hf_ldp_tlv_er_hop_prelen,
       { "Prefix length", "ldp.msg.tlv.er_hop.prefixlen", FT_UINT8, BASE_DEC, NULL, 0x0, "Prefix len", HFILL}},
 
     { &hf_ldp_tlv_er_hop_prefix4,
-      { "IPv4 Address", "ldp.msg.tlv.er_hop.prefix4", FT_IPv4, BASE_DEC, NULL, 0x0, "IPv4 Address", HFILL}},
+      { "IPv4 Address", "ldp.msg.tlv.er_hop.prefix4", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
    { &hf_ldp_tlv_er_hop_prefix6,
-     { "IPv6 Address", "ldp.msg.tlv.er_hop.prefix6", FT_IPv6, BASE_DEC, NULL, 0x0, "IPv6 Address", HFILL}},
+     { "IPv6 Address", "ldp.msg.tlv.er_hop.prefix6", FT_IPv6, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_er_hop_as,
-      { "AS Number", "ldp.msg.tlv.er_hop.as", FT_UINT16, BASE_DEC, NULL, 0x0, "AS Number", HFILL}},
+      { "AS Number", "ldp.msg.tlv.er_hop.as", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_er_hop_cr_lsp,
-      { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.locallspid", FT_UINT16, BASE_DEC, NULL, 0x0, "Local CR-LSP ID", HFILL}},
+      { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.locallspid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_er_hop_ldpid,
-      { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.lsrid", FT_IPv4, BASE_DEC, NULL, 0x0, "Local CR-LSP ID", HFILL}},
+      { "Local CR-LSP ID", "ldp.msg.tlv.er_hop.lsrid", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
     { &hf_ldp_tlv_flags_reserv,
-      { "Reserved", "ldp.msg.tlv.flags_reserv", FT_UINT8, BASE_HEX, NULL, 0xC0, "Reserved", HFILL}},
+      { "Reserved", "ldp.msg.tlv.flags_reserv", FT_UINT8, BASE_HEX, NULL, 0xC0, NULL, HFILL}},
 
     { &hf_ldp_tlv_flags_pdr,
       { "PDR", "ldp.msg.tlv.flags_pdr", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x1, "PDR negotiability flag", HFILL}},
@@ -3112,7 +3112,7 @@ proto_register_ldp(void)
       { "Weight", "ldp.msg.tlv.flags_weight", FT_BOOLEAN, 8, TFS(&tlv_negotiable), 0x20, "Weight negotiability flag", HFILL}},
 
     { &hf_ldp_tlv_frequency,
-      { "Frequency", "ldp.msg.tlv.frequency", FT_UINT8, BASE_DEC, VALS(freq_values), 0, "Frequency", HFILL}},
+      { "Frequency", "ldp.msg.tlv.frequency", FT_UINT8, BASE_DEC, VALS(freq_values), 0, NULL, HFILL}},
 
     { &hf_ldp_tlv_weight,
       { "Weight", "ldp.msg.tlv.weight", FT_UINT8, BASE_DEC, NULL, 0, "Weight of the CR-LSP", HFILL}},
@@ -3139,7 +3139,7 @@ proto_register_ldp(void)
       { "Hold Prio", "ldp.msg.tlv.hold_prio", FT_UINT8, BASE_DEC, NULL, 0, "LSP hold priority", HFILL}},
 
     { &hf_ldp_tlv_route_pinning,
-      { "Route Pinning", "ldp.msg.tlv.route_pinning", FT_UINT32, BASE_DEC, VALS(route_pinning_vals), 0x80000000, "Route Pinning", HFILL}},
+      { "Route Pinning", "ldp.msg.tlv.route_pinning", FT_UINT32, BASE_DEC, VALS(route_pinning_vals), 0x80000000, NULL, HFILL}},
 
     { &hf_ldp_tlv_resource_class,
       { "Resource Class", "ldp.msg.tlv.resource_class", FT_UINT32, BASE_HEX, NULL, 0, "Resource Class (Color)", HFILL}},
@@ -3150,7 +3150,7 @@ proto_register_ldp(void)
 
     { &hf_ldp_tlv_diffserv_type,
       { "LSP Type", "ldp.msg.tlv.diffserv.type", FT_UINT8, BASE_DEC,
-	VALS(diffserv_type_vals), 0x80, "LSP Type", HFILL}},
+	VALS(diffserv_type_vals), 0x80, NULL, HFILL}},
 
     { &hf_ldp_tlv_diffserv_mapnb,
       { "MAPnb", "ldp.msg.tlv.diffserv.mapnb", FT_UINT8, BASE_DEC, NULL,
diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index bd8c5772ba..ae18427357 100644
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -869,7 +869,7 @@ proto_register_ldss (void) {
 		{   &hf_ldss_digest,
 		    {	"Digest",
 			"ldss.digest",
-			FT_BYTES, BASE_HEX, NULL, 0x0,
+			FT_BYTES, BASE_NONE, NULL, 0x0,
 			"Digest of file padded with 0x00", HFILL
 		    }
 		},
@@ -932,14 +932,14 @@ proto_register_ldss (void) {
 		{   &hf_ldss_properties,
 		    {	"Properties",
 			"ldss.properties",
-			FT_BYTES, BASE_HEX, NULL, 0x0,		
+			FT_BYTES, BASE_NONE, NULL, 0x0,		
 			NULL, HFILL
 		    }
 		},
 		{   &hf_ldss_file_data,
 		    {	"File data",
 			"ldss.file_data",
-			FT_BYTES, BASE_HEX, NULL, 0x0,		
+			FT_BYTES, BASE_NONE, NULL, 0x0,		
 			NULL, HFILL
 		    }
 		},
diff --git a/epan/dissectors/packet-lge_monitor.c b/epan/dissectors/packet-lge_monitor.c
index 8197a7e788..98047615e5 100644
--- a/epan/dissectors/packet-lge_monitor.c
+++ b/epan/dissectors/packet-lge_monitor.c
@@ -161,17 +161,17 @@ proto_register_lge_monitor(void)
 		{ &hf_lge_monitor_dir,
 			{ "Direction",           "lge_monitor.dir",
 			FT_UINT32, BASE_DEC, VALS(lge_monitor_dir_vals), 0x0,          
-			"Direction", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_lge_monitor_prot,
 			{ "Protocol Identifier",           "lge_monitor.prot",
 			FT_UINT32, BASE_DEC, VALS(lge_monitor_prot_vals), 0x0,          
-			"Protocol Identifier", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_lge_monitor_length,
 			{ "Payload Length",           "lge_monitor.length",
 			FT_UINT32, BASE_DEC, NULL, 0x0,          
-			"Payload Length", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-linx.c b/epan/dissectors/packet-linx.c
index f280af8d97..a43357b7d6 100644
--- a/epan/dissectors/packet-linx.c
+++ b/epan/dissectors/packet-linx.c
@@ -584,7 +584,7 @@ proto_register_linx(void)
 
 	static hf_register_info hf[] = {
 		{ &hf_linx_nexthdr,
-			{ "Next Header", "linx.nexthdr", FT_UINT32, BASE_DEC, VALS(linx_long_header_names), 0xf0000000, "Next Header", HFILL },
+			{ "Next Header", "linx.nexthdr", FT_UINT32, BASE_DEC, VALS(linx_long_header_names), 0xf0000000, NULL, HFILL },
 		},
 		{ &hf_linx_main_version, /* in ETHCM_MAIN */
 			{ "Version", "linx.version", FT_UINT32, BASE_DEC, NULL, 0x0e000000, "LINX Version", HFILL },
@@ -593,13 +593,13 @@ proto_register_linx(void)
 			{ "Reserved", "linx.reserved1", FT_UINT32, BASE_DEC, NULL, 0x01800000, "Main Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_main_connection, /* in ETHCM_MAIN */
-			{ "Connection", "linx.connection", FT_UINT32, BASE_DEC, NULL, 0x007f8000, "Connection", HFILL },
+			{ "Connection", "linx.connection", FT_UINT32, BASE_DEC, NULL, 0x007f8000, NULL, HFILL },
 		},
 		{ &hf_linx_main_bundle, /* in ETHCM_MAIN */
-			{ "Bundle", "linx.bundle", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x00004000, "Bundle", HFILL },
+			{ "Bundle", "linx.bundle", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x00004000, NULL, HFILL },
 		},
 		{ &hf_linx_main_pkgsize, /* in ETHCM_MAIN */
-			{ "Package Size", "linx.pcksize", FT_UINT32, BASE_DEC, NULL, 0x00003fff, "Package Size", HFILL },
+			{ "Package Size", "linx.pcksize", FT_UINT32, BASE_DEC, NULL, 0x00003fff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_reserved, /* in ETHCM_UDATA */
 			{ "Reserved", "linx.reserved5", FT_UINT32, BASE_DEC, NULL, 0x0fff0000, "Udata Hdr Reserved", HFILL },
@@ -608,40 +608,40 @@ proto_register_linx(void)
 			{ "More Fragments", "linx.morefra", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x00008000, "More fragments follow", HFILL },
 		},
 		{ &hf_linx_udata_fragno, /* in ETHCM_UDATA */
-			{ "Fragment Number", "linx.fragno", FT_UINT32, BASE_DEC, VALS(linx_nofragment), 0x00007fff, "Fragment Number", HFILL },
+			{ "Fragment Number", "linx.fragno", FT_UINT32, BASE_DEC, VALS(linx_nofragment), 0x00007fff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_signo, /* in ETHCM_UDATA */
-			{ "Signal Number", "linx.signo", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "Signal Number", HFILL },
+			{ "Signal Number", "linx.signo", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_dstaddr16, /* in ETHCM_UDATA - protocol version 2 */
-			{ "Receiver Address", "linx.dstaddr", FT_UINT32, BASE_DEC, NULL, 0xffff0000, "Receiver Address", HFILL },
+			{ "Receiver Address", "linx.dstaddr", FT_UINT32, BASE_DEC, NULL, 0xffff0000, NULL, HFILL },
 		},
 		{ &hf_linx_udata_dstaddr32, /* in ETHCM_UDATA - protocol version 3 */
-			{ "Receiver Address", "linx.dstaddr32", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "Receiver Address", HFILL },
+			{ "Receiver Address", "linx.dstaddr32", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_srcaddr16, /* in ETHCM_UDATA - protocol version 2 */
-			{ "Sender Address", "linx.srcaddr", FT_UINT32, BASE_DEC, NULL, 0x0000ffff, "Sender Address", HFILL },
+			{ "Sender Address", "linx.srcaddr", FT_UINT32, BASE_DEC, NULL, 0x0000ffff, NULL, HFILL },
 		},
 		{ &hf_linx_udata_srcaddr32, /* in ETHCM_UDATA - protocol version 3 */
-			{ "Sender Address", "linx.srcaddr32", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "Sender Address", HFILL },
+			{ "Sender Address", "linx.srcaddr32", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL },
 		},
 		{ &hf_linx_ack_request, /* in ETHCM_ACK */
-			{ "ACK-request", "linx.ackreq", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x08000000, "ACK-request", HFILL },
+			{ "ACK-request", "linx.ackreq", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x08000000, NULL, HFILL },
 		},
 		{ &hf_linx_ack_reserved, /* in ETHCM_ACK */
 			{ "Reserved", "linx.reserved7", FT_UINT32, BASE_DEC, NULL, 0x07000000, "ACK Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_ack_ackno, /* in ETHCM_ACK */
-			{ "ACK Number", "linx.ackno", FT_UINT32, BASE_DEC, NULL, 0x00fff000, "ACK Number", HFILL },
+			{ "ACK Number", "linx.ackno", FT_UINT32, BASE_DEC, NULL, 0x00fff000, NULL, HFILL },
 		},
 		{ &hf_linx_ack_seqno, /* in ETHCM_ACK */
-			{ "Sequence Number", "linx.seqno", FT_UINT32, BASE_DEC, NULL, 0x00000fff, "Sequence Number", HFILL },
+			{ "Sequence Number", "linx.seqno", FT_UINT32, BASE_DEC, NULL, 0x00000fff, NULL, HFILL },
 		},
 		{ &hf_linx_conn_cmd, /* in ETHCM_CONN */
-			{ "Command", "linx.cmd", FT_UINT32, BASE_DEC, VALS(linx_conn_cmd), 0x0f000000, "Command", HFILL },
+			{ "Command", "linx.cmd", FT_UINT32, BASE_DEC, VALS(linx_conn_cmd), 0x0f000000, NULL, HFILL },
 		},
 		{ &hf_linx_conn_size, /* in ETHCM_CONN */
-			{ "Size", "linx.size", FT_UINT32, BASE_DEC, NULL, 0x00e00000, "Size", HFILL },
+			{ "Size", "linx.size", FT_UINT32, BASE_DEC, NULL, 0x00e00000, NULL, HFILL },
 		},
 		{ &hf_linx_conn_winsize, /* in ETHCM_CONN */
 			{ "WinSize", "linx.winsize", FT_UINT32, BASE_DEC, NULL, 0x001e0000, "Window Size", HFILL },
@@ -650,7 +650,7 @@ proto_register_linx(void)
 			{ "Reserved", "linx.reserved3", FT_UINT32, BASE_DEC, NULL, 0x0001ff00, "Conn Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_conn_publcid, /* in ETHCM_CONN */
-			{ "Publish Conn ID", "linx.publcid", FT_UINT32, BASE_DEC, NULL, 0x000000ff, "Publish Conn ID", HFILL },
+			{ "Publish Conn ID", "linx.publcid", FT_UINT32, BASE_DEC, NULL, 0x000000ff, NULL, HFILL },
 		},
 		{ &hf_linx_conn_srcmac, /* in ETHCM_CONN */
 			{ "Source", "linx.srcmaddr_ether", FT_ETHER, BASE_DEC, NULL, 0x0, "Source Media Address (ethernet)", HFILL },
@@ -659,28 +659,28 @@ proto_register_linx(void)
 			{ "Destination", "linx.destmaddr_ether", FT_ETHER, BASE_DEC, NULL, 0x0, "Destination Media Address (ethernet)", HFILL },
 		},
 		{ &hf_linx_conn_feat_neg_str, /* in ETHCM_CONN */
-		        { "Feature Negotiation String", "linx.feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Feature Negotiation String", HFILL },
+		        { "Feature Negotiation String", "linx.feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_linx_frag_reserved, /* in ETHCM_FRAG */
 			{ "Reserved", "linx.reserved6", FT_UINT32, BASE_DEC, NULL, 0x0fff0000, "Frag Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_frag_morefrags, /* in ETHCM_FRAG */
-			{ "More Fragments", "linx.morefr2", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x00008000, "More Fragments", HFILL },
+			{ "More Fragments", "linx.morefr2", FT_UINT32, BASE_DEC, VALS(linx_boolean), 0x00008000, NULL, HFILL },
 		},
 		{ &hf_linx_frag_fragno, /* in ETHCM_FRAG */
-			{ "Fragment Number", "linx.fragno2", FT_UINT32, BASE_DEC, NULL, 0x00007fff, "Fragment Number", HFILL },
+			{ "Fragment Number", "linx.fragno2", FT_UINT32, BASE_DEC, NULL, 0x00007fff, NULL, HFILL },
 		},
 		{ &hf_linx_nack_reserv1, /* in ETHCM_NACK */
 			{ "Reserved", "linx.nack_reserv", FT_UINT32, BASE_DEC, NULL, 0x0f000000, "Nack Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_nack_count, /* in ETHCM_NACK */
-			{ "Count", "linx.nack_count", FT_UINT32, BASE_DEC, NULL, 0x00ff0000, "Count", HFILL },
+			{ "Count", "linx.nack_count", FT_UINT32, BASE_DEC, NULL, 0x00ff0000, NULL, HFILL },
 		},
 		{ &hf_linx_nack_reserv2, /* in ETHCM_NACK */
 			{ "Reserved", "linx.nack_reserv", FT_UINT32, BASE_DEC, NULL, 0x0000f000, "Nack Hdr Reserved", HFILL },
 		},
 		{ &hf_linx_nack_seqno, /* in ETHCM_NACK */
-			{ "Sequence Number", "linx.nack_seqno", FT_UINT32, BASE_DEC, NULL, 0x00000fff, "Sequence Number", HFILL },
+			{ "Sequence Number", "linx.nack_seqno", FT_UINT32, BASE_DEC, NULL, 0x00000fff, NULL, HFILL },
 		},
 	
 	  /* RLNH */
@@ -703,16 +703,16 @@ proto_register_linx(void)
 			{ "RLNH peer linkaddr", "linx.rlnh_peer_linkaddr", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH peer linkaddress", HFILL },
 		},
 		{ &hf_linx_rlnh_version, /* in RLNH */
-			{ "RLNH version", "linx.rlnh_version", FT_UINT32, BASE_DEC, NULL, 0xffffffff, "RLNH version", HFILL },
+			{ "RLNH version", "linx.rlnh_version", FT_UINT32, BASE_DEC, NULL, 0xffffffff, NULL, HFILL },
 		},
 		{ &hf_linx_rlnh_status, /* in RLNH */
-			{ "RLNH reply", "linx.rlnh_status", FT_UINT32, BASE_DEC, VALS(linx_rlnh_reply), 0xffffffff, "RLNH reply", HFILL },
+			{ "RLNH reply", "linx.rlnh_status", FT_UINT32, BASE_DEC, VALS(linx_rlnh_reply), 0xffffffff, NULL, HFILL },
 		},
 		{ &hf_linx_rlnh_name, /* in RLNH */
-			{ "RLNH name", "linx.rlnh_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, "RLNH name", HFILL },
+			{ "RLNH name", "linx.rlnh_name", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL },
 		},
 		{ &hf_linx_rlnh_feat_neg_str, /* in RLNH */
-		        { "RLNH Feature Negotiation String", "linx.rlnh_feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, "RLNH Feature Negotiation String", HFILL },
+		        { "RLNH Feature Negotiation String", "linx.rlnh_feat_neg_str", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL },
 		}
 	};
 
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index c6e48db1ac..55ce9b6219 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -799,7 +799,7 @@ proto_register_llc(void)
 			VALS(sap_vals), 0x0, "DSAP - 7 Most Significant Bits only", HFILL }},
 
 		{ &hf_llc_dsap_ig,
-		{ "IG Bit",	"llc.dsap.ig", FT_BOOLEAN, 8,
+		{ "IG Bit",	"llc.dsap.ig", FT_BOOLEAN, BASE_NONE,
 			TFS(&ig_bit), 0x0, "Individual/Group - Least Significant Bit only", HFILL }},
 
 		{ &hf_llc_ssap,
@@ -807,7 +807,7 @@ proto_register_llc(void)
 			VALS(sap_vals), 0x0, "SSAP - 7 Most Significant Bits only", HFILL }},
 
 		{ &hf_llc_ssap_cr,
-		{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, 8,
+		{ "CR Bit", "llc.ssap.cr", FT_BOOLEAN, BASE_NONE,
 			TFS(&cr_bit), 0x0, "Command/Response - Least Significant Bit only", HFILL }},
 
 		{ &hf_llc_ctrl,
diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c
index eb812b0153..c85975d6e5 100644
--- a/epan/dissectors/packet-lldp.c
+++ b/epan/dissectors/packet-lldp.c
@@ -2581,87 +2581,87 @@ proto_register_lldp(void)
 	static hf_register_info hf[] = {
 		{ &hf_lldp_tlv_type,
 			{ "TLV Type", "lldp.tlv.type", FT_UINT16, BASE_DEC,
-			VALS(tlv_types), TLV_TYPE_MASK, "", HFILL }
+			VALS(tlv_types), TLV_TYPE_MASK, NULL, HFILL }
 		},
 		{ &hf_lldp_tlv_len,
 			{ "TLV Length", "lldp.tlv.len", FT_UINT16, BASE_DEC,
-			NULL, TLV_INFO_LEN_MASK, "", HFILL }
+			NULL, TLV_INFO_LEN_MASK, NULL, HFILL }
 		},
 		{ &hf_chassis_id_subtype,
 			{ "Chassis Id Subtype", "lldp.chassis.subtype", FT_UINT8, BASE_DEC,
-			VALS(chassis_id_subtypes), 0, "", HFILL }
+			VALS(chassis_id_subtypes), 0, NULL, HFILL }
 		},
 		{ &hf_chassis_id,
-			{ "Chassis Id", "lldp.chassis.id", FT_BYTES, BASE_HEX,
-			NULL, 0, "", HFILL }
+			{ "Chassis Id", "lldp.chassis.id", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_chassis_id_mac,
 			{ "Chassis Id", "lldp.chassis.id.mac", FT_ETHER, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_chassis_id_ip4,
 			{ "Chassis Id", "lldp.chassis.id.ip4", FT_IPv4, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_chassis_id_ip6,
 			{ "Chassis Id", "lldp.chassis.id.ip6", FT_IPv6, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_port_id_subtype,
 			{ "Port Id Subtype", "lldp.port.subtype", FT_UINT8, BASE_DEC,
-			VALS(port_id_subtypes), 0, "", HFILL }
+			VALS(port_id_subtypes), 0, NULL, HFILL }
 		},
 		{ &hf_port_id_mac,
 			{ "Port Id", "lldp.port.id.mac", FT_ETHER, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_lldp_network_address_family,
 			{ "Network Address family", "lldp.network_address.subtype", FT_UINT8, BASE_DEC,
-			VALS(afn_vals), 0, "Network Address family", HFILL }
+			VALS(afn_vals), 0, NULL, HFILL }
 		},
 		{ &hf_port_id_ip4,
 			{ "Port Id", "lldp.port.id.ip4", FT_IPv4, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_port_id_ip6,
 			{ "Port Id", "lldp.port.id.ip6", FT_IPv6, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_time_to_live,
 			{ "Seconds", "lldp.time_to_live", FT_UINT16, BASE_DEC,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_mgn_addr_ipv4,
 			{ "Management Address", "lldp.mgn.addr.ip4", FT_IPv4, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_mgn_addr_ipv6,
 			{ "Management Address", "lldp.mgn.addr.ip6", FT_IPv6, BASE_NONE,
-			NULL, 0, "", HFILL }
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_mgn_addr_hex,
-			{ "Management Address", "lldp.mgn.addr.hex", FT_BYTES, BASE_HEX,
-			NULL, 0, "", HFILL }
+			{ "Management Address", "lldp.mgn.addr.hex", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_mgn_obj_id,
-			{ "Object Identifier", "lldp.mgn.obj.id", FT_BYTES, BASE_HEX,
-			NULL, 0, "", HFILL }
+			{ "Object Identifier", "lldp.mgn.obj.id", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }
 		},
 		{ &hf_org_spc_oui,
 			{ "Organization Unique Code",	"lldp.orgtlv.oui", FT_UINT24, BASE_HEX,
-	   		VALS(tlv_oui_subtype_vals), 0x0, "", HFILL }
+	   		VALS(tlv_oui_subtype_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_ieee_802_1_subtype,
 			{ "IEEE 802.1 Subtype",	"lldp.ieee.802_1.subtype", FT_UINT8, BASE_HEX,
-	   		VALS(ieee_802_1_subtypes), 0x0, "", HFILL }
+	   		VALS(ieee_802_1_subtypes), 0x0, NULL, HFILL }
 		},
 		{ &hf_ieee_802_3_subtype,
 			{ "IEEE 802.3 Subtype",	"lldp.ieee.802_3.subtype", FT_UINT8, BASE_HEX,
-	   		VALS(ieee_802_3_subtypes), 0x0, "", HFILL }
+	   		VALS(ieee_802_3_subtypes), 0x0, NULL, HFILL }
 		},
 		{ &hf_media_tlv_subtype,
 			{ "Media Subtype",	"lldp.media.subtype", FT_UINT8, BASE_HEX,
-	   		VALS(media_subtypes), 0x0, "", HFILL }
+	   		VALS(media_subtypes), 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_tlv_subtype,
 			{ "Subtype",	"lldp.profinet.subtype", FT_UINT8, BASE_HEX,
@@ -2669,39 +2669,39 @@ proto_register_lldp(void)
 		},
 		{ &hf_profinet_port_rx_delay_local,
 			{ "Port RX Delay Local",	"lldp.profinet.port_rx_delay_local", FT_UINT32, BASE_DEC,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_port_rx_delay_remote,
 			{ "Port RX Delay Remote",	"lldp.profinet.port_rx_delay_remote", FT_UINT32, BASE_DEC,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_port_tx_delay_local,
 			{ "Port TX Delay Local",	"lldp.profinet.port_tx_delay_local", FT_UINT32, BASE_DEC,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_port_tx_delay_remote,
 			{ "Port TX Delay Remote",	"lldp.profinet.port_tx_delay_remote", FT_UINT32, BASE_DEC,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_cable_delay_local,
 			{ "Port Cable Delay Local",	"lldp.profinet.cable_delay_local", FT_UINT32, BASE_DEC,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_class2_port_status,
 			{ "RTClass2 Port Status",	"lldp.profinet.rtc2_port_status", FT_UINT16, BASE_HEX,
-	   		VALS(profinet_port2_status_vals), 0x0, "", HFILL }
+	   		VALS(profinet_port2_status_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_class3_port_status,
 			{ "RTClass3 Port Status",	"lldp.profinet.rtc3_port_status", FT_UINT16, BASE_HEX,
-	   		VALS(profinet_port3_status_vals), 0x0, "", HFILL }
+	   		VALS(profinet_port3_status_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_mrp_domain_uuid,
 			{ "MRP DomainUUID",	"lldp.profinet.mrp_domain_uuid", FT_GUID, BASE_NONE,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_mrrt_port_status,
 			{ "MRRT PortStatus",	"lldp.profinet.mrrt_port_status", FT_UINT16, BASE_HEX,
-	   		VALS(profinet_mrrt_port_status_vals), 0x0, "", HFILL }
+	   		VALS(profinet_mrrt_port_status_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_cm_mac,
 			{ "CMMacAdd",	"lldp.profinet.cm_mac_add", FT_ETHER, BASE_NONE,
@@ -2709,15 +2709,15 @@ proto_register_lldp(void)
 		},
 		{ &hf_profinet_master_source_address,
 			{ "MasterSourceAddress",	"lldp.profinet.master_source_address", FT_ETHER, BASE_NONE,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_subdomain_uuid,
 			{ "SubdomainUUID",	"lldp.profinet.subdomain_uuid", FT_GUID, BASE_NONE,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_ir_data_uuid,
 			{ "IRDataUUID",	"lldp.profinet.ir_data_uuid", FT_GUID, BASE_NONE,
-	   		NULL, 0x0, "", HFILL }
+	   		NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_profinet_length_of_period_valid,
 			{ "LengthOfPeriod.Valid",	"lldp.profinet.length_of_period_valid", FT_UINT32, BASE_DEC,
@@ -2752,8 +2752,8 @@ proto_register_lldp(void)
 	   		NULL, 0x7FFFFFFF, "Unrestricted period, offset to cycle begin in nanoseconds", HFILL }
 		},
 		{ &hf_unknown_subtype,
-			{ "Unknown Subtype Content","lldp.unknown_subtype", FT_BYTES, BASE_HEX,
-	   		NULL, 0x0, "", HFILL }
+			{ "Unknown Subtype Content","lldp.unknown_subtype", FT_BYTES, BASE_NONE,
+	   		NULL, 0x0, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-lmi.c b/epan/dissectors/packet-lmi.c
index 8e5c2f5e53..88f3cc62e3 100644
--- a/epan/dissectors/packet-lmi.c
+++ b/epan/dissectors/packet-lmi.c
@@ -205,7 +205,7 @@ proto_register_lmi(void)
 
 	{ &hf_lmi_msg_type,
 	  { "Message Type", "lmi.msg_type", FT_UINT8, BASE_HEX, VALS(msg_type_str), 0,
-	  	"Message Type", HFILL }},
+	  	NULL, HFILL }},
 
 	{ &hf_lmi_inf_ele,
 	  { "Type", "lmi.inf_ele_type", FT_UINT8, BASE_DEC, VALS(element_type_str), 0,
@@ -216,7 +216,7 @@ proto_register_lmi(void)
 
 	{ &hf_lmi_rcd_type,
 	  { "Record Type", "lmi.ele_rcd_type", FT_UINT8, BASE_DEC, VALS(record_type_str), 0,
-	  	"Record Type", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_lmi_send_seq,
 	  { "Send Seq", "lmi.send_seq", FT_UINT8, BASE_DEC, NULL, 0,
 	  	"Send Sequence", HFILL }},
diff --git a/epan/dissectors/packet-logotypecertextn.c b/epan/dissectors/packet-logotypecertextn.c
index c78a7c130c..850ff6387e 100644
--- a/epan/dissectors/packet-logotypecertextn.c
+++ b/epan/dissectors/packet-logotypecertextn.c
@@ -694,7 +694,7 @@ void proto_register_logotypecertextn(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_logotypecertextn_hashValue,
       { "hashValue", "logotypecertextn.hashValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "logotypecertextn.OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-logotypecertextn-hfarr.c ---*/
diff --git a/epan/dissectors/packet-loop.c b/epan/dissectors/packet-loop.c
index ed296f068f..4bcb9ea5cd 100644
--- a/epan/dissectors/packet-loop.c
+++ b/epan/dissectors/packet-loop.c
@@ -135,22 +135,22 @@ proto_register_loop(void)
     { &hf_loop_skipcount,
       { "skipCount",		"loop.skipcount",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_loop_function,
       { "Function",		"loop.function",
 	FT_UINT16,	BASE_DEC,	VALS(function_vals),	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_loop_receipt_number,
       { "Receipt number",	"loop.receipt_number",
 	FT_UINT16,	BASE_DEC,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_loop_forwarding_address,
       { "Forwarding address",	"loop.forwarding_address",
 	FT_ETHER,	BASE_NONE,	NULL,	0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_loop,
diff --git a/epan/dissectors/packet-lsc.c b/epan/dissectors/packet-lsc.c
index 7c4ed0daa7..b60a886233 100644
--- a/epan/dissectors/packet-lsc.c
+++ b/epan/dissectors/packet-lsc.c
@@ -364,7 +364,7 @@ proto_register_lsc(void)
     { &hf_lsc_trans_id,
       { "Transaction ID", "lsc.trans_id",
         FT_UINT8, BASE_DEC, NULL, 0,          
-        "Transaction ID", HFILL }
+        NULL, HFILL }
     },
     { &hf_lsc_op_code,
       { "Op Code", "lsc.op_code",
@@ -374,7 +374,7 @@ proto_register_lsc(void)
     { &hf_lsc_status_code,
       { "Status Code", "lsc.status_code",
         FT_UINT8, BASE_HEX, VALS(status_code_vals), 0,          
-        "Status Code", HFILL }
+        NULL, HFILL }
     },
     { &hf_lsc_stream_handle,
       { "Stream Handle", "lsc.stream_handle",
@@ -399,12 +399,12 @@ proto_register_lsc(void)
     { &hf_lsc_scale_num,
       { "Scale Numerator", "lsc.scale_num",
         FT_INT16, BASE_DEC, NULL, 0,          
-        "Scale Numerator", HFILL }
+        NULL, HFILL }
     },
     { &hf_lsc_scale_denom,
       { "Scale Denominator", "lsc.scale_denum",
         FT_UINT16, BASE_DEC, NULL, 0,          
-        "Scale Denominator", HFILL }
+        NULL, HFILL }
     },
     { &hf_lsc_mode,
       { "Server Mode", "lsc.mode",
diff --git a/epan/dissectors/packet-lte-rrc.c b/epan/dissectors/packet-lte-rrc.c
index 4ef7ed3d6a..f476c829f9 100644
--- a/epan/dissectors/packet-lte-rrc.c
+++ b/epan/dissectors/packet-lte-rrc.c
@@ -17109,11 +17109,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_criticalExtensionsFuture_01", HFILL }},
     { &hf_lte_rrc_cdma2000_RAND,
       { "cdma2000-RAND", "lte-rrc.cdma2000_RAND",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.CDMA2000_RAND", HFILL }},
     { &hf_lte_rrc_cdma2000_MobilityParameters,
       { "cdma2000-MobilityParameters", "lte-rrc.cdma2000_MobilityParameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.CDMA2000_MobilityParameters", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_01,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -17213,7 +17213,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_informationType", HFILL }},
     { &hf_lte_rrc_nas3GPP,
       { "nas3GPP", "lte-rrc.nas3GPP",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.NAS_DedicatedInformation", HFILL }},
     { &hf_lte_rrc_cdma2000,
       { "cdma2000", "lte-rrc.cdma2000",
@@ -17225,7 +17225,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.CDMA2000_Type", HFILL }},
     { &hf_lte_rrc_cdma2000_DedicatedInfo,
       { "cdma2000-DedicatedInfo", "lte-rrc.cdma2000_DedicatedInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.CDMA2000_DedicatedInfo", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_04,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -17261,11 +17261,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.PHICH_Configuration", HFILL }},
     { &hf_lte_rrc_systemFrameNumber,
       { "systemFrameNumber", "lte-rrc.systemFrameNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_lte_rrc_spare,
       { "spare", "lte-rrc.spare",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_lte_rrc_criticalExtensions_06,
       { "criticalExtensions", "lte-rrc.criticalExtensions",
@@ -17333,11 +17333,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_targetRAT_Type", HFILL }},
     { &hf_lte_rrc_targetRAT_MessageContainer,
       { "targetRAT-MessageContainer", "lte-rrc.targetRAT_MessageContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_nas_SecurityParamFromEUTRA,
       { "nas-SecurityParamFromEUTRA", "lte-rrc.nas_SecurityParamFromEUTRA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_t304,
       { "t304", "lte-rrc.t304",
@@ -17361,7 +17361,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.GERAN_CarrierFreq", HFILL }},
     { &hf_lte_rrc_networkControlOrder,
       { "networkControlOrder", "lte-rrc.networkControlOrder",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_lte_rrc_geran_SystemInformation,
       { "geran-SystemInformation", "lte-rrc.geran_SystemInformation",
@@ -17377,7 +17377,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.GERAN_SystemInformation", HFILL }},
     { &hf_lte_rrc_GERAN_SystemInformation_item,
       { "GERAN-SystemInformation item", "lte-rrc.GERAN_SystemInformation_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_1_23", HFILL }},
     { &hf_lte_rrc_pagingRecordList,
       { "pagingRecordList", "lte-rrc.pagingRecordList",
@@ -17445,7 +17445,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.SEQUENCE_SIZE_1_maxDRB_OF_NAS_DedicatedInformation", HFILL }},
     { &hf_lte_rrc_nas_DedicatedInformationList_item,
       { "NAS-DedicatedInformation", "lte-rrc.NAS_DedicatedInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.NAS_DedicatedInformation", HFILL }},
     { &hf_lte_rrc_radioResourceConfiguration,
       { "radioResourceConfiguration", "lte-rrc.radioResourceConfiguration",
@@ -17457,7 +17457,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.SecurityConfiguration", HFILL }},
     { &hf_lte_rrc_nas_SecurityParamToEUTRA,
       { "nas-SecurityParamToEUTRA", "lte-rrc.nas_SecurityParamToEUTRA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_6", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_09,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -17557,11 +17557,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.ReestablishmentCause", HFILL }},
     { &hf_lte_rrc_spare_01,
       { "spare", "lte-rrc.spare",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_lte_rrc_c_RNTI,
       { "c-RNTI", "lte-rrc.c_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.C_RNTI", HFILL }},
     { &hf_lte_rrc_physCellIdentity,
       { "physCellIdentity", "lte-rrc.physCellIdentity",
@@ -17569,7 +17569,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.PhysicalCellIdentity", HFILL }},
     { &hf_lte_rrc_shortMAC_I,
       { "shortMAC-I", "lte-rrc.shortMAC_I",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.ShortMAC_I", HFILL }},
     { &hf_lte_rrc_criticalExtensions_14,
       { "criticalExtensions", "lte-rrc.criticalExtensions",
@@ -17765,11 +17765,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.EstablishmentCause", HFILL }},
     { &hf_lte_rrc_spare_02,
       { "spare", "lte-rrc.spare",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_1", HFILL }},
     { &hf_lte_rrc_randomValue,
       { "randomValue", "lte-rrc.randomValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_40", HFILL }},
     { &hf_lte_rrc_criticalExtensions_17,
       { "criticalExtensions", "lte-rrc.criticalExtensions",
@@ -17817,7 +17817,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.RegisteredMME", HFILL }},
     { &hf_lte_rrc_nas_DedicatedInformation,
       { "nas-DedicatedInformation", "lte-rrc.nas_DedicatedInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.NAS_DedicatedInformation", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_17,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -17829,11 +17829,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.PLMN_Identity", HFILL }},
     { &hf_lte_rrc_mmegi,
       { "mmegi", "lte-rrc.mmegi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_mmec,
       { "mmec", "lte-rrc.mmec",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.MMEC", HFILL }},
     { &hf_lte_rrc_criticalExtensions_19,
       { "criticalExtensions", "lte-rrc.criticalExtensions",
@@ -17961,11 +17961,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.PLMN_IdentityList", HFILL }},
     { &hf_lte_rrc_trackingAreaCode,
       { "trackingAreaCode", "lte-rrc.trackingAreaCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.TrackingAreaCode", HFILL }},
     { &hf_lte_rrc_cellIdentity,
       { "cellIdentity", "lte-rrc.cellIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.CellIdentity", HFILL }},
     { &hf_lte_rrc_cellBarred,
       { "cellBarred", "lte-rrc.cellBarred",
@@ -17977,11 +17977,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_intraFrequencyReselection", HFILL }},
     { &hf_lte_rrc_csg_Indication,
       { "csg-Indication", "lte-rrc.csg_Indication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_csg_Identity,
       { "csg-Identity", "lte-rrc.csg_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_27", HFILL }},
     { &hf_lte_rrc_cellSelectionInfo,
       { "cellSelectionInfo", "lte-rrc.cellSelectionInfo",
@@ -18101,7 +18101,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.RAT_Type", HFILL }},
     { &hf_lte_rrc_ueCapabilitiesRAT_Container,
       { "ueCapabilitiesRAT-Container", "lte-rrc.ueCapabilitiesRAT_Container",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_24,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -18125,7 +18125,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_criticalExtensionsFuture_25", HFILL }},
     { &hf_lte_rrc_cdma2000_MEID,
       { "cdma2000-MEID", "lte-rrc.cdma2000_MEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_56", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_25,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -18165,7 +18165,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_accessBarringInformation", HFILL }},
     { &hf_lte_rrc_accessBarringForEmergencyCalls,
       { "accessBarringForEmergencyCalls", "lte-rrc.accessBarringForEmergencyCalls",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_accessBarringForSignalling,
       { "accessBarringForSignalling", "lte-rrc.accessBarringForSignalling",
@@ -18225,7 +18225,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.AccessClassBarringList_item", HFILL }},
     { &hf_lte_rrc_accessClassBarring,
       { "accessClassBarring", "lte-rrc.accessClassBarring",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_MBSFN_SubframeConfiguration_item,
       { "MBSFN-SubframeConfiguration item", "lte-rrc.MBSFN_SubframeConfiguration_item",
@@ -18245,11 +18245,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_subframeAllocation", HFILL }},
     { &hf_lte_rrc_oneFrame,
       { "oneFrame", "lte-rrc.oneFrame",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_6", HFILL }},
     { &hf_lte_rrc_fourFrames,
       { "fourFrames", "lte-rrc.fourFrames",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_lte_rrc_cellReselectionInfoCommon,
       { "cellReselectionInfoCommon", "lte-rrc.cellReselectionInfoCommon",
@@ -18281,7 +18281,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_q_HystSF_High", HFILL }},
     { &hf_lte_rrc_sameRefSignalsInNeighbour,
       { "sameRefSignalsInNeighbour", "lte-rrc.sameRefSignalsInNeighbour",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_cellReselectionServingFreqInfo,
       { "cellReselectionServingFreqInfo", "lte-rrc.cellReselectionServingFreqInfo",
@@ -18309,7 +18309,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.MeasurementBandwidth", HFILL }},
     { &hf_lte_rrc_neighbourCellConfiguration,
       { "neighbourCellConfiguration", "lte-rrc.neighbourCellConfiguration",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.NeighbourCellConfiguration", HFILL }},
     { &hf_lte_rrc_t_ReselectionEUTRAN,
       { "t-ReselectionEUTRAN", "lte-rrc.t_ReselectionEUTRAN",
@@ -18481,7 +18481,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_geran_BCCH_Configuration", HFILL }},
     { &hf_lte_rrc_ncc_Permitted,
       { "ncc-Permitted", "lte-rrc.ncc_Permitted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_lte_rrc_q_RxLevMin_01,
       { "q-RxLevMin", "lte-rrc.q_RxLevMin",
@@ -18545,7 +18545,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.OneXRTT_CSFB_RegistrationInfo", HFILL }},
     { &hf_lte_rrc_oneXRTT_LongCodeState,
       { "oneXRTT-LongCodeState", "lte-rrc.oneXRTT_LongCodeState",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_42", HFILL }},
     { &hf_lte_rrc_oneXRTT_CellReselectionParameters,
       { "oneXRTT-CellReselectionParameters", "lte-rrc.oneXRTT_CellReselectionParameters",
@@ -18629,23 +18629,23 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.CDMA2000_Bandclass", HFILL }},
     { &hf_lte_rrc_hnbid,
       { "hnbid", "lte-rrc.hnbid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_1_48", HFILL }},
     { &hf_lte_rrc_messageIdentifier,
       { "messageIdentifier", "lte-rrc.messageIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_serialNumber,
       { "serialNumber", "lte-rrc.serialNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_warningType,
       { "warningType", "lte-rrc.warningType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_lte_rrc_warningSecurityInformation,
       { "warningSecurityInformation", "lte-rrc.warningSecurityInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_50", HFILL }},
     { &hf_lte_rrc_warningMessageSegmentType,
       { "warningMessageSegmentType", "lte-rrc.warningMessageSegmentType",
@@ -18657,11 +18657,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_63", HFILL }},
     { &hf_lte_rrc_warningMessageSegment,
       { "warningMessageSegment", "lte-rrc.warningMessageSegment",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_dataCodingScheme,
       { "dataCodingScheme", "lte-rrc.dataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_1", HFILL }},
     { &hf_lte_rrc_antennaPortsCount,
       { "antennaPortsCount", "lte-rrc.antennaPortsCount",
@@ -18677,35 +18677,35 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_codebookSubsetRestriction", HFILL }},
     { &hf_lte_rrc_n2TxAntenna_tm3,
       { "n2TxAntenna-tm3", "lte-rrc.n2TxAntenna_tm3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_lte_rrc_n4TxAntenna_tm3,
       { "n4TxAntenna-tm3", "lte-rrc.n4TxAntenna_tm3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_lte_rrc_n2TxAntenna_tm4,
       { "n2TxAntenna-tm4", "lte-rrc.n2TxAntenna_tm4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_6", HFILL }},
     { &hf_lte_rrc_n4TxAntenna_tm4,
       { "n4TxAntenna-tm4", "lte-rrc.n4TxAntenna_tm4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_64", HFILL }},
     { &hf_lte_rrc_n2TxAntenna_tm5,
       { "n2TxAntenna-tm5", "lte-rrc.n2TxAntenna_tm5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_lte_rrc_n4TxAntenna_tm5,
       { "n4TxAntenna-tm5", "lte-rrc.n4TxAntenna_tm5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_n2TxAntenna_tm6,
       { "n2TxAntenna-tm6", "lte-rrc.n2TxAntenna_tm6",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_lte_rrc_n4TxAntenna_tm6,
       { "n4TxAntenna-tm6", "lte-rrc.n4TxAntenna_tm6",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_ue_TransmitAntennaSelection,
       { "ue-TransmitAntennaSelection", "lte-rrc.ue_TransmitAntennaSelection",
@@ -18765,7 +18765,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_1023", HFILL }},
     { &hf_lte_rrc_simultaneousAckNackAndCQI,
       { "simultaneousAckNackAndCQI", "lte-rrc.simultaneousAckNackAndCQI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_ul_SpecificParameters,
       { "ul-SpecificParameters", "lte-rrc.ul_SpecificParameters",
@@ -18809,7 +18809,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_retxBSR_Timer", HFILL }},
     { &hf_lte_rrc_ttiBundling,
       { "ttiBundling", "lte-rrc.ttiBundling",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_drx_Configuration,
       { "drx-Configuration", "lte-rrc.drx_Configuration",
@@ -18949,7 +18949,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_rlc_AM", HFILL }},
     { &hf_lte_rrc_statusReportRequired,
       { "statusReportRequired", "lte-rrc.statusReportRequired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_rlc_UM,
       { "rlc-UM", "lte-rrc.rlc_UM",
@@ -18981,39 +18981,39 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_profiles", HFILL }},
     { &hf_lte_rrc_profile0x0001,
       { "profile0x0001", "lte-rrc.profile0x0001",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0002,
       { "profile0x0002", "lte-rrc.profile0x0002",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0003,
       { "profile0x0003", "lte-rrc.profile0x0003",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0004,
       { "profile0x0004", "lte-rrc.profile0x0004",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0006,
       { "profile0x0006", "lte-rrc.profile0x0006",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0101,
       { "profile0x0101", "lte-rrc.profile0x0101",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0102,
       { "profile0x0102", "lte-rrc.profile0x0102",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0103,
       { "profile0x0103", "lte-rrc.profile0x0103",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_profile0x0104,
       { "profile0x0104", "lte-rrc.profile0x0104",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_referenceSignalPower,
       { "referenceSignalPower", "lte-rrc.referenceSignalPower",
@@ -19097,7 +19097,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_63", HFILL }},
     { &hf_lte_rrc_highSpeedFlag,
       { "highSpeedFlag", "lte-rrc.highSpeedFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_zeroCorrelationZoneConfig,
       { "zeroCorrelationZoneConfig", "lte-rrc.zeroCorrelationZoneConfig",
@@ -19157,7 +19157,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_63", HFILL }},
     { &hf_lte_rrc_enable64Qam,
       { "enable64Qam", "lte-rrc.enable64Qam",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_ul_ReferenceSignalsPUSCH,
       { "ul-ReferenceSignalsPUSCH", "lte-rrc.ul_ReferenceSignalsPUSCH",
@@ -19465,11 +19465,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_srsSubframeConfiguration", HFILL }},
     { &hf_lte_rrc_ackNackSrsSimultaneousTransmission,
       { "ackNackSrsSimultaneousTransmission", "lte-rrc.ackNackSrsSimultaneousTransmission",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_srsMaxUpPts,
       { "srsMaxUpPts", "lte-rrc.srsMaxUpPts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_enable_07,
       { "enable", "lte-rrc.enable",
@@ -19489,7 +19489,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_23", HFILL }},
     { &hf_lte_rrc_duration,
       { "duration", "lte-rrc.duration",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_srs_ConfigurationIndex,
       { "srs-ConfigurationIndex", "lte-rrc.srs_ConfigurationIndex",
@@ -19505,7 +19505,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_cyclicShift", HFILL }},
     { &hf_lte_rrc_semiPersistSchedC_RNTI,
       { "semiPersistSchedC-RNTI", "lte-rrc.semiPersistSchedC_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.C_RNTI", HFILL }},
     { &hf_lte_rrc_sps_ConfigurationDL,
       { "sps-ConfigurationDL", "lte-rrc.sps_ConfigurationDL",
@@ -19577,7 +19577,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_enable_10", HFILL }},
     { &hf_lte_rrc_tpc_RNTI,
       { "tpc-RNTI", "lte-rrc.tpc_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_tpc_Index,
       { "tpc-Index", "lte-rrc.tpc_Index",
@@ -19585,7 +19585,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.TPC_Index", HFILL }},
     { &hf_lte_rrc_groupHoppingEnabled,
       { "groupHoppingEnabled", "lte-rrc.groupHoppingEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_groupAssignmentPUSCH,
       { "groupAssignmentPUSCH", "lte-rrc.groupAssignmentPUSCH",
@@ -19593,7 +19593,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_29", HFILL }},
     { &hf_lte_rrc_sequenceHoppingEnabled,
       { "sequenceHoppingEnabled", "lte-rrc.sequenceHoppingEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_cyclicShift_01,
       { "cyclicShift", "lte-rrc.cyclicShift",
@@ -19629,7 +19629,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_deltaMCS_Enabled", HFILL }},
     { &hf_lte_rrc_accumulationEnabled,
       { "accumulationEnabled", "lte-rrc.accumulationEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_p0_uePUCCH,
       { "p0-uePUCCH", "lte-rrc.p0_uePUCCH",
@@ -19669,7 +19669,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.CipheringAlgorithm", HFILL }},
     { &hf_lte_rrc_keyChangeIndicator,
       { "keyChangeIndicator", "lte-rrc.keyChangeIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_cdma2000_CarrierInfo,
       { "cdma2000-CarrierInfo", "lte-rrc.cdma2000_CarrierInfo",
@@ -19681,7 +19681,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.CDMA2000_CellIdentity", HFILL }},
     { &hf_lte_rrc_cdma_EUTRA_Synchronisation,
       { "cdma-EUTRA-Synchronisation", "lte-rrc.cdma_EUTRA_Synchronisation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_cdma_SystemTime,
       { "cdma-SystemTime", "lte-rrc.cdma_SystemTime",
@@ -19689,11 +19689,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_cdma_SystemTime", HFILL }},
     { &hf_lte_rrc_cdma_SynchronousSystemTime,
       { "cdma-SynchronousSystemTime", "lte-rrc.cdma_SynchronousSystemTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_39", HFILL }},
     { &hf_lte_rrc_cdma_AsynchronousSystemTime,
       { "cdma-AsynchronousSystemTime", "lte-rrc.cdma_AsynchronousSystemTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_49", HFILL }},
     { &hf_lte_rrc_CellIndexList_item,
       { "CellIndexList item", "lte-rrc.CellIndexList_item",
@@ -19753,7 +19753,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_0_31", HFILL }},
     { &hf_lte_rrc_variableBitMapOfARFCNs,
       { "variableBitMapOfARFCNs", "lte-rrc.variableBitMapOfARFCNs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING_SIZE_1_16", HFILL }},
     { &hf_lte_rrc_ExplicitListOfARFCNs_item,
       { "GERAN-ARFCN-Value", "lte-rrc.GERAN_ARFCN_Value",
@@ -19761,35 +19761,35 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.GERAN_ARFCN_Value", HFILL }},
     { &hf_lte_rrc_networkColourCode,
       { "networkColourCode", "lte-rrc.networkColourCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_lte_rrc_baseStationColourCode,
       { "baseStationColourCode", "lte-rrc.baseStationColourCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_lte_rrc_utra_CellIdentity,
       { "utra-CellIdentity", "lte-rrc.utra_CellIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_28", HFILL }},
     { &hf_lte_rrc_locationAreaCode,
       { "locationAreaCode", "lte-rrc.locationAreaCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_geran_CellIdentity,
       { "geran-CellIdentity", "lte-rrc.geran_CellIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_globalCellId_oneXRTT,
       { "globalCellId-oneXRTT", "lte-rrc.globalCellId_oneXRTT",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_47", HFILL }},
     { &hf_lte_rrc_globalCellId_HRPD,
       { "globalCellId-HRPD", "lte-rrc.globalCellId_HRPD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_128", HFILL }},
     { &hf_lte_rrc_hrpd_PreRegistrationAllowed,
       { "hrpd-PreRegistrationAllowed", "lte-rrc.hrpd_PreRegistrationAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_hrpd_PreRegistrationZoneId,
       { "hrpd-PreRegistrationZoneId", "lte-rrc.hrpd_PreRegistrationZoneId",
@@ -19825,7 +19825,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_t304_01", HFILL }},
     { &hf_lte_rrc_newUE_Identity,
       { "newUE-Identity", "lte-rrc.newUE_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.C_RNTI", HFILL }},
     { &hf_lte_rrc_radioResourceConfigCommon_01,
       { "radioResourceConfigCommon", "lte-rrc.radioResourceConfigCommon",
@@ -19861,7 +19861,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_1_16", HFILL }},
     { &hf_lte_rrc_oneXRTT_CSFB_RegistrationAllowed,
       { "oneXRTT-CSFB-RegistrationAllowed", "lte-rrc.oneXRTT_CSFB_RegistrationAllowed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_RegistrationParameters,
       { "oneXRTT-RegistrationParameters", "lte-rrc.oneXRTT_RegistrationParameters",
@@ -19869,51 +19869,51 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.OneXRTT_RegistrationParameters", HFILL }},
     { &hf_lte_rrc_oneXRTT_SID,
       { "oneXRTT-SID", "lte-rrc.oneXRTT_SID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_15", HFILL }},
     { &hf_lte_rrc_oneXRTT_NID,
       { "oneXRTT-NID", "lte-rrc.oneXRTT_NID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_oneXRTT_MultipleSID,
       { "oneXRTT-MultipleSID", "lte-rrc.oneXRTT_MultipleSID",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_MultipleNID,
       { "oneXRTT-MultipleNID", "lte-rrc.oneXRTT_MultipleNID",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_HomeReg,
       { "oneXRTT-HomeReg", "lte-rrc.oneXRTT_HomeReg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_ForeignSIDReg,
       { "oneXRTT-ForeignSIDReg", "lte-rrc.oneXRTT_ForeignSIDReg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_ForeignNIDReg,
       { "oneXRTT-ForeignNIDReg", "lte-rrc.oneXRTT_ForeignNIDReg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_ParameterReg,
       { "oneXRTT-ParameterReg", "lte-rrc.oneXRTT_ParameterReg",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_oneXRTT_RegistrationPeriod,
       { "oneXRTT-RegistrationPeriod", "lte-rrc.oneXRTT_RegistrationPeriod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_7", HFILL }},
     { &hf_lte_rrc_oneXRTT_RegistrationZone,
       { "oneXRTT-RegistrationZone", "lte-rrc.oneXRTT_RegistrationZone",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_lte_rrc_oneXRTT_TotalZone,
       { "oneXRTT-TotalZone", "lte-rrc.oneXRTT_TotalZone",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_lte_rrc_oneXRTT_ZoneTimer,
       { "oneXRTT-ZoneTimer", "lte-rrc.oneXRTT_ZoneTimer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_lte_rrc_singlePCI,
       { "singlePCI", "lte-rrc.singlePCI",
@@ -20169,7 +20169,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.GlobalCellId_EUTRA", HFILL }},
     { &hf_lte_rrc_tac_ID,
       { "tac-ID", "lte-rrc.tac_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.TrackingAreaCode", HFILL }},
     { &hf_lte_rrc_plmn_IdentityList_01,
       { "plmn-IdentityList", "lte-rrc.plmn_IdentityList",
@@ -20205,11 +20205,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.GlobalCellId_UTRA", HFILL }},
     { &hf_lte_rrc_lac_Id,
       { "lac-Id", "lte-rrc.lac_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_lte_rrc_rac_Id,
       { "rac-Id", "lte-rrc.rac_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_lte_rrc_measResult_01,
       { "measResult", "lte-rrc.measResult",
@@ -20265,11 +20265,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_measResult_02", HFILL }},
     { &hf_lte_rrc_rssi,
       { "rssi", "lte-rrc.rssi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_6", HFILL }},
     { &hf_lte_rrc_hrpdPreRegistrationStatus,
       { "hrpdPreRegistrationStatus", "lte-rrc.hrpdPreRegistrationStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_measResultListCDMA2000,
       { "measResultListCDMA2000", "lte-rrc.measResultListCDMA2000",
@@ -20497,7 +20497,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_M30_30", HFILL }},
     { &hf_lte_rrc_reportOnLeave,
       { "reportOnLeave", "lte-rrc.reportOnLeave",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_eventA4,
       { "eventA4", "lte-rrc.eventA4",
@@ -20657,7 +20657,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.IMSI_Digit", HFILL }},
     { &hf_lte_rrc_m_TMSI,
       { "m-TMSI", "lte-rrc.m_TMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_lte_rrc_accessStratumRelease,
       { "accessStratumRelease", "lte-rrc.accessStratumRelease",
@@ -20729,11 +20729,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_maxNumberROHC_ContextSessions", HFILL }},
     { &hf_lte_rrc_ue_TxAntennaSelectionSupported,
       { "ue-TxAntennaSelectionSupported", "lte-rrc.ue_TxAntennaSelectionSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_ue_SpecificRefSigsSupported,
       { "ue-SpecificRefSigsSupported", "lte-rrc.ue_SpecificRefSigsSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_supportedEUTRA_BandList,
       { "supportedEUTRA-BandList", "lte-rrc.supportedEUTRA_BandList",
@@ -20749,7 +20749,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.INTEGER_1_64", HFILL }},
     { &hf_lte_rrc_halfDuplex,
       { "halfDuplex", "lte-rrc.halfDuplex",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_eutra_BandList,
       { "eutra-BandList", "lte-rrc.eutra_BandList",
@@ -20773,7 +20773,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.InterFreqEUTRA_BandList_item", HFILL }},
     { &hf_lte_rrc_interFreqNeedForGaps,
       { "interFreqNeedForGaps", "lte-rrc.interFreqNeedForGaps",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_InterRAT_BandList_item,
       { "InterRAT-BandList item", "lte-rrc.InterRAT_BandList_item",
@@ -20781,7 +20781,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.InterRAT_BandList_item", HFILL }},
     { &hf_lte_rrc_interRAT_NeedForGaps,
       { "interRAT-NeedForGaps", "lte-rrc.interRAT_NeedForGaps",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_supportedUTRA_FDD_BandList,
       { "supportedUTRA-FDD-BandList", "lte-rrc.supportedUTRA_FDD_BandList",
@@ -20837,7 +20837,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.SupportedGERAN_BandList", HFILL }},
     { &hf_lte_rrc_interRAT_PS_HO_ToGERAN,
       { "interRAT-PS-HO-ToGERAN", "lte-rrc.interRAT_PS_HO_ToGERAN",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "lte_rrc.BOOLEAN", HFILL }},
     { &hf_lte_rrc_SupportedGERAN_BandList_item,
       { "SupportedGERAN-BandList item", "lte-rrc.SupportedGERAN_BandList_item",
@@ -20989,7 +20989,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_criticalExtensionsFuture_27", HFILL }},
     { &hf_lte_rrc_interRAT_Message_01,
       { "interRAT-Message", "lte-rrc.interRAT_Message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_28,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -21013,7 +21013,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_criticalExtensionsFuture_28", HFILL }},
     { &hf_lte_rrc_handoverCommandMessage,
       { "handoverCommandMessage", "lte-rrc.handoverCommandMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.T_handoverCommandMessage", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_29,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -21069,7 +21069,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.T_criticalExtensionsFuture_30", HFILL }},
     { &hf_lte_rrc_ue_RadioAccessCapabilityInfo,
       { "ue-RadioAccessCapabilityInfo", "lte-rrc.ue_RadioAccessCapabilityInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.T_ue_RadioAccessCapabilityInfo", HFILL }},
     { &hf_lte_rrc_nonCriticalExtension_31,
       { "nonCriticalExtension", "lte-rrc.nonCriticalExtension",
@@ -21089,7 +21089,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.SecurityConfiguration", HFILL }},
     { &hf_lte_rrc_sourceUE_Identity,
       { "sourceUE-Identity", "lte-rrc.sourceUE_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.C_RNTI", HFILL }},
     { &hf_lte_rrc_sourceMasterInformationBlock,
       { "sourceMasterInformationBlock", "lte-rrc.sourceMasterInformationBlock",
@@ -21105,11 +21105,11 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.SystemInformationBlockType2", HFILL }},
     { &hf_lte_rrc_ue_RadioAccessCapabilityInfo_01,
       { "ue-RadioAccessCapabilityInfo", "lte-rrc.ue_RadioAccessCapabilityInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.T_ue_RadioAccessCapabilityInfo_01", HFILL }},
     { &hf_lte_rrc_ue_SecurityCapabilityInfo,
       { "ue-SecurityCapabilityInfo", "lte-rrc.ue_SecurityCapabilityInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.OCTET_STRING", HFILL }},
     { &hf_lte_rrc_reestablishmentInfo,
       { "reestablishmentInfo", "lte-rrc.reestablishmentInfo",
@@ -21121,7 +21121,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.PhysicalCellIdentity", HFILL }},
     { &hf_lte_rrc_targetCellShortMAC_I,
       { "targetCellShortMAC-I", "lte-rrc.targetCellShortMAC_I",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.ShortMAC_I", HFILL }},
     { &hf_lte_rrc_additionalReestabInfoList,
       { "additionalReestabInfoList", "lte-rrc.additionalReestabInfoList",
@@ -21133,7 +21133,7 @@ void proto_register_lte_rrc(void) {
         "lte_rrc.AdditionalReestabInfoList_item", HFILL }},
     { &hf_lte_rrc_key_eNodeB_Star,
       { "key-eNodeB-Star", "lte-rrc.key_eNodeB_Star",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "lte_rrc.Key_eNodeB_Star", HFILL }},
     { &hf_lte_rrc_ue_InactiveTime,
       { "ue-InactiveTime", "lte-rrc.ue_InactiveTime",
diff --git a/epan/dissectors/packet-lwapp.c b/epan/dissectors/packet-lwapp.c
index d049ec9ebd..43954daf24 100644
--- a/epan/dissectors/packet-lwapp.c
+++ b/epan/dissectors/packet-lwapp.c
@@ -482,48 +482,48 @@ proto_register_lwapp(void)
     static hf_register_info hf[] = {
         { &hf_lwapp_version,
           { "Version", "lwapp.version", FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_slotid,
           { "slotId","lwapp.slotId", FT_UINT24, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_flags_type,
           { "Type", "lwapp.flags.type", FT_BOOLEAN, 8, 
-            TFS(&lwapp_flags_type), LWAPP_FLAGS_T, "", HFILL }},
+            TFS(&lwapp_flags_type), LWAPP_FLAGS_T, NULL, HFILL }},
         { &hf_lwapp_flags_fragment,
           { "Fragment", "lwapp.flags.fragment", FT_BOOLEAN, 8,
             TFS(&lwapp_set_truth), LWAPP_FLAGS_F,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_flags_fragment_type,
           { "Fragment Type", "lwapp.flags.fragmentType", FT_BOOLEAN, 8,
             TFS(&lwapp_set_truth), LWAPP_FLAGS_FT,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_fragment_id,
           { "Fragment Id","lwapp.fragmentId", FT_UINT8, BASE_HEX,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
         { &hf_lwapp_length,
           { "Length","lwapp.Length", FT_UINT16, BASE_DEC,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
         { &hf_lwapp_rssi,
           { "RSSI","lwapp.rssi", FT_UINT8, BASE_HEX,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
         { &hf_lwapp_snr,
           { "SNR","lwapp.snr", FT_UINT8, BASE_HEX,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
         { &hf_lwapp_control,
           { "Control Data (not dissected yet)","lwapp.control", FT_BYTES, BASE_NONE,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
         { &hf_lwapp_control_mac,
           { "AP Identity", "lwapp.apid", FT_ETHER, BASE_NONE, NULL, 0x0,
               "Access Point Identity", HFILL }},
         { &hf_lwapp_control_type,
           { "Control Type", "lwapp.control.type", FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_control_seq_no,
           { "Control Sequence Number", "lwapp.control.seqno", FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }},
+            NULL, HFILL }},
         { &hf_lwapp_control_length,
           { "Control Length","lwapp.control.length", FT_UINT16, BASE_DEC,
-            NULL, 0x0, "", HFILL }},
+            NULL, 0x0, NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_lwapp_l3,
diff --git a/epan/dissectors/packet-lwres.c b/epan/dissectors/packet-lwres.c
index c3be742236..bbea636a37 100644
--- a/epan/dissectors/packet-lwres.c
+++ b/epan/dissectors/packet-lwres.c
@@ -1358,7 +1358,7 @@ proto_register_lwres(void)
   	"lwres namelen", HFILL }},
 
     { &hf_req_name,
-      { "Domain name" , "lwres.reqdname" , FT_STRING, BASE_DEC, NULL, 0x0,
+      { "Domain name" , "lwres.reqdname" , FT_STRING, BASE_NONE, NULL, 0x0,
 	"lwres reqdname", HFILL }},
 
     { &hf_ttl,
@@ -1378,7 +1378,7 @@ proto_register_lwres(void)
    	"lwres realnamelen", HFILL }},
 
     { &hf_realname,
-      { "Real doname name", "lwres.realname", FT_STRING, BASE_DEC, NULL, 0x0,
+      { "Real doname name", "lwres.realname", FT_STRING, BASE_NONE, NULL, 0x0,
 	"lwres realname", HFILL }},
 
 	{ &hf_a_record,
@@ -1414,7 +1414,7 @@ proto_register_lwres(void)
 	  "lwres adn namelen", HFILL }},
 
 	{ &hf_adn_name,
-        { "Name", "lwres.adn.name", FT_STRING, BASE_DEC, NULL, 0x0,
+        { "Name", "lwres.adn.name", FT_STRING, BASE_NONE, NULL, 0x0,
 	  "lwres adn name", HFILL }}, 
 
 	 { &hf_adn_naliases,
@@ -1426,11 +1426,11 @@ proto_register_lwres(void)
 	  "lwres adn naddrs", HFILL }}, 
 
 	  	{ &hf_adn_realname,
-        { "Real name", "lwres.adn.realname", FT_STRING, BASE_DEC, NULL, 0x0,
+        { "Real name", "lwres.adn.realname", FT_STRING, BASE_NONE, NULL, 0x0,
 	  "lwres adn realname", HFILL }}, 
 
 	  	{ &hf_adn_aliasname,
-        { "Alias name", "lwres.adn.aliasname", FT_STRING, BASE_DEC, NULL, 0x0,
+        { "Alias name", "lwres.adn.aliasname", FT_STRING, BASE_NONE, NULL, 0x0,
 	  "lwres adn aliasname", HFILL }}, 
 
 	{ &hf_adn_family,
@@ -1442,7 +1442,7 @@ proto_register_lwres(void)
 	"lwres adn addr length", HFILL }},
 
 	{ &hf_adn_addr_addr,
-    { "IP Address", "lwres.adn.addr.addr", FT_STRING, BASE_DEC, NULL, 0x0,
+    { "IP Address", "lwres.adn.addr.addr", FT_STRING, BASE_NONE, NULL, 0x0,
 	  "lwres adn addr addr", HFILL }},
 
     /* Add more fields here */
diff --git a/epan/dissectors/packet-m2pa.c b/epan/dissectors/packet-m2pa.c
index 0373299188..d84ea7eaed 100644
--- a/epan/dissectors/packet-m2pa.c
+++ b/epan/dissectors/packet-m2pa.c
@@ -542,27 +542,27 @@ void
 proto_register_m2pa(void)
 {
   static hf_register_info hf[] =
-  { { &hf_version,      { "Version",        "m2pa.version",        FT_UINT8,  BASE_DEC,  VALS(protocol_version_values), 0x0,                 "", HFILL} },
-    { &hf_spare,        { "Spare",          "m2pa.spare",          FT_UINT8,  BASE_HEX,  NULL,                          0x0,                 "", HFILL} },
-    { &hf_v2_type,      { "Message Type",   "m2pa.type",           FT_UINT16, BASE_HEX,  VALS(v2_message_type_values),  0x0,                 "", HFILL} },
-    { &hf_v8_type,      { "Message Type",   "m2pa.type",           FT_UINT8,  BASE_DEC,  VALS(v8_message_type_values),  0x0,                 "", HFILL} },
-    { &hf_v12_type,     { "Message Type",   "m2pa.type",           FT_UINT8,  BASE_DEC,  VALS(v12_message_type_values), 0x0,                 "", HFILL} },
-    { &hf_class,        { "Message Class",  "m2pa.class",          FT_UINT8,  BASE_DEC,  VALS(message_class_values),    0x0,                 "", HFILL} },
-    { &hf_length,       { "Message length", "m2pa.length",         FT_UINT32, BASE_DEC,  NULL,                          0x0,                 "", HFILL} },
-    { &hf_unused,       { "Unused",         "m2pa.unused",         FT_UINT8,  BASE_DEC,  NULL,                          0x0,                 "", HFILL} },
-    { &hf_bsn,          { "BSN",            "m2pa.bsn",            FT_UINT24, BASE_DEC,  NULL,                          0x0,                 "", HFILL} },
-    { &hf_fsn,          { "FSN",            "m2pa.fsn",            FT_UINT24, BASE_DEC,  NULL,                          0x0,                 "", HFILL} },
-    { &hf_v2_li_spare,  { "Spare",          "m2pa.li_spare",       FT_UINT8,  BASE_DEC,  NULL,                          V2_LI_SPARE_MASK,    "", HFILL} },
-    { &hf_v8_li_spare,  { "Spare",          "m2pa.li_spare",       FT_UINT8,  BASE_HEX,  NULL,                          V8_LI_SPARE_MASK,    "", HFILL} },
-    { &hf_pri_spare,    { "Spare",          "m2pa.priority_spare", FT_UINT8,  BASE_HEX,  NULL,                          SPARE_MASK,          "", HFILL} },
-    { &hf_v2_li_prio,   { "Priority",       "m2pa.li_priority",    FT_UINT8,  BASE_DEC,  NULL,                          V2_LI_PRIORITY_MASK, "", HFILL} },
-    { &hf_v8_li_prio,   { "Priority",       "m2pa.li_priority",    FT_UINT8,  BASE_HEX,  NULL,                          V8_LI_PRIORITY_MASK, "", HFILL} },
-    { &hf_pri_prio,     { "Priority",       "m2pa.priority",       FT_UINT8,  BASE_HEX,  NULL,                          PRIORITY_MASK,       "", HFILL} },
-    { &hf_v2_status,    { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v2_link_status_values),   0x0,                 "", HFILL} },
-    { &hf_v8_status,    { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v8_link_status_values),   0x0,                 "", HFILL} },
-    { &hf_v12_status,   { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v12_link_status_values),  0x0,                 "", HFILL} },
-    { &hf_filler,       { "Filler",         "m2pa.filler",         FT_BYTES,  BASE_NONE, NULL,                          0x0,                 "", HFILL} },
-    { &hf_unknown_data, { "Unknown Data",   "m2pa.unknown_data",   FT_BYTES,  BASE_NONE, NULL,                          0x0,                 "", HFILL} }
+  { { &hf_version,      { "Version",        "m2pa.version",        FT_UINT8,  BASE_DEC,  VALS(protocol_version_values), 0x0,                 NULL, HFILL} },
+    { &hf_spare,        { "Spare",          "m2pa.spare",          FT_UINT8,  BASE_HEX,  NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_v2_type,      { "Message Type",   "m2pa.type",           FT_UINT16, BASE_HEX,  VALS(v2_message_type_values),  0x0,                 NULL, HFILL} },
+    { &hf_v8_type,      { "Message Type",   "m2pa.type",           FT_UINT8,  BASE_DEC,  VALS(v8_message_type_values),  0x0,                 NULL, HFILL} },
+    { &hf_v12_type,     { "Message Type",   "m2pa.type",           FT_UINT8,  BASE_DEC,  VALS(v12_message_type_values), 0x0,                 NULL, HFILL} },
+    { &hf_class,        { "Message Class",  "m2pa.class",          FT_UINT8,  BASE_DEC,  VALS(message_class_values),    0x0,                 NULL, HFILL} },
+    { &hf_length,       { "Message length", "m2pa.length",         FT_UINT32, BASE_DEC,  NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_unused,       { "Unused",         "m2pa.unused",         FT_UINT8,  BASE_DEC,  NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_bsn,          { "BSN",            "m2pa.bsn",            FT_UINT24, BASE_DEC,  NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_fsn,          { "FSN",            "m2pa.fsn",            FT_UINT24, BASE_DEC,  NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_v2_li_spare,  { "Spare",          "m2pa.li_spare",       FT_UINT8,  BASE_DEC,  NULL,                          V2_LI_SPARE_MASK,    NULL, HFILL} },
+    { &hf_v8_li_spare,  { "Spare",          "m2pa.li_spare",       FT_UINT8,  BASE_HEX,  NULL,                          V8_LI_SPARE_MASK,    NULL, HFILL} },
+    { &hf_pri_spare,    { "Spare",          "m2pa.priority_spare", FT_UINT8,  BASE_HEX,  NULL,                          SPARE_MASK,          NULL, HFILL} },
+    { &hf_v2_li_prio,   { "Priority",       "m2pa.li_priority",    FT_UINT8,  BASE_DEC,  NULL,                          V2_LI_PRIORITY_MASK, NULL, HFILL} },
+    { &hf_v8_li_prio,   { "Priority",       "m2pa.li_priority",    FT_UINT8,  BASE_HEX,  NULL,                          V8_LI_PRIORITY_MASK, NULL, HFILL} },
+    { &hf_pri_prio,     { "Priority",       "m2pa.priority",       FT_UINT8,  BASE_HEX,  NULL,                          PRIORITY_MASK,       NULL, HFILL} },
+    { &hf_v2_status,    { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v2_link_status_values),   0x0,                 NULL, HFILL} },
+    { &hf_v8_status,    { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v8_link_status_values),   0x0,                 NULL, HFILL} },
+    { &hf_v12_status,   { "Link Status",    "m2pa.status",         FT_UINT32, BASE_DEC,  VALS(v12_link_status_values),  0x0,                 NULL, HFILL} },
+    { &hf_filler,       { "Filler",         "m2pa.filler",         FT_BYTES,  BASE_NONE, NULL,                          0x0,                 NULL, HFILL} },
+    { &hf_unknown_data, { "Unknown Data",   "m2pa.unknown_data",   FT_BYTES,  BASE_NONE, NULL,                          0x0,                 NULL, HFILL} }
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-m2tp.c b/epan/dissectors/packet-m2tp.c
index 596a318d0e..eb6bfa5609 100644
--- a/epan/dissectors/packet-m2tp.c
+++ b/epan/dissectors/packet-m2tp.c
@@ -566,87 +566,87 @@ proto_register_m2tp(void)
     { &hf_m2tp_version,
       { "Version", "m2tp.version",
         FT_UINT8, BASE_DEC, VALS(m2tp_protocol_version_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_reserved,
       { "Reserved", "m2tp.reserved",
         FT_UINT8, BASE_HEX, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_message_class,
       { "Message class", "m2tp.message_class",
         FT_UINT8, BASE_DEC, VALS(m2tp_message_class_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_message_type,
       { "Message Type", "m2tp.message_type",
         FT_UINT8, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_message_length,
       { "Message length", "m2tp.message_length",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_parameter_tag,
       { "Parameter Tag", "m2tp.parameter_tag",
         FT_UINT16, BASE_DEC, VALS(m2tp_parameter_tag_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_parameter_length,
       { "Parameter length", "m2tp.parameter_length",
         FT_UINT16, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_parameter_value,
       { "Parameter Value", "m2tp.parameter_value",
 	      FT_BYTES, BASE_NONE, NULL, 0x0,
-	      "", HFILL }
+	      NULL, HFILL }
     },
     { &hf_m2tp_parameter_padding,
       { "Padding", "m2tp.parameter_padding",
 	      FT_BYTES, BASE_NONE, NULL, 0x0,
-	      "", HFILL }
+	      NULL, HFILL }
     },
     { &hf_m2tp_interface_identifier,
       { "Interface Identifier", "m2tp.interface_identifier",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_user,
       { "M2tp User Identifier", "m2tp.user_identifier",
         FT_UINT32, BASE_DEC, VALS(m2tp_user_identifier_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_master_slave,
       { "Master Slave Indicator", "m2tp.master_slave",
         FT_UINT32, BASE_DEC, VALS(m2tp_mode_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_info_string,
       { "Info string", "m2tp.info_string",
-        FT_STRING, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        FT_STRING, BASE_NONE, NULL, 0x0,
+        NULL, HFILL}
     },
     { &hf_m2tp_diagnostic_info,
       { "Diagnostic information", "m2tp.diagnostic_info",
 	       FT_BYTES, BASE_NONE, NULL, 0x0,
-	       "", HFILL }
+	       NULL, HFILL }
     },
     { &hf_m2tp_heartbeat_data,
       { "Heartbeat data", "m2tp.heartbeat_data",
 	       FT_BYTES, BASE_NONE, NULL, 0x0,
-	       "", HFILL }
+	       NULL, HFILL }
     },
     { &hf_m2tp_error_code,
       { "Error code", "m2tp.error_code",
         FT_UINT32, BASE_DEC, VALS(m2tp_error_code_values), 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
     { &hf_m2tp_reason,
       { "Reason", "m2tp.reason",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL}
+        NULL, HFILL}
     },
   };
 
diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c
index dc28e5f59f..cfd5b9fba5 100644
--- a/epan/dissectors/packet-m2ua.c
+++ b/epan/dissectors/packet-m2ua.c
@@ -1079,43 +1079,43 @@ proto_register_m2ua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_version,                { "Version",                        "m2ua.version",                    FT_UINT8,  BASE_DEC,  VALS(protocol_version_values),      0x0, "", HFILL } },
-    { &hf_reserved,               { "Reserved",                       "m2ua.reserved",                   FT_UINT8,  BASE_HEX,  NULL,                               0x0, "", HFILL } },
-    { &hf_message_class,          { "Message class",                  "m2ua.message_class",              FT_UINT8,  BASE_DEC,  VALS(message_class_values),         0x0, "", HFILL } },
-    { &hf_message_type,           { "Message Type",                   "m2ua.message_type",               FT_UINT8,  BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_message_length,         { "Message length",                 "m2ua.message_length",             FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_parameter_tag,          { "Parameter Tag",                  "m2ua.parameter_tag",              FT_UINT16, BASE_HEX,  VALS(parameter_tag_values),         0x0, "", HFILL } },
-    { &hf_parameter_length,       { "Parameter length",               "m2ua.parameter_length",           FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_parameter_value,        { "Parameter value",                "m2ua.parameter_value",            FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
-    { &hf_parameter_padding,      { "Padding",                        "m2ua.parameter_padding",          FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
-    { &hf_interface_id_int,       { "Interface Identifier (integer)", "m2ua.interface_identifier_int",   FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_interface_id_text,      { "Interface identifier (text)",    "m2ua.interface_identifier_text",  FT_STRING, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_info_string,            { "Info string",                    "m2ua.info_string",                FT_STRING, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_diagnostic_information, { "Diagnostic information",         "m2ua.diagnostic_information",     FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
-    { &hf_interface_id_start,     { "Interface Identifier (start)",   "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_interface_id_stop,      { "Interface Identifier (stop)",    "m2ua.interface_identifier_stop",  FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_heartbeat_data,         { "Heartbeat data",                 "m2ua.heartbeat_data",             FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
-    { &hf_traffic_mode_type,      { "Traffic mode Type",              "m2ua.traffic_mode_type",          FT_UINT32, BASE_DEC,  VALS(traffic_mode_type_values),     0x0, "", HFILL } },
-    { &hf_error_code,             { "Error code",                     "m2ua.error_code",                 FT_UINT32, BASE_DEC,  VALS(error_code_values),            0x0, "", HFILL } },
-    { &hf_status_type,            { "Status type",                    "m2ua.status_type",                FT_UINT16, BASE_DEC,  VALS(status_type_values),           0x0, "", HFILL } },
-    { &hf_status_ident,           { "Status info",                    "m2ua.status_info",                FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_asp_id,                 { "ASP identifier",                 "m2ua.asp_identifier",             FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_correlation_id,         { "Correlation identifier",         "m2ua.correlation_identifier",     FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_data_2_li,              { "Length indicator",               "m2ua.data_2_li",                  FT_UINT8,  BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_state,                  { "State",                          "m2ua.state",                      FT_UINT32, BASE_DEC,  VALS(state_values),                 0x0, "", HFILL } },
-    { &hf_event,                  { "Event",                          "m2ua.event",                      FT_UINT32, BASE_DEC,  VALS(event_values),                 0x0, "", HFILL } },
-    { &hf_congestion_status,      { "Congestion status",              "m2ua.congestion_status",          FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, "", HFILL } },
-    { &hf_discard_status,         { "Discard status",                 "m2ua.discard_status",             FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, "", HFILL } },
-    { &hf_action,                 { "Actions",                        "m2ua.action",                     FT_UINT32, BASE_DEC,  VALS(action_values),                0x0, "", HFILL } },
-    { &hf_sequence_number,        { "Sequence number",                "m2ua.sequence_number",            FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_retrieval_result,       { "Retrieval result",               "m2ua.retrieval_result",           FT_UINT32, BASE_DEC,  VALS(retrieval_result_values),      0x0, "", HFILL } },
-    { &hf_local_lk_id,            { "Local LK identifier",            "m2ua.local_lk_identifier",        FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_sdt_reserved,           { "Reserved",                       "m2ua.sdt_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, "", HFILL } },
-    { &hf_sdt_id,                 { "SDT identifier",                 "m2ua.sdt_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_sdl_reserved,           { "Reserved",                       "m2ua.sdl_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, "", HFILL } },
-    { &hf_sdl_id,                 { "SDL identifier",                 "m2ua.sdl_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
-    { &hf_registration_status,    { "Registration status",            "m2ua.registration_status",        FT_UINT32, BASE_DEC,  VALS(registration_status_values),   0x0, "", HFILL } },
-    { &hf_deregistration_status,  { "Deregistration status",          "m2ua.deregistration_status",      FT_UINT32, BASE_DEC,  VALS(deregistration_status_values), 0x0, "", HFILL } },
+    { &hf_version,                { "Version",                        "m2ua.version",                    FT_UINT8,  BASE_DEC,  VALS(protocol_version_values),      0x0, NULL, HFILL } },
+    { &hf_reserved,               { "Reserved",                       "m2ua.reserved",                   FT_UINT8,  BASE_HEX,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_message_class,          { "Message class",                  "m2ua.message_class",              FT_UINT8,  BASE_DEC,  VALS(message_class_values),         0x0, NULL, HFILL } },
+    { &hf_message_type,           { "Message Type",                   "m2ua.message_type",               FT_UINT8,  BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_message_length,         { "Message length",                 "m2ua.message_length",             FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_parameter_tag,          { "Parameter Tag",                  "m2ua.parameter_tag",              FT_UINT16, BASE_HEX,  VALS(parameter_tag_values),         0x0, NULL, HFILL } },
+    { &hf_parameter_length,       { "Parameter length",               "m2ua.parameter_length",           FT_UINT16, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_parameter_value,        { "Parameter value",                "m2ua.parameter_value",            FT_BYTES,  BASE_NONE, NULL,                               0x0, NULL, HFILL } },
+    { &hf_parameter_padding,      { "Padding",                        "m2ua.parameter_padding",          FT_BYTES,  BASE_NONE, NULL,                               0x0, NULL, HFILL } },
+    { &hf_interface_id_int,       { "Interface Identifier (integer)", "m2ua.interface_identifier_int",   FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_interface_id_text,      { "Interface identifier (text)",    "m2ua.interface_identifier_text",  FT_STRING, BASE_NONE,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_info_string,            { "Info string",                    "m2ua.info_string",                FT_STRING, BASE_NONE,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_diagnostic_information, { "Diagnostic information",         "m2ua.diagnostic_information",     FT_BYTES,  BASE_NONE, NULL,                               0x0, NULL, HFILL } },
+    { &hf_interface_id_start,     { "Interface Identifier (start)",   "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_interface_id_stop,      { "Interface Identifier (stop)",    "m2ua.interface_identifier_stop",  FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_heartbeat_data,         { "Heartbeat data",                 "m2ua.heartbeat_data",             FT_BYTES,  BASE_NONE, NULL,                               0x0, NULL, HFILL } },
+    { &hf_traffic_mode_type,      { "Traffic mode Type",              "m2ua.traffic_mode_type",          FT_UINT32, BASE_DEC,  VALS(traffic_mode_type_values),     0x0, NULL, HFILL } },
+    { &hf_error_code,             { "Error code",                     "m2ua.error_code",                 FT_UINT32, BASE_DEC,  VALS(error_code_values),            0x0, NULL, HFILL } },
+    { &hf_status_type,            { "Status type",                    "m2ua.status_type",                FT_UINT16, BASE_DEC,  VALS(status_type_values),           0x0, NULL, HFILL } },
+    { &hf_status_ident,           { "Status info",                    "m2ua.status_info",                FT_UINT16, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_asp_id,                 { "ASP identifier",                 "m2ua.asp_identifier",             FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_correlation_id,         { "Correlation identifier",         "m2ua.correlation_identifier",     FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_data_2_li,              { "Length indicator",               "m2ua.data_2_li",                  FT_UINT8,  BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_state,                  { "State",                          "m2ua.state",                      FT_UINT32, BASE_DEC,  VALS(state_values),                 0x0, NULL, HFILL } },
+    { &hf_event,                  { "Event",                          "m2ua.event",                      FT_UINT32, BASE_DEC,  VALS(event_values),                 0x0, NULL, HFILL } },
+    { &hf_congestion_status,      { "Congestion status",              "m2ua.congestion_status",          FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, NULL, HFILL } },
+    { &hf_discard_status,         { "Discard status",                 "m2ua.discard_status",             FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, NULL, HFILL } },
+    { &hf_action,                 { "Actions",                        "m2ua.action",                     FT_UINT32, BASE_DEC,  VALS(action_values),                0x0, NULL, HFILL } },
+    { &hf_sequence_number,        { "Sequence number",                "m2ua.sequence_number",            FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_retrieval_result,       { "Retrieval result",               "m2ua.retrieval_result",           FT_UINT32, BASE_DEC,  VALS(retrieval_result_values),      0x0, NULL, HFILL } },
+    { &hf_local_lk_id,            { "Local LK identifier",            "m2ua.local_lk_identifier",        FT_UINT32, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_sdt_reserved,           { "Reserved",                       "m2ua.sdt_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_sdt_id,                 { "SDT identifier",                 "m2ua.sdt_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_sdl_reserved,           { "Reserved",                       "m2ua.sdl_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_sdl_id,                 { "SDL identifier",                 "m2ua.sdl_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, NULL, HFILL } },
+    { &hf_registration_status,    { "Registration status",            "m2ua.registration_status",        FT_UINT32, BASE_DEC,  VALS(registration_status_values),   0x0, NULL, HFILL } },
+    { &hf_deregistration_status,  { "Deregistration status",          "m2ua.deregistration_status",      FT_UINT32, BASE_DEC,  VALS(deregistration_status_values), 0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c
index 7f9b8831a0..8121bb91a9 100644
--- a/epan/dissectors/packet-m3ua.c
+++ b/epan/dissectors/packet-m3ua.c
@@ -1961,75 +1961,75 @@ proto_register_m3ua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_version,                          { "Version",                      "m3ua.version",                               FT_UINT8,  BASE_DEC,  VALS(protocol_version_values),                0x0, "", HFILL } },
-    { &hf_reserved,                         { "Reserved",                     "m3ua.reserved",                              FT_UINT8,  BASE_HEX,  NULL,                                         0x0, "", HFILL } },
-    { &hf_v5_message_class,                 { "Message class",                "m3ua.message_class",                         FT_UINT8,  BASE_DEC,  VALS(v5_message_class_values),                0x0, "", HFILL } },
-    { &hf_message_class,                    { "Message class",                "m3ua.message_class",                         FT_UINT8,  BASE_DEC,  VALS(message_class_values),                   0x0, "", HFILL } },
-    { &hf_message_type,                     { "Message Type",                 "m3ua.message_type",                          FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_message_length,                   { "Message length",               "m3ua.message_length",                        FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_v5_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v5_parameter_tag_values),                0x0, "", HFILL } },
-    { &hf_v6_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v6_parameter_tag_values),                0x0, "", HFILL } },
-    { &hf_v7_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v7_parameter_tag_values),                0x0, "", HFILL } },
-    { &hf_parameter_tag,                    { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(parameter_tag_values),                   0x0, "", HFILL } },
-    { &hf_parameter_length,                 { "Parameter length",             "m3ua.parameter_length",                      FT_UINT16, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_parameter_value,                  { "Parameter value",              "m3ua.parameter_value",                       FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_parameter_padding,                { "Padding",                      "m3ua.parameter_padding",                     FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_parameter_trailer,                { "Trailer",                      "m3ua.paramter_trailer",                      FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_network_appearance,               { "Network appearance",           "m3ua.network_appearance",                    FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_info_string,                      { "Info string",                  "m3ua.info_string",                           FT_STRING, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_routing_context,                  { "Routing context",              "m3ua.routing_context",                       FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_diagnostic_information,           { "Diagnostic information",       "m3ua.diagnostic_information",                FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_heartbeat_data,                   { "Heartbeat data",               "m3ua.heartbeat_data",                        FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_v5_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v5_error_code_values),                   0x0, "", HFILL } },
-    { &hf_v6_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v6_error_code_values),                   0x0, "", HFILL } },
-    { &hf_v7_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v7_error_code_values),                   0x0, "", HFILL } },
-    { &hf_error_code,                       { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(error_code_values),                      0x0, "", HFILL } },
-    { &hf_status_type,                      { "Status type",                  "m3ua.status_type",                           FT_UINT16, BASE_DEC,  VALS(status_type_values),                     0x0, "", HFILL } },
-    { &hf_status_info,                      { "Status info",                  "m3ua.status_info",                           FT_UINT16, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_asp_identifier,                   { "ASP identifier",               "m3ua.asp_identifier",                        FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_affected_point_code_mask,         { "Mask",                         "m3ua.affected_point_code_mask",              FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_affected_point_code_pc,           { "Affected point code",          "m3ua.affected_point_code_pc",                FT_UINT24, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_cause,                            { "Unavailability cause",         "m3ua.unavailability_cause",                  FT_UINT16, BASE_DEC,  VALS(unavailability_cause_values),            0x0, "", HFILL } },
-    { &hf_user,                             { "User Identity",                "m3ua.user_identity",                         FT_UINT16, BASE_DEC,  VALS(user_identity_values),                   0x0, "", HFILL } },
-    { &hf_reason,                           { "Reason",                       "m3ua.reason",                                FT_UINT32, BASE_DEC,  VALS(reason_values),                          0x0, "", HFILL } },
-    { &hf_v5_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v5_traffic_mode_type_values),            0x0, "", HFILL } },
-    { &hf_v6_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v6_traffic_mode_type_values),            0x0, "", HFILL } },
-    { &hf_v7_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v7_traffic_mode_type_values),            0x0, "", HFILL } },
-    { &hf_traffic_mode_type,                { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(traffic_mode_type_values),               0x0, "", HFILL } },
-    { &hf_congestion_reserved,              { "Reserved",                     "m3ua.congestion_reserved",                   FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_congestion_level,                 { "Congestion level",             "m3ua.congestion_level",                      FT_UINT8,  BASE_DEC,  VALS(congestion_level_values),                0x0, "", HFILL } },
-    { &hf_concerned_dest_reserved,          { "Reserved",                     "m3ua.concerned_reserved",                    FT_BYTES,  BASE_NONE, NULL,                                         0x0, "", HFILL } },
-    { &hf_concerned_dest_pc,                { "Concerned DPC",                "m3ua.concerned_dpc",                         FT_UINT24, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_local_rk_identifier,              { "Local routing key identifier", "m3ua.local_rk_identifier",                   FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_dpc_mask,                         { "Mask",                         "m3ua.dpc_mask",                              FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_dpc_pc,                           { "Destination point code",       "m3ua.dpc_pc",                                FT_UINT24, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_si,                               { "Service indicator",            "m3ua.si",                                    FT_UINT8,  BASE_DEC,  VALS(user_identity_values),                   0x0, "", HFILL } },
-    { &hf_ssn,                              { "Subsystem number",             "m3ua.ssn",                                   FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_opc_list_mask,                    { "Mask",                         "m3ua.opc_list_mask",                         FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_opc_list_pc,                      { "Originating point code",       "m3ua.opc_list_pc",                           FT_UINT24, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_cic_range_mask,                   { "Mask",                         "m3ua.cic_range_mask",                        FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_cic_range_pc,                     { "Originating point code",       "m3ua.cic_range_pc",                          FT_UINT24, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_cic_range_lower,                  { "Lower CIC value",              "m3ua.cic_range_lower",                       FT_UINT16, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_cic_range_upper,                  { "Upper CIC value",              "m3ua.cic_range_upper",                       FT_UINT16, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_li,                               { "Length indicator",             "m3ua.protocol_data_2_li",                    FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_opc,                { "OPC",                          "m3ua.protocol_data_opc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_dpc,                { "DPC",                          "m3ua.protocol_data_dpc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_mtp3_opc,                { "OPC",                          "mtp3.opc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_mtp3_dpc,                { "DPC",                          "mtp3.dpc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_mtp3_pc,                { "PC",                          "mtp3.pc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_si,                 { "SI",                           "m3ua.protocol_data_si",                      FT_UINT8,  BASE_DEC,  VALS(user_identity_values),                                         0x0, "", HFILL } },
-    { &hf_protocol_data_ni,                 { "NI",                           "m3ua.protocol_data_ni",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_mtp3_ni,                 { "NI",                           "mtp3.ni",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_mp,                 { "MP",                           "m3ua.protocol_data_mp",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_protocol_data_sls,                { "SLS",                          "m3ua.protocol_data_sls",                     FT_UINT8,  BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_correlation_identifier,           { "Correlation Identifier",       "m3ua.correlation_identifier",                FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_registration_status,              { "Registration status",          "m3ua.registration_status",                   FT_UINT32, BASE_DEC,  VALS(registration_status_values),             0x0, "", HFILL } },
-    { &hf_deregistration_status,            { "Deregistration status",        "m3ua.deregistration_status",                 FT_UINT32, BASE_DEC,  VALS(deregistration_status_values),           0x0, "", HFILL } },
-    { &hf_registration_result_identifier,   { "Local RK-identifier value",    "m3ua.registration_result_identifier",        FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_registration_result_status,       { "Registration status",          "m3ua.registration_results_status",           FT_UINT32, BASE_DEC,  VALS(registration_result_status_values),      0x0, "", HFILL } },
-    { &hf_registration_result_context,      { "Routing context",              "m3ua.registration_result_routing_context",   FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
-    { &hf_v6_deregistration_result_status,  { "De-Registration status",       "m3ua.deregistration_results_status",         FT_UINT32, BASE_DEC,  VALS(v6_deregistration_result_status_values), 0x0, "", HFILL } },
-    { &hf_v6_deregistration_result_context, { "Routing context",              "m3ua.deregistration_result_routing_context", FT_UINT32, BASE_DEC,  NULL,                                         0x0, "", HFILL } },
+    { &hf_version,                          { "Version",                      "m3ua.version",                               FT_UINT8,  BASE_DEC,  VALS(protocol_version_values),                0x0, NULL, HFILL } },
+    { &hf_reserved,                         { "Reserved",                     "m3ua.reserved",                              FT_UINT8,  BASE_HEX,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_v5_message_class,                 { "Message class",                "m3ua.message_class",                         FT_UINT8,  BASE_DEC,  VALS(v5_message_class_values),                0x0, NULL, HFILL } },
+    { &hf_message_class,                    { "Message class",                "m3ua.message_class",                         FT_UINT8,  BASE_DEC,  VALS(message_class_values),                   0x0, NULL, HFILL } },
+    { &hf_message_type,                     { "Message Type",                 "m3ua.message_type",                          FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_message_length,                   { "Message length",               "m3ua.message_length",                        FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_v5_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v5_parameter_tag_values),                0x0, NULL, HFILL } },
+    { &hf_v6_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v6_parameter_tag_values),                0x0, NULL, HFILL } },
+    { &hf_v7_parameter_tag,                 { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(v7_parameter_tag_values),                0x0, NULL, HFILL } },
+    { &hf_parameter_tag,                    { "Parameter Tag",                "m3ua.parameter_tag",                         FT_UINT16, BASE_DEC,  VALS(parameter_tag_values),                   0x0, NULL, HFILL } },
+    { &hf_parameter_length,                 { "Parameter length",             "m3ua.parameter_length",                      FT_UINT16, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_parameter_value,                  { "Parameter value",              "m3ua.parameter_value",                       FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_parameter_padding,                { "Padding",                      "m3ua.parameter_padding",                     FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_parameter_trailer,                { "Trailer",                      "m3ua.paramter_trailer",                      FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_network_appearance,               { "Network appearance",           "m3ua.network_appearance",                    FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_info_string,                      { "Info string",                  "m3ua.info_string",                           FT_STRING, BASE_NONE,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_routing_context,                  { "Routing context",              "m3ua.routing_context",                       FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_diagnostic_information,           { "Diagnostic information",       "m3ua.diagnostic_information",                FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_heartbeat_data,                   { "Heartbeat data",               "m3ua.heartbeat_data",                        FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_v5_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v5_error_code_values),                   0x0, NULL, HFILL } },
+    { &hf_v6_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v6_error_code_values),                   0x0, NULL, HFILL } },
+    { &hf_v7_error_code,                    { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(v7_error_code_values),                   0x0, NULL, HFILL } },
+    { &hf_error_code,                       { "Error code",                   "m3ua.error_code",                            FT_UINT32, BASE_DEC,  VALS(error_code_values),                      0x0, NULL, HFILL } },
+    { &hf_status_type,                      { "Status type",                  "m3ua.status_type",                           FT_UINT16, BASE_DEC,  VALS(status_type_values),                     0x0, NULL, HFILL } },
+    { &hf_status_info,                      { "Status info",                  "m3ua.status_info",                           FT_UINT16, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_asp_identifier,                   { "ASP identifier",               "m3ua.asp_identifier",                        FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_affected_point_code_mask,         { "Mask",                         "m3ua.affected_point_code_mask",              FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_affected_point_code_pc,           { "Affected point code",          "m3ua.affected_point_code_pc",                FT_UINT24, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_cause,                            { "Unavailability cause",         "m3ua.unavailability_cause",                  FT_UINT16, BASE_DEC,  VALS(unavailability_cause_values),            0x0, NULL, HFILL } },
+    { &hf_user,                             { "User Identity",                "m3ua.user_identity",                         FT_UINT16, BASE_DEC,  VALS(user_identity_values),                   0x0, NULL, HFILL } },
+    { &hf_reason,                           { "Reason",                       "m3ua.reason",                                FT_UINT32, BASE_DEC,  VALS(reason_values),                          0x0, NULL, HFILL } },
+    { &hf_v5_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v5_traffic_mode_type_values),            0x0, NULL, HFILL } },
+    { &hf_v6_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v6_traffic_mode_type_values),            0x0, NULL, HFILL } },
+    { &hf_v7_traffic_mode_type,             { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(v7_traffic_mode_type_values),            0x0, NULL, HFILL } },
+    { &hf_traffic_mode_type,                { "Traffic mode Type",            "m3ua.traffic_mode_type",                     FT_UINT32, BASE_DEC,  VALS(traffic_mode_type_values),               0x0, NULL, HFILL } },
+    { &hf_congestion_reserved,              { "Reserved",                     "m3ua.congestion_reserved",                   FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_congestion_level,                 { "Congestion level",             "m3ua.congestion_level",                      FT_UINT8,  BASE_DEC,  VALS(congestion_level_values),                0x0, NULL, HFILL } },
+    { &hf_concerned_dest_reserved,          { "Reserved",                     "m3ua.concerned_reserved",                    FT_BYTES,  BASE_NONE, NULL,                                         0x0, NULL, HFILL } },
+    { &hf_concerned_dest_pc,                { "Concerned DPC",                "m3ua.concerned_dpc",                         FT_UINT24, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_local_rk_identifier,              { "Local routing key identifier", "m3ua.local_rk_identifier",                   FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_dpc_mask,                         { "Mask",                         "m3ua.dpc_mask",                              FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_dpc_pc,                           { "Destination point code",       "m3ua.dpc_pc",                                FT_UINT24, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_si,                               { "Service indicator",            "m3ua.si",                                    FT_UINT8,  BASE_DEC,  VALS(user_identity_values),                   0x0, NULL, HFILL } },
+    { &hf_ssn,                              { "Subsystem number",             "m3ua.ssn",                                   FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_opc_list_mask,                    { "Mask",                         "m3ua.opc_list_mask",                         FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_opc_list_pc,                      { "Originating point code",       "m3ua.opc_list_pc",                           FT_UINT24, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_cic_range_mask,                   { "Mask",                         "m3ua.cic_range_mask",                        FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_cic_range_pc,                     { "Originating point code",       "m3ua.cic_range_pc",                          FT_UINT24, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_cic_range_lower,                  { "Lower CIC value",              "m3ua.cic_range_lower",                       FT_UINT16, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_cic_range_upper,                  { "Upper CIC value",              "m3ua.cic_range_upper",                       FT_UINT16, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_li,                               { "Length indicator",             "m3ua.protocol_data_2_li",                    FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_opc,                { "OPC",                          "m3ua.protocol_data_opc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_dpc,                { "DPC",                          "m3ua.protocol_data_dpc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_mtp3_opc,                { "OPC",                          "mtp3.opc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_mtp3_dpc,                { "DPC",                          "mtp3.dpc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_mtp3_pc,                { "PC",                          "mtp3.pc",                     FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_si,                 { "SI",                           "m3ua.protocol_data_si",                      FT_UINT8,  BASE_DEC,  VALS(user_identity_values),                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_ni,                 { "NI",                           "m3ua.protocol_data_ni",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_mtp3_ni,                 { "NI",                           "mtp3.ni",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_mp,                 { "MP",                           "m3ua.protocol_data_mp",                      FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_protocol_data_sls,                { "SLS",                          "m3ua.protocol_data_sls",                     FT_UINT8,  BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_correlation_identifier,           { "Correlation Identifier",       "m3ua.correlation_identifier",                FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_registration_status,              { "Registration status",          "m3ua.registration_status",                   FT_UINT32, BASE_DEC,  VALS(registration_status_values),             0x0, NULL, HFILL } },
+    { &hf_deregistration_status,            { "Deregistration status",        "m3ua.deregistration_status",                 FT_UINT32, BASE_DEC,  VALS(deregistration_status_values),           0x0, NULL, HFILL } },
+    { &hf_registration_result_identifier,   { "Local RK-identifier value",    "m3ua.registration_result_identifier",        FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_registration_result_status,       { "Registration status",          "m3ua.registration_results_status",           FT_UINT32, BASE_DEC,  VALS(registration_result_status_values),      0x0, NULL, HFILL } },
+    { &hf_registration_result_context,      { "Routing context",              "m3ua.registration_result_routing_context",   FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
+    { &hf_v6_deregistration_result_status,  { "De-Registration status",       "m3ua.deregistration_results_status",         FT_UINT32, BASE_DEC,  VALS(v6_deregistration_result_status_values), 0x0, NULL, HFILL } },
+    { &hf_v6_deregistration_result_context, { "Routing context",              "m3ua.deregistration_result_routing_context", FT_UINT32, BASE_DEC,  NULL,                                         0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-mac-lte.c b/epan/dissectors/packet-mac-lte.c
index 262e9f1aa7..9864a6fa61 100644
--- a/epan/dissectors/packet-mac-lte.c
+++ b/epan/dissectors/packet-mac-lte.c
@@ -1517,7 +1517,7 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_context_radio_type,
             { "Radio Type",
               "mac-lte.radio-type", FT_UINT8, BASE_DEC, VALS(radio_type_vals), 0x0,
-              "Radio Type", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_context_direction,
@@ -1587,25 +1587,25 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_ulsch_header,
             { "UL-SCH Header",
               "mac-lte.ulsch.header", FT_STRING, BASE_NONE, NULL, 0x0,
-              "UL-SCH Header", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_dlsch_header,
             { "DL-SCH Header",
               "mac-lte.dlsch.header", FT_STRING, BASE_NONE, NULL, 0x0,
-              "DL-SCH Header", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_sch_subheader,
             { "SCH sub-header",
               "mac-lte.sch.subheader", FT_STRING, BASE_NONE, NULL, 0x0,
-              "SCH sub-header", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_sch_reserved,
             { "SCH reserved bits",
               "mac-lte.sch.reserved", FT_UINT8, BASE_HEX, NULL, 0xc0,
-              "SCH reserved bits", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_sch_extended,
@@ -1629,7 +1629,7 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_sch_format,
             { "Format",
               "mac-lte.sch.format", FT_UINT8, BASE_HEX, VALS(format_vals), 0x80,
-              "Format", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_sch_length,
@@ -1641,7 +1641,7 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_sch_header_only,
             { "MAC PDU Header only",
               "mac-lte.sch.header-only", FT_UINT8, BASE_DEC, VALS(header_only_vals), 0x0,
-              "MAC PDU Header only", HFILL
+              NULL, HFILL
             }
         },
 
@@ -1649,32 +1649,32 @@ void proto_register_mac_lte(void)
         /* Data                         */
         { &hf_mac_lte_sch_sdu,
             { "SDU",
-              "mac-lte.sch.sdu", FT_BYTES, BASE_HEX, 0, 0x0,
+              "mac-lte.sch.sdu", FT_BYTES, BASE_NONE, 0, 0x0,
               "Shared channel SDU", HFILL
             }
         },
         { &hf_mac_lte_bch_pdu,
             { "BCH PDU",
-              "mac-lte.bch.pdu", FT_BYTES, BASE_HEX, 0, 0x0,
-              "BCH PDU", HFILL
+              "mac-lte.bch.pdu", FT_BYTES, BASE_NONE, 0, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_pch_pdu,
             { "PCH PDU",
-              "mac-lte.pch.pdu", FT_BYTES, BASE_HEX, 0, 0x0,
-              "PCH PDU", HFILL
+              "mac-lte.pch.pdu", FT_BYTES, BASE_NONE, 0, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_predefined_pdu,
             { "Predefined data",
-              "mac-lte.predefined-data", FT_BYTES, BASE_HEX, 0, 0x0,
+              "mac-lte.predefined-data", FT_BYTES, BASE_NONE, 0, 0x0,
               "Predefined test data", HFILL
             }
         },
         { &hf_mac_lte_padding_data,
             { "Padding data",
-              "mac-lte.padding-data", FT_BYTES, BASE_HEX, 0, 0x0,
-              "Padding data", HFILL
+              "mac-lte.padding-data", FT_BYTES, BASE_NONE, 0, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_padding_length,
@@ -1691,19 +1691,19 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_rar,
             { "RAR",
               "mac-lte.rar", FT_NONE, BASE_NONE, NULL, 0x0,
-              "RAR", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_headers,
             { "RAR Headers",
               "mac-lte.rar.headers", FT_STRING, BASE_NONE, NULL, 0x0,
-              "RAR Headers", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_header,
             { "RAR Header",
               "mac-lte.rar.header", FT_STRING, BASE_NONE, NULL, 0x0,
-              "RAR Header", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_extension,
@@ -1740,7 +1740,7 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_rar_body,
             { "RAR Body",
               "mac-lte.rar.body", FT_STRING, BASE_NONE, NULL, 0x0,
-              "RAR Body", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_reserved2,
@@ -1770,37 +1770,37 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_rar_ul_grant_fsrba,
             { "Fixed sized resource block assignment",
               "mac-lte.rar.ul-grant.fsrba", FT_UINT16, BASE_DEC, 0, 0x07fe,
-              "Fixed sized resource block assignment", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_ul_grant_tmcs,
             { "Truncated Modulation and coding scheme",
               "mac-lte.rar.ul-grant.tmcs", FT_UINT16, BASE_DEC, 0, 0x01e0,
-              "Truncated Modulation and coding scheme", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_ul_grant_tcsp,
             { "TPC command for scheduled PUSCH",
               "mac-lte.rar.ul-grant.tcsp", FT_UINT8, BASE_DEC, 0, 0x01c,
-              "TPC command for scheduled PUSCH", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_ul_grant_ul_delay,
             { "UL Delay",
               "mac-lte.rar.ul-grant.ul-delay", FT_UINT8, BASE_DEC, 0, 0x02,
-              "UL Delay", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_ul_grant_cqi_request,
             { "CQI Request",
               "mac-lte.rar.ul-grant.cqi-request", FT_UINT8, BASE_DEC, 0, 0x01,
-              "CQI Request", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_rar_temporary_crnti,
             { "Temporary C-RNTI",
               "mac-lte.rar.temporary-crnti", FT_UINT16, BASE_DEC, 0, 0x0,
-              "Temporary C-RNTI", HFILL
+              NULL, HFILL
             }
         },
 
@@ -1815,7 +1815,7 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_control_bsr_lcg_id,
             { "Logical Channel Group ID",
               "mac-lte.control.bsr.lcg-id", FT_UINT8, BASE_DEC, 0, 0xc0,
-              "Logical Channel Group ID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_control_bsr_buffer_size,
@@ -1862,8 +1862,8 @@ void proto_register_mac_lte(void)
         },
         { &hf_mac_lte_control_ue_contention_resolution_identity,
             { "UE Contention Resolution Identity",
-              "mac-lte.control.ue-contention-resolution-identity", FT_BYTES, BASE_HEX, 0, 0x0,
-              "UE Contention Resolution Identity", HFILL
+              "mac-lte.control.ue-contention-resolution-identity", FT_BYTES, BASE_NONE, 0, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_control_power_headroom_reserved,
@@ -1875,13 +1875,13 @@ void proto_register_mac_lte(void)
         { &hf_mac_lte_control_power_headroom,
             { "Power Headroom",
               "mac-lte.control.power-headroom", FT_UINT8, BASE_DEC, 0, 0x3f,
-              "Power Headroom", HFILL
+              NULL, HFILL
             }
         },
         { &hf_mac_lte_control_padding,
             { "Padding",
               "mac-lte.control.padding", FT_NONE, BASE_NONE, 0, 0x0,
-              "Padding", HFILL
+              NULL, HFILL
             }
         },
     };
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c
index bdb7dd8b7a..1d41c494fb 100644
--- a/epan/dissectors/packet-mbtcp.c
+++ b/epan/dissectors/packet-mbtcp.c
@@ -594,98 +594,98 @@ proto_register_modbus(void)
 		{ &hf_mbtcp_transid,
 			{ "transaction identifier",			"modbus_tcp.trans_id",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_mbtcp_protid,
 			{ "protocol identifier",			"modbus_tcp.prot_id",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_mbtcp_len,
 			{ "length",							"modbus_tcp.len",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		/* Modbus header fields */
 		{ &hf_mbtcp_unitid,
 			{ "unit identifier",           		"modbus_tcp.unit_id",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_mbtcp_functioncode,
 			{ "function code",            		"modbus_tcp.func_code",
 			FT_UINT8, BASE_DEC, VALS(function_code_vals), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_reference,
 			{ "reference number",            	"modbus_tcp.reference_num",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_lreference,
 			{ "reference number (32 bit)",   	"modbus_tcp.reference_num_32",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_reftype,
 			{ "reference type",   				"modbus_tcp.reference_type",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_readref,
 			{ "read reference number",   		"modbus_tcp.read_reference_num",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_writeref,
 			{ "write reference number",   		"modbus_tcp.write_reference_num",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_wordcnt,
 			{ "word count",            			"modbus_tcp.word_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_readwordcnt,
 			{ "read word count",       			"modbus_tcp.read_word_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_writewordcnt,
 			{ "write word count",       		"modbus_tcp.write_word_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_bitcnt,
 			{ "bit count",            			"modbus_tcp.bit_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_bytecnt,
 			{ "byte count",            			"modbus_tcp.byte_cnt",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_lbytecnt,
 			{ "byte count (16-bit)",   			"modbus_tcp.byte_cnt_16",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_exceptioncode,
 			{ "exception code",            		"modbus_tcp.exception_code",
 			FT_UINT8, BASE_DEC, VALS(exception_code_vals), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_andmask,
 			{ "AND mask",            			"modbus_tcp.and_mask",
 			FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_modbus_ormask,
 			{ "OR mask",            			"modbus_tcp.or_mask",
 			FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		}
 	};
 
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c
index 84f2954550..a2f26f316f 100644
--- a/epan/dissectors/packet-mdshdr.c
+++ b/epan/dissectors/packet-mdshdr.c
@@ -288,22 +288,22 @@ proto_register_mdshdr(void)
 /* Setup list of header fields  See Section 1.6.1 for details*/
     static hf_register_info hf[] = {
         { &hf_mdshdr_sof,
-          {"SOF", "mdshdr.sof", FT_UINT8, BASE_DEC, VALS(sof_vals), 0x0, "", HFILL}},
+          {"SOF", "mdshdr.sof", FT_UINT8, BASE_DEC, VALS(sof_vals), 0x0, NULL, HFILL}},
         { &hf_mdshdr_pkt_len,
-          {"Packet Len", "mdshdr.plen", FT_UINT16, BASE_DEC, NULL, 0x1FFF, "", HFILL}},
+          {"Packet Len", "mdshdr.plen", FT_UINT16, BASE_DEC, NULL, 0x1FFF, NULL, HFILL}},
         { &hf_mdshdr_dstidx,
-          {"Dst Index", "mdshdr.dstidx", FT_UINT16, BASE_HEX, NULL, 0xFFC, "", HFILL}},
+          {"Dst Index", "mdshdr.dstidx", FT_UINT16, BASE_HEX, NULL, 0xFFC, NULL, HFILL}},
         { &hf_mdshdr_srcidx,
-          {"Src Index", "mdshdr.srcidx", FT_UINT16, BASE_HEX, NULL, 0x3FF, "", HFILL}},
+          {"Src Index", "mdshdr.srcidx", FT_UINT16, BASE_HEX, NULL, 0x3FF, NULL, HFILL}},
         { &hf_mdshdr_vsan,
-          {"VSAN", "mdshdr.vsan", FT_UINT16, BASE_DEC, NULL, 0x0FFF, "", HFILL}},
+          {"VSAN", "mdshdr.vsan", FT_UINT16, BASE_DEC, NULL, 0x0FFF, NULL, HFILL}},
         { &hf_mdshdr_eof,
-          {"EOF", "mdshdr.eof", FT_UINT8, BASE_DEC, VALS(eof_vals), 0x0, "", HFILL}},
+          {"EOF", "mdshdr.eof", FT_UINT8, BASE_DEC, VALS(eof_vals), 0x0, NULL, HFILL}},
         { &hf_mdshdr_span,
           {"SPAN Frame", "mdshdr.span", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_mdshdr_fccrc,
-          {"CRC", "mdshdr.crc", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL}},
+          {"CRC", "mdshdr.crc", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL}},
     };
 
 /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c
index 2ceff64b10..1099ca4143 100644
--- a/epan/dissectors/packet-megaco.c
+++ b/epan/dissectors/packet-megaco.c
@@ -3414,124 +3414,124 @@ proto_register_megaco(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_megaco_audititem,
-		{ " Audit Item", "megaco.audititem", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Identity of item to be audited ", HFILL }},
+		{ "Audit Item", "megaco.audititem", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Identity of item to be audited", HFILL }},
 		{ &hf_megaco_audit_descriptor,
-		{ "Audit Descriptor", "megaco.audit", FT_NONE, BASE_DEC, NULL, 0x0,
-		"Audit Descriptor of the megaco Command ", HFILL }},
+		{ "Audit Descriptor", "megaco.audit", FT_NONE, BASE_NONE, NULL, 0x0,
+		"Audit Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_command_line,
-		{ "Command line", "megaco.command_line", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Commands of this message ", HFILL }},
+		{ "Command line", "megaco.command_line", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Commands of this message", HFILL }},
 		{ &hf_megaco_command,
-		{ "Command", "megaco.command", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Command of this message ", HFILL }},
+		{ "Command", "megaco.command", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Command of this message", HFILL }},
 		{ &hf_megaco_Context,
-		{ "Context", "megaco.context", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Context ID of this massage ", HFILL }},
+		{ "Context", "megaco.context", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Context ID of this massage", HFILL }},
 		{ &hf_megaco_digitmap_descriptor,
-		{ "DigitMap Descriptor", "megaco.digitmap", FT_STRING, BASE_DEC, NULL, 0x0,
-		"DigitMap Descriptor of the megaco Command ", HFILL }},
+		{ "DigitMap Descriptor", "megaco.digitmap", FT_STRING, BASE_NONE, NULL, 0x0,
+		"DigitMap Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_error_descriptor,
-		{ "ERROR Descriptor", "megaco.error", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Error Descriptor of the megaco Command ", HFILL }},
+		{ "ERROR Descriptor", "megaco.error", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Error Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_error_Frame,
-		{ "ERROR frame", "megaco.error_frame", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Syntax error ", HFILL }},
+		{ "ERROR frame", "megaco.error_frame", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Syntax error", HFILL }},
 		{ &hf_megaco_Event_Buffer_Control,
-		{ "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Event Buffer Control", "megaco.eventbuffercontrol", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Event Buffer Control in Termination State Descriptor", HFILL }},
 		{ &hf_megaco_events_descriptor,
-		{ "Events Descriptor", "megaco.events", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Events Descriptor of the megaco Command ", HFILL }},
+		{ "Events Descriptor", "megaco.events", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Events Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_Local_descriptor,
-		{ "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Local Descriptor in Media Descriptor ", HFILL }},
+		{ "Local Descriptor", "megaco.localdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Local Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_LocalControl_descriptor,
-		{ "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Local Control Descriptor in Media Descriptor ", HFILL }},
+		{ "Local Control Descriptor", "megaco.localcontroldescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Local Control Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_media_descriptor,
-		{ "Media Descriptor", "megaco.media", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Media Descriptor of the megaco Command ", HFILL }},
+		{ "Media Descriptor", "megaco.media", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Media Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_modem_descriptor,
-		{ "Modem Descriptor", "megaco.modem", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Modem Descriptor of the megaco Command ", HFILL }},
+		{ "Modem Descriptor", "megaco.modem", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Modem Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_mode,
-		{ "Mode", "megaco.mode", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Mode", "megaco.mode", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Mode  sendonly/receiveonly/inactive/loopback", HFILL }},
 		{ &hf_megaco_multiplex_descriptor,
-		{ "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Multiplex Descriptor of the megaco Command ", HFILL }},
+		{ "Multiplex Descriptor", "megaco.multiplex", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Multiplex Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_observedevents_descriptor,
-		{ "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Observed Events Descriptor of the megaco Command ", HFILL }},
+		{ "Observed Events Descriptor", "megaco.observedevents", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Observed Events Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_packages_descriptor,
-		{ "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Packages Descriptor", HFILL }},
+		{ "Packages Descriptor", "megaco.packagesdescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_pkgdname,
-		{ "pkgdName", "megaco.pkgdname", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "pkgdName", "megaco.pkgdname", FT_STRING, BASE_NONE, NULL, 0x0,
 		"PackageName SLASH ItemID", HFILL }},
 		{ &hf_megaco_Remote_descriptor,
-		{ "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Remote Descriptor in Media Descriptor ", HFILL }},
+		{ "Remote Descriptor", "megaco.remotedescriptor", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Remote Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_reserve_group,
-		{ "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Reserve Group", "megaco.reservegroup", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Reserve Group on or off", HFILL }},
 		{ &hf_megaco_h324_muxtbl_in,
-		{ "h324/muxtbl_in", "megaco.h324_muxtbl_in", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/muxtbl_in", HFILL }},
+		{ "h324/muxtbl_in", "megaco.h324_muxtbl_in", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_h324_muxtbl_out,
-		{ "h324/muxtbl_out", "megaco.h324_muxtbl_out", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/muxtbl_out", HFILL }},
+		{ "h324/muxtbl_out", "megaco.h324_muxtbl_out", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_ds_dscp,
-		{ "ds/dscp", "megaco.ds_dscp", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "ds/dscp", "megaco.ds_dscp", FT_STRING, BASE_NONE, NULL, 0x0,
 		"ds/dscp Differentiated Services Code Point", HFILL }},
 		{ &hf_megaco_h324_h223capr,
-		{ "h324/h223capr", "megaco._h324_h223capr", FT_STRING, BASE_DEC, NULL, 0x0,
-		"h324/h223capr", HFILL }},
+		{ "h324/h223capr", "megaco._h324_h223capr", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_reserve_value,
-		{ "Reserve Value", "megaco.reservevalue", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Reserve Value", "megaco.reservevalue", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Reserve Value on or off", HFILL }},
 		{ &hf_megaco_requestid,
-		{ "RequestID", "megaco.requestid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"RequestID in Events or Observedevents Descriptor ", HFILL }},
+		{ "RequestID", "megaco.requestid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"RequestID in Events or Observedevents Descriptor", HFILL }},
 		{ &hf_megaco_servicechange_descriptor,
-		{ "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Service Change Descriptor of the megaco Command ", HFILL }},
+		{ "Service Change Descriptor", "megaco.servicechange", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Service Change Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_Service_State,
-		{ "Service State", "megaco.servicestates", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Service State", "megaco.servicestates", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Service States in Termination State Descriptor", HFILL }},
 		{ &hf_megaco_signal_descriptor,
-		{ "Signal Descriptor", "megaco.signal", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Signal Descriptor of the megaco Command ", HFILL }},
+		{ "Signal Descriptor", "megaco.signal", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Signal Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_statistics_descriptor,
-		{ "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Statistics Descriptor of the megaco Command ", HFILL }},
+		{ "Statistics Descriptor", "megaco.statistics", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Statistics Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_streamid,
-		{ "StreamID", "megaco.streamid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"StreamID in the Media Descriptor ", HFILL }},
+		{ "StreamID", "megaco.streamid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"StreamID in the Media Descriptor", HFILL }},
 		{ &hf_megaco_termid,
-		{ "Termination ID", "megaco.termid", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Termination ID of this Command ", HFILL }},
+		{ "Termination ID", "megaco.termid", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Termination ID of this Command", HFILL }},
 		{ &hf_megaco_TerminationState_descriptor,
-		{ "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Termination State Descriptor in Media Descriptor ", HFILL }},
+		{ "Termination State Descriptor", "megaco.terminationstate", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Termination State Descriptor in Media Descriptor", HFILL }},
 		{ &hf_megaco_topology_descriptor,
-		{ "Topology Descriptor", "megaco.topology", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Topology Descriptor of the megaco Command ", HFILL }},
+		{ "Topology Descriptor", "megaco.topology", FT_STRING, BASE_NONE, NULL, 0x0,
+		"Topology Descriptor of the megaco Command", HFILL }},
 		{ &hf_megaco_transaction,
-		{ "Transaction", "megaco.transaction", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Transaction", "megaco.transaction", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Message Originator", HFILL }},
 		{ &hf_megaco_transid,
-		{ "Transaction ID", "megaco.transid", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "Transaction ID", "megaco.transid", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Transaction ID of this message", HFILL }},
 		{ &hf_megaco_mId,
-		{ "MediagatewayID", "megaco.mId", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "MediagatewayID", "megaco.mId", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Mediagateway ID", HFILL }},
 		{ &hf_megaco_version,
-		{ "Version", "megaco.version", FT_STRING, BASE_DEC, NULL, 0x0,
-		"Version", HFILL }},
+		{ "Version", "megaco.version", FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 		{ &hf_megaco_h245,
-		{ "h245", "megaco.h245", FT_STRING, BASE_DEC, NULL, 0x0,
+		{ "h245", "megaco.h245", FT_STRING, BASE_NONE, NULL, 0x0,
 		"Embedded H.245 message", HFILL }},
 		{ &hf_megaco_h223Capability,
  		{ "h223Capability", "megaco.h245.h223Capability", FT_NONE, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-memcache.c b/epan/dissectors/packet-memcache.c
index 3a0e14850c..dbd3a0f252 100644
--- a/epan/dissectors/packet-memcache.c
+++ b/epan/dissectors/packet-memcache.c
@@ -2041,7 +2041,7 @@ proto_register_memcache (void)
 
     { &hf_extras_unknown,
       { "Unknown", "memcache.extras.unknown", 
-        FT_BYTES, BASE_DEC, NULL, 0x0, 
+        FT_BYTES, BASE_NONE, NULL, 0x0, 
         "Unknown Extras", HFILL } },
 
     { &hf_extras_missing,
@@ -2051,7 +2051,7 @@ proto_register_memcache (void)
 
     { &hf_key,
       { "Key", "memcache.key", 
-        FT_STRING, BASE_DEC, NULL, 0x0, 
+        FT_STRING, BASE_NONE, NULL, 0x0, 
         NULL, HFILL } },
 
     { &hf_key_missing,
@@ -2061,7 +2061,7 @@ proto_register_memcache (void)
 
     { &hf_value,
       { "Value", "memcache.value", 
-        FT_STRING, BASE_DEC, NULL, 0x0, 
+        FT_STRING, BASE_NONE, NULL, 0x0, 
         NULL, HFILL } },
 
     { &hf_value_missing,
diff --git a/epan/dissectors/packet-mesh.c b/epan/dissectors/packet-mesh.c
index 6e601a839e..c02fadd161 100644
--- a/epan/dissectors/packet-mesh.c
+++ b/epan/dissectors/packet-mesh.c
@@ -88,11 +88,11 @@ proto_register_mesh(void)
   static hf_register_info hf[] = {
     { &hf_mesh_ttl,
       { "Mesh TTL", "mesh.ttl", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
 
     { &hf_mesh_e2eseq,
       { "Mesh End-to-end Seq", "mesh.e2eseq", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index 76ec419743..d7f7988c89 100644
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -632,150 +632,150 @@ void proto_register_mgcp(void)
             "TRUE if MGCP response", HFILL }},
         { &hf_mgcp_req_frame,
           { "Request Frame", "mgcp.reqframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-            "Request Frame", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_rsp_frame,
           { "Response Frame", "mgcp.rspframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-            "Response Frame", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_time,
           { "Time from request", "mgcp.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0,
             "Timedelta between Request and Response", HFILL }},
         { &hf_mgcp_req_verb,
-          { "Verb", "mgcp.req.verb", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Verb", "mgcp.req.verb", FT_STRING, BASE_NONE, NULL, 0x0,
             "Name of the verb", HFILL }},
         { &hf_mgcp_req_endpoint,
-          { "Endpoint", "mgcp.req.endpoint", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Endpoint", "mgcp.req.endpoint", FT_STRING, BASE_NONE, NULL, 0x0,
             "Endpoint referenced by the message", HFILL }},
         { &hf_mgcp_transid,
-          { "Transaction ID", "mgcp.transid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Transaction ID", "mgcp.transid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Transaction ID of this message", HFILL }},
         { &hf_mgcp_version,
-          { "Version", "mgcp.version", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Version", "mgcp.version", FT_STRING, BASE_NONE, NULL, 0x0,
             "MGCP Version", HFILL }},
         { &hf_mgcp_rsp_rspcode,
           { "Response Code", "mgcp.rsp.rspcode", FT_UINT32, BASE_DEC, VALS(mgcp_return_code_vals), 0x0,
-            "Response Code", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_rsp_rspstring,
-          { "Response String", "mgcp.rsp.rspstring", FT_STRING, BASE_DEC, NULL, 0x0,
-            "Response String", HFILL }},
+          { "Response String", "mgcp.rsp.rspstring", FT_STRING, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }},
         { &hf_mgcp_params,
-          { "Parameters", "mgcp.params", FT_NONE, 0, NULL, 0x0,
+          { "Parameters", "mgcp.params", FT_NONE, BASE_NONE, NULL, 0x0,
             "MGCP parameters", HFILL }},
         { &hf_mgcp_param_rspack,
-          { "ResponseAck (K)", "mgcp.param.rspack", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "ResponseAck (K)", "mgcp.param.rspack", FT_STRING, BASE_NONE, NULL, 0x0,
             "Response Ack", HFILL }},
         { &hf_mgcp_param_bearerinfo,
-          { "BearerInformation (B)", "mgcp.param.bearerinfo", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "BearerInformation (B)", "mgcp.param.bearerinfo", FT_STRING, BASE_NONE, NULL, 0x0,
             "Bearer Information", HFILL }},
         { &hf_mgcp_param_callid,
-          { "CallId (C)", "mgcp.param.callid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "CallId (C)", "mgcp.param.callid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Call Id", HFILL }},
         { &hf_mgcp_param_connectionid,
-          {"ConnectionIdentifier (I)", "mgcp.param.connectionid", FT_STRING, BASE_DEC, NULL, 0x0,
+          {"ConnectionIdentifier (I)", "mgcp.param.connectionid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Connection Identifier", HFILL }},
         { &hf_mgcp_param_secondconnectionid,
-          { "SecondConnectionID (I2)", "mgcp.param.secondconnectionid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "SecondConnectionID (I2)", "mgcp.param.secondconnectionid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Second Connection Identifier", HFILL }},
         { &hf_mgcp_param_notifiedentity,
-          { "NotifiedEntity (N)", "mgcp.param.notifiedentity", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "NotifiedEntity (N)", "mgcp.param.notifiedentity", FT_STRING, BASE_NONE, NULL, 0x0,
             "Notified Entity", HFILL }},
         { &hf_mgcp_param_requestid,
-          { "RequestIdentifier (X)", "mgcp.param.requestid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RequestIdentifier (X)", "mgcp.param.requestid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Request Identifier", HFILL }},
         { &hf_mgcp_param_localconnoptions,
-          { "LocalConnectionOptions (L)", "mgcp.param.localconnectionoptions", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "LocalConnectionOptions (L)", "mgcp.param.localconnectionoptions", FT_STRING, BASE_NONE, NULL, 0x0,
             "Local Connection Options", HFILL }},
         { &hf_mgcp_param_localconnoptions_p,
           { "Packetization period (p)", "mgcp.param.localconnectionoptions.p", FT_UINT32, BASE_DEC, NULL, 0x0,
             "Packetization period", HFILL }},
         { &hf_mgcp_param_localconnoptions_a,
-          { "Codecs (a)", "mgcp.param.localconnectionoptions.a", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Codecs (a)", "mgcp.param.localconnectionoptions.a", FT_STRING, BASE_NONE, NULL, 0x0,
             "Codecs", HFILL }},
         { &hf_mgcp_param_localconnoptions_s,
-          { "Silence Suppression (s)", "mgcp.param.localconnectionoptions.s", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Silence Suppression (s)", "mgcp.param.localconnectionoptions.s", FT_STRING, BASE_NONE, NULL, 0x0,
             "Silence Suppression", HFILL }},
         { &hf_mgcp_param_localconnoptions_e,
-          { "Echo Cancellation (e)", "mgcp.param.localconnectionoptions.e", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Echo Cancellation (e)", "mgcp.param.localconnectionoptions.e", FT_STRING, BASE_NONE, NULL, 0x0,
             "Echo Cancellation", HFILL }},
         { &hf_mgcp_param_localconnoptions_scrtp,
-          { "RTP ciphersuite (sc-rtp)", "mgcp.param.localconnectionoptions.scrtp", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RTP ciphersuite (sc-rtp)", "mgcp.param.localconnectionoptions.scrtp", FT_STRING, BASE_NONE, NULL, 0x0,
             "RTP ciphersuite", HFILL }},
         { &hf_mgcp_param_localconnoptions_scrtcp,
-          { "RTCP ciphersuite (sc-rtcp)", "mgcp.param.localconnectionoptions.scrtcp", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RTCP ciphersuite (sc-rtcp)", "mgcp.param.localconnectionoptions.scrtcp", FT_STRING, BASE_NONE, NULL, 0x0,
             "RTCP ciphersuite", HFILL }},
         { &hf_mgcp_param_localconnoptions_b,
-          { "Bandwidth (b)", "mgcp.param.localconnectionoptions.b", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Bandwidth (b)", "mgcp.param.localconnectionoptions.b", FT_STRING, BASE_NONE, NULL, 0x0,
             "Bandwidth", HFILL }},
         { &hf_mgcp_param_localconnoptions_esccd,
-          { "Content Destination (es-ccd)", "mgcp.param.localconnectionoptions.esccd", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Content Destination (es-ccd)", "mgcp.param.localconnectionoptions.esccd", FT_STRING, BASE_NONE, NULL, 0x0,
             "Content Destination", HFILL }},
         { &hf_mgcp_param_localconnoptions_escci,
-          { "Content Identifier (es-cci)", "mgcp.param.localconnectionoptions.escci", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Content Identifier (es-cci)", "mgcp.param.localconnectionoptions.escci", FT_STRING, BASE_NONE, NULL, 0x0,
             "Content Identifier", HFILL }},
         { &hf_mgcp_param_localconnoptions_dqgi,
-          { "D-QoS GateID (dq-gi)", "mgcp.param.localconnectionoptions.dqgi", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "D-QoS GateID (dq-gi)", "mgcp.param.localconnectionoptions.dqgi", FT_STRING, BASE_NONE, NULL, 0x0,
             "D-QoS GateID", HFILL }},
         { &hf_mgcp_param_localconnoptions_dqrd,
-          { "D-QoS Reserve Destination (dq-rd)", "mgcp.param.localconnectionoptions.dqrd", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "D-QoS Reserve Destination (dq-rd)", "mgcp.param.localconnectionoptions.dqrd", FT_STRING, BASE_NONE, NULL, 0x0,
             "D-QoS Reserve Destination", HFILL }},
         { &hf_mgcp_param_localconnoptions_dqri,
-          { "D-QoS Resource ID (dq-ri)", "mgcp.param.localconnectionoptions.dqri", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "D-QoS Resource ID (dq-ri)", "mgcp.param.localconnectionoptions.dqri", FT_STRING, BASE_NONE, NULL, 0x0,
             "D-QoS Resource ID", HFILL }},
         { &hf_mgcp_param_localconnoptions_dqrr,
-          { "D-QoS Resource Reservation (dq-rr)", "mgcp.param.localconnectionoptions.dqrr", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "D-QoS Resource Reservation (dq-rr)", "mgcp.param.localconnectionoptions.dqrr", FT_STRING, BASE_NONE, NULL, 0x0,
             "D-QoS Resource Reservation", HFILL }},
         { &hf_mgcp_param_localconnoptions_k,
-          { "Encryption Key (k)", "mgcp.param.localconnectionoptions.k", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Encryption Key (k)", "mgcp.param.localconnectionoptions.k", FT_STRING, BASE_NONE, NULL, 0x0,
             "Encryption Key", HFILL }},
         { &hf_mgcp_param_localconnoptions_gc,
           { "Gain Control (gc)", "mgcp.param.localconnectionoptions.gc", FT_UINT32, BASE_DEC, NULL, 0x0,
             "Gain Control", HFILL }},
         { &hf_mgcp_param_localconnoptions_fmtp,
-          { "Media Format (fmtp)", "mgcp.param.localconnectionoptions.fmtp", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Media Format (fmtp)", "mgcp.param.localconnectionoptions.fmtp", FT_STRING, BASE_NONE, NULL, 0x0,
             "Media Format", HFILL }},
         { &hf_mgcp_param_localconnoptions_nt,
-          { "Network Type (nt)", "mgcp.param.localconnectionoptions.nt", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Network Type (nt)", "mgcp.param.localconnectionoptions.nt", FT_STRING, BASE_NONE, NULL, 0x0,
             "Network Type", HFILL }},
         { &hf_mgcp_param_localconnoptions_ofmtp,
-          { "Optional Media Format (o-fmtp)", "mgcp.param.localconnectionoptions.ofmtp", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Optional Media Format (o-fmtp)", "mgcp.param.localconnectionoptions.ofmtp", FT_STRING, BASE_NONE, NULL, 0x0,
             "Optional Media Format", HFILL }},
         { &hf_mgcp_param_localconnoptions_r,
-          { "Resource Reservation (r)", "mgcp.param.localconnectionoptions.r", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Resource Reservation (r)", "mgcp.param.localconnectionoptions.r", FT_STRING, BASE_NONE, NULL, 0x0,
             "Resource Reservation", HFILL }},
         { &hf_mgcp_param_localconnoptions_t,
-          { "Type of Service (r)", "mgcp.param.localconnectionoptions.t", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Type of Service (r)", "mgcp.param.localconnectionoptions.t", FT_STRING, BASE_NONE, NULL, 0x0,
             "Type of Service", HFILL }},
         { &hf_mgcp_param_localconnoptions_rcnf,
-          { "Reservation Confirmation (r-cnf)", "mgcp.param.localconnectionoptions.rcnf", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Reservation Confirmation (r-cnf)", "mgcp.param.localconnectionoptions.rcnf", FT_STRING, BASE_NONE, NULL, 0x0,
             "Reservation Confirmation", HFILL }},
         { &hf_mgcp_param_localconnoptions_rdir,
-          { "Reservation Direction (r-dir)", "mgcp.param.localconnectionoptions.rdir", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Reservation Direction (r-dir)", "mgcp.param.localconnectionoptions.rdir", FT_STRING, BASE_NONE, NULL, 0x0,
             "Reservation Direction", HFILL }},
         { &hf_mgcp_param_localconnoptions_rsh,
-          { "Resource Sharing (r-sh)", "mgcp.param.localconnectionoptions.rsh", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Resource Sharing (r-sh)", "mgcp.param.localconnectionoptions.rsh", FT_STRING, BASE_NONE, NULL, 0x0,
             "Resource Sharing", HFILL }},
         { &hf_mgcp_param_connectionmode,
-          { "ConnectionMode (M)", "mgcp.param.connectionmode", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "ConnectionMode (M)", "mgcp.param.connectionmode", FT_STRING, BASE_NONE, NULL, 0x0,
             "Connection Mode", HFILL }},
         { &hf_mgcp_param_reqevents,
-          { "RequestedEvents (R)", "mgcp.param.reqevents", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RequestedEvents (R)", "mgcp.param.reqevents", FT_STRING, BASE_NONE, NULL, 0x0,
             "Requested Events", HFILL }},
         { &hf_mgcp_param_signalreq,
-          { "SignalRequests (S)", "mgcp.param.signalreq", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "SignalRequests (S)", "mgcp.param.signalreq", FT_STRING, BASE_NONE, NULL, 0x0,
             "Signal Request", HFILL }},
         { &hf_mgcp_param_restartmethod,
-          { "RestartMethod (RM)", "mgcp.param.restartmethod", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RestartMethod (RM)", "mgcp.param.restartmethod", FT_STRING, BASE_NONE, NULL, 0x0,
             "Restart Method", HFILL }},
         { &hf_mgcp_param_restartdelay,
-          { "RestartDelay (RD)", "mgcp.param.restartdelay", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RestartDelay (RD)", "mgcp.param.restartdelay", FT_STRING, BASE_NONE, NULL, 0x0,
             "Restart Delay", HFILL }},
         { &hf_mgcp_param_digitmap,
-          { "DigitMap (D)", "mgcp.param.digitmap", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "DigitMap (D)", "mgcp.param.digitmap", FT_STRING, BASE_NONE, NULL, 0x0,
             "Digit Map", HFILL }},
         { &hf_mgcp_param_observedevent,
-          { "ObservedEvents (O)", "mgcp.param.observedevents", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "ObservedEvents (O)", "mgcp.param.observedevents", FT_STRING, BASE_NONE, NULL, 0x0,
             "Observed Events", HFILL }},
         { &hf_mgcp_param_connectionparam,
-          { "ConnectionParameters (P)", "mgcp.param.connectionparam", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "ConnectionParameters (P)", "mgcp.param.connectionparam", FT_STRING, BASE_NONE, NULL, 0x0,
             "Connection Parameters", HFILL }},
         { &hf_mgcp_param_connectionparam_ps,
           { "Packets sent (PS)", "mgcp.param.connectionparam.ps", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -811,62 +811,62 @@ void proto_register_mgcp(void)
           { "Remote Jitter (PC/RJI)", "mgcp.param.connectionparam.pcrji", FT_UINT32, BASE_DEC, NULL, 0x0,
             "Remote Jitter (P:PC/RJI)", HFILL }},
         { &hf_mgcp_param_connectionparam_x,
-          { "Vendor Extension", "mgcp.param.connectionparam.x", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Vendor Extension", "mgcp.param.connectionparam.x", FT_STRING, BASE_NONE, NULL, 0x0,
             "Vendor Extension (P:X-*)", HFILL }},
         { &hf_mgcp_param_reasoncode,
-          { "ReasonCode (E)", "mgcp.param.reasoncode", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "ReasonCode (E)", "mgcp.param.reasoncode", FT_STRING, BASE_NONE, NULL, 0x0,
             "Reason Code", HFILL }},
         { &hf_mgcp_param_eventstates,
-          { "EventStates (ES)", "mgcp.param.eventstates", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "EventStates (ES)", "mgcp.param.eventstates", FT_STRING, BASE_NONE, NULL, 0x0,
             "Event States", HFILL }},
         { &hf_mgcp_param_specificendpoint,
-          { "SpecificEndpointID (Z)", "mgcp.param.specificendpointid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "SpecificEndpointID (Z)", "mgcp.param.specificendpointid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Specific Endpoint ID", HFILL }},
         { &hf_mgcp_param_secondendpointid,
-          { "SecondEndpointID (Z2)", "mgcp.param.secondendpointid", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "SecondEndpointID (Z2)", "mgcp.param.secondendpointid", FT_STRING, BASE_NONE, NULL, 0x0,
             "Second Endpoint ID", HFILL }},
         { &hf_mgcp_param_reqinfo,
-          { "RequestedInfo (F)", "mgcp.param.reqinfo", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "RequestedInfo (F)", "mgcp.param.reqinfo", FT_STRING, BASE_NONE, NULL, 0x0,
             "Requested Info", HFILL }},
         { &hf_mgcp_param_quarantinehandling,
-          { "QuarantineHandling (Q)", "mgcp.param.quarantinehandling", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "QuarantineHandling (Q)", "mgcp.param.quarantinehandling", FT_STRING, BASE_NONE, NULL, 0x0,
             "Quarantine Handling", HFILL }},
         { &hf_mgcp_param_detectedevents,
-          { "DetectedEvents (T)", "mgcp.param.detectedevents", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "DetectedEvents (T)", "mgcp.param.detectedevents", FT_STRING, BASE_NONE, NULL, 0x0,
             "Detected Events", HFILL }},
         { &hf_mgcp_param_capabilities,
-          { "Capabilities (A)", "mgcp.param.capabilities", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Capabilities (A)", "mgcp.param.capabilities", FT_STRING, BASE_NONE, NULL, 0x0,
             "Capabilities", HFILL }},
         { &hf_mgcp_param_maxmgcpdatagram,
-          {"MaxMGCPDatagram (MD)", "mgcp.param.maxmgcpdatagram", FT_STRING, BASE_DEC, NULL, 0x0,
+          {"MaxMGCPDatagram (MD)", "mgcp.param.maxmgcpdatagram", FT_STRING, BASE_NONE, NULL, 0x0,
            "Maximum MGCP Datagram size", HFILL }},
         { &hf_mgcp_param_packagelist,
-          {"PackageList (PL)", "mgcp.param.packagelist", FT_STRING, BASE_DEC, NULL, 0x0,
+          {"PackageList (PL)", "mgcp.param.packagelist", FT_STRING, BASE_NONE, NULL, 0x0,
            "Package List", HFILL }},
         { &hf_mgcp_param_extension,
-          { "Extension Parameter (non-critical)", "mgcp.param.extension", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Extension Parameter (non-critical)", "mgcp.param.extension", FT_STRING, BASE_NONE, NULL, 0x0,
             "Extension Parameter", HFILL }},
         { &hf_mgcp_param_extension_critical,
-          { "Extension Parameter (critical)", "mgcp.param.extensioncritical", FT_STRING, BASE_DEC, NULL, 0x0,
+          { "Extension Parameter (critical)", "mgcp.param.extensioncritical", FT_STRING, BASE_NONE, NULL, 0x0,
             "Critical Extension Parameter", HFILL }},
         { &hf_mgcp_param_invalid,
-          { "Invalid Parameter", "mgcp.param.invalid", FT_STRING, BASE_DEC, NULL, 0x0,
-            "Invalid Parameter", HFILL }},
+          { "Invalid Parameter", "mgcp.param.invalid", FT_STRING, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }},
         { &hf_mgcp_messagecount,
           { "MGCP Message Count", "mgcp.messagecount", FT_UINT32, BASE_DEC, NULL, 0x0,
             "Number of MGCP message in a packet", HFILL }},
         { &hf_mgcp_dup,
           { "Duplicate Message", "mgcp.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Duplicate Message", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_req_dup,
           { "Duplicate Request", "mgcp.req.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Duplicate Request", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_req_dup_frame,
           { "Original Request Frame", "mgcp.req.dup.frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
             "Frame containing original request", HFILL }},
         { &hf_mgcp_rsp_dup,
           { "Duplicate Response", "mgcp.rsp.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Duplicate Response", HFILL }},
+            NULL, HFILL }},
         { &hf_mgcp_rsp_dup_frame,
           { "Original Response Frame", "mgcp.rsp.dup.frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
             "Frame containing original response", HFILL }},
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index d1d73bde96..1c4c667dca 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -1533,7 +1533,7 @@ proto_register_mikey(void)
 		    NULL, HFILL }},
 		{ &hf_mikey[POS_TS_NTP],
 		  { "NTP timestamp", "mikey.t.ntp",
-		    FT_STRING, BASE_HEX, NULL, 0x0,
+		    FT_STRING, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
 		{ &hf_mikey[POS_PAYLOAD_STR],
diff --git a/epan/dissectors/packet-mip.c b/epan/dissectors/packet-mip.c
index fc359c10a5..1d48e456f3 100644
--- a/epan/dissectors/packet-mip.c
+++ b/epan/dissectors/packet-mip.c
@@ -807,7 +807,7 @@ void proto_register_mip(void)
 	  { &hf_mip_flags,
 		{"Flags", "mip.flags",
 		 FT_UINT8, BASE_HEX, NULL, 0x0,
-		 "", HFILL}
+		 NULL, HFILL}
 	  },
 	  { &hf_mip_s,
 		 {"Simultaneous Bindings",           "mip.s",
@@ -838,7 +838,7 @@ void proto_register_mip(void)
 	  { &hf_mip_v,
 		 { "Van Jacobson",           "mip.v",
 		   FT_BOOLEAN, 8, NULL, 4,
-		   "Van Jacobson", HFILL }
+		   NULL, HFILL }
 	  },
 	  { &hf_mip_t,
 		 { "Reverse Tunneling",           "mip.t",
@@ -848,7 +848,7 @@ void proto_register_mip(void)
 	  { &hf_mip_x,
 		 { "Reserved",           "mip.x",
 		   FT_BOOLEAN, 8, NULL, 1,
-		   "Reserved", HFILL }
+		   NULL, HFILL }
 	  },
 	  { &hf_mip_code,
 		 { "Reply Code",           "mip.code",
@@ -898,8 +898,8 @@ void proto_register_mip(void)
 	  },
 	  { &hf_mip_ext,
 		 { "Extension",                      "mip.extension",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Extension", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 	  },
 	  { &hf_mip_aext_spi,
 		 { "SPI",                      "mip.auth.spi",
@@ -914,7 +914,7 @@ void proto_register_mip(void)
 	  { &hf_mip_next_nai,
 		 { "NAI",                      "mip.nai",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"NAI", HFILL }
+			NULL, HFILL }
 	  },
           { &hf_mip_rext_flags,
 	    	 {"Rev Ext Flags",             "mip.ext.rev.flags",
@@ -929,7 +929,7 @@ void proto_register_mip(void)
           { &hf_mip_rext_reserved,
 		 { "Reserved",                 "mip.ext.rev.reserved",
 			FT_UINT16, BASE_HEX, NULL, 0x7fff,
-			"", HFILL }
+			NULL, HFILL }
           },
           { &hf_mip_rext_tstamp,
 		 { "Timestamp",                "mip.ext.rev.tstamp",
@@ -939,7 +939,7 @@ void proto_register_mip(void)
 	  { &hf_mip_rev_reserved,
 		 { "Reserved",                 "mip.rev.reserved", 
 			FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL}
+			NULL, HFILL}
 	  },
           { &hf_mip_rev_a,
 		 { "Home Agent",               "mip.rev.a",
@@ -954,7 +954,7 @@ void proto_register_mip(void)
 	  { &hf_mip_rev_reserved2,
 		 { "Reserved",                 "mip.rev.reserved2", 
 			FT_UINT16, BASE_HEX, NULL, 0x3fff,
-			"", HFILL}},
+			NULL, HFILL}},
           { &hf_mip_hda,
 		 { "Home Domain Address",      "mip.rev.hda",
 			FT_IPv4, BASE_NONE, NULL, 0,
@@ -973,7 +973,7 @@ void proto_register_mip(void)
 	  { &hf_mip_ack_reserved,
 		 { "Reserved",                 "mip.ack.reserved", 
 			FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL}
+			NULL, HFILL}
 	  },
           { &hf_mip_ack_i,
 		 { "Inform",                   "mip.ack.i",
@@ -983,7 +983,7 @@ void proto_register_mip(void)
 	  { &hf_mip_ack_reserved2,
 		 { "Reserved",                 "mip.ack.reserved2", 
 			FT_UINT16, BASE_HEX, NULL, 0x7fff,
-			"", HFILL}},
+			NULL, HFILL}},
 	  { &hf_mip_dhaext_stype,
 		 { "DynHA Ext SubType",        "mip.ext.dynha.subtype",
 			FT_UINT8, BASE_DEC, VALS(mip_dhaext_stypes), 0,
@@ -1012,7 +1012,7 @@ void proto_register_mip(void)
 	  { &hf_mip_nattt_reserved,
 		 { "Reserved",                 "mip.nattt.reserved",
 			FT_UINT16, BASE_HEX, NULL , 0x0,
-			"", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_utrqext_stype,
 		 { "UDP TunReq Ext SubType",   "mip.ext.utrq.subtype",
@@ -1022,7 +1022,7 @@ void proto_register_mip(void)
 	  { &hf_mip_utrqext_reserved1,
 		 { "Reserved 1",                "mip.ext.utrq.reserved1",
 			FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_utrqext_flags,
 		 { "UDP TunReq Ext Flags",     "mip.ext.utrq.flags",
@@ -1042,7 +1042,7 @@ void proto_register_mip(void)
 	  { &hf_mip_utrqext_reserved2,
 		 { "Reserved 2",                "mip.ext.utrq.reserved2",
 			FT_UINT8, BASE_HEX, NULL, 0x3f,
-			"", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_utrqext_encap_type,
 		 { "UDP Encap Type",           "mip.ext.utrq.encaptype",
@@ -1052,7 +1052,7 @@ void proto_register_mip(void)
 	  { &hf_mip_utrqext_reserved3,
 		 { "Reserved 3",                "mip.ext.utrq.reserved3",
 			FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_utrpext_stype,
 		 { "UDP TunRep Ext SubType",   "mip.ext.utrp.subtype",
@@ -1077,7 +1077,7 @@ void proto_register_mip(void)
 	  { &hf_mip_utrpext_reserved,
 		 { "Reserved",           "mip.ext.utrp.reserved",
  			FT_UINT16, BASE_HEX, NULL, 0x7fff,
-			"", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_utrpext_keepalive,
 		 { "Keepalive Interval",            "mip.ext.utrp.keepalive",
@@ -1092,7 +1092,7 @@ void proto_register_mip(void)
 	  { &hf_mip_pmipv4nonskipext_pernodeauthmethod,
 		 { "Per-Node Authentication Method",		"mip.ext.pmipv4nonskipext.pernodeauthmethod",
 			FT_UINT8, BASE_DEC, VALS(mip_pmipv4nonskipext_pernodeauthmethod_types), 0,
-			"Per-Node Authentication Method", HFILL }
+			NULL, HFILL }
 	  },
 	  { &hf_mip_pmipv4skipext_stype,
 		 { "Sub-type",	"mip.ext.pmipv4skipext.subtype",
@@ -1101,8 +1101,8 @@ void proto_register_mip(void)
 	  },
 	  { &hf_mip_pmipv4skipext_interfaceid,
 		 { "Interface ID",		"mip.ext.pmipv4skipext.interfaceid",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"Interface ID", HFILL }
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }
 	  },
 	  { &hf_mip_pmipv4skipext_deviceid_type,
 		 { "ID-Type",		"mip.ext.pmipv4skipext.deviceid_type",
@@ -1111,7 +1111,7 @@ void proto_register_mip(void)
 	  },
 	  { &hf_mip_pmipv4skipext_deviceid_id,
 		 { "Identifier",	"mip.ext.pmipv4skipext.deviceid_id",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Device ID Identifier", HFILL }
 	  },
 	  { &hf_mip_pmipv4skipext_subscriberid_type,
@@ -1121,13 +1121,13 @@ void proto_register_mip(void)
 	  },
 	  { &hf_mip_pmipv4skipext_subscriberid_id,
 		 { "Identifier",	"mip.ext.pmipv4skipext.subscriberid_id",
-			FT_BYTES, BASE_HEX, NULL, 0,
+			FT_BYTES, BASE_NONE, NULL, 0,
 			"Subscriber ID Identifier", HFILL }
 	  },
 	  { &hf_mip_pmipv4skipext_accesstechnology_type,
 		 { "Access Technology Type",	"mip.ext.pmipv4skipext.accesstechnology_type",
 			FT_UINT8, BASE_DEC, VALS(mip_pmipv4skipext_accesstechnology_types), 0,
-			"Access Technology Type", HFILL }
+			NULL, HFILL }
 	  },
 	};
 
diff --git a/epan/dissectors/packet-mip6.c b/epan/dissectors/packet-mip6.c
index d95fc99ea2..ab89e2e824 100644
--- a/epan/dissectors/packet-mip6.c
+++ b/epan/dissectors/packet-mip6.c
@@ -979,58 +979,58 @@ proto_register_mip6(void)
 
 	{ &hf_mip6_proto,           { "Payload protocol", "mip6.proto",
 	                              FT_UINT8, BASE_DEC, NULL, 0,
-	                              "Payload protocol", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_hlen,            { "Header length", "mip6.hlen",
 	                              FT_UINT8, BASE_DEC, NULL, 0,
-	                              "Header length", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_mhtype,          { "Mobility Header Type", "mip6.mhtype",
 	                              FT_UINT8, BASE_DEC, VALS(mip6_mh_types), 0,
-	                              "Mobility Header Type", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_reserved,        { "Reserved", "mip6.reserved",
 	                              FT_UINT8, BASE_HEX, NULL, 0,
-	                              "Reserved", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_csum,            { "Checksum", "mip6.csum",
 	                              FT_UINT16, BASE_HEX, NULL, 0,
 	                              "Header Checksum", HFILL }},
 
 	{ &hf_mip6_hoti_cookie,     { "Home Init Cookie", "mip6.hoti.cookie",
 	                              FT_UINT64, BASE_HEX, NULL, 0,
-	                              "Home Init Cookie", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_coti_cookie,     { "Care-of Init Cookie", "mip6.coti.cookie",
 	                              FT_UINT64, BASE_HEX, NULL, 0,
-	                              "Care-of Init Cookie", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_hot_nindex,      { "Home Nonce Index", "mip6.hot.nindex",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Home Nonce Index", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_hot_cookie,      { "Home Init Cookie", "mip6.hot.cookie",
 	                              FT_UINT64, BASE_HEX, NULL, 0,
-	                              "Home Init Cookie", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_hot_token,       { "Home Keygen Token", "mip6.hot.token",
 	                               FT_UINT64, BASE_HEX, NULL, 0,
-	                               "Home Keygen Token", HFILL }},
+	                               NULL, HFILL }},
 
 	{ &hf_mip6_cot_nindex,      { "Care-of Nonce Index", "mip6.cot.nindex",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Care-of Nonce Index", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_cot_cookie,      { "Care-of Init Cookie", "mip6.cot.cookie",
 	                              FT_UINT64, BASE_HEX, NULL, 0,
-	                              "Care-of Init Cookie", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_cot_token,       { "Care-of Keygen Token", "mip6.cot.token",
 	                              FT_UINT64, BASE_HEX, NULL, 0,
-	                              "Care-of Keygen Token", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_bu_seqnr,        { "Sequence number", "mip6.bu.seqnr",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Sequence number", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_bu_a_flag,       { "Acknowledge (A) flag", "mip6.bu.a_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_a_flag_value),
-	                              0x80, "Acknowledge (A) flag", HFILL }},
+	                              0x80, NULL, HFILL }},
 	{ &hf_mip6_bu_h_flag,       { "Home Registration (H) flag",
 	                              "mip6.bu.h_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_h_flag_value),
-	                              0x40, "Home Registration (H) flag", HFILL }},
+	                              0x40, NULL, HFILL }},
 	{ &hf_mip6_bu_l_flag,       { "Link-Local Compatibility (L) flag",
 	                              "mip6.bu.l_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_l_flag_value),
@@ -1038,26 +1038,26 @@ proto_register_mip6(void)
 	{ &hf_mip6_bu_k_flag,       { "Key Management Compatibility (K) flag",
 	                              "mip6.bu.k_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
-	                              0x10, "Key Management Compatibility (K) flag",
+	                              0x10, NULL,
 	                              HFILL }},
 	{ &hf_mip6_bu_m_flag,       { "MAP Registration Compatibility (M) flag",
 	                              "mip6.bu.m_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_m_flag_value),
-	                              0x08, "MAP Registration Compatibility (M) flag",
+	                              0x08, NULL,
 	                              HFILL }},
 	{ &hf_nemo_bu_r_flag,       { "Mobile Router (R) flag", 
 	                              "nemo.bu.r_flag",
 	                              FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
-	                              0x04, "Mobile Router (R) flag",
+	                              0x04, NULL,
 	                              HFILL }},
 	{ &hf_proxy_bu_p_flag,      { "Proxy Registration (P) flag", 
 	                              "mip6.bu.p_flag",
 	                              FT_BOOLEAN, 8, TFS(&proxy_bu_p_flag_value),
-	                              0x02, "Proxy Registration (P) flag",
+	                              0x02, NULL,
 	                              HFILL }},
 	{ &hf_mip6_bu_lifetime,     { "Lifetime", "mip6.bu.lifetime",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Lifetime", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_ba_status,       { "Status", "mip6.ba.status",
 	                              FT_UINT8, BASE_DEC,
@@ -1066,44 +1066,44 @@ proto_register_mip6(void)
 	{ &hf_mip6_ba_k_flag,       { "Key Management Compatibility (K) flag", 
 	                              "mip6.ba.k_flag",
 	                              FT_BOOLEAN, 8, TFS(&mip6_bu_k_flag_value),
-	                              0x80, "Key Management Compatibility (K) flag",
+	                              0x80, NULL,
 	                              HFILL }},
 	{ &hf_nemo_ba_r_flag,       { "Mobile Router (R) flag",
 	                              "nemo.ba.r_flag",
 	                              FT_BOOLEAN, 8, TFS(&nemo_bu_r_flag_value),
-	                              0x40, "Mobile Router (R) flag",
+	                              0x40, NULL,
 	                              HFILL }},
 	{ &hf_proxy_ba_p_flag,      { "Proxy Registration (P) flag",
 	                              "proxy.ba.p_flag",
 	                              FT_BOOLEAN, 8, TFS(&proxy_bu_p_flag_value),
-	                              0x20, "Proxy Registration (P) flag",
+	                              0x20, NULL,
 	                              HFILL }},
 
 	{ &hf_mip6_ba_seqnr,        { "Sequence number", "mip6.ba.seqnr",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Sequence number", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_ba_lifetime,     { "Lifetime", "mip6.ba.lifetime",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Lifetime", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_be_status,       { "Status", "mip6.be.status",
 	                              FT_UINT8, BASE_DEC,
 	                              VALS(&mip6_be_status_value), 0,
 	                              "Binding Error status", HFILL }},
 	{ &hf_mip6_be_haddr,        { "Home Address", "mip6.be.haddr",
-	                              FT_IPv6, BASE_HEX, NULL, 0,
-	                              "Home Address", HFILL }},
+	                              FT_IPv6, BASE_NONE, NULL, 0,
+	                              NULL, HFILL }},
 
 	{ &hf_fmip6_fbu_seqnr,      { "Sequence number", "fmip6.fbu.seqnr",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Sequence number", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_fmip6_fbu_a_flag,     { "Acknowledge (A) flag", "fmip6.fbu.a_flag",
 	                              FT_BOOLEAN, 8, TFS(&fmip6_fbu_a_flag_value),
-	                              0x80, "Acknowledge (A) flag", HFILL }},
+	                              0x80, NULL, HFILL }},
 	{ &hf_fmip6_fbu_h_flag,     { "Home Registration (H) flag",
 	                              "fmip6.fbu.h_flag",
 	                              FT_BOOLEAN, 8, TFS(&fmip6_fbu_h_flag_value),
-	                              0x40, "Home Registration (H) flag", HFILL }},
+	                              0x40, NULL, HFILL }},
 	{ &hf_fmip6_fbu_l_flag,     { "Link-Local Compatibility (L) flag",
 	                              "fmip6.fbu.l_flag",
 	                              FT_BOOLEAN, 8, TFS(&fmip6_fbu_l_flag_value),
@@ -1111,11 +1111,11 @@ proto_register_mip6(void)
 	{ &hf_fmip6_fbu_k_flag,     { "Key Management Compatibility (K) flag",
 	                              "fmip6.fbu.k_flag",
 	                              FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
-	                              0x10, "Key Management Compatibility (K) flag",
+	                              0x10, NULL,
 	                              HFILL }},
 	{ &hf_fmip6_fbu_lifetime,   { "Lifetime", "fmip6.fbu.lifetime",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Lifetime", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_fmip6_fback_status,   { "Status", "fmip6.fback.status",
 	                              FT_UINT8, BASE_DEC,
@@ -1124,52 +1124,52 @@ proto_register_mip6(void)
 	{ &hf_fmip6_fback_k_flag,   { "Key Management Compatibility (K) flag",
 	                              "fmip6.fback.k_flag",
 	                              FT_BOOLEAN, 8, TFS(&fmip6_fbu_k_flag_value),
-	                              0x80, "Key Management Compatibility (K) flag",
+	                              0x80, NULL,
 	                              HFILL }},
 	{ &hf_fmip6_fback_seqnr,    { "Sequence number", "fmip6.fback.seqnr",
 	                             FT_UINT16, BASE_DEC, NULL, 0,
-	                             "Sequence number", HFILL }},
+	                             NULL, HFILL }},
 	{ &hf_fmip6_fback_lifetime, { "Lifetime", "fmip6.fback.lifetime",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Lifetime", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_bra_interval,    { "Refresh interval", "mip6.bra.interval",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                             "Refresh interval", HFILL }},
+	                             NULL, HFILL }},
 
 	{ &hf_mip6_acoa_acoa,       { "Alternate care-of address", "mip6.acoa.acoa",
-	                              FT_IPv6, BASE_HEX, NULL, 0,
+	                              FT_IPv6, BASE_NONE, NULL, 0,
 	                              "Alternate Care-of address", HFILL }},
 
 	{ &hf_mip6_ni_hni,          { "Home nonce index", "mip6.ni.hni",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Home nonce index", HFILL }},
+	                              NULL, HFILL }},
 	{ &hf_mip6_ni_cni,          { "Care-of nonce index", "mip6.ni.cni",
 	                              FT_UINT16, BASE_DEC, NULL, 0,
-	                              "Care-of nonce index", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_bad_auth,        { "Authenticator", "mip6.bad.auth",
-	                              FT_BYTES, BASE_HEX, NULL, 0,
-	                              "Authenticator", HFILL }},
+	                              FT_BYTES, BASE_NONE, NULL, 0,
+	                              NULL, HFILL }},
 
 	{ &hf_fmip6_lla_optcode,    { "Option-Code", "mip6.lla.optcode",
 	                              FT_UINT8, BASE_DEC, VALS(&fmip6_lla_optcode_value), 0,
-	                              "Option-Code", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_nemo_mnp_pfl,         { "Mobile Network Prefix Length", "nemo.mnp.pfl",
 	                              FT_UINT8, BASE_DEC, NULL, 0,
-	                              "Mobile Network Prefix Length", HFILL }},
+	                              NULL, HFILL }},
 
 	{ &hf_nemo_mnp_mnp,         { "Mobile Network Prefix", "nemo.mnp.mnp",
-	                              FT_IPv6, BASE_HEX, NULL, 0,
-	                              "Mobile Network Prefix", HFILL }},
+	                              FT_IPv6, BASE_NONE, NULL, 0,
+	                              NULL, HFILL }},
 
 	{ &hf_mip6_mnid_subtype,    { "Subtype", "mip6.mnid.subtype",
                                       FT_UINT8, BASE_DEC, VALS(&mip6_mnid_subtype_value), 0,
-                                      "Subtype", HFILL }},
+                                      NULL, HFILL }},
 
 	{ &hf_pmip6_timestamp,      { "Timestamp", "pmip6.timestamp",
-                                      FT_BYTES, BASE_NONE, NULL, 0, "Timestamp", HFILL }},
+                                      FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-mms.c b/epan/dissectors/packet-mms.c
index a175274415..0d1d37ca52 100644
--- a/epan/dissectors/packet-mms.c
+++ b/epan/dissectors/packet-mms.c
@@ -7041,7 +7041,7 @@ void proto_register_mms(void) {
         "mms.AttachToSemaphore", HFILL }},
     { &hf_mms_status,
       { "status", "mms.status",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.Status_Request", HFILL }},
     { &hf_mms_getNameList,
       { "getNameList", "mms.getNameList",
@@ -7733,11 +7733,11 @@ void proto_register_mms(void) {
         "mms.Integer16", HFILL }},
     { &hf_mms_proposedParameterCBB,
       { "proposedParameterCBB", "mms.proposedParameterCBB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.ParameterSupportOptions", HFILL }},
     { &hf_mms_servicesSupportedCalling,
       { "servicesSupportedCalling", "mms.servicesSupportedCalling",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.ServiceSupportOptions", HFILL }},
     { &hf_mms_localDetailCalled,
       { "localDetailCalled", "mms.localDetailCalled",
@@ -7765,11 +7765,11 @@ void proto_register_mms(void) {
         "mms.Integer16", HFILL }},
     { &hf_mms_negociatedParameterCBB,
       { "negociatedParameterCBB", "mms.negociatedParameterCBB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.ParameterSupportOptions", HFILL }},
     { &hf_mms_servicesSupportedCalled,
       { "servicesSupportedCalled", "mms.servicesSupportedCalled",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.ServiceSupportOptions", HFILL }},
     { &hf_mms_originalInvokeID,
       { "originalInvokeID", "mms.originalInvokeID",
@@ -7941,7 +7941,7 @@ void proto_register_mms(void) {
         "mms.T_vmdPhysicalStatus", HFILL }},
     { &hf_mms_localDetail,
       { "localDetail", "mms.localDetail",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.BIT_STRING_SIZE_0_128", HFILL }},
     { &hf_mms_extendedObjectClass,
       { "extendedObjectClass", "mms.extendedObjectClass",
@@ -7981,7 +7981,7 @@ void proto_register_mms(void) {
         "mms.Identifier", HFILL }},
     { &hf_mms_moreFollows,
       { "moreFollows", "mms.moreFollows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_vendorName,
       { "vendorName", "mms.vendorName",
@@ -8041,7 +8041,7 @@ void proto_register_mms(void) {
         "mms.T_listOfCapabilities_01", HFILL }},
     { &hf_mms_sharable,
       { "sharable", "mms.sharable",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_loadData,
       { "loadData", "mms.loadData",
@@ -8049,7 +8049,7 @@ void proto_register_mms(void) {
         "mms.T_loadData", HFILL }},
     { &hf_mms_non_coded,
       { "non-coded", "mms.non_coded",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_coded,
       { "coded", "mms.coded",
@@ -8101,7 +8101,7 @@ void proto_register_mms(void) {
         "mms.DomainState", HFILL }},
     { &hf_mms_mmsDeletable,
       { "mmsDeletable", "mms.mmsDeletable",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_listOfProgramInvocations,
       { "listOfProgramInvocations", "mms.listOfProgramInvocations",
@@ -8129,11 +8129,11 @@ void proto_register_mms(void) {
         "mms.Identifier", HFILL }},
     { &hf_mms_reusable,
       { "reusable", "mms.reusable",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_monitorType,
       { "monitorType", "mms.monitorType",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_executionArgument,
       { "executionArgument", "mms.executionArgument",
@@ -8165,7 +8165,7 @@ void proto_register_mms(void) {
         "mms.Identifier", HFILL }},
     { &hf_mms_monitor,
       { "monitor", "mms.monitor",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_startArgument,
       { "startArgument", "mms.startArgument",
@@ -8185,7 +8185,7 @@ void proto_register_mms(void) {
         "mms.T_array", HFILL }},
     { &hf_mms_packed,
       { "packed", "mms.packed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_numberOfElements,
       { "numberOfElements", "mms.numberOfElements",
@@ -8245,7 +8245,7 @@ void proto_register_mms(void) {
         "mms.NULL", HFILL }},
     { &hf_mms_binary_time,
       { "binary-time", "mms.binary_time",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_bcd,
       { "bcd", "mms.bcd",
@@ -8297,7 +8297,7 @@ void proto_register_mms(void) {
         "mms.NULL", HFILL }},
     { &hf_mms_specificationWithResult,
       { "specificationWithResult", "mms.specificationWithResult",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_variableAccessSpecificatn,
       { "variableAccessSpecificatn", "mms.variableAccessSpecificatn",
@@ -8449,11 +8449,11 @@ void proto_register_mms(void) {
         "mms.Data", HFILL }},
     { &hf_mms_boolean_01,
       { "boolean", "mms.boolean",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_bit_string_01,
       { "bit-string", "mms.bit_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.BIT_STRING", HFILL }},
     { &hf_mms_integer_01,
       { "integer", "mms.integer",
@@ -8465,11 +8465,11 @@ void proto_register_mms(void) {
         "mms.INTEGER", HFILL }},
     { &hf_mms_floating_point,
       { "floating-point", "mms.floating_point",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.FloatingPoint", HFILL }},
     { &hf_mms_octet_string_01,
       { "octet-string", "mms.octet_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_visible_string_01,
       { "visible-string", "mms.visible_string",
@@ -8477,7 +8477,7 @@ void proto_register_mms(void) {
         "mms.VisibleString", HFILL }},
     { &hf_mms_binary_time_01,
       { "binary-time", "mms.binary_time",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_bcd_01,
       { "bcd", "mms.bcd",
@@ -8485,7 +8485,7 @@ void proto_register_mms(void) {
         "mms.INTEGER", HFILL }},
     { &hf_mms_booleanArray,
       { "booleanArray", "mms.booleanArray",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.BIT_STRING", HFILL }},
     { &hf_mms_listOfVariable_02,
       { "listOfVariable", "mms.listOfVariable",
@@ -8517,7 +8517,7 @@ void proto_register_mms(void) {
         "mms.VisibleString", HFILL }},
     { &hf_mms_unconstrainedAddress,
       { "unconstrainedAddress", "mms.unconstrainedAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_semaphoreName,
       { "semaphoreName", "mms.semaphoreName",
@@ -8541,11 +8541,11 @@ void proto_register_mms(void) {
         "mms.Unsigned32", HFILL }},
     { &hf_mms_abortOnTimeOut,
       { "abortOnTimeOut", "mms.abortOnTimeOut",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_relinquishIfConnectionLost,
       { "relinquishIfConnectionLost", "mms.relinquishIfConnectionLost",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_applicationToPreempt,
       { "applicationToPreempt", "mms.applicationToPreempt",
@@ -8605,7 +8605,7 @@ void proto_register_mms(void) {
         "mms.T_state", HFILL }},
     { &hf_mms_entryIdToStartAfter,
       { "entryIdToStartAfter", "mms.entryIdToStartAfter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_listOfSemaphoreEntry,
       { "listOfSemaphoreEntry", "mms.listOfSemaphoreEntry",
@@ -8617,7 +8617,7 @@ void proto_register_mms(void) {
         "mms.SemaphoreEntry", HFILL }},
     { &hf_mms_entryId,
       { "entryId", "mms.entryId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_entryClass,
       { "entryClass", "mms.entryClass",
@@ -8637,7 +8637,7 @@ void proto_register_mms(void) {
         "mms.Identifier", HFILL }},
     { &hf_mms_echo,
       { "echo", "mms.echo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_listOfPromptData,
       { "listOfPromptData", "mms.listOfPromptData",
@@ -8677,7 +8677,7 @@ void proto_register_mms(void) {
         "mms.Unsigned8", HFILL }},
     { &hf_mms_alarmSummaryReports,
       { "alarmSummaryReports", "mms.alarmSummaryReports",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_monitoredVariable,
       { "monitoredVariable", "mms.monitoredVariable",
@@ -8729,7 +8729,7 @@ void proto_register_mms(void) {
         "mms.Unsigned32", HFILL }},
     { &hf_mms_enabled,
       { "enabled", "mms.enabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_timeOfLastTransitionToActive,
       { "timeOfLastTransitionToActive", "mms.timeOfLastTransitionToActive",
@@ -8749,7 +8749,7 @@ void proto_register_mms(void) {
         "mms.ObjectName", HFILL }},
     { &hf_mms_eventConditionTransition,
       { "eventConditionTransition", "mms.eventConditionTransition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.Transitions", HFILL }},
     { &hf_mms_alarmAcknowledgementRule,
       { "alarmAcknowledgementRule", "mms.alarmAcknowledgementRule",
@@ -8821,11 +8821,11 @@ void proto_register_mms(void) {
         "mms.EventEnrollment", HFILL }},
     { &hf_mms_eventConditionTransitions,
       { "eventConditionTransitions", "mms.eventConditionTransitions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.Transitions", HFILL }},
     { &hf_mms_notificationLost,
       { "notificationLost", "mms.notificationLost",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_alarmAcknowledgmentRule,
       { "alarmAcknowledgmentRule", "mms.alarmAcknowledgmentRule",
@@ -8857,11 +8857,11 @@ void proto_register_mms(void) {
         "mms.EventTime", HFILL }},
     { &hf_mms_enrollmentsOnly,
       { "enrollmentsOnly", "mms.enrollmentsOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_activeAlarmsOnly,
       { "activeAlarmsOnly", "mms.activeAlarmsOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mms.BOOLEAN", HFILL }},
     { &hf_mms_acknowledgmentFilter,
       { "acknowledgmentFilter", "mms.acknowledgmentFilter",
@@ -8945,11 +8945,11 @@ void proto_register_mms(void) {
         "mms.ServiceError", HFILL }},
     { &hf_mms_causingTransitions,
       { "causingTransitions", "mms.causingTransitions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.Transitions", HFILL }},
     { &hf_mms_timeOfDayT,
       { "timeOfDayT", "mms.timeOfDayT",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_timeSequenceIdentifier,
       { "timeSequenceIdentifier", "mms.timeSequenceIdentifier",
@@ -8965,11 +8965,11 @@ void proto_register_mms(void) {
         "mms.T_rangeStartSpecification", HFILL }},
     { &hf_mms_startingTime,
       { "startingTime", "mms.startingTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_startingEntry,
       { "startingEntry", "mms.startingEntry",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_rangeStopSpecification,
       { "rangeStopSpecification", "mms.rangeStopSpecification",
@@ -8977,7 +8977,7 @@ void proto_register_mms(void) {
         "mms.T_rangeStopSpecification", HFILL }},
     { &hf_mms_endingTime,
       { "endingTime", "mms.endingTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_numberOfEntries,
       { "numberOfEntries", "mms.numberOfEntries",
@@ -8997,11 +8997,11 @@ void proto_register_mms(void) {
         "mms.T_entryToStartAfter", HFILL }},
     { &hf_mms_timeSpecification,
       { "timeSpecification", "mms.timeSpecification",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_entrySpecification,
       { "entrySpecification", "mms.entrySpecification",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_listOfJournalEntry,
       { "listOfJournalEntry", "mms.listOfJournalEntry",
@@ -9013,7 +9013,7 @@ void proto_register_mms(void) {
         "mms.JournalEntry", HFILL }},
     { &hf_mms_entryIdentifier,
       { "entryIdentifier", "mms.entryIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_originatingApplication,
       { "originatingApplication", "mms.originatingApplication",
@@ -9037,11 +9037,11 @@ void proto_register_mms(void) {
         "mms.T_limitSpecification", HFILL }},
     { &hf_mms_limitingTime,
       { "limitingTime", "mms.limitingTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_limitingEntry,
       { "limitingEntry", "mms.limitingEntry",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_currentEntries,
       { "currentEntries", "mms.currentEntries",
@@ -9049,7 +9049,7 @@ void proto_register_mms(void) {
         "mms.Unsigned32", HFILL }},
     { &hf_mms_occurenceTime,
       { "occurenceTime", "mms.occurenceTime",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.TimeOfDay", HFILL }},
     { &hf_mms_additionalDetail,
       { "additionalDetail", "mms.additionalDetail",
@@ -9113,7 +9113,7 @@ void proto_register_mms(void) {
         "mms.FileAttributes", HFILL }},
     { &hf_mms_fileData,
       { "fileData", "mms.fileData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mms.OCTET_STRING", HFILL }},
     { &hf_mms_currentFileName,
       { "currentFileName", "mms.currentFileName",
@@ -9154,411 +9154,411 @@ void proto_register_mms(void) {
     { &hf_mms_ParameterSupportOptions_str1,
       { "str1", "mms.str1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_str2,
       { "str2", "mms.str2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vnam,
       { "vnam", "mms.vnam",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_valt,
       { "valt", "mms.valt",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vadr,
       { "vadr", "mms.vadr",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vsca,
       { "vsca", "mms.vsca",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_tpy,
       { "tpy", "mms.tpy",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_vlis,
       { "vlis", "mms.vlis",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_real,
       { "real", "mms.real",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ParameterSupportOptions_cei,
       { "cei", "mms.cei",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_status,
       { "status", "mms.status",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNameList,
       { "getNameList", "mms.getNameList",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_identify,
       { "identify", "mms.identify",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_rename,
       { "rename", "mms.rename",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_read,
       { "read", "mms.read",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_write,
       { "write", "mms.write",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getVariableAccessAttributes,
       { "getVariableAccessAttributes", "mms.getVariableAccessAttributes",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedVariable,
       { "defineNamedVariable", "mms.defineNamedVariable",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineScatteredAccess,
       { "defineScatteredAccess", "mms.defineScatteredAccess",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getScatteredAccessAttributes,
       { "getScatteredAccessAttributes", "mms.getScatteredAccessAttributes",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteVariableAccess,
       { "deleteVariableAccess", "mms.deleteVariableAccess",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedVariableList,
       { "defineNamedVariableList", "mms.defineNamedVariableList",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNamedVariableListAttributes,
       { "getNamedVariableListAttributes", "mms.getNamedVariableListAttributes",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteNamedVariableList,
       { "deleteNamedVariableList", "mms.deleteNamedVariableList",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineNamedType,
       { "defineNamedType", "mms.defineNamedType",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getNamedTypeAttributes,
       { "getNamedTypeAttributes", "mms.getNamedTypeAttributes",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteNamedType,
       { "deleteNamedType", "mms.deleteNamedType",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_input,
       { "input", "mms.input",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_output,
       { "output", "mms.output",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_takeControl,
       { "takeControl", "mms.takeControl",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_relinquishControl,
       { "relinquishControl", "mms.relinquishControl",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineSemaphore,
       { "defineSemaphore", "mms.defineSemaphore",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteSemaphore,
       { "deleteSemaphore", "mms.deleteSemaphore",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportSemaphoreStatus,
       { "reportSemaphoreStatus", "mms.reportSemaphoreStatus",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportPoolSemaphoreStatus,
       { "reportPoolSemaphoreStatus", "mms.reportPoolSemaphoreStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportSemaphoreEntryStatus,
       { "reportSemaphoreEntryStatus", "mms.reportSemaphoreEntryStatus",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initiateDownloadSequence,
       { "initiateDownloadSequence", "mms.initiateDownloadSequence",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_downloadSegment,
       { "downloadSegment", "mms.downloadSegment",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_terminateDownloadSequence,
       { "terminateDownloadSequence", "mms.terminateDownloadSequence",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initiateUploadSequence,
       { "initiateUploadSequence", "mms.initiateUploadSequence",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_uploadSegment,
       { "uploadSegment", "mms.uploadSegment",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_terminateUploadSequence,
       { "terminateUploadSequence", "mms.terminateUploadSequence",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_requestDomainDownload,
       { "requestDomainDownload", "mms.requestDomainDownload",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_requestDomainUpload,
       { "requestDomainUpload", "mms.requestDomainUpload",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_loadDomainContent,
       { "loadDomainContent", "mms.loadDomainContent",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_storeDomainContent,
       { "storeDomainContent", "mms.storeDomainContent",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteDomain,
       { "deleteDomain", "mms.deleteDomain",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getDomainAttributes,
       { "getDomainAttributes", "mms.getDomainAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_createProgramInvocation,
       { "createProgramInvocation", "mms.createProgramInvocation",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteProgramInvocation,
       { "deleteProgramInvocation", "mms.deleteProgramInvocation",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_start,
       { "start", "mms.start",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_stop,
       { "stop", "mms.stop",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_resume,
       { "resume", "mms.resume",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reset,
       { "reset", "mms.reset",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_kill,
       { "kill", "mms.kill",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getProgramInvocationAttributes,
       { "getProgramInvocationAttributes", "mms.getProgramInvocationAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_obtainFile,
       { "obtainFile", "mms.obtainFile",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventCondition,
       { "defineEventCondition", "mms.defineEventCondition",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventCondition,
       { "deleteEventCondition", "mms.deleteEventCondition",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventConditionAttributes,
       { "getEventConditionAttributes", "mms.getEventConditionAttributes",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportEventConditionStatus,
       { "reportEventConditionStatus", "mms.reportEventConditionStatus",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_alterEventConditionMonitoring,
       { "alterEventConditionMonitoring", "mms.alterEventConditionMonitoring",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_triggerEvent,
       { "triggerEvent", "mms.triggerEvent",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventAction,
       { "defineEventAction", "mms.defineEventAction",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventAction,
       { "deleteEventAction", "mms.deleteEventAction",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventActionAttributes,
       { "getEventActionAttributes", "mms.getEventActionAttributes",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportActionStatus,
       { "reportActionStatus", "mms.reportActionStatus",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_defineEventEnrollment,
       { "defineEventEnrollment", "mms.defineEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteEventEnrollment,
       { "deleteEventEnrollment", "mms.deleteEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_alterEventEnrollment,
       { "alterEventEnrollment", "mms.alterEventEnrollment",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportEventEnrollmentStatus,
       { "reportEventEnrollmentStatus", "mms.reportEventEnrollmentStatus",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getEventEnrollmentAttributes,
       { "getEventEnrollmentAttributes", "mms.getEventEnrollmentAttributes",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_acknowledgeEventNotification,
       { "acknowledgeEventNotification", "mms.acknowledgeEventNotification",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getAlarmSummary,
       { "getAlarmSummary", "mms.getAlarmSummary",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getAlarmEnrollmentSummary,
       { "getAlarmEnrollmentSummary", "mms.getAlarmEnrollmentSummary",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_readJournal,
       { "readJournal", "mms.readJournal",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_writeJournal,
       { "writeJournal", "mms.writeJournal",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_initializeJournal,
       { "initializeJournal", "mms.initializeJournal",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_reportJournalStatus,
       { "reportJournalStatus", "mms.reportJournalStatus",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_createJournal,
       { "createJournal", "mms.createJournal",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_deleteJournal,
       { "deleteJournal", "mms.deleteJournal",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_getCapabilityList,
       { "getCapabilityList", "mms.getCapabilityList",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileOpen,
       { "fileOpen", "mms.fileOpen",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileRead,
       { "fileRead", "mms.fileRead",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileClose,
       { "fileClose", "mms.fileClose",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileRename,
       { "fileRename", "mms.fileRename",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileDelete,
       { "fileDelete", "mms.fileDelete",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_fileDirectory,
       { "fileDirectory", "mms.fileDirectory",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_unsolicitedStatus,
       { "unsolicitedStatus", "mms.unsolicitedStatus",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_informationReport,
       { "informationReport", "mms.informationReport",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_eventNotification,
       { "eventNotification", "mms.eventNotification",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_attachToEventCondition,
       { "attachToEventCondition", "mms.attachToEventCondition",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_attachToSemaphore,
       { "attachToSemaphore", "mms.attachToSemaphore",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_conclude,
       { "conclude", "mms.conclude",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_ServiceSupportOptions_cancel,
       { "cancel", "mms.cancel",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_idle_to_disabled,
       { "idle-to-disabled", "mms.idle-to-disabled",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_active_to_disabled,
       { "active-to-disabled", "mms.active-to-disabled",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_disabled_to_idle,
       { "disabled-to-idle", "mms.disabled-to-idle",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_active_to_idle,
       { "active-to-idle", "mms.active-to-idle",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_disabled_to_active,
       { "disabled-to-active", "mms.disabled-to-active",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_idle_to_active,
       { "idle-to-active", "mms.idle-to-active",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_mms_Transitions_any_to_deleted,
       { "any-to-deleted", "mms.any-to-deleted",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-mms-hfarr.c ---*/
 #line 97 "packet-mms-template.c"
diff --git a/epan/dissectors/packet-mmse.c b/epan/dissectors/packet-mmse.c
index a0b07768c4..8e0b06f22e 100644
--- a/epan/dissectors/packet-mmse.c
+++ b/epan/dissectors/packet-mmse.c
@@ -1347,8 +1347,7 @@ proto_register_mmse(void)
 	{   &hf_mmse_transaction_id,
 	    {   "X-Mms-Transaction-ID", "mmse.transaction_id",
 		FT_STRING, BASE_NONE, NULL, 0x00,
-		"A unique identifier for this transaction. "
-		"Identifies request and corresponding response only.",
+		"A unique identifier for this transaction. Identifies request and corresponding response only.",
 		HFILL
 	    }
 	},
diff --git a/epan/dissectors/packet-mount.c b/epan/dissectors/packet-mount.c
index 6542639271..ee54e75975 100644
--- a/epan/dissectors/packet-mount.c
+++ b/epan/dissectors/packet-mount.c
@@ -897,49 +897,49 @@ proto_register_mount(void)
 	static hf_register_info hf[] = {
 		{ &hf_mount_procedure_v1, {
 			"V1 Procedure", "mount.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(mount1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(mount1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_mount_procedure_v2, {
 			"V2 Procedure", "mount.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(mount2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(mount2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_mount_procedure_v3, {
 			"V3 Procedure", "mount.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(mount3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(mount3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_sgi_mount_procedure_v1, {
 			"SGI V1 procedure", "mount.procedure_sgi_v1", FT_UINT32, BASE_DEC,
 			VALS(sgi_mount1_proc_vals), 0, "SGI V1 Procedure", HFILL }},
 		{ &hf_mount_path, {
-			"Path", "mount.path", FT_STRING, BASE_DEC,
-			NULL, 0, "Path", HFILL }},
+			"Path", "mount.path", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount3_status, {
 			"Status", "mount.status", FT_UINT32, BASE_DEC,
-			VALS(mount3_mountstat3), 0, "Status", HFILL }},
+			VALS(mount3_mountstat3), 0, NULL, HFILL }},
 		{ &hf_mount_mountlist_hostname, {
-			"Hostname", "mount.dump.hostname", FT_STRING, BASE_DEC,
-			NULL, 0, "Hostname", HFILL }},
+			"Hostname", "mount.dump.hostname", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_mountlist_directory, {
-			"Directory", "mount.dump.directory", FT_STRING, BASE_DEC,
-			NULL, 0, "Directory", HFILL }},
+			"Directory", "mount.dump.directory", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_mountlist, {
-			"Mount List Entry", "mount.dump.entry", FT_NONE, 0,
-			NULL, 0, "Mount List Entry", HFILL }},
+			"Mount List Entry", "mount.dump.entry", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_groups_group, {
-			"Group", "mount.export.group", FT_STRING, BASE_DEC,
-			NULL, 0, "Group", HFILL }},
+			"Group", "mount.export.group", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_groups, {
-			"Groups", "mount.export.groups", FT_NONE, 0,
-			NULL, 0, "Groups", HFILL }},
+			"Groups", "mount.export.groups", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_has_options, {
 			"Has options", "mount.export.has_options", FT_UINT32,
-			 BASE_DEC, NULL, 0, "Has options", HFILL }},
+			 BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_mount_options, {
-			"Options", "mount.export.options", FT_STRING, BASE_DEC,
-			NULL, 0, "Options", HFILL }},
+			"Options", "mount.export.options", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_exportlist_directory, {
-			"Directory", "mount.export.directory", FT_STRING, BASE_DEC,
-			NULL, 0, "Directory", HFILL }},
+			"Directory", "mount.export.directory", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_exportlist, {
-			"Export List Entry", "mount.export.entry", FT_NONE, 0,
-			NULL, 0, "Export List Entry", HFILL }},
+			"Export List Entry", "mount.export.entry", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_link_max, {
 			"Maximum number of links to a file", "mount.pathconf.link_max",
 			FT_UINT32, BASE_DEC,
@@ -951,15 +951,15 @@ proto_register_mount(void)
 		{ &hf_mount_pathconf_max_input, {
 			"Terminal input buffer size", "mount.pathconf.max_input",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Terminal input buffer size", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_name_max, {
 			"Maximum file name length", "mount.pathconf.name_max",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Maximum file name length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_path_max, {
 			"Maximum path name length", "mount.pathconf.path_max",
 			FT_UINT16, BASE_DEC,
-			NULL, 0, "Maximum path name length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_pathconf_pipe_buf, {
 			"Pipe buffer size", "mount.pathconf.pipe_buf",
 			FT_UINT16, BASE_DEC,
@@ -975,43 +975,43 @@ proto_register_mount(void)
 		{ &hf_mount_pathconf_error_all, {
 			"ERROR_ALL",	"mount.pathconf.mask.error_all",
 			FT_BOOLEAN, 16, TFS(&tos_error_all),
-			PC_ERROR_ALL, "", HFILL }},
+			PC_ERROR_ALL, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_link_max, {
 			"ERROR_LINK_MAX", "mount.pathconf.mask.error_link_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_link_max),
-			PC_ERROR_LINK_MAX, "", HFILL }},
+			PC_ERROR_LINK_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_max_canon, {
 			"ERROR_MAX_CANON", "mount.pathconf.mask.error_max_canon",
 			FT_BOOLEAN, 16, TFS(&tos_error_max_canon),
-			PC_ERROR_MAX_CANON, "", HFILL }},
+			PC_ERROR_MAX_CANON, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_max_input, {
 			"ERROR_MAX_INPUT", "mount.pathconf.mask.error_max_input",
 			FT_BOOLEAN, 16, TFS(&tos_error_max_input),
-			PC_ERROR_MAX_INPUT, "", HFILL }},
+			PC_ERROR_MAX_INPUT, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_name_max, {
 			"ERROR_NAME_MAX", "mount.pathconf.mask.error_name_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_name_max),
-			PC_ERROR_NAME_MAX, "", HFILL }},
+			PC_ERROR_NAME_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_path_max, {
 			"ERROR_PATH_MAX", "mount.pathconf.mask.error_path_max",
 			FT_BOOLEAN, 16, TFS(&tos_error_path_max),
-			PC_ERROR_PATH_MAX, "", HFILL }},
+			PC_ERROR_PATH_MAX, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_pipe_buf, {
 			"ERROR_PIPE_BUF", "mount.pathconf.mask.error_pipe_buf",
 			FT_BOOLEAN, 16, TFS(&tos_error_pipe_buf),
-			PC_ERROR_PIPE_BUF, "", HFILL }},
+			PC_ERROR_PIPE_BUF, NULL, HFILL }},
 		{ &hf_mount_pathconf_chown_restricted, {
 			"CHOWN_RESTRICTED", "mount.pathconf.mask.chown_restricted",
 			FT_BOOLEAN, 16, TFS(&tos_chown_restricted),
-			PC_CHOWN_RESTRICTED, "", HFILL }},
+			PC_CHOWN_RESTRICTED, NULL, HFILL }},
 		{ &hf_mount_pathconf_no_trunc, {
 			"NO_TRUNC", "mount.pathconf.mask.no_trunc",
 			FT_BOOLEAN, 16, TFS(&tos_no_trunc),
-			PC_NO_TRUNC, "", HFILL }},
+			PC_NO_TRUNC, NULL, HFILL }},
 		{ &hf_mount_pathconf_error_vdisable, {
 			"ERROR_VDISABLE", "mount.pathconf.mask.error_vdisable",
 			FT_BOOLEAN, 16, TFS(&tos_error_vdisable),
-			PC_ERROR_VDISABLE, "", HFILL }},
+			PC_ERROR_VDISABLE, NULL, HFILL }},
 		{ &hf_mount_statvfs_bsize, {
 			"Block size", "mount.statvfs.f_bsize",
 			FT_UINT32, BASE_DEC, NULL, 0,
@@ -1050,7 +1050,7 @@ proto_register_mount(void)
 			"File system identifier", HFILL }},
 		{ &hf_mount_statvfs_basetype, {
 			"Type", "mount.statvfs.f_basetype",
-			FT_STRING, BASE_DEC, NULL, 0,
+			FT_STRING, BASE_NONE, NULL, 0,
 			"File system type", HFILL }},
 		{ &hf_mount_statvfs_flag, {
 			"Flags", "mount.statvfs.f_flag",
@@ -1059,41 +1059,41 @@ proto_register_mount(void)
 		{ &hf_mount_statvfs_flag_rdonly, {
 			"ST_RDONLY", "mount.statvfs.f_flag.st_rdonly",
 			FT_BOOLEAN, 32, TFS(&tos_st_rdonly), ST_RDONLY,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_nosuid, {
 			"ST_NOSUID", "mount.statvfs.f_flag.st_nosuid",
 			FT_BOOLEAN, 32, TFS(&tos_st_nosuid), ST_NOSUID,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_notrunc, {
 			"ST_NOTRUNC", "mount.statvfs.f_flag.st_notrunc",
 			FT_BOOLEAN, 32, TFS(&tos_st_notrunc), ST_NOTRUNC,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_nodev, {
 			"ST_NODEV", "mount.statvfs.f_flag.st_nodev",
 			 FT_BOOLEAN, 32, TFS(&tos_st_nodev), ST_NODEV,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_grpid, {
 			"ST_GRPID", "mount.statvfs.f_flag.st_grpid",
 			FT_BOOLEAN, 32, TFS(&tos_st_grpid), ST_GRPID,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_flag_local, {
 			"ST_LOCAL", "mount.statvfs.f_flag.st_local",
 			FT_BOOLEAN, 32, TFS(&tos_st_local), ST_LOCAL,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_namemax, {
 			"Maximum file name length", "mount.statvfs.f_namemax",
 			FT_UINT32, BASE_DEC, NULL, 0,
-			"Maximum file name length", HFILL }},
+			NULL, HFILL }},
 		{ &hf_mount_statvfs_fstr, {
 			"File system specific string", "mount.statvfs.f_fstr",
-			FT_BYTES, BASE_HEX, NULL, 0,
-			"File system specific string", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0,
+			NULL, HFILL }},
 		{ &hf_mount_flavors, {
 			"Flavors", "mount.flavors", FT_UINT32, BASE_DEC,
-			NULL, 0, "Flavors", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_mount_flavor, {
 			"Flavor", "mount.flavor", FT_UINT32, BASE_DEC,
-			VALS(rpc_auth_flavor), 0, "Flavor", HFILL }},
+			VALS(rpc_auth_flavor), 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_mount,
diff --git a/epan/dissectors/packet-mp2t.c b/epan/dissectors/packet-mp2t.c
index 8d99ea181a..9e963bcae8 100644
--- a/epan/dissectors/packet-mp2t.c
+++ b/epan/dissectors/packet-mp2t.c
@@ -782,11 +782,11 @@ proto_register_mp2t(void)
 		} } ,
 		{ &hf_mp2t_cc_drop, {
 			"Continuity Counter Drops", "mp2t.cc.drop",
-			FT_NONE, BASE_DEC, NULL, 0x0, NULL, HFILL
+			FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af, {
 			"Adaption field", "mp2t.af",
-			FT_NONE, BASE_HEX, NULL, 0, NULL, HFILL
+			FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_length, {
 			"Adaptation Field Length", "mp2t.af.length",
@@ -826,11 +826,11 @@ proto_register_mp2t(void)
 		} } ,
 		{ &hf_mp2t_af_pcr, {
 			"Program Clock Reference", "mp2t.af.pcr",
-			FT_NONE, BASE_DEC, NULL, 0, NULL, HFILL
+			FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_opcr, {
 			"Original Program Clock Reference", "mp2t.af.opcr",
-			FT_NONE, BASE_DEC, NULL, 0, NULL, HFILL
+			FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_sc, {
 			"Splice Countdown", "mp2t.af.sc",
@@ -842,7 +842,7 @@ proto_register_mp2t(void)
 		} } ,
 		{ &hf_mp2t_af_tpd, {
 			"Transport Private Data", "mp2t.af.tpd",
-			FT_BYTES, BASE_DEC, NULL, 0, NULL, HFILL
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_e_length, {
 			"Adaptation Field Extension Length", "mp2t.af.e_length",
@@ -866,11 +866,11 @@ proto_register_mp2t(void)
 		} } ,
 		{ &hf_mp2t_af_e_reserved_bytes, {
 			"Reserved", "mp2t.af.e.reserved_bytes",
-			FT_BYTES, BASE_DEC, NULL, 0x0, NULL, HFILL
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_stuffing_bytes, {
 			"Stuffing", "mp2t.af.stuffing_bytes",
-			FT_BYTES, BASE_DEC, NULL, 0x0, NULL, HFILL
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_af_e_ltwv_flag, {
 			"LTW Valid Flag", "mp2t.af.e.ltwv_flag",
@@ -918,11 +918,11 @@ proto_register_mp2t(void)
 		} } ,
 		{ &hf_mp2t_payload, {
 			"Payload", "mp2t.payload",
-			FT_BYTES, BASE_DEC, NULL, 0x0, NULL, HFILL
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} } ,
 		{ &hf_mp2t_malformed_payload, {
 			"Malformed Payload", "mp2t.malformed_payload",
-			FT_BYTES, BASE_DEC, NULL, 0x0, NULL, HFILL
+			FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
 		} }
 	};
 
diff --git a/epan/dissectors/packet-mp4ves.c b/epan/dissectors/packet-mp4ves.c
index ba252b39bf..d274bbd1fa 100644
--- a/epan/dissectors/packet-mp4ves.c
+++ b/epan/dissectors/packet-mp4ves.c
@@ -897,17 +897,17 @@ proto_register_mp4ves(void)
 		{ &hf_mp4ves_config,
 		  { "Configuration",        "mp4ves.configuration", 
 		    FT_BYTES, BASE_NONE, NULL, 0x0,
-		    "Configuration", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_start_code_prefix,
 		  { "start code prefix",		"mp4ves.start_code_prefix", 
 		    FT_UINT32, BASE_HEX, NULL, 0x0,
-		    "start code prefix", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_start_code,
 		  { "Start code",		"mp4ves.start_code", 
 		    FT_UINT8, BASE_RANGE_STRING|BASE_HEX, RVALS(&mp4ves_startcode_vals), 0x0,
-		    "Start code", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_vop_coding_type,
 		  { "vop_coding_type",		"mp4ves.vop_coding_type", 
@@ -917,32 +917,32 @@ proto_register_mp4ves(void)
 		{&hf_mp4ves_profile_and_level_indication,
 		 { "profile_and_level_indication",		"mp4ves.profile_and_level_indication",
 		   FT_UINT8, BASE_DEC,VALS(mp4ves_level_indication_vals), 0x0,
-		   "profile_and_level_indication", HFILL }
+		   NULL, HFILL }
 		},
 		{ &hf_mp4ves_is_visual_object_identifier,
 		  { "visual_object_identifier",		"mp4ves.visual_object_identifier",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "visual_object_identifier", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_visual_object_type,
 		  { "visual_object_type",		"mp4ves.visual_object_type",
 		    FT_UINT32, BASE_DEC, VALS(mp4ves_visual_object_type_vals), 0x0,
-		    "visual_object_type", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_video_signal_type,
 		  { "video_signal_type",		"mp4ves.video_signal_type",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "video_signal_type", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_stuffing,
 		  { "Stuffing",		"mp4ves.stuffing",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "Stuffing", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_video_object_type_indication,
 		  { "video_object_type_indication",		"mp4ves.video_object_type_indication",
 		    FT_UINT8, BASE_DEC, VALS(mp4ves_video_object_type_indication_vals), 0x0,
-		    "video_object_type_indication", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_random_accessible_vol,
 		  { "random_accessible_vol",		"mp4ves.random_accessible_vol",
@@ -952,22 +952,22 @@ proto_register_mp4ves(void)
 		{ &hf_mp4ves_is_object_layer_identifier,
 		  { "is_object_layer_identifier",		"mp4ves.is_object_layer_identifier",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "is_object_layer_identifier", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_aspect_ratio_info,
 		  { "aspect_ratio_info",		"mp4ves.aspect_ratio_info",
 		    FT_UINT8, BASE_DEC, VALS(mp4ves_aspect_ratio_info_vals), 0x0,
-		    "aspect_ratio_info", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_vol_control_parameters,
 		  { "vol_control_parameters",		"mp4ves.vol_control_parameters",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "vol_control_parameters", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_mp4ves_video_object_layer_shape,
 		  { "video_object_layer_shape",		"mp4ves.video_object_layer_shape",
 		    FT_UINT8, BASE_DEC, VALS(mp4ves_video_object_layer_shape_vals), 0x0,
-		    "video_object_layer_shape", HFILL }
+		    NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-mpeg-audio.c b/epan/dissectors/packet-mpeg-audio.c
index 22fb9e51ca..1a2d58a182 100644
--- a/epan/dissectors/packet-mpeg-audio.c
+++ b/epan/dissectors/packet-mpeg-audio.c
@@ -583,7 +583,7 @@ proto_register_mpeg_audio(void)
 #line 1 "packet-mpeg-audio-hfarr.c"
     { &hf_mpeg_audio_sync,
       { "sync", "mpeg-audio.sync",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_audio.BIT_STRING_SIZE_11", HFILL }},
     { &hf_mpeg_audio_version,
       { "version", "mpeg-audio.version",
@@ -607,11 +607,11 @@ proto_register_mpeg_audio(void)
         "mpeg_audio.INTEGER_0_3", HFILL }},
     { &hf_mpeg_audio_padding,
       { "padding", "mpeg-audio.padding",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_audio.BOOLEAN", HFILL }},
     { &hf_mpeg_audio_private,
       { "private", "mpeg-audio.private",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_audio.BOOLEAN", HFILL }},
     { &hf_mpeg_audio_channel_mode,
       { "channel-mode", "mpeg-audio.channel_mode",
@@ -623,11 +623,11 @@ proto_register_mpeg_audio(void)
         "mpeg_audio.INTEGER_0_3", HFILL }},
     { &hf_mpeg_audio_copyright,
       { "copyright", "mpeg-audio.copyright",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_audio.BOOLEAN", HFILL }},
     { &hf_mpeg_audio_original,
       { "original", "mpeg-audio.original",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_audio.BOOLEAN", HFILL }},
     { &hf_mpeg_audio_emphasis,
       { "emphasis", "mpeg-audio.emphasis",
@@ -635,27 +635,27 @@ proto_register_mpeg_audio(void)
         "mpeg_audio.T_emphasis", HFILL }},
     { &hf_mpeg_audio_tag,
       { "tag", "mpeg-audio.tag",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_mpeg_audio_title,
       { "title", "mpeg-audio.title",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_30", HFILL }},
     { &hf_mpeg_audio_artist,
       { "artist", "mpeg-audio.artist",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_30", HFILL }},
     { &hf_mpeg_audio_album,
       { "album", "mpeg-audio.album",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_30", HFILL }},
     { &hf_mpeg_audio_year,
       { "year", "mpeg-audio.year",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_mpeg_audio_comment,
       { "comment", "mpeg-audio.comment",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "mpeg_audio.OCTET_STRING_SIZE_28", HFILL }},
     { &hf_mpeg_audio_must_be_zero,
       { "must-be-zero", "mpeg-audio.must_be_zero",
diff --git a/epan/dissectors/packet-mpeg-pes.c b/epan/dissectors/packet-mpeg-pes.c
index 7c8d3d57eb..4521f13b13 100644
--- a/epan/dissectors/packet-mpeg-pes.c
+++ b/epan/dissectors/packet-mpeg-pes.c
@@ -925,7 +925,7 @@ proto_register_mpeg_pes(void)
 #line 1 "packet-mpeg-pes-hfarr.c"
     { &hf_mpeg_pes_prefix,
       { "prefix", "mpeg-pes.prefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_mpeg_pes_stream,
       { "stream", "mpeg-pes.stream",
@@ -937,11 +937,11 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_65535", HFILL }},
     { &hf_mpeg_pes_must_be_one,
       { "must-be-one", "mpeg-pes.must_be_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_zero,
       { "must-be-zero", "mpeg-pes.must_be_zero",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_scrambling_control,
       { "scrambling-control", "mpeg-pes.scrambling_control",
@@ -949,51 +949,51 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_scrambling_control", HFILL }},
     { &hf_mpeg_pes_priority,
       { "priority", "mpeg-pes.priority",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_data_alignment,
       { "data-alignment", "mpeg-pes.data_alignment",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_copyright,
       { "copyright", "mpeg-pes.copyright",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_original,
       { "original", "mpeg-pes.original",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_pts_flag,
       { "pts-flag", "mpeg-pes.pts_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_dts_flag,
       { "dts-flag", "mpeg-pes.dts_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_escr_flag,
       { "escr-flag", "mpeg-pes.escr_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_es_rate_flag,
       { "es-rate-flag", "mpeg-pes.es_rate_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_dsm_trick_mode_flag,
       { "dsm-trick-mode-flag", "mpeg-pes.dsm_trick_mode_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_additional_copy_info_flag,
       { "additional-copy-info-flag", "mpeg-pes.additional_copy_info_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_crc_flag,
       { "crc-flag", "mpeg-pes.crc_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_extension_flag,
       { "extension-flag", "mpeg-pes.extension_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_header_data_length,
       { "header-data-length", "mpeg-pes.header_data_length",
@@ -1001,11 +1001,11 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_horizontal_size,
       { "horizontal-size", "mpeg-pes.horizontal_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_vertical_size,
       { "vertical-size", "mpeg-pes.vertical_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_aspect_ratio,
       { "aspect-ratio", "mpeg-pes.aspect_ratio",
@@ -1017,27 +1017,27 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_frame_rate", HFILL }},
     { &hf_mpeg_pes_bit_rate,
       { "bit-rate", "mpeg-pes.bit_rate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_18", HFILL }},
     { &hf_mpeg_pes_vbv_buffer_size,
       { "vbv-buffer-size", "mpeg-pes.vbv_buffer_size",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_10", HFILL }},
     { &hf_mpeg_pes_constrained_parameters_flag,
       { "constrained-parameters-flag", "mpeg-pes.constrained_parameters_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_load_intra_quantiser_matrix,
       { "load-intra-quantiser-matrix", "mpeg-pes.load_intra_quantiser_matrix",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_load_non_intra_quantiser_matrix,
       { "load-non-intra-quantiser-matrix", "mpeg-pes.load_non_intra_quantiser_matrix",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_0001,
       { "must-be-0001", "mpeg-pes.must_be_0001",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_4", HFILL }},
     { &hf_mpeg_pes_profile_and_level,
       { "profile-and-level", "mpeg-pes.profile_and_level",
@@ -1045,7 +1045,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_progressive_sequence,
       { "progressive-sequence", "mpeg-pes.progressive_sequence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_chroma_format,
       { "chroma-format", "mpeg-pes.chroma_format",
@@ -1061,7 +1061,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_3", HFILL }},
     { &hf_mpeg_pes_bit_rate_extension,
       { "bit-rate-extension", "mpeg-pes.bit_rate_extension",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_12", HFILL }},
     { &hf_mpeg_pes_vbv_buffer_size_extension,
       { "vbv-buffer-size-extension", "mpeg-pes.vbv_buffer_size_extension",
@@ -1069,7 +1069,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_255", HFILL }},
     { &hf_mpeg_pes_low_delay,
       { "low-delay", "mpeg-pes.low_delay",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_frame_rate_extension_n,
       { "frame-rate-extension-n", "mpeg-pes.frame_rate_extension_n",
@@ -1081,7 +1081,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_3", HFILL }},
     { &hf_mpeg_pes_drop_frame_flag,
       { "drop-frame-flag", "mpeg-pes.drop_frame_flag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_hour,
       { "hour", "mpeg-pes.hour",
@@ -1101,19 +1101,19 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.INTEGER_0_64", HFILL }},
     { &hf_mpeg_pes_closed_gop,
       { "closed-gop", "mpeg-pes.closed_gop",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_broken_gop,
       { "broken-gop", "mpeg-pes.broken_gop",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "mpeg_pes.BOOLEAN", HFILL }},
     { &hf_mpeg_pes_must_be_zero_01,
       { "must-be-zero", "mpeg-pes.must_be_zero",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_5", HFILL }},
     { &hf_mpeg_pes_temporal_sequence_number,
       { "temporal-sequence-number", "mpeg-pes.temporal_sequence_number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_10", HFILL }},
     { &hf_mpeg_pes_frame_type,
       { "frame-type", "mpeg-pes.frame_type",
@@ -1121,7 +1121,7 @@ proto_register_mpeg_pes(void)
         "mpeg_pes.T_frame_type", HFILL }},
     { &hf_mpeg_pes_vbv_delay,
       { "vbv-delay", "mpeg-pes.vbv_delay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "mpeg_pes.BIT_STRING_SIZE_16", HFILL }},
 
 /*--- End of included file: packet-mpeg-pes-hfarr.c ---*/
diff --git a/epan/dissectors/packet-mpeg1.c b/epan/dissectors/packet-mpeg1.c
index 5055d7e3a5..b707609d68 100644
--- a/epan/dissectors/packet-mpeg1.c
+++ b/epan/dissectors/packet-mpeg1.c
@@ -203,7 +203,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -215,7 +215,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -227,7 +227,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -239,7 +239,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -252,7 +252,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -262,10 +262,10 @@ proto_register_mpeg1(void)
 				"Sequence Header",
 				"rtp.payload_mpeg_s",
 				FT_BOOLEAN,
-				BASE_DEC,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -275,10 +275,10 @@ proto_register_mpeg1(void)
 				"Beginning-of-slice",
 				"rtp.payload_mpeg_b",
 				FT_BOOLEAN,
-				BASE_DEC,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -288,10 +288,10 @@ proto_register_mpeg1(void)
 				"End-of-slice",
 				"rtp.payload_mpeg_an",
 				FT_BOOLEAN,
-				BASE_DEC,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -304,7 +304,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				VALS(rtp_mpg_picture_types_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -317,7 +317,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -330,7 +330,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -342,7 +342,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -355,7 +355,7 @@ proto_register_mpeg1(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -367,7 +367,7 @@ proto_register_mpeg1(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index b14eb7d367..9fa3691f74 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -1206,7 +1206,7 @@ proto_register_mpls_echo(void)
 		},
                 { &hf_mpls_echo_tlv_fec_rsvp_ipv6_ext_tunnel_id,
                         { "Extended Tunnel ID", "mpls_echo.tlv.fec.rsvp_ipv6_ext_tun_id",
-                        FT_BYTES, BASE_HEX, NULL, 0x0, "MPLS ECHO TLV FEC Stack RSVP IPv6 Extended Tunnel ID", HFILL}
+                        FT_BYTES, BASE_NONE, NULL, 0x0, "MPLS ECHO TLV FEC Stack RSVP IPv6 Extended Tunnel ID", HFILL}
                 },
                 { &hf_mpls_echo_tlv_fec_rsvp_ipv6_ipv6_sender,
                         { "IPv6 Tunnel sender address", "mpls_echo.tlv.fec.rsvp_ipv6_sender",
@@ -1336,7 +1336,7 @@ proto_register_mpls_echo(void)
                 },
                 { &hf_mpls_echo_tlv_ds_map_mp_mask,
                         { "Mask", "mpls_echo.tlv.ds_map_mp.mask",
-                        FT_BYTES, BASE_HEX, NULL, 0x0, "MPLS ECHO TLV Downstream Map Multipath Mask", HFILL}
+                        FT_BYTES, BASE_NONE, NULL, 0x0, "MPLS ECHO TLV Downstream Map Multipath Mask", HFILL}
                 },
                 { &hf_mpls_echo_tlv_ds_map_mp_ip_low,
                         { "IP Address Low", "mpls_echo.tlv.ds_map_mp.ip_low",
diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c
index a197968de3..fca8836f8c 100644
--- a/epan/dissectors/packet-mq.c
+++ b/epan/dissectors/packet-mq.c
@@ -2475,7 +2475,7 @@ proto_register_mq(void)
 {
   static hf_register_info hf[] = {
    { &hf_mq_tsh_structid,
-      { "TSH structid", "mq.tsh.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "TSH structid", HFILL }},
+      { "TSH structid", "mq.tsh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_tsh_packetlength,
       { "MQ Segment length", "mq.tsh.seglength", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH MQ Segment length", HFILL }},
@@ -2493,7 +2493,7 @@ proto_register_mq(void)
       { "Reserved", "mq.tsh.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "TSH Reserved", HFILL }},
 
     { &hf_mq_tsh_luwid,
-      { "Logical unit of work identifier", "mq.tsh.luwid", FT_BYTES, BASE_HEX, NULL, 0x0, "TSH logical unit of work identifier", HFILL }},
+      { "Logical unit of work identifier", "mq.tsh.luwid", FT_BYTES, BASE_NONE, NULL, 0x0, "TSH logical unit of work identifier", HFILL }},
 
     { &hf_mq_tsh_encoding,
       { "Encoding", "mq.tsh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "TSH Encoding", HFILL }},
@@ -2559,7 +2559,7 @@ proto_register_mq(void)
       { "Runtime application", "mq.id.icf.runtime", FT_BOOLEAN, 8, TFS(&flags_set_truth), MQ_ICF_RUNTIME, "ID ICF Runtime application", HFILL }},
 
     { &hf_mq_msh_structid,
-      { "MSH structid", "mq.msh.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MSH structid", HFILL }},
+      { "MSH structid", "mq.msh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_msh_seqnum,
       { "Sequence number", "mq.msh.seqnum", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH sequence number", HFILL }},
@@ -2574,19 +2574,19 @@ proto_register_mq(void)
       { "Message length", "mq.msh.msglength", FT_UINT32, BASE_DEC, NULL, 0x0, "MSH message length", HFILL }},
 
     { &hf_mq_xqh_structid,
-      { "XQH structid", "mq.xqh.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "XQH structid", HFILL }},
+      { "XQH structid", "mq.xqh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_xqh_version,
       { "Version", "mq.xqh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "XQH version", HFILL }},
 
     { &hf_mq_xqh_remoteq,
-      { "Remote queue", "mq.xqh.remoteq", FT_STRINGZ, BASE_DEC, NULL, 0x0, "XQH remote queue", HFILL }},
+      { "Remote queue", "mq.xqh.remoteq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XQH remote queue", HFILL }},
 
     { &hf_mq_xqh_remoteqmgr,
-      { "Remote queue manager", "mq.xqh.remoteqmgr", FT_STRINGZ, BASE_DEC, NULL, 0x0, "XQH remote queue manager", HFILL }},
+      { "Remote queue manager", "mq.xqh.remoteqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XQH remote queue manager", HFILL }},
 
     { &hf_mq_id_structid,
-      { "ID structid", "mq.id.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "ID structid", HFILL }},
+      { "ID structid", "mq.id.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_id_level,
       { "FAP level", "mq.id.level", FT_UINT8, BASE_DEC, NULL, 0x0, "ID Formats And Protocols level", HFILL }},
@@ -2616,7 +2616,7 @@ proto_register_mq(void)
       { "Sequence wrap value", "mq.id.seqwrap", FT_UINT32, BASE_DEC, NULL, 0x0, "ID seq wrap value", HFILL }},
 
     { &hf_mq_id_channel,
-      { "Channel name", "mq.id.channelname", FT_STRINGZ, BASE_HEX, NULL, 0x0, "ID channel name", HFILL }},
+      { "Channel name", "mq.id.channelname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID channel name", HFILL }},
 
     { &hf_mq_id_capflags,
       { "Capability flags", "mq.id.capflags", FT_UINT8, BASE_HEX, NULL, 0x0, "ID Capability flags", HFILL }},
@@ -2628,7 +2628,7 @@ proto_register_mq(void)
       { "Character set", "mq.id.ccsid", FT_UINT16, BASE_DEC, NULL, 0x0, "ID character set", HFILL }},
 
     { &hf_mq_id_queuemanager,
-      { "Queue manager", "mq.id.qm", FT_STRINGZ, BASE_HEX, NULL, 0x0, "ID Queue manager", HFILL }},
+      { "Queue manager", "mq.id.qm", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID Queue manager", HFILL }},
 
     { &hf_mq_id_heartbeatinterval,
       { "Heartbeat interval", "mq.id.hbint", FT_UINT32, BASE_DEC, NULL, 0x0, "ID Heartbeat interval", HFILL }},
@@ -2661,31 +2661,31 @@ proto_register_mq(void)
       { "Invalid heartbeat interval", "mq.id.ief.hbint", FT_BOOLEAN, 8, TFS(&flags_set_truth), MQ_IEF_HEARTBEAT_INTERVAL, "ID invalid heartbeat interval", HFILL }},
 
     { &hf_mq_uid_structid,
-      { "UID structid", "mq.uid.structid", FT_STRINGZ, BASE_HEX, NULL, 0x0, "UID structid", HFILL }},
+      { "UID structid", "mq.uid.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_uid_userid,
-      { "User ID", "mq.uid.userid", FT_STRINGZ, BASE_HEX, NULL, 0x0, "UID structid", HFILL }},
+      { "User ID", "mq.uid.userid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID structid", HFILL }},
 
     { &hf_mq_uid_password,
-      { "Password", "mq.uid.password", FT_STRINGZ, BASE_HEX, NULL, 0x0, "UID password", HFILL }},
+      { "Password", "mq.uid.password", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID password", HFILL }},
 
     { &hf_mq_uid_longuserid,
-      { "Long User ID", "mq.uid.longuserid", FT_STRINGZ, BASE_HEX, NULL, 0x0, "UID long user id", HFILL }},
+      { "Long User ID", "mq.uid.longuserid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "UID long user id", HFILL }},
 
     { &hf_mq_uid_securityid,
-      { "Security ID", "mq.uid.securityid", FT_BYTES, BASE_HEX, NULL, 0x0, "UID security id", HFILL }},
+      { "Security ID", "mq.uid.securityid", FT_BYTES, BASE_NONE, NULL, 0x0, "UID security id", HFILL }},
 
     { &hf_mq_conn_queuemanager,
-      { "Queue manager", "mq.conn.qm", FT_STRINGZ, BASE_HEX, NULL, 0x0, "CONN queue manager", HFILL }},
+      { "Queue manager", "mq.conn.qm", FT_STRINGZ, BASE_NONE, NULL, 0x0, "CONN queue manager", HFILL }},
 
     { &hf_mq_conn_appname,
-      { "Application name", "mq.conn.appname", FT_STRINGZ, BASE_HEX, NULL, 0x0, "CONN application name", HFILL }},
+      { "Application name", "mq.conn.appname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "CONN application name", HFILL }},
 
     { &hf_mq_conn_apptype,
       { "Application type", "mq.conn.apptype", FT_INT32, BASE_DEC, NULL, 0x0, "CONN application type", HFILL }},
 
     { &hf_mq_conn_acttoken,
-      { "Accounting token", "mq.conn.acttoken", FT_BYTES, BASE_HEX, NULL, 0x0, "CONN accounting token", HFILL }},
+      { "Accounting token", "mq.conn.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "CONN accounting token", HFILL }},
 
     { &hf_mq_conn_version,
       { "Version", "mq.conn.version", FT_UINT32, BASE_DEC, VALS(mq_conn_version_vals), 0x0, "CONN version", HFILL }},
@@ -2709,10 +2709,10 @@ proto_register_mq(void)
       { "Integer value", "mq.inq.intvalue", FT_UINT32, BASE_DEC, NULL, 0x0, "INQ Integer value", HFILL }},
 
     { &hf_mq_inq_charvalues,
-      { "Char values", "mq.inq.charvalues", FT_STRINGZ, BASE_HEX, NULL, 0x0, "INQ Character values", HFILL }},
+      { "Char values", "mq.inq.charvalues", FT_STRINGZ, BASE_NONE, NULL, 0x0, "INQ Character values", HFILL }},
 
     { &hf_mq_spi_verb,
-      { "SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(mq_spi_verbs_vals), 0x0, "SPI Verb", HFILL }},
+      { "SPI Verb", "mq.spi.verb", FT_UINT32, BASE_DEC, VALS(mq_spi_verbs_vals), 0x0, NULL, HFILL }},
 
     { &hf_mq_spi_version,
       { "Version", "mq.spi.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Version", HFILL }},
@@ -2721,7 +2721,7 @@ proto_register_mq(void)
       { "Max reply size", "mq.spi.replength", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Max reply size", HFILL }},
 
     { &hf_mq_spi_base_structid,
-      { "SPI Structid", "mq.spib.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "SPI Base structid", HFILL }},
+      { "SPI Structid", "mq.spib.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Base structid", HFILL }},
 
     { &hf_mq_spi_base_version,
       { "Version", "mq.spib.version", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Base Version", HFILL }},
@@ -2751,13 +2751,13 @@ proto_register_mq(void)
       { "Mode", "mq.spai.mode", FT_UINT32, BASE_DEC, VALS(mq_spi_activate_vals), 0x0, "SPI Activate Input mode", HFILL }},
 
     { &hf_mq_spi_spai_unknown1,
-      { "Unknown1", "mq.spai.unknown1", FT_STRINGZ, BASE_DEC, NULL, 0x0, "SPI Activate Input unknown1", HFILL }},
+      { "Unknown1", "mq.spai.unknown1", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown1", HFILL }},
 
     { &hf_mq_spi_spai_unknown2,
-      { "Unknown2", "mq.spai.unknown2", FT_STRINGZ, BASE_DEC, NULL, 0x0, "SPI Activate Input unknown2", HFILL }},
+      { "Unknown2", "mq.spai.unknown2", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input unknown2", HFILL }},
 
     { &hf_mq_spi_spai_msgid,
-      { "Message Id", "mq.spai.msgid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "SPI Activate Input message id", HFILL }},
+      { "Message Id", "mq.spai.msgid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "SPI Activate Input message id", HFILL }},
 
     { &hf_mq_spi_spgi_batchsize,
       { "Batch size", "mq.spgi.batchsize", FT_UINT32, BASE_DEC, NULL, 0x0, "SPI Get Input batch size", HFILL }},
@@ -2793,7 +2793,7 @@ proto_register_mq(void)
       { "Length", "mq.ping.length", FT_UINT32, BASE_DEC, NULL, 0x0, "PING length", HFILL }},
 
     { &hf_mq_ping_buffer,
-      { "Buffer", "mq.ping.buffer", FT_BYTES, BASE_DEC, NULL, 0x0, "PING buffer", HFILL }},
+      { "Buffer", "mq.ping.buffer", FT_BYTES, BASE_NONE, NULL, 0x0, "PING buffer", HFILL }},
 
     { &hf_mq_reset_length,
       { "Length", "mq.ping.length", FT_UINT32, BASE_DEC, NULL, 0x0, "RESET length", HFILL }},
@@ -2811,7 +2811,7 @@ proto_register_mq(void)
       { "Value", "mq.status.value", FT_UINT32, BASE_DEC, NULL, 0x0, "STATUS value", HFILL }},
 
     { &hf_mq_od_structid,
-      { "OD structid", "mq.od.structid", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OD structid", HFILL }},
+      { "OD structid", "mq.od.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_od_version,
       { "Version", "mq.od.version", FT_UINT32, BASE_DEC, NULL, 0x0, "OD version", HFILL }},
@@ -2820,16 +2820,16 @@ proto_register_mq(void)
       { "Object type", "mq.od.objtype", FT_UINT32, BASE_DEC, NULL, 0x0, "OD object type", HFILL }},
 
     { &hf_mq_od_objectname,
-      { "Object name", "mq.od.objname", FT_STRINGZ, BASE_DEC, NULL, 0x0, "OD object name", HFILL }},
+      { "Object name", "mq.od.objname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD object name", HFILL }},
 
     { &hf_mq_od_objectqmgrname,
-      { "Object queue manager name", "mq.od.objqmgrname", FT_STRINGZ, BASE_DEC, NULL, 0x0, "OD object queue manager name", HFILL }},
+      { "Object queue manager name", "mq.od.objqmgrname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD object queue manager name", HFILL }},
 
     { &hf_mq_od_dynamicqname,
-      { "Dynamic queue name", "mq.od.dynqname", FT_STRINGZ, BASE_DEC, NULL, 0x0, "OD dynamic queue name", HFILL }},
+      { "Dynamic queue name", "mq.od.dynqname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD dynamic queue name", HFILL }},
 
     { &hf_mq_od_alternateuserid,
-      { "Alternate user id", "mq.od.altuserid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "OD alternate userid", HFILL }},
+      { "Alternate user id", "mq.od.altuserid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD alternate userid", HFILL }},
 
     { &hf_mq_od_recspresent,
       { "Number of records", "mq.od.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "OD number of records", HFILL }},
@@ -2856,19 +2856,19 @@ proto_register_mq(void)
       { "Address of first RR", "mq.od.addrrr", FT_UINT32, BASE_HEX, NULL, 0x0, "OD address of first RR", HFILL }},
 
     { &hf_mq_od_alternatesecurityid,
-      { "Alternate security id", "mq.od.altsecid", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OD alternate security id", HFILL }},
+      { "Alternate security id", "mq.od.altsecid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD alternate security id", HFILL }},
 
     { &hf_mq_od_resolvedqname,
-      { "Resolved queue name", "mq.od.resolvq", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OD resolved queue name", HFILL }},
+      { "Resolved queue name", "mq.od.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD resolved queue name", HFILL }},
 
     { &hf_mq_od_resolvedqmgrname,
-      { "Resolved queue manager name", "mq.od.resolvqmgr", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OD resolved queue manager name", HFILL }},
+      { "Resolved queue manager name", "mq.od.resolvqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OD resolved queue manager name", HFILL }},
 
     { &hf_mq_or_objname,
-      { "Object name", "mq.od.objname", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OR object name", HFILL }},
+      { "Object name", "mq.od.objname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OR object name", HFILL }},
 
     { &hf_mq_or_objqmgrname,
-      { "Object queue manager name", "mq.od.objqmgrname", FT_STRINGZ, BASE_HEX, NULL, 0x0, "OR object queue manager name", HFILL }},
+      { "Object queue manager name", "mq.od.objqmgrname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "OR object queue manager name", HFILL }},
 
     { &hf_mq_rr_completioncode,
       { "Completion code", "mq.rr.completioncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR completion code", HFILL }},
@@ -2877,22 +2877,22 @@ proto_register_mq(void)
       { "Reason code", "mq.rr.reasoncode", FT_UINT32, BASE_DEC, NULL, 0x0, "OR reason code", HFILL }},
 
     { &hf_mq_pmr_msgid,
-      { "Message Id", "mq.pmr.msgid", FT_BYTES, BASE_DEC, NULL, 0x0, "PMR Message Id", HFILL }},
+      { "Message Id", "mq.pmr.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR Message Id", HFILL }},
 
     { &hf_mq_pmr_correlid,
-      { "Correlation Id", "mq.pmr.correlid", FT_BYTES, BASE_DEC, NULL, 0x0, "PMR Correlation Id", HFILL }},
+      { "Correlation Id", "mq.pmr.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR Correlation Id", HFILL }},
 
     { &hf_mq_pmr_groupid,
-      { "GroupId", "mq.pmr.groupid", FT_BYTES, BASE_DEC, NULL, 0x0, "PMR GroupId", HFILL }},
+      { "GroupId", "mq.pmr.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR GroupId", HFILL }},
 
     { &hf_mq_pmr_feedback,
       { "Feedback", "mq.pmr.feedback", FT_UINT32, BASE_DEC, NULL, 0x0, "PMR Feedback", HFILL }},
 
     { &hf_mq_pmr_acttoken,
-      { "Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_DEC, NULL, 0x0, "PMR accounting token", HFILL }},
+      { "Accounting token", "mq.pmr.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "PMR accounting token", HFILL }},
 
     { &hf_mq_md_structid,
-      { "MD structid", "mq.md.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD structid", HFILL }},
+      { "MD structid", "mq.md.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_md_version,
       { "Version", "mq.md.version", FT_UINT32, BASE_DEC, NULL, 0x0, "MD version", HFILL }},
@@ -2916,7 +2916,7 @@ proto_register_mq(void)
       { "Character set", "mq.md.ccsid", FT_INT32, BASE_DEC, NULL, 0x0, "MD character set", HFILL }},
 
     { &hf_mq_md_format,
-      { "Format", "mq.md.format", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD format", HFILL }},
+      { "Format", "mq.md.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD format", HFILL }},
 
     { &hf_mq_md_priority,
       { "Priority", "mq.md.priority", FT_INT32, BASE_DEC, NULL, 0x0, "MD priority", HFILL }},
@@ -2925,46 +2925,46 @@ proto_register_mq(void)
       { "Persistence", "mq.md.persistence", FT_UINT32, BASE_DEC, NULL, 0x0, "MD persistence", HFILL }},
 
     { &hf_mq_md_msgid,
-      { "MessageId", "mq.md.msgid", FT_BYTES, BASE_DEC, NULL, 0x0, "MD Message Id", HFILL }},
+      { "MessageId", "mq.md.msgid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Message Id", HFILL }},
 
     { &hf_mq_md_correlid,
-      { "CorrelationId", "mq.md.correlid", FT_BYTES, BASE_DEC, NULL, 0x0, "MD Correlation Id", HFILL }},
+      { "CorrelationId", "mq.md.correlid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD Correlation Id", HFILL }},
 
     { &hf_mq_md_backountcount,
       { "Backount count", "mq.md.backount", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Backount count", HFILL }},
 
     { &hf_mq_md_replytoq,
-      { "ReplyToQ", "mq.md.replytoq", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD ReplyTo queue", HFILL }},
+      { "ReplyToQ", "mq.md.replytoq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD ReplyTo queue", HFILL }},
 
     { &hf_mq_md_replytoqmgr,
-      { "ReplyToQMgr", "mq.md.replytoqmgr", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD ReplyTo queue manager", HFILL }},
+      { "ReplyToQMgr", "mq.md.replytoqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD ReplyTo queue manager", HFILL }},
 
     { &hf_mq_md_userid,
-      { "UserId", "mq.md.userid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD UserId", HFILL }},
+      { "UserId", "mq.md.userid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD UserId", HFILL }},
 
     { &hf_mq_md_acttoken,
-      { "Accounting token", "mq.md.acttoken", FT_BYTES, BASE_DEC, NULL, 0x0, "MD accounting token", HFILL }},
+      { "Accounting token", "mq.md.acttoken", FT_BYTES, BASE_NONE, NULL, 0x0, "MD accounting token", HFILL }},
 
     { &hf_mq_md_appliddata,
-      { "ApplicationId data", "mq.md.appldata", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Put applicationId data", HFILL }},
+      { "ApplicationId data", "mq.md.appldata", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put applicationId data", HFILL }},
 
     { &hf_mq_md_putappltype,
       { "Put Application Type", "mq.md.appltype", FT_INT32, BASE_DEC, NULL, 0x0, "MD Put application type", HFILL }},
 
     { &hf_mq_md_putapplname,
-      { "Put Application Name", "mq.md.applname", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Put application name", HFILL }},
+      { "Put Application Name", "mq.md.applname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put application name", HFILL }},
 
     { &hf_mq_md_putdate,
-      { "Put date", "mq.md.date", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Put date", HFILL }},
+      { "Put date", "mq.md.date", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put date", HFILL }},
 
     { &hf_mq_md_puttime,
-      { "Put time", "mq.md.time", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Put time", HFILL }},
+      { "Put time", "mq.md.time", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Put time", HFILL }},
 
     { &hf_mq_md_applorigindata,
-      { "Application original data", "mq.md.origdata", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Application original data", HFILL }},
+      { "Application original data", "mq.md.origdata", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Application original data", HFILL }},
 
     { &hf_mq_md_groupid,
-      { "GroupId", "mq.md.groupid", FT_BYTES, BASE_DEC, NULL, 0x0, "MD GroupId", HFILL }},
+      { "GroupId", "mq.md.groupid", FT_BYTES, BASE_NONE, NULL, 0x0, "MD GroupId", HFILL }},
 
     { &hf_mq_md_msgseqnumber,
       { "Message sequence number", "mq.md.msgseqnumber", FT_UINT32, BASE_DEC, NULL, 0x0, "MD Message sequence number", HFILL }},
@@ -2979,10 +2979,10 @@ proto_register_mq(void)
       { "Original length", "mq.md.origdata", FT_INT32, BASE_DEC, NULL, 0x0, "MD Original length", HFILL }},
 
     { &hf_mq_md_hidden_lastformat,
-      { "Last format", "mq.md.lastformat", FT_STRINGZ, BASE_DEC, NULL, 0x0, "MD Last format", HFILL }},
+      { "Last format", "mq.md.lastformat", FT_STRINGZ, BASE_NONE, NULL, 0x0, "MD Last format", HFILL }},
 
     { &hf_mq_dlh_structid,
-      { "DLH structid", "mq.dlh.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH structid", HFILL }},
+      { "DLH structid", "mq.dlh.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_dlh_version,
       { "Version", "mq.dlh.version", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH version", HFILL }},
@@ -2991,10 +2991,10 @@ proto_register_mq(void)
       { "Reason", "mq.dlh.reason", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH reason", HFILL }},
 
     { &hf_mq_dlh_destq,
-      { "Destination queue", "mq.dlh.destq", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH destination queue", HFILL }},
+      { "Destination queue", "mq.dlh.destq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH destination queue", HFILL }},
 
     { &hf_mq_dlh_destqmgr,
-      { "Destination queue manager", "mq.dlh.destqmgr", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH destination queue manager", HFILL }},
+      { "Destination queue manager", "mq.dlh.destqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH destination queue manager", HFILL }},
 
     { &hf_mq_dlh_encoding,
       { "Encoding", "mq.dlh.encoding", FT_UINT32, BASE_DEC, NULL, 0x0, "DLH encoding", HFILL }},
@@ -3003,19 +3003,19 @@ proto_register_mq(void)
       { "Character set", "mq.dlh.ccsid", FT_INT32, BASE_DEC, NULL, 0x0, "DLH character set", HFILL }},
 
     { &hf_mq_dlh_format,
-      { "Format", "mq.dlh.format", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH format", HFILL }},
+      { "Format", "mq.dlh.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH format", HFILL }},
 
     { &hf_mq_dlh_putappltype,
       { "Put application type", "mq.dlh.putappltype", FT_INT32, BASE_DEC, NULL, 0x0, "DLH put application type", HFILL }},
 
     { &hf_mq_dlh_putapplname,
-      { "Put application name", "mq.dlh.putapplname", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH put application name", HFILL }},
+      { "Put application name", "mq.dlh.putapplname", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put application name", HFILL }},
 
     { &hf_mq_dlh_putdate,
-      { "Put date", "mq.dlh.putdate", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH put date", HFILL }},
+      { "Put date", "mq.dlh.putdate", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put date", HFILL }},
 
     { &hf_mq_dlh_puttime,
-      { "Put time", "mq.dlh.puttime", FT_STRINGZ, BASE_DEC, NULL, 0x0, "DLH put time", HFILL }},
+      { "Put time", "mq.dlh.puttime", FT_STRINGZ, BASE_NONE, NULL, 0x0, "DLH put time", HFILL }},
 
     { &hf_mq_dh_putmsgrecfields,
       { "Flags PMR", "mq.dh.flagspmr", FT_UINT32, BASE_DEC, NULL, 0x0, "DH flags PMR", HFILL }},
@@ -3030,7 +3030,7 @@ proto_register_mq(void)
       { "Offset of first PMR", "mq.dh.offsetpmr", FT_UINT32, BASE_DEC, NULL, 0x0, "DH offset of first PMR", HFILL }},
 
     { &hf_mq_gmo_structid,
-      { "GMO structid", "mq.gmo.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "GMO structid", HFILL }},
+      { "GMO structid", "mq.gmo.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_gmo_version,
       { "Version", "mq.gmo.version", FT_UINT32, BASE_DEC, NULL, 0x0, "GMO version", HFILL }},
@@ -3048,7 +3048,7 @@ proto_register_mq(void)
       { "Signal 2", "mq.gmo.signal2", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO signal 2", HFILL }},
 
     { &hf_mq_gmo_resolvedqname,
-      { "Resolved queue name", "mq.gmo.resolvq", FT_STRINGZ, BASE_HEX, NULL, 0x0, "GMO resolved queue name", HFILL }},
+      { "Resolved queue name", "mq.gmo.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "GMO resolved queue name", HFILL }},
 
     { &hf_mq_gmo_matchoptions,
       { "Match options", "mq.gmo.matchopt", FT_UINT32, BASE_HEX, NULL, 0x0, "GMO match options", HFILL }},
@@ -3066,13 +3066,13 @@ proto_register_mq(void)
       { "Reserved", "mq.gmo.reserved", FT_UINT8, BASE_HEX, NULL, 0x0, "GMO reserved", HFILL }},
 
     { &hf_mq_gmo_msgtoken,
-      { "Message token", "mq.gmo.msgtoken", FT_BYTES, BASE_HEX, NULL, 0x0, "GMO message token", HFILL }},
+      { "Message token", "mq.gmo.msgtoken", FT_BYTES, BASE_NONE, NULL, 0x0, "GMO message token", HFILL }},
 
     { &hf_mq_gmo_returnedlength,
       { "Returned length", "mq.gmo.retlen", FT_INT32, BASE_DEC, NULL, 0x0, "GMO returned length", HFILL }},
 
     { &hf_mq_pmo_structid,
-      { "PMO structid", "mq.pmo.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "PMO structid", HFILL }},
+      { "PMO structid", "mq.pmo.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_mq_pmo_version,
       { "Version", "mq.pmo.structid", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO version", HFILL }},
@@ -3096,10 +3096,10 @@ proto_register_mq(void)
       { "Invalid destination count", "mq.pmo.idestcount", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO invalid destination count", HFILL }},
 
     { &hf_mq_pmo_resolvedqname,
-      { "Resolved queue name", "mq.pmo.resolvq", FT_STRINGZ, BASE_DEC, NULL, 0x0, "PMO resolved queue name", HFILL }},
+      { "Resolved queue name", "mq.pmo.resolvq", FT_STRINGZ, BASE_NONE, NULL, 0x0, "PMO resolved queue name", HFILL }},
 
     { &hf_mq_pmo_resolvedqmgrname,
-      { "Resolved queue name manager", "mq.pmo.resolvqmgr", FT_STRINGZ, BASE_DEC, NULL, 0x0, "PMO resolved queue manager name", HFILL }},
+      { "Resolved queue name manager", "mq.pmo.resolvqmgr", FT_STRINGZ, BASE_NONE, NULL, 0x0, "PMO resolved queue manager name", HFILL }},
 
     { &hf_mq_pmo_recspresent,
       { "Number of records", "mq.pmo.nbrrec", FT_UINT32, BASE_DEC, NULL, 0x0, "PMO number of records", HFILL }},
@@ -3120,7 +3120,7 @@ proto_register_mq(void)
       { "Address of first response record", "mq.pmo.addrres", FT_UINT32, BASE_HEX, NULL, 0x0, "PMO address of first response record", HFILL }},
 
     { &hf_mq_head_structid,
-      { "Structid", "mq.head.structid", FT_STRINGZ, BASE_DEC, NULL, 0x0, "Header structid", HFILL }},
+      { "Structid", "mq.head.structid", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Header structid", HFILL }},
 
     { &hf_mq_head_version,
       { "Structid", "mq.head.version", FT_UINT32, BASE_DEC, NULL, 0x0, "Header version", HFILL }},
@@ -3135,13 +3135,13 @@ proto_register_mq(void)
       { "Character set", "mq.head.ccsid", FT_INT32, BASE_DEC, NULL, 0x0, "Header character set", HFILL }},
 
     { &hf_mq_head_format,
-      { "Format", "mq.head.format", FT_STRINGZ, BASE_DEC, NULL, 0x0, "Header format", HFILL }},
+      { "Format", "mq.head.format", FT_STRINGZ, BASE_NONE, NULL, 0x0, "Header format", HFILL }},
 
     { &hf_mq_head_flags,
       { "Flags", "mq.head.flags", FT_UINT32, BASE_DEC, NULL, 0x0, "Header flags", HFILL }},
 
     { &hf_mq_head_struct,
-      { "Struct", "mq.head.struct", FT_BYTES, BASE_HEX, NULL, 0x0, "Header struct", HFILL }},
+      { "Struct", "mq.head.struct", FT_BYTES, BASE_NONE, NULL, 0x0, "Header struct", HFILL }},
 
     { &hf_mq_xa_length,
       { "Length", "mq.xa.length", FT_UINT32, BASE_DEC, NULL, 0x0, "XA Length", HFILL }},
@@ -3192,16 +3192,16 @@ proto_register_mq(void)
       { "Branch Qualifier Length", "mq.xa.xid.bql", FT_UINT8, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier Length", HFILL }},
 
     { &hf_mq_xa_xid_globalxid,
-      { "Global TransactionId", "mq.xa.xid.gxid", FT_BYTES, BASE_DEC, NULL, 0x0, "XA Xid Global TransactionId", HFILL }},
+      { "Global TransactionId", "mq.xa.xid.gxid", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Global TransactionId", HFILL }},
 
     { &hf_mq_xa_xid_brq,
-      { "Branch Qualifier", "mq.xa.xid.bq", FT_BYTES, BASE_DEC, NULL, 0x0, "XA Xid Branch Qualifier", HFILL }},
+      { "Branch Qualifier", "mq.xa.xid.bq", FT_BYTES, BASE_NONE, NULL, 0x0, "XA Xid Branch Qualifier", HFILL }},
 
     { &hf_mq_xa_xainfo_length,
       { "Length", "mq.xa.xainfo.length", FT_UINT8, BASE_DEC, NULL, 0x0, "XA XA_info Length", HFILL }},
 
     { &hf_mq_xa_xainfo_value,
-      { "Value", "mq.xa.xainfo.value", FT_STRINGZ, BASE_DEC, NULL, 0x0, "XA XA_info Value", HFILL }}
+      { "Value", "mq.xa.xainfo.value", FT_STRINGZ, BASE_NONE, NULL, 0x0, "XA XA_info Value", HFILL }}
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-mrdisc.c b/epan/dissectors/packet-mrdisc.c
index 36a7efba88..d4174b6294 100644
--- a/epan/dissectors/packet-mrdisc.c
+++ b/epan/dissectors/packet-mrdisc.c
@@ -250,7 +250,7 @@ proto_register_mrdisc(void)
 
 		{ &hf_checksum_bad,
 			{ "Bad Checksum", "mrdisc.checksum_bad", FT_BOOLEAN, BASE_NONE,
-			  NULL, 0, "Bad MRDISC Checksum", HFILL }},
+			  NULL, 0x0, "Bad MRDISC Checksum", HFILL }},
 
 		{ &hf_advint,
 			{ "Advertising Interval", "mrdisc.adv_int", FT_UINT8, BASE_DEC,
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 75fa0a35d6..d0a76a3440 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -485,7 +485,7 @@ proto_register_msdp(void)
                 },
                 { &hf_msdp_sa_rp_addr,
                         { "RP Address",           "msdp.sa.rp_addr",
-                        FT_IPv4, 0, NULL, 0,
+                        FT_IPv4, BASE_NONE, NULL, 0,
                         "Active source's RP address", HFILL }
                 },
                 { &hf_msdp_sa_reserved,
@@ -500,12 +500,12 @@ proto_register_msdp(void)
                 },
                 { &hf_msdp_sa_group_addr,
                         { "Group Address",           "msdp.sa.group_addr",
-                        FT_IPv4, 0, NULL, 0,
+                        FT_IPv4, BASE_NONE, NULL, 0,
                         "The group address the active source has sent data to", HFILL }
                 },
                 { &hf_msdp_sa_src_addr,
                         { "Source Address",           "msdp.sa.src_addr",
-                        FT_IPv4, 0, NULL, 0,
+                        FT_IPv4, BASE_NONE, NULL, 0,
                         "The IP address of the active source", HFILL }
                 },
                 { &hf_msdp_sa_req_res,
@@ -515,7 +515,7 @@ proto_register_msdp(void)
                 },
                 { &hf_msdp_sa_req_group,
                         { "Group Address",           "msdp.sa_req.group_addr",
-                        FT_IPv4, 0, NULL, 0,
+                        FT_IPv4, BASE_NONE, NULL, 0,
                         "The group address the MSDP peer is requesting", HFILL }
                 },
                 { &hf_msdp_not_o,
@@ -535,7 +535,7 @@ proto_register_msdp(void)
                 },
                 { &hf_msdp_not_ipv4,
                         { "IPv4 address",           "msdp.not.ipv4",
-                        FT_IPv4, 0, NULL, 0,
+                        FT_IPv4, BASE_NONE, NULL, 0,
                         "Group/RP/Source address in Notification messages", HFILL }
                 },
                 { &hf_msdp_not_res,
diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index f3af65c908..2df63aed53 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -286,7 +286,7 @@ proto_register_msnip(void)
 
 		{ &hf_checksum_bad,
 			{ "Bad Checksum", "msnip.checksum_bad", FT_BOOLEAN, BASE_NONE,
-			  NULL, 0, "Bad MSNIP Checksum", HFILL }},
+			  NULL, 0x0, "Bad MSNIP Checksum", HFILL }},
 
 		{ &hf_count,
 			{ "Count", "msnip.count", FT_UINT8, BASE_DEC,
diff --git a/epan/dissectors/packet-msnlb.c b/epan/dissectors/packet-msnlb.c
index aa9c806e6e..49f67a533e 100644
--- a/epan/dissectors/packet-msnlb.c
+++ b/epan/dissectors/packet-msnlb.c
@@ -139,25 +139,25 @@ proto_register_msnlb(void)
   static hf_register_info hf[] = {
     { &hf_msnlb_unknown,
       { "Unknown", "msnlb.unknown",
-        FT_BYTES, BASE_HEX,
+        FT_BYTES, BASE_NONE,
         NULL, 0,
-        "", HFILL }
+        NULL, HFILL }
     },
     { &hf_msnlb_hpn,
       { "Host Priority Number", "msnlb.hpn",
         FT_UINT32, BASE_DEC,
         NULL, 0,
-        "Host Priority Number", HFILL }
+        NULL, HFILL }
     },
     { &hf_msnlb_host_ip,
       { "Host IP", "msnlb.host_ip",
-        FT_IPv4, BASE_HEX,
+        FT_IPv4, BASE_NONE,
         NULL, 0,
         "Host IP address", HFILL }
     },
     { &hf_msnlb_cls_virt_ip,
       { "Cluster Virtual IP", "msnlb.cluster_virtual_ip",
-        FT_IPv4, BASE_HEX,
+        FT_IPv4, BASE_NONE,
         NULL, 0,
         "Cluster Virtual IP address", HFILL }
     },
@@ -165,13 +165,13 @@ proto_register_msnlb(void)
       { "Count", "msnlb.count",
         FT_UINT32, BASE_HEX,
         NULL, 0,
-        "Count", HFILL }
+        NULL, HFILL }
     },
     { &hf_msnlb_host_name,
       { "Host name", "msnlb.host_name",
         FT_STRING, BASE_NONE,
         NULL, 0,
-        "Host name", HFILL }
+        NULL, HFILL }
     }
   };
 
diff --git a/epan/dissectors/packet-msproxy.c b/epan/dissectors/packet-msproxy.c
index ffdbcefc88..9d8c386d84 100644
--- a/epan/dissectors/packet-msproxy.c
+++ b/epan/dissectors/packet-msproxy.c
@@ -1155,87 +1155,87 @@ proto_register_msproxy( void){
 
                 { &hf_msproxy_cmd,
                 	{ "Command", "msproxy.command", FT_UINT16, BASE_DEC,
-                		 NULL, 0x0, "", HFILL
+                		 NULL, 0x0, NULL, HFILL
                 	}
 		},
 
  		{ &hf_msproxy_dstaddr,
 			{ "Destination Address", "msproxy.dstaddr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		},
 
 		{ &hf_msproxy_srcport,
 			{ "Source Port", "msproxy.srcport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_dstport,
 			{ "Destination Port", "msproxy.dstport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_clntport,
 			{ "Client Port",	"msproxy.clntport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
  		{ &hf_msproxy_server_ext_addr,
 			{ "Server External Address", "msproxy.server_ext_addr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		},
 
 		{ &hf_msproxy_server_ext_port,
 			{ "Server External Port",	"msproxy.server_ext_port", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 
  		{ &hf_msproxy_server_int_addr,
 			{ "Server Internal Address", "msproxy.server_int_addr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		},
 
 		{ &hf_msproxy_server_int_port,
 			{ "Server Internal Port",	"msproxy.server_int_port", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_serverport,
 			{ "Server Port",	"msproxy.serverport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_bindport,
 			{ "Bind Port",	"msproxy.bindport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_boundport,
 			{ "Bound Port",	"msproxy.boundport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
  		{ &hf_msproxy_serveraddr,
 			{ "Server Address", "msproxy.serveraddr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		},
  		{ &hf_msproxy_bindaddr,
 			{ "Destination", "msproxy.bindaddr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		},
 		{ &hf_msproxy_bind_id,
 			{ "Bound Port Id",	"msproxy.bindid", FT_UINT32,
-				BASE_HEX, NULL, 0x0, "", HFILL
+				BASE_HEX, NULL, 0x0, NULL, HFILL
 			}
 		},
  		{ &hf_msproxy_resolvaddr,
 			{ "Address", "msproxy.resolvaddr", FT_IPv4, BASE_NONE, NULL,
-			 	0x0, "", HFILL
+			 	0x0, NULL, HFILL
 			}
 		}
 
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c
index 9133e1b6f2..4c55d60cc1 100644
--- a/epan/dissectors/packet-msrp.c
+++ b/epan/dissectors/packet-msrp.c
@@ -801,122 +801,122 @@ proto_register_msrp(void)
 		{ &hf_msrp_request_line,
 			{ "Request Line", 		"msrp.request.line",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Request Line", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_response_line,
 			{ "Response Line", 		"msrp.response.line",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Response Line", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_transactionID,
 			{ "Transaction Id", 		"msrp.transaction.id",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Transaction Id", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_method,
 			{ "Method", 				"msrp.method",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Method", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_status_code,
 			{ "Status code", 		"msrp.status.code",
 			FT_UINT16, BASE_DEC,NULL,0x0,
-			"Status code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_msg_hdr,
 			{ "Message Header", 		"msrp.msg.hdr",
-			FT_NONE, 0,NULL,0x0,
-			"Message Header", HFILL }
+			FT_NONE, BASE_NONE,NULL,0x0,
+			NULL, HFILL }
 		},
 		{ &hf_msrp_end_line,
 			{ "End Line", 		"msrp.end.line",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"End Line", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_cnt_flg,
 			{ "Continuation-flag", 		"msrp.cnt.flg",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Continuation-flag", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_FROM_PATH],
 			{ "From Path", 		"msrp.from.path",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"From Path", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_TO_PATH],
 			{ "To Path", 		"msrp.to.path",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"To Path", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_MESSAGE_ID],
 			{ "Message ID", 		"msrp.messageid",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Message ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_SUCCESS_REPORT],
 			{ "Success Report", 		"msrp.success.report",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Success Report", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_FAILURE_REPORT],
 			{ "Failure Report", 		"msrp.failure.report",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Failure Report", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_BYTE_RANGE],
 			{ "Byte Range", 		"msrp.byte.range",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Byte Range", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_STATUS],
 			{ "Status", 		"msrp.status",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Status", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_CONTENT_TYPE],
 			{ "Content-Type", 		"msrp.content.type",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Content-Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_CONTENT_ID],
 			{ "Content-ID", 		"msrp.content.id",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Content-ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_CONTENT_DISCRIPTION],
 			{ "Content-Description", 		"msrp.content.description",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Content-Description", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_CONTENT_DISPOSITION],
 			{ "Content-Disposition", 		"msrp.content.disposition",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Content-Disposition", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_USE_PATH],
 			{ "Use-Path", 		"msrp.use.path",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Use-Path", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_WWW_AUTHENTICATE],
 			{ "WWW-Authenticate", 		"msrp.www.authenticate",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"WWW-Authenticate", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_AUTHORIZATION],
 			{ "Authorization", 		"msrp.authorization",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Authorization", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[MSRP_AUTHENTICATION_INFO],
 			{ "Authentication-Info", 		"msrp.authentication.info",
 			FT_STRING, BASE_NONE,NULL,0x0,
-			"Authentication-Info", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_msrp_data,
 			{ "Data", "msrp.data",
 			FT_STRING, BASE_NONE, NULL, 0x0,
-			"Data", HFILL}
+			NULL, HFILL}
         },
 		{ &hf_msrp_setup,
 			{ "Stream setup", "msrp.setup",
diff --git a/epan/dissectors/packet-mstp.c b/epan/dissectors/packet-mstp.c
index 2c9f1387e3..400293f9fd 100644
--- a/epan/dissectors/packet-mstp.c
+++ b/epan/dissectors/packet-mstp.c
@@ -384,13 +384,13 @@ proto_register_mstp(void)
 			"MS/TP Data CRC", HFILL }
 		},
 		{ &hf_mstp_frame_checksum_bad,
-			{ "Bad ", "mstp.checksum_bad",
-			FT_BOOLEAN, BASE_NONE,	NULL, 0,
+			{ "Bad", "mstp.checksum_bad",
+			FT_BOOLEAN, BASE_NONE,	NULL, 0x0,
 			"True: checksum doesn't match packet content; False: matches content or not checked", HFILL }
 		},
 		{ &hf_mstp_frame_checksum_good,
 			{ "Good", "mstp.checksum_good",
-			FT_BOOLEAN, BASE_NONE,	NULL, 0,
+			FT_BOOLEAN, BASE_NONE,	NULL, 0x0,
 			"True: checksum matches packet content; False: doesn't match content or not checked", HFILL }
 		}
 	};
diff --git a/epan/dissectors/packet-mtp3mg.c b/epan/dissectors/packet-mtp3mg.c
index 107f437aa1..1e2a63da43 100644
--- a/epan/dissectors/packet-mtp3mg.c
+++ b/epan/dissectors/packet-mtp3mg.c
@@ -1288,15 +1288,15 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_cbd_ansi_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT16, BASE_DEC, NULL, ANSI_CBD_CBC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_cbd_itu_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_cbd_japan_cbc,
 	    { "Change Back Code", "mtp3mg.cbc",
 	      FT_UINT8, BASE_DEC, NULL, JAPAN_CBD_CBC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_eco_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_ECO_SLC_MASK,
@@ -1304,19 +1304,19 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_ansi_status,
 	    { "Status", "mtp3mg.status",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_TFC_STATUS_MASK,
@@ -1324,7 +1324,7 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_itu_status,
 	    { "Status", "mtp3mg.status",
 	      FT_UINT8, BASE_DEC, NULL, ITU_TFC_STATUS_MASK,
@@ -1332,95 +1332,95 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_tfc_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_spare,
 	    { "TFC spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_status,
 	    { "Status", "mtp3mg.japan_status",
 	      FT_UINT8, BASE_DEC, NULL, JAPAN_TFC_STATUS_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfc_japan_status_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT8, BASE_HEX, NULL, JAPAN_TFC_STATUS_SPARE_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_count,
 	    { "Count of Affected Point Codes (Japan)", "mtp3mg.japan_count",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_tfm_japan_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_itu_apc,
 	    { "Affected Point Code (ITU)", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_count,
 	    { "Count of Affected Point Codes (Japan)", "mtp3mg.japan_count",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_apc,
 	    { "Affected Point Code", "mtp3mg.japan_apc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_rsm_japan_spare,
 	    { "Spare (Japan)", "mtp3mg.japan_spare",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_mim_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_MIM_SLC_MASK,
@@ -1440,31 +1440,31 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_upu_ansi_apc,
 	    { "Affected Point Code", "mtp3mg.ansi_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_member,
 	    { "Affected Point Code member", "mtp3mg.apc.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_cluster,
 	    { "Affected Point Code cluster", "mtp3mg.apc.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_apc_network,
 	    { "Affected Point Code network", "mtp3mg.apc.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_itu_apc,
 	    { "Affected Point Code", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_chinese_apc,
 	    { "Affected Point Code", "mtp3mg.chinese_apc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_japan_apc,
 	    { "Affected Point Code", "mtp3mg.apc",
 	      FT_UINT16, BASE_DEC, NULL, JAPAN_PC_MASK,
-	      "", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_upu_user,
 	    { "User", "mtp3mg.user",
 	      FT_UINT8, BASE_HEX, VALS(service_indicator_code_vals), UPU_USER_MASK,
@@ -1492,15 +1492,15 @@ proto_register_mtp3mg(void)
 	{ &hf_mtp3mg_japan_test_spare,
 	    { "Japan test message spare", "mtp3mg.test.spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Japan test message spare", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_japan_test_pattern,
 	    { "Japan test message pattern", "mtp3mg.test.pattern",
 	      FT_UINT16, BASE_HEX, NULL, 0x0,
-	      "Japan test message pattern", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_japan_spare,
 	    { "Japan management spare", "mtp3mg.spare",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Japan management spare", HFILL }},
+	      NULL, HFILL }},
 	{ &hf_mtp3mg_test_ansi_slc,
 	    { "Signalling Link Code", "mtp3mg.slc",
 	      FT_UINT8, BASE_DEC, NULL, ANSI_TEST_SLC_MASK,
diff --git a/epan/dissectors/packet-multipart.c b/epan/dissectors/packet-multipart.c
index bf6bc2d17b..1b5280a521 100644
--- a/epan/dissectors/packet-multipart.c
+++ b/epan/dissectors/packet-multipart.c
@@ -935,7 +935,7 @@ proto_register_multipart(void)
 			{	"Encapsulated multipart part",
 				"mime_multipart.part",
 				FT_STRING, BASE_NONE, NULL, 0x00,
-				"Encapsulated multipart part", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_header_array[POS_CONTENT_DISPOSITION],
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c
index 98d3df6500..6dec059e82 100644
--- a/epan/dissectors/packet-mysql.c
+++ b/epan/dissectors/packet-mysql.c
@@ -577,42 +577,42 @@ void proto_register_mysql(void)
 		{ &hf_mysql_packet_length,
 		{ "Packet Length", "mysql.packet_length",
 		FT_UINT24, BASE_DEC, NULL,  0x0,
-		"Packet Length", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_packet_number,
 		{ "Packet Number", "mysql.packet_number",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Packet Number", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_opcode,
 		{ "Command", "mysql.opcode",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Command", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_response_code,
 		{ "Response Code", "mysql.response_code",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Response Code", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_error_code,
 		{ "Error Code", "mysql.error_code",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Error Code", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_error_string,
 		{ "Error message", "mysql.error.message",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Error string in case of MySQL error message", HFILL }},
 
 		{ &hf_mysql_sqlstate,
 		{ "SQL state", "mysql.sqlstate",
 		FT_STRING, BASE_NONE, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_message,
 		{ "Message", "mysql.message",
-		FT_STRINGZ, BASE_DEC, NULL, 0x0,
-		"Message", HFILL }},
+		FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_protocol,
 		{ "Protocol", "mysql.protocol",
@@ -621,7 +621,7 @@ void proto_register_mysql(void)
 
 		{ &hf_mysql_version,
 		{ "Version", "mysql.version",
-		FT_STRINGZ, BASE_DEC, NULL, 0x0,
+		FT_STRINGZ, BASE_NONE, NULL, 0x0,
 		"MySQL Version", HFILL }},
 
 		{ &hf_mysql_caps,
@@ -632,82 +632,82 @@ void proto_register_mysql(void)
 		{ &hf_mysql_cap_long_password,
 		{ "Long Password","mysql.caps.lp",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_LP,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_found_rows,
 		{ "Found Rows","mysql.caps.fr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_FR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_long_flag,
 		{ "Long Column Flags","mysql.caps.lf",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_LF,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_connect_with_db,
 		{ "Connect With Database","mysql.caps.cd",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_CD,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_no_schema,
 		{ "Don't Allow database.table.column","mysql.caps.ns",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_NS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_compress,
 		{ "Can use compression protocol","mysql.caps.cp",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_CP,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_odbc,
 		{ "ODBC Client","mysql.caps.ob",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_OB,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_local_files,
 		{ "Can Use LOAD DATA LOCAL","mysql.caps.li",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_LI,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_ignore_space,
 		{ "Ignore Spaces before '('","mysql.caps.is",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_IS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_change_user,
 		{ "Speaks 4.1 protocol (new flag)","mysql.caps.cu",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_CU,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_interactive,
 		{ "Interactive Client","mysql.caps.ia",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_IA,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_ssl,
 		{ "Switch to SSL after handshake","mysql.caps.sl",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_SL,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_ignore_sigpipe,
 		{ "Ignore sigpipes","mysql.caps.ii",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_II,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_transactions,
 		{ "Knows about transactions","mysql.caps.ta",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_TA,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_reserved,
 		{ "Speaks 4.1 protocol (old flag)","mysql.caps.rs",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_RS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_secure_connect,
 		{ "Can do 4.1 authentication","mysql.caps.sc",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_SC,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_extcaps,
 		{ "Ext. Caps", "mysql.extcaps",
@@ -717,12 +717,12 @@ void proto_register_mysql(void)
 		{ &hf_mysql_cap_multi_statements,
 		{ "Supports multiple statements","mysql.caps.ms",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_MS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_cap_multi_results,
 		{ "Supports multiple results","mysql.caps.mr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_CAPS_MR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_max_packet,
 		{ "MAX Packet", "mysql.max_packet",
@@ -731,23 +731,23 @@ void proto_register_mysql(void)
 
 		{ &hf_mysql_user,
 		{ "Username", "mysql.user",
-		FT_STRINGZ, BASE_DEC, NULL, 0x0,
+		FT_STRINGZ, BASE_NONE, NULL, 0x0,
 		"Login Username", HFILL }},
 
 		{ &hf_mysql_schema,
 		{ "Schema", "mysql.schema",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Login Schema", HFILL }},
 
 		{ &hf_mysql_salt,
 		{ "Salt", "mysql.salt",
-		FT_STRINGZ, BASE_DEC, NULL, 0x0,
-		"Salt", HFILL }},
+		FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_salt2,
 		{ "Salt", "mysql.salt2",
-		FT_STRINGZ, BASE_DEC, NULL, 0x0,
-		"Salt", HFILL }},
+		FT_STRINGZ, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_thread_id,
 		{ "Thread ID", "mysql.thread_id",
@@ -767,216 +767,216 @@ void proto_register_mysql(void)
 		{ &hf_mysql_stat_it,
 		{ "In transaction", "mysql.stat.it",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_IT,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_ac,
 		{ "AUTO_COMMIT", "mysql.stat.ac",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_AC,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_mr,
 		{ "More results", "mysql.stat.mr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_MR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_mu,
 		{ "Multi query - more resultsets", "mysql.stat.mu",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_MU,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_bi,
 		{ "Bad index used", "mysql.stat.bi",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_BI,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_ni,
 		{ "No index used", "mysql.stat.ni",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_NI,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_cr,
 		{ "Cursor exists", "mysql.stat.cr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_CR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_lr,
 		{ "Last row sebd", "mysql.stat.lr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_LR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_dr,
 		{ "database dropped", "mysql.stat.dr",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_DR,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stat_bs,
 		{ "No backslash escapes", "mysql.stat.bs",
 		FT_BOOLEAN, 16, TFS(&flags_set_truth), MYSQL_STAT_BS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_refresh,
 		{ "Refresh Option", "mysql.refresh",
 		FT_UINT8, BASE_DEC, NULL,  0x0,
-		"Refresh Option", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_grants,
 		{ "reload permissions", "mysql.rfsh.grants",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_GRANT,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_log,
 		{ "flush logfiles", "mysql.rfsh.log",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_LOG,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_tables,
 		{ "flush tables", "mysql.rfsh.tables",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_TABLES,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_hosts,
 		{ "flush hosts", "mysql.rfsh.hosts",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_HOSTS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_status,
 		{ "reset statistics", "mysql.rfsh.status",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_STATUS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_threads,
 		{ "empty thread cache", "mysql.rfsh.threads",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_THREADS,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_slave,
 		{ "flush slave status", "mysql.rfsh.slave",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_SLAVE,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_rfsh_master,
 		{ "flush master status", "mysql.rfsh.master",
 		FT_BOOLEAN, 8, TFS(&flags_set_truth), MYSQL_RFSH_MASTER,
-		"", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_unused,
 		{ "Unused", "mysql.unused",
-		FT_STRING, BASE_DEC, NULL, 0x0,
-		"Unused", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_passwd,
 		{ "Password", "mysql.passwd",
-		FT_STRING, BASE_DEC, NULL, 0x0,
-		"Password", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_parameter,
 		{ "Parameter", "mysql.parameter",
-		FT_STRING, BASE_DEC, NULL, 0x0,
-		"Parameter", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_payload,
 		{ "Payload", "mysql.payload",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Additional Payload", HFILL }},
 
 		{ &hf_mysql_affected_rows,
 		{ "Affected Rows", "mysql.affected_rows",
 		FT_UINT64, BASE_DEC, NULL, 0x0,
-		"Affected Rows", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_insert_id,
 		{ "Last INSERT ID", "mysql.insert_id",
 		FT_UINT64, BASE_DEC, NULL, 0x0,
-		"Last INSERT ID", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_num_warn,
 		{ "Warnings", "mysql.warnings",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Warnings", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_thd_id,
 		{ "Thread ID", "mysql.thd_id",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"Thread ID", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_stmt_id,
 		{ "Statement ID", "mysql.stmt_id",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"Statement ID", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_query,
 		{ "Statement", "mysql.query",
-		FT_STRING, BASE_DEC, NULL, 0x0,
-		"Statement", HFILL }},
+		FT_STRING, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }},
 
 		{ &hf_mysql_option,
 		{ "Option", "mysql.option",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Option", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_param,
 		{ "Parameter", "mysql.param",
 		FT_UINT16, BASE_DEC, NULL, 0x0,
-		"Parameter", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_num_rows,
 		{ "Rows to fetch", "mysql.num_rows",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"Rows to fetch", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_exec_flags,
 		{ "Flags (unused)", "mysql.exec_flags",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"Flags (unused)", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_exec_iter,
 		{ "Iterations (unused)", "mysql.exec_iter",
 		FT_UINT32, BASE_DEC, NULL, 0x0,
-		"Iterations (unused)", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_eof,
 		{ "EOF", "mysql.eof",
 		FT_UINT8, BASE_DEC, NULL,  0x0,
-		"EOF", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_num_fields,
 		{ "Number of fields", "mysql.num_fields",
 		FT_UINT64, BASE_DEC, NULL,  0x0,
-		"Number of fields", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_extra,
 		{ "Extra data", "mysql.extra",
 		FT_UINT64, BASE_DEC, NULL,  0x0,
-		"Extra data", HFILL }},
+		NULL, HFILL }},
 
 		{ &hf_mysql_fld_catalog,
 		{ "Catalog", "mysql.field.catalog",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: catalog", HFILL }},
 
 		{ &hf_mysql_fld_db,
 		{ "Database", "mysql.field.db",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: database", HFILL }},
 
 		{ &hf_mysql_fld_table,
 		{ "Table", "mysql.field.table",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: table", HFILL }},
 
 		{ &hf_mysql_fld_org_table,
 		{ "Original table", "mysql.field.org_table",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: original table", HFILL }},
 
 		{ &hf_mysql_fld_name,
 		{ "Name", "mysql.field.name",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: name", HFILL }},
 
 		{ &hf_mysql_fld_org_name,
 		{ "Original name", "mysql.field.org_name",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: original name", HFILL }},
 
 		{ &hf_mysql_fld_charsetnr,
@@ -991,7 +991,7 @@ void proto_register_mysql(void)
 
 		{ &hf_mysql_fld_type,
 		{ "Type", "mysql.field.type",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: type", HFILL }},
 
 		{ &hf_mysql_fld_flags,
@@ -1071,7 +1071,7 @@ void proto_register_mysql(void)
 
 		{ &hf_mysql_row_text,
 		{ "text", "mysql.row.text",
-		FT_STRING, BASE_DEC, NULL, 0x0,
+		FT_STRING, BASE_NONE, NULL, 0x0,
 		"Field: row packet text", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c
index b0cca22b78..41edb25de0 100644
--- a/epan/dissectors/packet-nas_eps.c
+++ b/epan/dissectors/packet-nas_eps.c
@@ -4087,7 +4087,7 @@ void proto_register_nas_eps(void) {
 		NULL, HFILL }
 	},
 	{ &hf_nas_eps_tsc,
-		{ "Type of security context flag (TSC) ","nas_eps.emm.tsc",
+		{ "Type of security context flag (TSC)","nas_eps.emm.tsc",
 		FT_UINT8,BASE_DEC, VALS(nas_eps_tsc_vals), 0x0,
 		NULL, HFILL }
 	},
@@ -4129,7 +4129,7 @@ void proto_register_nas_eps(void) {
 	{ &hf_nas_eps_esm_msg_cont,
 		{ "ESM message container contents","nas_eps.emm.esm_msg_cont",
 		FT_BYTES, BASE_NONE, NULL, 0x0,
-		"ESM message container contents", HFILL }
+		NULL, HFILL }
 	},
 	{ &hf_nas_eps_esm_imeisv_req,
 		{ "IMEISV request","nas_eps.emm.imeisv_req",
@@ -4158,8 +4158,8 @@ void proto_register_nas_eps(void) {
 	},
 	{ &hf_nas_eps_emm_res,
 		{ "RES","nas_eps.emm.res",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"RES", HFILL }
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL }
 	},
 	{ &hf_nas_eps_emm_csfb_resp,
 		{ "CSFB response","nas_eps.emm.csfb_resp",
@@ -4178,7 +4178,7 @@ void proto_register_nas_eps(void) {
 	},
 	{ &hf_nas_eps_emm_short_mac,
 		{ "Short MAC value","nas_eps.emm.short_mac",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
 		NULL, HFILL }
 	},
 	{ &hf_nas_eps_emm_tai_tol,
@@ -4395,12 +4395,12 @@ void proto_register_nas_eps(void) {
 	},
 
 	{ &hf_nas_eps_emm_1xsrvcc_cap,
-		{ "1xSRVCC capability ","nas_eps.emm.1xsrvcc_cap",
+		{ "1xSRVCC capability","nas_eps.emm.1xsrvcc_cap",
 		FT_BOOLEAN, 8, TFS(&nas_eps_emm_1xsrvcc_cap_flg), 0x02,
 		NULL, HFILL }
 	},
 	{ &hf_nas_eps_emm_ue_ra_cap_inf_upd_need_flg,
-		{ "1xSRVCC capability ","nas_eps.emm.ue_ra_cap_inf_upd_need_flg",
+		{ "1xSRVCC capability","nas_eps.emm.ue_ra_cap_inf_upd_need_flg",
 		FT_BOOLEAN, 8, TFS(&nas_eps_emm_ue_ra_cap_inf_upd_need_flg), 0x01,
 		NULL, HFILL }
 	},
@@ -4521,27 +4521,27 @@ void proto_register_nas_eps(void) {
 	},
 	{ &hf_nas_eps_esm_pdn_ipv4,
 		{"PDN IPv4", "nas_eps.esm.pdn_ipv4",
-		FT_IPv4, BASE_DEC, NULL, 0x0,
-		"PDN IPv4", HFILL}
+		FT_IPv4, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
 	},
 	{ &hf_nas_eps_esm_pdn_ipv6_len,
 		{"IPv6 Prefix Length", "nas_eps.esm.pdn_ipv6_len",
 		FT_UINT8, BASE_DEC, NULL, 0x0,
-		"IPv6 Prefix Length", HFILL}
+		NULL, HFILL}
 	},
 	{ &hf_nas_eps_esm_pdn_ipv6,
 		{"PDN IPv6", "nas_eps.esm.pdn_ipv6",
-		FT_IPv6, BASE_HEX, NULL, 0x0,
-		"PDN IPv6", HFILL}
+		FT_IPv6, BASE_NONE, NULL, 0x0,
+		NULL, HFILL}
 	},
 	{ &hf_nas_eps_esm_linked_bearer_id,
-		{ "Linked EPS bearer identity ","nas_eps.esm.linked_bearer_id",
+		{ "Linked EPS bearer identity","nas_eps.esm.linked_bearer_id",
 		FT_UINT8,BASE_DEC, VALS(nas_eps_esm_linked_bearer_id_vals), 0x0,
 		NULL, HFILL }
 	},
 	{ &hf_nas_eps_active_flg,
 		{ "Active flag", "nas_eps.emm.active_flg",
-		FT_BOOLEAN, 8, TFS(&nas_eps_emm_active_flg_value), 0x0,
+		FT_BOOLEAN, BASE_NONE, TFS(&nas_eps_emm_active_flg_value), 0x0,
 		NULL, HFILL }
 	},
 	{ &hf_nas_eps_eps_update_result_value,
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c
index f445a7b60a..a23da85f34 100644
--- a/epan/dissectors/packet-nbap.c
+++ b/epan/dissectors/packet-nbap.c
@@ -47856,7 +47856,7 @@ void proto_register_nbap(void) {
         "nbap.Best_Cell_Portions_Value", HFILL }},
     { &hf_nbap_BindingID_PDU,
       { "BindingID", "nbap.BindingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BindingID", HFILL }},
     { &hf_nbap_BlockingPriorityIndicator_PDU,
       { "BlockingPriorityIndicator", "nbap.BlockingPriorityIndicator",
@@ -47868,7 +47868,7 @@ void proto_register_nbap(void) {
         "nbap.BroadcastCommonTransportBearerIndication", HFILL }},
     { &hf_nbap_BroadcastReference_PDU,
       { "BroadcastReference", "nbap.BroadcastReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BroadcastReference", HFILL }},
     { &hf_nbap_Cause_PDU,
       { "Cause", "nbap.Cause",
@@ -48144,7 +48144,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_TDD_CapacityConsumptionLaw", HFILL }},
     { &hf_nbap_E_DCH_TTI2ms_Capability_PDU,
       { "E-DCH-TTI2ms-Capability", "nbap.E_DCH_TTI2ms_Capability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.E_DCH_TTI2ms_Capability", HFILL }},
     { &hf_nbap_E_DCH_SF_Capability_PDU,
       { "E-DCH-SF-Capability", "nbap.E_DCH_SF_Capability",
@@ -48228,7 +48228,7 @@ void proto_register_nbap(void) {
         "nbap.EDCH_RACH_Report_Value", HFILL }},
     { &hf_nbap_E_DPDCH_PowerInterpolation_PDU,
       { "E-DPDCH-PowerInterpolation", "nbap.E_DPDCH_PowerInterpolation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.E_DPDCH_PowerInterpolation", HFILL }},
     { &hf_nbap_E_DCH_MACdFlows_to_DeleteLCR_PDU,
       { "E-DCH-MACdFlows-to-DeleteLCR", "nbap.E_DCH_MACdFlows_to_DeleteLCR",
@@ -48672,7 +48672,7 @@ void proto_register_nbap(void) {
         "nbap.IPMulticastIndication", HFILL }},
     { &hf_nbap_IPMulticastDataBearerIndication_PDU,
       { "IPMulticastDataBearerIndication", "nbap.IPMulticastDataBearerIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.IPMulticastDataBearerIndication", HFILL }},
     { &hf_nbap_Local_Cell_ID_PDU,
       { "Local-Cell-ID", "nbap.Local_Cell_ID",
@@ -49136,7 +49136,7 @@ void proto_register_nbap(void) {
         "nbap.Transmitted_Carrier_Power_Value", HFILL }},
     { &hf_nbap_TransmissionDiversityApplied_PDU,
       { "TransmissionDiversityApplied", "nbap.TransmissionDiversityApplied",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.TransmissionDiversityApplied", HFILL }},
     { &hf_nbap_TransportBearerRequestIndicator_PDU,
       { "TransportBearerRequestIndicator", "nbap.TransportBearerRequestIndicator",
@@ -49152,7 +49152,7 @@ void proto_register_nbap(void) {
         "nbap.TransportBearerNotSetupIndicator", HFILL }},
     { &hf_nbap_TransportLayerAddress_PDU,
       { "TransportLayerAddress", "nbap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.TransportLayerAddress", HFILL }},
     { &hf_nbap_TSTD_Indicator_PDU,
       { "TSTD-Indicator", "nbap.TSTD_Indicator",
@@ -51572,7 +51572,7 @@ void proto_register_nbap(void) {
         "nbap.Max_TB_Size", HFILL }},
     { &hf_nbap_common_E_DCH_ImplicitRelease_Indicator,
       { "common-E-DCH-ImplicitRelease-Indicator", "nbap.common_E_DCH_ImplicitRelease_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_cqiFeedback_CycleK,
       { "cqiFeedback-CycleK", "nbap.cqiFeedback_CycleK",
@@ -51604,7 +51604,7 @@ void proto_register_nbap(void) {
         "nbap.Measurement_Power_Offset", HFILL }},
     { &hf_nbap_common_E_DCH_PreambleSignatures,
       { "common-E-DCH-PreambleSignatures", "nbap.common_E_DCH_PreambleSignatures",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.PreambleSignatures", HFILL }},
     { &hf_nbap_scramblingCodeNumber,
       { "scramblingCodeNumber", "nbap.scramblingCodeNumber",
@@ -51612,7 +51612,7 @@ void proto_register_nbap(void) {
         "nbap.ScramblingCodeNumber", HFILL }},
     { &hf_nbap_e_AI_Indicator,
       { "e-AI-Indicator", "nbap.e_AI_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.E_AI_Indicator", HFILL }},
     { &hf_nbap_common_E_DCH_AICH_Information,
       { "common-E-DCH-AICH-Information", "nbap.common_E_DCH_AICH_Information",
@@ -51688,11 +51688,11 @@ void proto_register_nbap(void) {
         "nbap.TransportBearerRequestIndicator", HFILL }},
     { &hf_nbap_bindingID,
       { "bindingID", "nbap.bindingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BindingID", HFILL }},
     { &hf_nbap_transportLayerAddress,
       { "transportLayerAddress", "nbap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.TransportLayerAddress", HFILL }},
     { &hf_nbap_tnlQos,
       { "tnlQos", "nbap.tnlQos",
@@ -51728,7 +51728,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_HARQ_PO_FDD", HFILL }},
     { &hf_nbap_eDCH_MACdFlow_Multiplexing_List,
       { "eDCH-MACdFlow-Multiplexing-List", "nbap.eDCH_MACdFlow_Multiplexing_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.E_DCH_MACdFlow_Multiplexing_List", HFILL }},
     { &hf_nbap_common_E_DCHLogicalChannelInformation,
       { "common-E-DCHLogicalChannelInformation", "nbap.common_E_DCHLogicalChannelInformation",
@@ -51900,7 +51900,7 @@ void proto_register_nbap(void) {
         "nbap.Transport_Block_Size_Index", HFILL }},
     { &hf_nbap_hSPDSCH_Second_Code_Support,
       { "hSPDSCH-Second-Code-Support", "nbap.hSPDSCH_Second_Code_Support",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.HSPDSCH_Second_Code_Support", HFILL }},
     { &hf_nbap_hSPDSCH_First_Code_Index,
       { "hSPDSCH-First-Code-Index", "nbap.hSPDSCH_First_Code_Index",
@@ -52348,7 +52348,7 @@ void proto_register_nbap(void) {
         "nbap.DGANSS_Information", HFILL }},
     { &hf_nbap_dGANSS_Signal_ID,
       { "dGANSS-Signal-ID", "nbap.dGANSS_Signal_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_DGANSS_Information_item,
       { "DGANSS-InformationItem", "nbap.DGANSS_InformationItem",
@@ -52376,7 +52376,7 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_63", HFILL }},
     { &hf_nbap_gANSS_iod,
       { "gANSS-iod", "nbap.gANSS_iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_udre,
       { "udre", "nbap.udre",
@@ -52540,7 +52540,7 @@ void proto_register_nbap(void) {
         "nbap.Inactivity_Threshold_for_UE_Grant_Monitoring", HFILL }},
     { &hf_nbap_uE_DRX_Grant_Monitoring,
       { "uE-DRX-Grant-Monitoring", "nbap.uE_DRX_Grant_Monitoring",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.UE_DRX_Grant_Monitoring", HFILL }},
     { &hf_nbap_modify,
       { "modify", "nbap.modify",
@@ -52680,7 +52680,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_MACdFlows_Information", HFILL }},
     { &hf_nbap_hARQ_Process_Allocation_Scheduled_2ms_EDCH,
       { "hARQ-Process-Allocation-Scheduled-2ms-EDCH", "nbap.hARQ_Process_Allocation_Scheduled_2ms_EDCH",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_nbap_e_DCH_Maximum_Bitrate,
       { "e-DCH-Maximum-Bitrate", "nbap.e_DCH_Maximum_Bitrate",
@@ -52716,7 +52716,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_MACdFlow_ID", HFILL }},
     { &hf_nbap_hARQ_Process_Allocation_NonSched_2ms_EDCH,
       { "hARQ-Process-Allocation-NonSched-2ms-EDCH", "nbap.hARQ_Process_Allocation_NonSched_2ms_EDCH",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_nbap_E_DCH_DL_Control_Channel_Change_Information_item,
       { "E-DCH-DL-Control-Channel-Change-Information-Item", "nbap.E_DCH_DL_Control_Channel_Change_Information_Item",
@@ -52832,7 +52832,7 @@ void proto_register_nbap(void) {
         "nbap.Max_Bits_MACe_PDU_non_scheduled", HFILL }},
     { &hf_nbap_hARQ_Process_Allocation_NonSched_2ms,
       { "hARQ-Process-Allocation-NonSched-2ms", "nbap.hARQ_Process_Allocation_NonSched_2ms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_nbap_e_DCH_serving_cell_choice,
       { "e-DCH-serving-cell-choice", "nbap.e_DCH_serving_cell_choice",
@@ -53004,7 +53004,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_Grant_TypeTDD", HFILL }},
     { &hf_nbap_timeslotResource,
       { "timeslotResource", "nbap.timeslotResource",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.E_DCH_TimeslotResource", HFILL }},
     { &hf_nbap_powerResource,
       { "powerResource", "nbap.powerResource",
@@ -53132,7 +53132,7 @@ void proto_register_nbap(void) {
         "nbap.E_DCH_LCRTDD_Information", HFILL }},
     { &hf_nbap_timeslotResourceLCR,
       { "timeslotResourceLCR", "nbap.timeslotResourceLCR",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.E_DCH_TimeslotResourceLCR", HFILL }},
     { &hf_nbap_subframeNumber,
       { "subframeNumber", "nbap.subframeNumber",
@@ -53192,11 +53192,11 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SBASclockModel", HFILL }},
     { &hf_nbap_dataID,
       { "dataID", "nbap.dataID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_ganss_Add_Nav_Models_And_Time_Recovery,
       { "ganss-Add-Nav-Models-And-Time-Recovery", "nbap.ganss_Add_Nav_Models_And_Time_Recovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_navKeplerianSet,
       { "navKeplerianSet", "nbap.navKeplerianSet",
@@ -53216,7 +53216,7 @@ void proto_register_nbap(void) {
         "nbap.GANSS_NavModel_SBASecef", HFILL }},
     { &hf_nbap_ganss_Add_UTC_Models,
       { "ganss-Add-UTC-Models", "nbap.ganss_Add_UTC_Models",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_alpha_beta_parameters,
       { "alpha-beta-parameters", "nbap.alpha_beta_parameters",
@@ -53324,7 +53324,7 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_63", HFILL }},
     { &hf_nbap_signalsAvailable,
       { "signalsAvailable", "nbap.signalsAvailable",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_GANSS_AuxInfoGANSS_ID3_item,
       { "GANSS-AuxInfoGANSS-ID3-element", "nbap.GANSS_AuxInfoGANSS_ID3_element",
@@ -53336,7 +53336,7 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_M7_13", HFILL }},
     { &hf_nbap_ganss_Aux_Info,
       { "ganss-Aux-Info", "nbap.ganss_Aux_Info",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_GANSS_Clock_Model_item,
       { "GANSS-SatelliteClockModelItem", "nbap.GANSS_SatelliteClockModelItem",
@@ -53344,63 +53344,63 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SatelliteClockModelItem", HFILL }},
     { &hf_nbap_cnavToc,
       { "cnavToc", "nbap.cnavToc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_cnavTop,
       { "cnavTop", "nbap.cnavTop",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_cnavURA0,
       { "cnavURA0", "nbap.cnavURA0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_cnavURA1,
       { "cnavURA1", "nbap.cnavURA1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_nbap_cnavURA2,
       { "cnavURA2", "nbap.cnavURA2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_nbap_cnavAf2,
       { "cnavAf2", "nbap.cnavAf2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_cnavAf1,
       { "cnavAf1", "nbap.cnavAf1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_nbap_cnavAf0,
       { "cnavAf0", "nbap.cnavAf0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_26", HFILL }},
     { &hf_nbap_cnavTgd,
       { "cnavTgd", "nbap.cnavTgd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl1cp,
       { "cnavISCl1cp", "nbap.cnavISCl1cp",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl1cd,
       { "cnavISCl1cd", "nbap.cnavISCl1cd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl1ca,
       { "cnavISCl1ca", "nbap.cnavISCl1ca",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl2c,
       { "cnavISCl2c", "nbap.cnavISCl2c",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl5i5,
       { "cnavISCl5i5", "nbap.cnavISCl5i5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_cnavISCl5q5,
       { "cnavISCl5q5", "nbap.cnavISCl5q5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_ganss_Ionospheric_Model,
       { "ganss-Ionospheric-Model", "nbap.ganss_Ionospheric_Model",
@@ -53412,7 +53412,7 @@ void proto_register_nbap(void) {
         "nbap.GANSS_RX_Pos", HFILL }},
     { &hf_nbap_ionospheric_Model,
       { "ionospheric-Model", "nbap.ionospheric_Model",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_ganssTod,
       { "ganssTod", "nbap.ganssTod",
@@ -53440,7 +53440,7 @@ void proto_register_nbap(void) {
         "nbap.GANSS_Signal_ID", HFILL }},
     { &hf_nbap_ganssDataBits,
       { "ganssDataBits", "nbap.ganssDataBits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1_1024", HFILL }},
     { &hf_nbap_ganssTod_01,
       { "ganssTod", "nbap.ganssTod",
@@ -53464,43 +53464,43 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_63", HFILL }},
     { &hf_nbap_b1,
       { "b1", "nbap.b1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_b2,
       { "b2", "nbap.b2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_teop,
       { "teop", "nbap.teop",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_pmX,
       { "pmX", "nbap.pmX",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_pmXdot,
       { "pmXdot", "nbap.pmXdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_pmY,
       { "pmY", "nbap.pmY",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_pmYdot,
       { "pmYdot", "nbap.pmYdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_deltaUT1,
       { "deltaUT1", "nbap.deltaUT1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_31", HFILL }},
     { &hf_nbap_deltaUT1dot,
       { "deltaUT1dot", "nbap.deltaUT1dot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_19", HFILL }},
     { &hf_nbap_eopReq,
       { "eopReq", "nbap.eopReq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_GANSS_GenericDataInfoReqList_item,
       { "GANSS-GenericDataInfoReqItem", "nbap.GANSS_GenericDataInfoReqItem",
@@ -53512,23 +53512,23 @@ void proto_register_nbap(void) {
         "nbap.GANSS_ID", HFILL }},
     { &hf_nbap_ganss_Navigation_Model_And_Time_Recovery,
       { "ganss-Navigation-Model-And-Time-Recovery", "nbap.ganss_Navigation_Model_And_Time_Recovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_ganss_Time_Model_GNSS_GNSS,
       { "ganss-Time-Model-GNSS-GNSS", "nbap.ganss_Time_Model_GNSS_GNSS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_9", HFILL }},
     { &hf_nbap_ganss_UTC_Model,
       { "ganss-UTC-Model", "nbap.ganss_UTC_Model",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_ganss_Almanac,
       { "ganss-Almanac", "nbap.ganss_Almanac",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_ganss_Real_Time_Integrity,
       { "ganss-Real-Time-Integrity", "nbap.ganss_Real_Time_Integrity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_ganss_Data_Bit_Assistance_Req,
       { "ganss-Data-Bit-Assistance-Req", "nbap.ganss_Data_Bit_Assistance_Req",
@@ -53568,15 +53568,15 @@ void proto_register_nbap(void) {
         "nbap.GANSS_Data_Bit_Assistance", HFILL }},
     { &hf_nbap_gloTau,
       { "gloTau", "nbap.gloTau",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_nbap_gloGamma,
       { "gloGamma", "nbap.gloGamma",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_gloDeltaTau,
       { "gloDeltaTau", "nbap.gloDeltaTau",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gANSS_CommonDataInfoReq,
       { "gANSS-CommonDataInfoReq", "nbap.gANSS_CommonDataInfoReq",
@@ -53588,15 +53588,15 @@ void proto_register_nbap(void) {
         "nbap.GANSS_GenericDataInfoReqList", HFILL }},
     { &hf_nbap_alpha_zero_ionos,
       { "alpha-zero-ionos", "nbap.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_alpha_one_ionos,
       { "alpha-one-ionos", "nbap.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_alpha_two_ionos,
       { "alpha-two-ionos", "nbap.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_gANSS_IonosphereRegionalStormFlags,
       { "gANSS-IonosphereRegionalStormFlags", "nbap.gANSS_IonosphereRegionalStormFlags",
@@ -53604,23 +53604,23 @@ void proto_register_nbap(void) {
         "nbap.GANSS_IonosphereRegionalStormFlags", HFILL }},
     { &hf_nbap_storm_flag_one,
       { "storm-flag-one", "nbap.storm_flag_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_storm_flag_two,
       { "storm-flag-two", "nbap.storm_flag_two",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_storm_flag_three,
       { "storm-flag-three", "nbap.storm_flag_three",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_storm_flag_four,
       { "storm-flag-four", "nbap.storm_flag_four",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_storm_flag_five,
       { "storm-flag-five", "nbap.storm_flag_five",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.BOOLEAN", HFILL }},
     { &hf_nbap_iod_a,
       { "iod-a", "nbap.iod_a",
@@ -53632,87 +53632,87 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SatelliteInformationKP", HFILL }},
     { &hf_nbap_toe_nav,
       { "toe-nav", "nbap.toe_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_ganss_omega_nav,
       { "ganss-omega-nav", "nbap.ganss_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_delta_n_nav,
       { "delta-n-nav", "nbap.delta_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_m_zero_nav,
       { "m-zero-nav", "nbap.m_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_omegadot_nav,
       { "omegadot-nav", "nbap.omegadot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_ganss_e_nav,
       { "ganss-e-nav", "nbap.ganss_e_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_idot_nav,
       { "idot-nav", "nbap.idot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_a_sqrt_nav,
       { "a-sqrt-nav", "nbap.a_sqrt_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_i_zero_nav,
       { "i-zero-nav", "nbap.i_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_omega_zero_nav,
       { "omega-zero-nav", "nbap.omega_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_c_rs_nav,
       { "c-rs-nav", "nbap.c_rs_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_c_is_nav,
       { "c-is-nav", "nbap.c_is_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_c_us_nav,
       { "c-us-nav", "nbap.c_us_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_c_rc_nav,
       { "c-rc-nav", "nbap.c_rc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_c_ic_nav,
       { "c-ic-nav", "nbap.c_ic_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_c_uc_nav,
       { "c-uc-nav", "nbap.c_uc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navToc,
       { "navToc", "nbap.navToc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navaf2,
       { "navaf2", "nbap.navaf2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_navaf1,
       { "navaf1", "nbap.navaf1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navaf0,
       { "navaf0", "nbap.navaf0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_nbap_navTgd,
       { "navTgd", "nbap.navTgd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_non_broadcastIndication_01,
       { "non-broadcastIndication", "nbap.non_broadcastIndication",
@@ -53724,243 +53724,243 @@ void proto_register_nbap(void) {
         "nbap.GANSS_Sat_Info_Nav", HFILL }},
     { &hf_nbap_cnavURAindex,
       { "cnavURAindex", "nbap.cnavURAindex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_cnavDeltaA,
       { "cnavDeltaA", "nbap.cnavDeltaA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_26", HFILL }},
     { &hf_nbap_cnavAdot,
       { "cnavAdot", "nbap.cnavAdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_25", HFILL }},
     { &hf_nbap_cnavDeltaNo,
       { "cnavDeltaNo", "nbap.cnavDeltaNo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_cnavDeltaNoDot,
       { "cnavDeltaNoDot", "nbap.cnavDeltaNoDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_23", HFILL }},
     { &hf_nbap_cnavMo,
       { "cnavMo", "nbap.cnavMo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_33", HFILL }},
     { &hf_nbap_cnavE,
       { "cnavE", "nbap.cnavE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_33", HFILL }},
     { &hf_nbap_cnavOmega,
       { "cnavOmega", "nbap.cnavOmega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_33", HFILL }},
     { &hf_nbap_cnavOMEGA0,
       { "cnavOMEGA0", "nbap.cnavOMEGA0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_33", HFILL }},
     { &hf_nbap_cnavDeltaOmegaDot,
       { "cnavDeltaOmegaDot", "nbap.cnavDeltaOmegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_cnavIo,
       { "cnavIo", "nbap.cnavIo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_33", HFILL }},
     { &hf_nbap_cnavIoDot,
       { "cnavIoDot", "nbap.cnavIoDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_cnavCis,
       { "cnavCis", "nbap.cnavCis",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_cnavCic,
       { "cnavCic", "nbap.cnavCic",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_cnavCrs,
       { "cnavCrs", "nbap.cnavCrs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_cnavCrc,
       { "cnavCrc", "nbap.cnavCrc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_cnavCus,
       { "cnavCus", "nbap.cnavCus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_cnavCuc,
       { "cnavCuc", "nbap.cnavCuc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_gloEn,
       { "gloEn", "nbap.gloEn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gloP1,
       { "gloP1", "nbap.gloP1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_gloP2,
       { "gloP2", "nbap.gloP2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_gloM,
       { "gloM", "nbap.gloM",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_gloX,
       { "gloX", "nbap.gloX",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_27", HFILL }},
     { &hf_nbap_gloXdot,
       { "gloXdot", "nbap.gloXdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_gloXdotdot,
       { "gloXdotdot", "nbap.gloXdotdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gloY,
       { "gloY", "nbap.gloY",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_27", HFILL }},
     { &hf_nbap_gloYdot,
       { "gloYdot", "nbap.gloYdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_gloYdotdot,
       { "gloYdotdot", "nbap.gloYdotdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gloZ,
       { "gloZ", "nbap.gloZ",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_27", HFILL }},
     { &hf_nbap_gloZdot,
       { "gloZdot", "nbap.gloZdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_gloZdotdot,
       { "gloZdotdot", "nbap.gloZdotdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_navURA,
       { "navURA", "nbap.navURA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_navFitFlag,
       { "navFitFlag", "nbap.navFitFlag",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_navToe,
       { "navToe", "nbap.navToe",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navOmega,
       { "navOmega", "nbap.navOmega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navDeltaN,
       { "navDeltaN", "nbap.navDeltaN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navM0,
       { "navM0", "nbap.navM0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navOmegaADot,
       { "navOmegaADot", "nbap.navOmegaADot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_navE,
       { "navE", "nbap.navE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navIDot,
       { "navIDot", "nbap.navIDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_navAPowerHalf,
       { "navAPowerHalf", "nbap.navAPowerHalf",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navI0,
       { "navI0", "nbap.navI0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navOmegaA0,
       { "navOmegaA0", "nbap.navOmegaA0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_navCrs,
       { "navCrs", "nbap.navCrs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navCis,
       { "navCis", "nbap.navCis",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navCus,
       { "navCus", "nbap.navCus",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navCrc,
       { "navCrc", "nbap.navCrc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navCic,
       { "navCic", "nbap.navCic",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navCuc,
       { "navCuc", "nbap.navCuc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_sbasTo,
       { "sbasTo", "nbap.sbasTo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_sbasAccuracy,
       { "sbasAccuracy", "nbap.sbasAccuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_sbasXg,
       { "sbasXg", "nbap.sbasXg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_30", HFILL }},
     { &hf_nbap_sbasYg,
       { "sbasYg", "nbap.sbasYg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_30", HFILL }},
     { &hf_nbap_sbasZg,
       { "sbasZg", "nbap.sbasZg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_25", HFILL }},
     { &hf_nbap_sbasXgDot,
       { "sbasXgDot", "nbap.sbasXgDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_sbasYgDot,
       { "sbasYgDot", "nbap.sbasYgDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_sbasZgDot,
       { "sbasZgDot", "nbap.sbasZgDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_18", HFILL }},
     { &hf_nbap_sbasXgDotDot,
       { "sbasXgDotDot", "nbap.sbasXgDotDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_sbagYgDotDot,
       { "sbagYgDotDot", "nbap.sbagYgDotDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_sbasZgDotDot,
       { "sbasZgDotDot", "nbap.sbasZgDotDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_gANSS_keplerianParameters_01,
       { "gANSS-keplerianParameters", "nbap.gANSS_keplerianParameters",
@@ -53976,7 +53976,7 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_63", HFILL }},
     { &hf_nbap_bad_ganss_signalId,
       { "bad-ganss-signalId", "nbap.bad_ganss_signalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_latitudeSign,
       { "latitudeSign", "nbap.latitudeSign",
@@ -54000,23 +54000,23 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_32767", HFILL }},
     { &hf_nbap_t_oc,
       { "t-oc", "nbap.t_oc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_a_i2,
       { "a-i2", "nbap.a_i2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_a_i1,
       { "a-i1", "nbap.a_i1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_18", HFILL }},
     { &hf_nbap_a_i0,
       { "a-i0", "nbap.a_i0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_nbap_t_gd,
       { "t-gd", "nbap.t_gd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_model_id,
       { "model-id", "nbap.model_id",
@@ -54028,43 +54028,43 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SatelliteInformationKPItem", HFILL }},
     { &hf_nbap_ganss_e_alm,
       { "ganss-e-alm", "nbap.ganss_e_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_ganss_delta_I_alm,
       { "ganss-delta-I-alm", "nbap.ganss_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_ganss_omegadot_alm,
       { "ganss-omegadot-alm", "nbap.ganss_omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_ganss_svhealth_alm,
       { "ganss-svhealth-alm", "nbap.ganss_svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_ganss_delta_a_sqrt_alm,
       { "ganss-delta-a-sqrt-alm", "nbap.ganss_delta_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_ganss_omegazero_alm,
       { "ganss-omegazero-alm", "nbap.ganss_omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_ganss_m_zero_alm,
       { "ganss-m-zero-alm", "nbap.ganss_m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_ganss_omega_alm,
       { "ganss-omega-alm", "nbap.ganss_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_ganss_af_zero_alm,
       { "ganss-af-zero-alm", "nbap.ganss_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_ganss_af_one_alm,
       { "ganss-af-one-alm", "nbap.ganss_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_Ganss_Sat_Info_AddNavList_item,
       { "Ganss-Sat-Info-AddNavList item", "nbap.Ganss_Sat_Info_AddNavList_item",
@@ -54072,11 +54072,11 @@ void proto_register_nbap(void) {
         "nbap.Ganss_Sat_Info_AddNavList_item", HFILL }},
     { &hf_nbap_svHealth,
       { "svHealth", "nbap.svHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_6", HFILL }},
     { &hf_nbap_iod,
       { "iod", "nbap.iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_ganssAddClockModels,
       { "ganssAddClockModels", "nbap.ganssAddClockModels",
@@ -54092,55 +54092,55 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SAT_Info_Almanac_GLOkp", HFILL }},
     { &hf_nbap_gloAlmNA,
       { "gloAlmNA", "nbap.gloAlmNA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_gloAlmnA,
       { "gloAlmnA", "nbap.gloAlmnA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gloAlmHA,
       { "gloAlmHA", "nbap.gloAlmHA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gloAlmLambdaA,
       { "gloAlmLambdaA", "nbap.gloAlmLambdaA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_gloAlmTlambdaA,
       { "gloAlmTlambdaA", "nbap.gloAlmTlambdaA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_21", HFILL }},
     { &hf_nbap_gloAlmDeltaIA,
       { "gloAlmDeltaIA", "nbap.gloAlmDeltaIA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_18", HFILL }},
     { &hf_nbap_gloAkmDeltaTA,
       { "gloAkmDeltaTA", "nbap.gloAkmDeltaTA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_nbap_gloAlmDeltaTdotA,
       { "gloAlmDeltaTdotA", "nbap.gloAlmDeltaTdotA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_nbap_gloAlmEpsilonA,
       { "gloAlmEpsilonA", "nbap.gloAlmEpsilonA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_gloAlmOmegaA,
       { "gloAlmOmegaA", "nbap.gloAlmOmegaA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_gloAlmTauA,
       { "gloAlmTauA", "nbap.gloAlmTauA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_gloAlmCA,
       { "gloAlmCA", "nbap.gloAlmCA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_gloAlmMA,
       { "gloAlmMA", "nbap.gloAlmMA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_MIDIkpList_item,
       { "GANSS-SAT-Info-Almanac-MIDIkp", "nbap.GANSS_SAT_Info_Almanac_MIDIkp",
@@ -54148,51 +54148,51 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SAT_Info_Almanac_MIDIkp", HFILL }},
     { &hf_nbap_midiAlmE,
       { "midiAlmE", "nbap.midiAlmE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_midiAlmDeltaI,
       { "midiAlmDeltaI", "nbap.midiAlmDeltaI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_midiAlmOmegaDot,
       { "midiAlmOmegaDot", "nbap.midiAlmOmegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_midiAlmSqrtA,
       { "midiAlmSqrtA", "nbap.midiAlmSqrtA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_nbap_midiAlmOmega0,
       { "midiAlmOmega0", "nbap.midiAlmOmega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_midiAlmOmega,
       { "midiAlmOmega", "nbap.midiAlmOmega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_midiAlmMo,
       { "midiAlmMo", "nbap.midiAlmMo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_midiAlmaf0,
       { "midiAlmaf0", "nbap.midiAlmaf0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_midiAlmaf1,
       { "midiAlmaf1", "nbap.midiAlmaf1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_midiAlmL1Health,
       { "midiAlmL1Health", "nbap.midiAlmL1Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_midiAlmL2Health,
       { "midiAlmL2Health", "nbap.midiAlmL2Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_midiAlmL5Health,
       { "midiAlmL5Health", "nbap.midiAlmL5Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_NAVkpList_item,
       { "GANSS-SAT-Info-Almanac-NAVkp", "nbap.GANSS_SAT_Info_Almanac_NAVkp",
@@ -54200,43 +54200,43 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SAT_Info_Almanac_NAVkp", HFILL }},
     { &hf_nbap_navAlmE,
       { "navAlmE", "nbap.navAlmE",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navAlmDeltaI,
       { "navAlmDeltaI", "nbap.navAlmDeltaI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navAlmOMEGADOT,
       { "navAlmOMEGADOT", "nbap.navAlmOMEGADOT",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_navAlmSVHealth,
       { "navAlmSVHealth", "nbap.navAlmSVHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_navAlmSqrtA,
       { "navAlmSqrtA", "nbap.navAlmSqrtA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_navAlmOMEGAo,
       { "navAlmOMEGAo", "nbap.navAlmOMEGAo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_navAlmOmega,
       { "navAlmOmega", "nbap.navAlmOmega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_navAlmMo,
       { "navAlmMo", "nbap.navAlmMo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_navAlmaf0,
       { "navAlmaf0", "nbap.navAlmaf0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_navAlmaf1,
       { "navAlmaf1", "nbap.navAlmaf1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_REDkpList_item,
       { "GANSS-SAT-Info-Almanac-REDkp", "nbap.GANSS_SAT_Info_Almanac_REDkp",
@@ -54244,27 +54244,27 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SAT_Info_Almanac_REDkp", HFILL }},
     { &hf_nbap_redAlmDeltaA,
       { "redAlmDeltaA", "nbap.redAlmDeltaA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_redAlmOmega0,
       { "redAlmOmega0", "nbap.redAlmOmega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_nbap_redAlmPhi0,
       { "redAlmPhi0", "nbap.redAlmPhi0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_nbap_redAlmL1Health,
       { "redAlmL1Health", "nbap.redAlmL1Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_redAlmL2Health,
       { "redAlmL2Health", "nbap.redAlmL2Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_redAlmL5Health,
       { "redAlmL5Health", "nbap.redAlmL5Health",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_GANSS_SAT_Info_Almanac_SBASecefList_item,
       { "GANSS-SAT-Info-Almanac-SBASecef", "nbap.GANSS_SAT_Info_Almanac_SBASecef",
@@ -54272,39 +54272,39 @@ void proto_register_nbap(void) {
         "nbap.GANSS_SAT_Info_Almanac_SBASecef", HFILL }},
     { &hf_nbap_sbasAlmDataID,
       { "sbasAlmDataID", "nbap.sbasAlmDataID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_sbasAlmHealth,
       { "sbasAlmHealth", "nbap.sbasAlmHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_sbasAlmXg,
       { "sbasAlmXg", "nbap.sbasAlmXg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_sbasAlmYg,
       { "sbasAlmYg", "nbap.sbasAlmYg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_15", HFILL }},
     { &hf_nbap_sbasAlmZg,
       { "sbasAlmZg", "nbap.sbasAlmZg",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_9", HFILL }},
     { &hf_nbap_sbasAlmXgdot,
       { "sbasAlmXgdot", "nbap.sbasAlmXgdot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_nbap_sbasAlmYgDot,
       { "sbasAlmYgDot", "nbap.sbasAlmYgDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_nbap_sbasAlmZgDot,
       { "sbasAlmZgDot", "nbap.sbasAlmZgDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_sbasAlmTo,
       { "sbasAlmTo", "nbap.sbasAlmTo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_GANSS_Sat_Info_Nav_item,
       { "GANSS-Sat-Info-Nav item", "nbap.GANSS_Sat_Info_Nav_item",
@@ -54312,11 +54312,11 @@ void proto_register_nbap(void) {
         "nbap.GANSS_Sat_Info_Nav_item", HFILL }},
     { &hf_nbap_svHealth_01,
       { "svHealth", "nbap.svHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_iod_01,
       { "iod", "nbap.iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_ganssClockModel,
       { "ganssClockModel", "nbap.ganssClockModel",
@@ -54328,11 +54328,11 @@ void proto_register_nbap(void) {
         "nbap.GANSS_Orbit_Model", HFILL }},
     { &hf_nbap_sbasAgfo,
       { "sbasAgfo", "nbap.sbasAgfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_nbap_sbasAgf1,
       { "sbasAgf1", "nbap.sbasAgf1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_ganss_time_model_Ref_Time,
       { "ganss-time-model-Ref-Time", "nbap.ganss_time_model_Ref_Time",
@@ -54364,79 +54364,79 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_8191", HFILL }},
     { &hf_nbap_a_one_utc,
       { "a-one-utc", "nbap.a_one_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_a_zero_utc,
       { "a-zero-utc", "nbap.a_zero_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_t_ot_utc,
       { "t-ot-utc", "nbap.t_ot_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_w_n_t_utc,
       { "w-n-t-utc", "nbap.w_n_t_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_delta_t_ls_utc,
       { "delta-t-ls-utc", "nbap.delta_t_ls_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_w_n_lsf_utc,
       { "w-n-lsf-utc", "nbap.w_n_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_dn_utc,
       { "dn-utc", "nbap.dn_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_delta_t_lsf_utc,
       { "delta-t-lsf-utc", "nbap.delta_t_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcA0,
       { "utcA0", "nbap.utcA0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_utcA1,
       { "utcA1", "nbap.utcA1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_utcA2,
       { "utcA2", "nbap.utcA2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_nbap_utcDeltaTls,
       { "utcDeltaTls", "nbap.utcDeltaTls",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcTot,
       { "utcTot", "nbap.utcTot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_utcWNot,
       { "utcWNot", "nbap.utcWNot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_13", HFILL }},
     { &hf_nbap_utcWNlsf,
       { "utcWNlsf", "nbap.utcWNlsf",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcDN,
       { "utcDN", "nbap.utcDN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_utcDeltaTlsf,
       { "utcDeltaTlsf", "nbap.utcDeltaTlsf",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_nA,
       { "nA", "nbap.nA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_tauC,
       { "tauC", "nbap.tauC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_deltaUT1_01,
       { "deltaUT1", "nbap.deltaUT1",
@@ -54444,35 +54444,35 @@ void proto_register_nbap(void) {
         "nbap.GANSS_DeltaUT1", HFILL }},
     { &hf_nbap_kp,
       { "kp", "nbap.kp",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_utcA1wnt,
       { "utcA1wnt", "nbap.utcA1wnt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_utcA0wnt,
       { "utcA0wnt", "nbap.utcA0wnt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_utcTot_01,
       { "utcTot", "nbap.utcTot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcWNt,
       { "utcWNt", "nbap.utcWNt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcDN_01,
       { "utcDN", "nbap.utcDN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_utcStandardID,
       { "utcStandardID", "nbap.utcStandardID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_nbap_wna_alm,
       { "wna-alm", "nbap.wna_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_sat_info_almanac,
       { "sat-info-almanac", "nbap.sat_info_almanac",
@@ -54480,39 +54480,39 @@ void proto_register_nbap(void) {
         "nbap.SAT_Info_Almanac", HFILL }},
     { &hf_nbap_sVGlobalHealth_alm,
       { "sVGlobalHealth-alm", "nbap.sVGlobalHealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_364", HFILL }},
     { &hf_nbap_alpha_zero_ionos_01,
       { "alpha-zero-ionos", "nbap.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_alpha_one_ionos_01,
       { "alpha-one-ionos", "nbap.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_alpha_two_ionos_01,
       { "alpha-two-ionos", "nbap.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_alpha_three_ionos,
       { "alpha-three-ionos", "nbap.alpha_three_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_beta_zero_ionos,
       { "beta-zero-ionos", "nbap.beta_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_beta_one_ionos,
       { "beta-one-ionos", "nbap.beta_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_beta_two_ionos,
       { "beta-two-ionos", "nbap.beta_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_beta_three_ionos,
       { "beta-three-ionos", "nbap.beta_three_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_GPS_Information_item,
       { "GPS-Information-Item", "nbap.GPS_Information_Item",
@@ -54544,87 +54544,87 @@ void proto_register_nbap(void) {
         "nbap.SAT_ID", HFILL }},
     { &hf_nbap_tlm_message_nav,
       { "tlm-message-nav", "nbap.tlm_message_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_nbap_tlm_revd_c_nav,
       { "tlm-revd-c-nav", "nbap.tlm_revd_c_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_ho_word_nav,
       { "ho-word-nav", "nbap.ho_word_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_nbap_w_n_nav,
       { "w-n-nav", "nbap.w_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_ca_or_p_on_l2_nav,
       { "ca-or-p-on-l2-nav", "nbap.ca_or_p_on_l2_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_nbap_user_range_accuracy_index_nav,
       { "user-range-accuracy-index-nav", "nbap.user_range_accuracy_index_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_nbap_sv_health_nav,
       { "sv-health-nav", "nbap.sv_health_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_6", HFILL }},
     { &hf_nbap_iodc_nav,
       { "iodc-nav", "nbap.iodc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_nbap_l2_p_dataflag_nav,
       { "l2-p-dataflag-nav", "nbap.l2_p_dataflag_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_sf1_reserved_nav,
       { "sf1-reserved-nav", "nbap.sf1_reserved_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_87", HFILL }},
     { &hf_nbap_t_gd_nav,
       { "t-gd-nav", "nbap.t_gd_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_t_oc_nav,
       { "t-oc-nav", "nbap.t_oc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_a_f_2_nav,
       { "a-f-2-nav", "nbap.a_f_2_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_a_f_1_nav,
       { "a-f-1-nav", "nbap.a_f_1_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_a_f_zero_nav,
       { "a-f-zero-nav", "nbap.a_f_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_nbap_gps_e_nav,
       { "gps-e-nav", "nbap.gps_e_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_t_oe_nav,
       { "t-oe-nav", "nbap.t_oe_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_fit_interval_flag_nav,
       { "fit-interval-flag-nav", "nbap.fit_interval_flag_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_nbap_aodo_nav,
       { "aodo-nav", "nbap.aodo_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_nbap_gps_omega_nav,
       { "gps-omega-nav", "nbap.gps_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_nbap_spare_zero_fill,
       { "spare-zero-fill", "nbap.spare_zero_fill",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_nbap_latitudeSign_01,
       { "latitudeSign", "nbap.latitudeSign",
@@ -55668,7 +55668,7 @@ void proto_register_nbap(void) {
         "nbap.DCH_ID", HFILL }},
     { &hf_nbap_transportlayeraddress,
       { "transportlayeraddress", "nbap.transportlayeraddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.TransportLayerAddress", HFILL }},
     { &hf_nbap_rL_Specific_E_DCH_Information,
       { "rL-Specific-E-DCH-Information", "nbap.rL_Specific_E_DCH_Information",
@@ -55908,47 +55908,47 @@ void proto_register_nbap(void) {
         "nbap.SAT_ID", HFILL }},
     { &hf_nbap_gps_e_alm,
       { "gps-e-alm", "nbap.gps_e_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_gps_toa_alm,
       { "gps-toa-alm", "nbap.gps_toa_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_gps_delta_I_alm,
       { "gps-delta-I-alm", "nbap.gps_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_omegadot_alm,
       { "omegadot-alm", "nbap.omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_nbap_svhealth_alm,
       { "svhealth-alm", "nbap.svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_gps_a_sqrt_alm,
       { "gps-a-sqrt-alm", "nbap.gps_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_omegazero_alm,
       { "omegazero-alm", "nbap.omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_m_zero_alm,
       { "m-zero-alm", "nbap.m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_gps_omega_alm,
       { "gps-omega-alm", "nbap.gps_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_nbap_gps_af_zero_alm,
       { "gps-af-zero-alm", "nbap.gps_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_gps_af_one_alm,
       { "gps-af-one-alm", "nbap.gps_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_nbap_SAT_Info_Almanac_ExtList_item,
       { "SAT-Info-Almanac-ExtItem", "nbap.SAT_Info_Almanac_ExtItem",
@@ -55960,7 +55960,7 @@ void proto_register_nbap(void) {
         "nbap.SAT_Info_DGPSCorrections_Item", HFILL }},
     { &hf_nbap_iode_dgps,
       { "iode-dgps", "nbap.iode_dgps",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_prc,
       { "prc", "nbap.prc",
@@ -56276,11 +56276,11 @@ void proto_register_nbap(void) {
         "nbap.INTEGER_0_1048575_", HFILL }},
     { &hf_nbap_dsField,
       { "dsField", "nbap.dsField",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.DsField", HFILL }},
     { &hf_nbap_genericTrafficCategory,
       { "genericTrafficCategory", "nbap.genericTrafficCategory",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.GenericTrafficCategory", HFILL }},
     { &hf_nbap_Transmission_Gap_Pattern_Sequence_Information_item,
       { "Transmission-Gap-Pattern-Sequence-Information item", "nbap.Transmission_Gap_Pattern_Sequence_Information_item",
@@ -56708,7 +56708,7 @@ void proto_register_nbap(void) {
         "nbap.MICH_Mode", HFILL }},
     { &hf_nbap_preambleSignatures,
       { "preambleSignatures", "nbap.preambleSignatures",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.PreambleSignatures", HFILL }},
     { &hf_nbap_allowedSlotFormatInformation,
       { "allowedSlotFormatInformation", "nbap.allowedSlotFormatInformation",
@@ -56716,7 +56716,7 @@ void proto_register_nbap(void) {
         "nbap.AllowedSlotFormatInformationList_CTCH_SetupRqstFDD", HFILL }},
     { &hf_nbap_rACH_SubChannelNumbers,
       { "rACH-SubChannelNumbers", "nbap.rACH_SubChannelNumbers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.RACH_SubChannelNumbers", HFILL }},
     { &hf_nbap_ul_punctureLimit,
       { "ul-punctureLimit", "nbap.ul_punctureLimit",
@@ -57712,7 +57712,7 @@ void proto_register_nbap(void) {
         "nbap.Segment_Type", HFILL }},
     { &hf_nbap_iB_SG_DATA,
       { "iB-SG-DATA", "nbap.iB_SG_DATA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.IB_SG_DATA", HFILL }},
     { &hf_nbap_Additional_HS_Cell_Information_RL_Setup_List_item,
       { "Additional-HS-Cell-Information-RL-Setup-ItemIEs", "nbap.Additional_HS_Cell_Information_RL_Setup_ItemIEs",
@@ -59244,7 +59244,7 @@ void proto_register_nbap(void) {
         "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_lTGI_Presence,
       { "lTGI-Presence", "nbap.lTGI_Presence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "nbap.LTGI_Presence", HFILL }},
     { &hf_nbap_sNPL_Reporting_Type,
       { "sNPL-Reporting-Type", "nbap.sNPL_Reporting_Type",
@@ -59360,7 +59360,7 @@ void proto_register_nbap(void) {
         "nbap.Delete_From_E_HICH_Resource_PoolItem_PSCH_ReconfRqst", HFILL }},
     { &hf_nbap_eRUCCH_SYNC_UL_codes_bitmap,
       { "eRUCCH-SYNC-UL-codes-bitmap", "nbap.eRUCCH_SYNC_UL_codes_bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "nbap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_nbap_Delete_From_HS_SCCH_Resource_PoolExt_PSCH_ReconfRqst_item,
       { "Delete-From-HS-SCCH-Resource-PoolItem-PSCH-ReconfRqst", "nbap.Delete_From_HS_SCCH_Resource_PoolItem_PSCH_ReconfRqst",
@@ -59757,115 +59757,115 @@ void proto_register_nbap(void) {
     { &hf_nbap_PreambleSignatures_signature15,
       { "signature15", "nbap.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature14,
       { "signature14", "nbap.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature13,
       { "signature13", "nbap.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature12,
       { "signature12", "nbap.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature11,
       { "signature11", "nbap.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature10,
       { "signature10", "nbap.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature9,
       { "signature9", "nbap.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature8,
       { "signature8", "nbap.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature7,
       { "signature7", "nbap.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature6,
       { "signature6", "nbap.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature5,
       { "signature5", "nbap.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature4,
       { "signature4", "nbap.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature3,
       { "signature3", "nbap.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature2,
       { "signature2", "nbap.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature1,
       { "signature1", "nbap.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_PreambleSignatures_signature0,
       { "signature0", "nbap.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh11,
       { "subCh11", "nbap.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh10,
       { "subCh10", "nbap.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh9,
       { "subCh9", "nbap.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh8,
       { "subCh8", "nbap.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh7,
       { "subCh7", "nbap.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh6,
       { "subCh6", "nbap.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh5,
       { "subCh5", "nbap.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh4,
       { "subCh4", "nbap.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh3,
       { "subCh3", "nbap.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh2,
       { "subCh2", "nbap.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh1,
       { "subCh1", "nbap.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_nbap_RACH_SubChannelNumbers_subCh0,
       { "subCh0", "nbap.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-nbap-hfarr.c ---*/
 #line 148 "packet-nbap-template.c"
diff --git a/epan/dissectors/packet-nbd.c b/epan/dissectors/packet-nbd.c
index 5a228b49b6..89fcb1e8b2 100644
--- a/epan/dissectors/packet-nbd.c
+++ b/epan/dissectors/packet-nbd.c
@@ -451,22 +451,22 @@ void proto_register_nbd(void)
         static hf_register_info hf[] = {
 	{ &hf_nbd_magic,
 	{ "Magic", "nbd.magic", FT_UINT32, BASE_HEX, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_nbd_type,
 	{ "Type", "nbd.type", FT_UINT32, BASE_DEC, 
-		VALS(nbd_type_vals), 0x0, "", HFILL }},
+		VALS(nbd_type_vals), 0x0, NULL, HFILL }},
 	{ &hf_nbd_error,
 	{ "Error", "nbd.error", FT_UINT32, BASE_DEC, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_nbd_len,
 	{ "Length", "nbd.len", FT_UINT32, BASE_DEC, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_nbd_handle,
 	{ "Handle", "nbd.handle", FT_UINT64, BASE_HEX, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_nbd_from,
 	{ "From", "nbd.from", FT_UINT64, BASE_HEX, 
-		NULL, 0x0, "", HFILL }},
+		NULL, 0x0, NULL, HFILL }},
 	{ &hf_nbd_response_in,
 	{ "Response In", "nbd.response_in", FT_FRAMENUM, BASE_DEC, 
 		NULL, 0x0, "The response to this NBD request is in this frame", HFILL }},
@@ -478,8 +478,8 @@ void proto_register_nbd(void)
 		NULL, 0x0, "The time between the Call and the Reply", HFILL }},
 
 	{ &hf_nbd_data,
-	{ "Data", "nbd.data", FT_BYTES, BASE_HEX, 
-		NULL, 0x0, "", HFILL }},
+	{ "Data", "nbd.data", FT_BYTES, BASE_NONE, 
+		NULL, 0x0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c
index f2493d35b5..4a07e21644 100644
--- a/epan/dissectors/packet-nbns.c
+++ b/epan/dissectors/packet-nbns.c
@@ -1832,7 +1832,7 @@ proto_register_nbt(void)
     { &hf_nbns_flags,
       { "Flags",		"nbns.flags",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_nbns_flags_response,
       { "Response",		"nbns.flags.response",
 	FT_BOOLEAN, 16, TFS(&tfs_flags_response), F_RESPONSE,
@@ -1864,7 +1864,7 @@ proto_register_nbt(void)
     { &hf_nbns_flags_rcode,
       { "Reply code",		"nbns.flags.rcode",
 	FT_UINT16, BASE_DEC, VALS(rcode_vals), F_RCODE,
-	"Reply code", HFILL }},
+	NULL, HFILL }},
     { &hf_nbns_transaction_id,
       { "Transaction ID",      	"nbns.id",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
diff --git a/epan/dissectors/packet-ncp-nmas.c b/epan/dissectors/packet-ncp-nmas.c
index 689b8d6def..812e719eec 100644
--- a/epan/dissectors/packet-ncp-nmas.c
+++ b/epan/dissectors/packet-ncp-nmas.c
@@ -662,124 +662,124 @@ proto_register_nmas(void)
     static hf_register_info hf_nmas[] = {
         { &hf_func,
         { "Function",		"nmas.func", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "Function", HFILL }},
+            NULL, HFILL }},
 
         { &hf_subfunc,
         { "Subfunction",		"nmas.subfunc", FT_UINT8, BASE_HEX, NULL, 0x0,
-            "Subfunction", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ping_version,
         { "Ping Version",		"nmas.ping_version", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Ping Version", HFILL }},
+            NULL, HFILL }},
 
         { &hf_ping_flags,
         { "Flags",		"nmas.ping_flags", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Flags", HFILL }},
+            NULL, HFILL }},
 
         { &hf_frag_handle,
         { "Fragment Handle",        "nmas.frag_handle", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Fragment Handle", HFILL }},
+            NULL, HFILL }},
 
         { &hf_length,
         { "Length",        "nmas.length", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Length", HFILL }},
+            NULL, HFILL }},
 
         { &hf_subverb,
         { "Sub Verb",    "nmas.subverb",
           FT_UINT32,    BASE_HEX,   VALS(nmas_subverb_enum),   0x0,
-          "Sub Verb", HFILL }},
+          NULL, HFILL }},
 
         { &hf_tree,
         { "Tree",    "nmas.tree",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Tree", HFILL }},
+          NULL, HFILL }},
 
         { &hf_user,
         { "User",    "nmas.user",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "User", HFILL }},
+          NULL, HFILL }},
 
         { &hf_nmas_version,
         { "NMAS Protocol Version",        "nmas.version", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "NMAS Protocol Version", HFILL }},
+            NULL, HFILL }},
 
         { &hf_msg_version,
         { "Message Version",        "nmas.msg_version", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Message Version", HFILL }},
+            NULL, HFILL }},
 
         { &hf_session_ident,
         { "Session Identifier",        "nmas.session_ident", FT_UINT32, BASE_HEX, NULL, 0x0,
-            "Session Identifier", HFILL }},
+            NULL, HFILL }},
 
         { &hf_msg_verb,
         { "Message Verb",        "nmas.msg_verb", FT_UINT8, BASE_HEX, VALS(nmas_msgverb_enum), 0x0,
-            "Message Verb", HFILL }},
+            NULL, HFILL }},
 
         { &hf_attribute,
         { "Attribute Type",        "nmas.attribute", FT_UINT32, BASE_DEC, VALS(nmas_attribute_enum), 0x0,
-            "Attribute Type", HFILL }},
+            NULL, HFILL }},
 
         { &hf_clearance,
         { "Requested Clearance",    "nmas.clearance",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Requested Clearance", HFILL }},
+          NULL, HFILL }},
 
         { &hf_login_sequence,
         { "Requested Login Sequence",    "nmas.login_seq",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Requested Login Sequence", HFILL }},
+          NULL, HFILL }},
 
         { &hf_opaque,
         { "Opaque Data",    "nmas.opaque",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Opaque Data", HFILL }},
+          NULL, HFILL }},
 
         { &hf_data,
         { "Data",    "nmas.data",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Data", HFILL }},
+          NULL, HFILL }},
 
         { &hf_return_code,
         { "Return Code",        "nmas.return_code", FT_UINT32, BASE_HEX, VALS(nmas_errors_enum), 0x0,
-            "Return Code", HFILL }},
+            NULL, HFILL }},
 
         { &hf_lsm_verb,
         { "Login Store Message Verb",        "nmas.lsm_verb", FT_UINT8, BASE_HEX, VALS(nmas_lsmverb_enum), 0x0,
-            "Login Store Message Verb", HFILL }},
+            NULL, HFILL }},
 
         { &hf_squeue_bytes,
         { "Server Queue Number of Bytes",        "nmas.squeue_bytes", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Server Queue Number of Bytes", HFILL }},
+            NULL, HFILL }},
 
         { &hf_cqueue_bytes,
         { "Client Queue Number of Bytes",        "nmas.cqueue_bytes", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Client Queue Number of Bytes", HFILL }},
+            NULL, HFILL }},
 
         { &hf_num_creds,
         { "Number of Credentials",        "nmas.num_creds", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Number of Credentials", HFILL }},
+            NULL, HFILL }},
 
         { &hf_cred_type,
         { "Credential Type",        "nmas.cred_type", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Credential Type", HFILL }},
+            NULL, HFILL }},
 
         { &hf_login_state,
         { "Login State",        "nmas.login_state", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Login State", HFILL }},
+            NULL, HFILL }},
 
         { &hf_enc_cred,
         { "Encrypted Credential",    "nmas.enc_cred",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Encrypted Credential", HFILL }},
+          NULL, HFILL }},
 
         { &hf_enc_data,
         { "Encrypted Data",    "nmas.enc_data",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Encrypted Data", HFILL }},
+          NULL, HFILL }},
 
         { &hf_reply_buffer_size,
         { "Reply Buffer Size",        "nmas.buf_size", FT_UINT32, BASE_DEC, NULL, 0x0,
-            "Reply Buffer Size", HFILL }},
+            NULL, HFILL }},
 
         { &hf_encrypt_error,
         { "Payload Error",        "nmas.encrypt_error", FT_UINT32, BASE_HEX, VALS(nmas_errors_enum), 0x0,
diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index 508d615ebe..964e3b2143 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -822,156 +822,156 @@ proto_register_sss(void)
 	static hf_register_info hf_sss[] = {
 		{ &hf_buffer_size,
 		{ "Buffer Size",		"sss.buffer", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Buffer Size", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ping_version,
 		{ "Ping Version",		"sss.ping_version", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Ping Version", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_flags,
 		{ "Flags",		"sss.flags", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Flags", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_context,
 		{ "Context",		"sss.context", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Context", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_frag_handle,
 		{ "Fragment Handle",		"sss.frag_handle", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Fragment Handle", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_length,
 		{ "Length",		"sss.length", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Length", HFILL }},
+			NULL, HFILL }},
 
         { &hf_verb,
         { "Verb",    "sss.verb",
           FT_UINT32,    BASE_HEX,   VALS(sss_verb_enum),   0x0,
-          "Verb", HFILL }},
+          NULL, HFILL }},
 
         { &hf_user,
         { "User",    "sss.user",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "User", HFILL }},
+          NULL, HFILL }},
 
         { &hf_secret,
         { "Secret ID",    "sss.secret",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Secret ID", HFILL }},
+          NULL, HFILL }},
 
 		{ &hf_sss_version,
 		{ "SecretStore Protocol Version",		"sss.version", FT_UINT32, BASE_HEX, NULL, 0x0,
-			"SecretStore Protocol Version", HFILL }},
+			NULL, HFILL }},
 
         { &hf_return_code,
 		{ "Return Code",		"sss.return_code", FT_UINT32, BASE_HEX, VALS(sss_errors_enum), 0x0,
-			"Return Code", HFILL }},
+			NULL, HFILL }},
 
         { &hf_enc_cred,
         { "Encrypted Credential",    "sss.enc_cred",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Encrypted Credential", HFILL }},
+          NULL, HFILL }},
 
         { &hf_enc_data,
         { "Encrypted Data",    "sss.enc_data",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Encrypted Data", HFILL }},
+          NULL, HFILL }},
 
         { &hfbit1,
-        { "Enhanced Protection", "ncp.sss_bit1", FT_BOOLEAN, 32, NULL, 0x00000001, "", HFILL }},
+        { "Enhanced Protection", "ncp.sss_bit1", FT_BOOLEAN, 32, NULL, 0x00000001, NULL, HFILL }},
 
         { &hfbit2,
-        { "Create ID", "ncp.sss_bit2", FT_BOOLEAN, 32, NULL, 0x00000002, "", HFILL }},
+        { "Create ID", "ncp.sss_bit2", FT_BOOLEAN, 32, NULL, 0x00000002, NULL, HFILL }},
 
         { &hfbit3,
-        { "Remove Lock", "ncp.sss_bit3", FT_BOOLEAN, 32, NULL, 0x00000004, "", HFILL }},
+        { "Remove Lock", "ncp.sss_bit3", FT_BOOLEAN, 32, NULL, 0x00000004, NULL, HFILL }},
 
         { &hfbit4,
-        { "Repair", "ncp.sss_bit4", FT_BOOLEAN, 32, NULL, 0x00000008, "", HFILL }},
+        { "Repair", "ncp.sss_bit4", FT_BOOLEAN, 32, NULL, 0x00000008, NULL, HFILL }},
 
         { &hfbit5,
-        { "Unicode", "ncp.sss_bit5", FT_BOOLEAN, 32, NULL, 0x00000010, "", HFILL }},
+        { "Unicode", "ncp.sss_bit5", FT_BOOLEAN, 32, NULL, 0x00000010, NULL, HFILL }},
 
         { &hfbit6,
-        { "EP Master Password Used", "ncp.sss_bit6", FT_BOOLEAN, 32, NULL, 0x00000020, "", HFILL }},
+        { "EP Master Password Used", "ncp.sss_bit6", FT_BOOLEAN, 32, NULL, 0x00000020, NULL, HFILL }},
 
         { &hfbit7,
-        { "EP Password Used", "ncp.sss_bit7", FT_BOOLEAN, 32, NULL, 0x00000040, "", HFILL }},
+        { "EP Password Used", "ncp.sss_bit7", FT_BOOLEAN, 32, NULL, 0x00000040, NULL, HFILL }},
 
         { &hfbit8,
-        { "Set Tree Name", "ncp.sss_bit8", FT_BOOLEAN, 32, NULL, 0x00000080, "", HFILL }},
+        { "Set Tree Name", "ncp.sss_bit8", FT_BOOLEAN, 32, NULL, 0x00000080, NULL, HFILL }},
 
         { &hfbit9,
-        { "Get Context", "ncp.sss_bit9", FT_BOOLEAN, 32, NULL, 0x00000100, "", HFILL }},
+        { "Get Context", "ncp.sss_bit9", FT_BOOLEAN, 32, NULL, 0x00000100, NULL, HFILL }},
 
         { &hfbit10,
-        { "Destroy Context", "ncp.sss_bit10", FT_BOOLEAN, 32, NULL, 0x00000200, "", HFILL }},
+        { "Destroy Context", "ncp.sss_bit10", FT_BOOLEAN, 32, NULL, 0x00000200, NULL, HFILL }},
 
         { &hfbit11,
-        { "Not Defined", "ncp.sss_bit11", FT_BOOLEAN, 32, NULL, 0x00000400, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit11", FT_BOOLEAN, 32, NULL, 0x00000400, NULL, HFILL }},
 
         { &hfbit12,
-        { "Not Defined", "ncp.sss_bit12", FT_BOOLEAN, 32, NULL, 0x00000800, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit12", FT_BOOLEAN, 32, NULL, 0x00000800, NULL, HFILL }},
 
         { &hfbit13,
-        { "Not Defined", "ncp.sss_bit13", FT_BOOLEAN, 32, NULL, 0x00001000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit13", FT_BOOLEAN, 32, NULL, 0x00001000, NULL, HFILL }},
 
         { &hfbit14,
-        { "Not Defined", "ncp.sss_bit14", FT_BOOLEAN, 32, NULL, 0x00002000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit14", FT_BOOLEAN, 32, NULL, 0x00002000, NULL, HFILL }},
 
         { &hfbit15,
-        { "Not Defined", "ncp.sss_bit15", FT_BOOLEAN, 32, NULL, 0x00004000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit15", FT_BOOLEAN, 32, NULL, 0x00004000, NULL, HFILL }},
 
         { &hfbit16,
-        { "Not Defined", "ncp.sss_bit16", FT_BOOLEAN, 32, NULL, 0x00008000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit16", FT_BOOLEAN, 32, NULL, 0x00008000, NULL, HFILL }},
 
         { &hfbit17,
-        { "EP Lock", "ncp.sss_bit17", FT_BOOLEAN, 32, NULL, 0x00010000, "", HFILL }},
+        { "EP Lock", "ncp.sss_bit17", FT_BOOLEAN, 32, NULL, 0x00010000, NULL, HFILL }},
 
         { &hfbit18,
-        { "Not Initialized", "ncp.sss_bit18", FT_BOOLEAN, 32, NULL, 0x00020000, "", HFILL }},
+        { "Not Initialized", "ncp.sss_bit18", FT_BOOLEAN, 32, NULL, 0x00020000, NULL, HFILL }},
 
         { &hfbit19,
-        { "Enhanced Protection", "ncp.sss_bit19", FT_BOOLEAN, 32, NULL, 0x00040000, "", HFILL }},
+        { "Enhanced Protection", "ncp.sss_bit19", FT_BOOLEAN, 32, NULL, 0x00040000, NULL, HFILL }},
 
         { &hfbit20,
-        { "Store Not Synced", "ncp.sss_bit20", FT_BOOLEAN, 32, NULL, 0x00080000, "", HFILL }},
+        { "Store Not Synced", "ncp.sss_bit20", FT_BOOLEAN, 32, NULL, 0x00080000, NULL, HFILL }},
 
         { &hfbit21,
-        { "Admin Last Modified", "ncp.sss_bit21", FT_BOOLEAN, 32, NULL, 0x00100000, "", HFILL }},
+        { "Admin Last Modified", "ncp.sss_bit21", FT_BOOLEAN, 32, NULL, 0x00100000, NULL, HFILL }},
 
         { &hfbit22,
-        { "EP Password Present", "ncp.sss_bit22", FT_BOOLEAN, 32, NULL, 0x00200000, "", HFILL }},
+        { "EP Password Present", "ncp.sss_bit22", FT_BOOLEAN, 32, NULL, 0x00200000, NULL, HFILL }},
 
         { &hfbit23,
-        { "EP Master Password Present", "ncp.sss_bit23", FT_BOOLEAN, 32, NULL, 0x00400000, "", HFILL }},
+        { "EP Master Password Present", "ncp.sss_bit23", FT_BOOLEAN, 32, NULL, 0x00400000, NULL, HFILL }},
 
         { &hfbit24,
-        { "MP Disabled", "ncp.sss_bit24", FT_BOOLEAN, 32, NULL, 0x00800000, "", HFILL }},
+        { "MP Disabled", "ncp.sss_bit24", FT_BOOLEAN, 32, NULL, 0x00800000, NULL, HFILL }},
 
         { &hfbit25,
-        { "Not Defined", "ncp.sss_bit25", FT_BOOLEAN, 32, NULL, 0x01000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit25", FT_BOOLEAN, 32, NULL, 0x01000000, NULL, HFILL }},
 
         { &hfbit26,
-        { "Not Defined", "ncp.sss_bit26", FT_BOOLEAN, 32, NULL, 0x02000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit26", FT_BOOLEAN, 32, NULL, 0x02000000, NULL, HFILL }},
 
         { &hfbit27,
-        { "Not Defined", "ncp.sss_bit27", FT_BOOLEAN, 32, NULL, 0x04000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit27", FT_BOOLEAN, 32, NULL, 0x04000000, NULL, HFILL }},
 
         { &hfbit28,
-        { "Not Defined", "ncp.sss_bit28", FT_BOOLEAN, 32, NULL, 0x08000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit28", FT_BOOLEAN, 32, NULL, 0x08000000, NULL, HFILL }},
 
         { &hfbit29,
-        { "Not Defined", "ncp.sss_bit29", FT_BOOLEAN, 32, NULL, 0x10000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit29", FT_BOOLEAN, 32, NULL, 0x10000000, NULL, HFILL }},
 
         { &hfbit30,
-        { "Not Defined", "ncp.sss_bit30", FT_BOOLEAN, 32, NULL, 0x20000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit30", FT_BOOLEAN, 32, NULL, 0x20000000, NULL, HFILL }},
 
         { &hfbit31,
-        { "Not Defined", "ncp.sss_bit31", FT_BOOLEAN, 32, NULL, 0x40000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit31", FT_BOOLEAN, 32, NULL, 0x40000000, NULL, HFILL }},
 
         { &hfbit32,
-        { "Not Defined", "ncp.sss_bit32", FT_BOOLEAN, 32, NULL, 0x80000000, "", HFILL }},
+        { "Not Defined", "ncp.sss_bit32", FT_BOOLEAN, 32, NULL, 0x80000000, NULL, HFILL }},
 
     };
 
diff --git a/epan/dissectors/packet-ncp.c b/epan/dissectors/packet-ncp.c
index 3e7df69d12..9d284b82af 100644
--- a/epan/dissectors/packet-ncp.c
+++ b/epan/dissectors/packet-ncp.c
@@ -888,23 +888,23 @@ proto_register_ncp(void)
     { &hf_ncp_ip_sig,
       { "NCP over IP signature",	"ncp.ip.signature",
         FT_UINT32, BASE_HEX, VALS(ncp_ip_signature), 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_length,
       { "NCP over IP length",		"ncp.ip.length",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_ver,
       { "NCP over IP Version",		"ncp.ip.version",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_rplybufsize,
       { "NCP over IP Reply Buffer Size",	"ncp.ip.replybufsize",
         FT_UINT32, BASE_DEC, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_ip_packetsig,
       { "NCP over IP Packet Signature",	"ncp.ip.packetsig",
         FT_BYTES, BASE_NONE, NULL, 0x0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ncp_type,
       { "Type",			"ncp.type",
 	FT_UINT16, BASE_HEX, VALS(ncp_type_vals), 0x0,
@@ -912,23 +912,23 @@ proto_register_ncp(void)
     { &hf_ncp_seq,
       { "Sequence Number",     	"ncp.seq",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_connection,
       { "Connection Number",    "ncp.connection",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_task,
       { "Task Number",     	"ncp.task",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_oplock_flag,
       { "Broadcast Message Flag",    "ncp.msg_flag",
 	FT_UINT8, BASE_HEX, VALS(ncp_oplock_vals), 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_oplock_handle,
       { "File Handle",    "ncp.oplock_handle",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_stream_type,
       { "Stream Type",     	"ncp.stream_type",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
@@ -936,7 +936,7 @@ proto_register_ncp(void)
     { &hf_ncp_system_flags,
       { "System Flags",     	"ncp.system_flags",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_system_flags_abt,
       { "ABT",     	"ncp.system_flags.abt",
 	FT_BOOLEAN, 8, NULL, ABT,
@@ -1012,27 +1012,27 @@ proto_register_ncp(void)
     { &hf_ncp_completion_code,
       { "Completion Code",    "ncp.completion_code",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_connection_status,
       { "Connection Status",    "ncp.connection_status",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_slot,
       { "Slot",    "ncp.slot",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_control_code,
       { "Control Code",    "ncp.control_code",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_ncp_fragment_handle,
       { "Fragment Handle",    "ncp.fragger_hndl",
     FT_UINT16, BASE_HEX, NULL, 0x0,
-    "", HFILL }},
+    NULL, HFILL }},
     { &hf_lip_echo,
       { "Large Internet Packet Echo",    "ncp.lip_echo",
     FT_STRING, BASE_NONE, NULL, 0x0,
-    "", HFILL }},
+    NULL, HFILL }},
     { &hf_ncp_burst_command,
       { "Burst Command",    "ncp.burst_command",
 	FT_UINT32, BASE_HEX, VALS(burst_command), 0x0,
@@ -1043,7 +1043,7 @@ proto_register_ncp(void)
 	"Packet Burst File Handle", HFILL }},
  	{ &hf_ncp_burst_reserved,
 	{ "Reserved", "ncp.burst_reserved",
-    FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+    FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ncs.c b/epan/dissectors/packet-ncs.c
index 9359d40b82..4c4959b5c4 100644
--- a/epan/dissectors/packet-ncs.c
+++ b/epan/dissectors/packet-ncs.c
@@ -70,11 +70,11 @@ proto_register_ncs(void)
 
     { &hf_panning_id,
       { "Panning ID",		"ncs.pan_id",		FT_UINT32, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_incarnation,
       { "Incarnation",		"ncs.incarnation",		FT_UINT32, BASE_HEX,	NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c
index ab6838cb45..0a49ca57b7 100644
--- a/epan/dissectors/packet-ndmp.c
+++ b/epan/dissectors/packet-ndmp.c
@@ -3107,8 +3107,8 @@ proto_register_ndmp(void)
 
   static hf_register_info hf_ndmp[] = {
 	{ &hf_ndmp_header, {
-		"NDMP Header", "ndmp.header", FT_NONE, 0,
-		NULL, 0, "NDMP Header", HFILL }},
+		"NDMP Header", "ndmp.header", FT_NONE, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
         { &hf_ndmp_response_frame, {
 		"Response In", "ndmp.response_frame", FT_FRAMENUM, BASE_NONE,
@@ -3152,19 +3152,19 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_hostname, {
 		"Hostname", "ndmp.hostname", FT_STRING, BASE_NONE,
-		NULL, 0, "Hostname", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_hostid, {
 		"HostID", "ndmp.hostid", FT_STRING, BASE_NONE,
-		NULL, 0, "HostID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_os_type, {
 		"OS Type", "ndmp.os.type", FT_STRING, BASE_NONE,
-		NULL, 0, "OS Type", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_os_vers, {
 		"OS Version", "ndmp.os.version", FT_STRING, BASE_NONE,
-		NULL, 0, "OS Version", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_addr_types, {
 		"Addr Types", "ndmp.addr_types", FT_NONE, BASE_NONE,
@@ -3179,16 +3179,16 @@ proto_register_ndmp(void)
 		VALS(auth_type_vals), 0, "Authentication Type", HFILL }},
 
 	{ &hf_ndmp_auth_challenge, {
-		"Challenge", "ndmp.auth.challenge", FT_BYTES, BASE_HEX,
+		"Challenge", "ndmp.auth.challenge", FT_BYTES, BASE_NONE,
 		NULL, 0, "Authentication Challenge", HFILL }},
 
 	{ &hf_ndmp_auth_digest, {
-		"Digest", "ndmp.auth.digest", FT_BYTES, BASE_HEX,
+		"Digest", "ndmp.auth.digest", FT_BYTES, BASE_NONE,
 		NULL, 0, "Authentication Digest", HFILL }},
 
 	{ &hf_ndmp_butype_info, {
 		"Butype Info", "ndmp.butype.info", FT_NONE, BASE_NONE,
-		NULL, 0, "Butype Info", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_butype_name, {
 		"Butype Name", "ndmp.butype.name", FT_STRING, BASE_NONE,
@@ -3260,7 +3260,7 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_fs_info, {
 		"FS Info", "ndmp.fs.info", FT_NONE, BASE_NONE,
-		NULL, 0, "FS Info", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_fs_invalid_total_size, {
 		"Total size invalid", "ndmp.fs.invalid.total_size", FT_BOOLEAN, 32,
@@ -3332,7 +3332,7 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_tape_info, {
 		"Tape Info", "ndmp.tape.info", FT_NONE, BASE_NONE,
-		NULL, 0, "Tape Info", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_model, {
 		"Model", "ndmp.tape.model", FT_STRING, BASE_NONE,
@@ -3356,7 +3356,7 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_tape_capability, {
 		"Tape Capabilities", "ndmp.tape.capability", FT_NONE, BASE_NONE,
-		NULL, 0, "Tape Capabilities", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_capability_name, {
 		"Name", "ndmp.tape.cap.name", FT_STRING, BASE_NONE,
@@ -3368,7 +3368,7 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_scsi_info, {
 		"SCSI Info", "ndmp.scsi.info", FT_NONE, BASE_NONE,
-		NULL, 0, "SCSI Info", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_scsi_model, {
 		"Model", "ndmp.scsi.model", FT_STRING, BASE_NONE,
@@ -3388,7 +3388,7 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_auth_types, {
 		"Auth types", "ndmp.auth.types", FT_NONE, BASE_NONE,
-		NULL, 0, "Auth types", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_scsi_device, {
 		"Device", "ndmp.scsi.device", FT_STRING, BASE_NONE,
@@ -3408,11 +3408,11 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_execute_cdb_flags_data_in, {
 		"DATA_IN", "ndmp.execute_cdb.flags.data_in", FT_BOOLEAN, 32,
-		NULL, 0x00000001, "DATA_IN", HFILL }},
+		NULL, 0x00000001, NULL, HFILL }},
 
 	{ &hf_ndmp_execute_cdb_flags_data_out, {
 		"DATA_OUT", "ndmp.execute_cdb.flags.data_out", FT_BOOLEAN, 32,
-		NULL, 0x00000002, "DATA_OUT", HFILL }},
+		NULL, 0x00000002, NULL, HFILL }},
 
 	{ &hf_ndmp_execute_cdb_timeout, {
 		"Timeout", "ndmp.execute_cdb.timeout", FT_UINT32, BASE_DEC,
@@ -3496,31 +3496,31 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_tape_file_num, {
 		"file_num", "ndmp.tape.status.file_num", FT_UINT32, BASE_DEC,
-		NULL, 0, "file_num", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_soft_errors, {
 		"soft_errors", "ndmp.tape.status.soft_errors", FT_UINT32, BASE_DEC,
-		NULL, 0, "soft_errors", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_block_size, {
 		"block_size", "ndmp.tape.status.block_size", FT_UINT32, BASE_DEC,
-		NULL, 0, "block_size", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_block_no, {
 		"block_no", "ndmp.tape.status.block_no", FT_UINT32, BASE_DEC,
-		NULL, 0, "block_no", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_total_space, {
 		"total_space", "ndmp.tape.status.total_space", FT_UINT64, BASE_DEC,
-		NULL, 0, "total_space", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_space_remain, {
 		"space_remain", "ndmp.tape.status.space_remain", FT_UINT64, BASE_DEC,
-		NULL, 0, "space_remain", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_partition, {
 		"partition", "ndmp.tape.status.partition", FT_UINT32, BASE_DEC,
-		NULL, 0, "partition", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_tape_mtio_op, {
 		"Operation", "ndmp.tape.mtio.op", FT_UINT32, BASE_DEC,
@@ -3575,19 +3575,19 @@ proto_register_ndmp(void)
 		NULL, 0, "Size of window in bytes", HFILL }},
 
 	{ &hf_ndmp_addr_ip, {
-		"IP Address", "ndmp.addr.ip", FT_IPv4, BASE_DEC,
-		NULL, 0, "IP Address", HFILL }},
+		"IP Address", "ndmp.addr.ip", FT_IPv4, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_addr_tcp, {
 		"TCP Port", "ndmp.addr.tcp_port", FT_UINT32, BASE_DEC,
-		NULL, 0, "TCP Port", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_addr_fcal_loop_id, {
 		"Loop ID", "ndmp.addr.loop_id", FT_UINT32, BASE_HEX,
 		NULL, 0, "FCAL Loop ID", HFILL }},
 
 	{ &hf_ndmp_addr_ipc, {
-		"IPC", "ndmp.addr.ipc", FT_BYTES, BASE_HEX,
+		"IPC", "ndmp.addr.ipc", FT_BYTES, BASE_NONE,
 		NULL, 0, "IPC identifier", HFILL }},
 
 	{ &hf_ndmp_mover_mode, {
@@ -3639,15 +3639,15 @@ proto_register_ndmp(void)
 		NULL, 0, "Password of client authenticating", HFILL }},
 
 	{ &hf_ndmp_data, {
-		"Data", "ndmp.data", FT_BYTES, BASE_HEX,
+		"Data", "ndmp.data", FT_BYTES, BASE_NONE,
 		NULL, 0, "Data written/read", HFILL }},
 
 	{ &hf_ndmp_files, {
-		"Files", "ndmp.files", FT_NONE, 0,
+		"Files", "ndmp.files", FT_NONE, BASE_NONE,
 		NULL, 0, "List of files", HFILL }},
 
 	{ &hf_ndmp_file_names, {
-		"File Names", "ndmp.file.names", FT_NONE, 0,
+		"File Names", "ndmp.file.names", FT_NONE, BASE_NONE,
 		NULL, 0, "List of file names", HFILL }},
 
 	{ &hf_ndmp_file_fs_type, {
@@ -3659,7 +3659,7 @@ proto_register_ndmp(void)
 		VALS(file_type_vals), 0, "Type of file", HFILL }},
 
 	{ &hf_ndmp_file_stats, {
-		"File Stats", "ndmp.file.stats", FT_NONE, 0,
+		"File Stats", "ndmp.file.stats", FT_NONE, BASE_NONE,
 		NULL, 0, "List of file stats", HFILL }},
 
 	{ &hf_ndmp_file_node, {
@@ -3719,15 +3719,15 @@ proto_register_ndmp(void)
 		NULL, 0, "Number of links to this file", HFILL }},
 
 	{ &hf_ndmp_dirs, {
-		"Dirs", "ndmp.dirs", FT_NONE, 0,
+		"Dirs", "ndmp.dirs", FT_NONE, BASE_NONE,
 		NULL, 0, "List of directories", HFILL }},
 
 	{ &hf_ndmp_nodes, {
-		"Nodes", "ndmp.nodes", FT_NONE, 0,
+		"Nodes", "ndmp.nodes", FT_NONE, BASE_NONE,
 		NULL, 0, "List of nodes", HFILL }},
 
 	{ &hf_ndmp_nlist, {
-		"Nlist", "ndmp.nlist", FT_NONE, 0,
+		"Nlist", "ndmp.nlist", FT_NONE, BASE_NONE,
 		NULL, 0, "List of names", HFILL }},
 
 	{ &hf_ndmp_bu_original_path, {
@@ -3740,11 +3740,11 @@ proto_register_ndmp(void)
 
 	{ &hf_ndmp_bu_new_name, {
 		"New Name", "ndmp.bu.new_name", FT_STRING, BASE_NONE,
-		NULL, 0, "New Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_bu_other_name, {
 		"Other Name", "ndmp.bu.other_name", FT_STRING, BASE_NONE,
-		NULL, 0, "Other Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_ndmp_state_invalid_ebr, {
 		"EstimatedBytesLeft valid", "ndmp.bu.state.invalid_ebr", FT_BOOLEAN, 32,
@@ -3775,14 +3775,14 @@ proto_register_ndmp(void)
 		NULL, 0, "Estimated number of bytes remaining", HFILL }},
 
 	{ &hf_ndmp_data_est_time_remain, {
-		"Est Time Remain", "ndmp.data.est_time_remain", FT_RELATIVE_TIME, BASE_DEC,
+		"Est Time Remain", "ndmp.data.est_time_remain", FT_RELATIVE_TIME, BASE_NONE,
 		NULL, 0, "Estimated time remaining", HFILL }},
 	{ &hf_ndmp_lastfrag, {
 		"Last Fragment", "ndmp.lastfrag", FT_BOOLEAN, 32,
-		TFS(&tfs_yes_no), RPC_RM_LASTFRAG, "Last Fragment", HFILL }},
+		TFS(&tfs_yes_no), RPC_RM_LASTFRAG, NULL, HFILL }},
 	{ &hf_ndmp_fraglen, {
 		"Fragment Length", "ndmp.fraglen", FT_UINT32, BASE_DEC,
-		NULL, RPC_RM_FRAGLEN, "Fragment Length", HFILL }},
+		NULL, RPC_RM_FRAGLEN, NULL, HFILL }},
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c
index cd526d41c4..f51455f30c 100644
--- a/epan/dissectors/packet-ndps.c
+++ b/epan/dissectors/packet-ndps.c
@@ -8333,577 +8333,577 @@ proto_register_ndps(void)
 	static hf_register_info hf_ndps[] = {
 		{ &hf_ndps_record_mark,
 		{ "Record Mark",		"ndps.record_mark", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"Record Mark", HFILL }},
+			NULL, HFILL }},
 
         { &hf_ndps_packet_type,
         { "Packet Type",    "ndps.packet_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_packet_types),   0x0,
-          "Packet Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_length,
         { "Record Length",    "ndps.record_length",
            FT_UINT16,    BASE_DEC,   NULL,   0x0,
-           "Record Length", HFILL }},
+           NULL, HFILL }},
 
         { &hf_ndps_xid,
         { "Exchange ID",    "ndps.xid",
            FT_UINT32,    BASE_HEX,   NULL,   0x0,
-           "Exchange ID", HFILL }},
+           NULL, HFILL }},
 
         { &hf_ndps_rpc_version,
         { "RPC Version",    "ndps.rpc_version",
            FT_UINT32,    BASE_HEX,   NULL,   0x0,
-           "RPC Version", HFILL }},
+           NULL, HFILL }},
 
         { &hf_spx_ndps_program,
         { "NDPS Program Number",    "spx.ndps_program",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_program_vals),   0x0,
-          "NDPS Program Number", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_version,
         { "Program Version",    "spx.ndps_version",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Program Version", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_error,
         { "NDPS Error",    "spx.ndps_error",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "NDPS Error", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_other_error_string,
         { "Extended Error String",    "ndps.ext_err_string",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Extended Error String", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_print,
         { "Print Program",    "spx.ndps_func_print",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_print_func_vals),   0x0,
-          "Print Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_notify,
         { "Notify Program",    "spx.ndps_func_notify",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_notify_func_vals),   0x0,
-          "Notify Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_delivery,
         { "Delivery Program",    "spx.ndps_func_delivery",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_deliver_func_vals),   0x0,
-          "Delivery Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_registry,
         { "Registry Program",    "spx.ndps_func_registry",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_registry_func_vals),   0x0,
-          "Registry Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_resman,
         { "ResMan Program",    "spx.ndps_func_resman",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_resman_func_vals),   0x0,
-          "ResMan Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_spx_ndps_func_broker,
         { "Broker Program",    "spx.ndps_func_broker",
           FT_UINT32,    BASE_HEX,   VALS(spx_ndps_broker_func_vals),   0x0,
-          "Broker Program", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_objects,
         { "Number of Objects",    "ndps.num_objects",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Objects", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_attributes,
         { "Number of Attributes",    "ndps.num_attributes",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Attributes", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_sbuffer,
         { "Server",    "ndps.sbuffer",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Server", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_rbuffer,
         { "Connection",    "ndps.rbuffer",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Connection", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_user_name,
         { "Trustee Name",    "ndps.user_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Trustee Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_broker_name,
         { "Broker Name",    "ndps.broker_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Broker Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_results,
         { "Number of Results",    "ndps.num_results",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Results", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_options,
         { "Number of Options",    "ndps.num_options",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Options", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_jobs,
         { "Number of Jobs",    "ndps.num_jobs",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Jobs", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_pa_name,
         { "Printer Name",    "ndps.pa_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_tree,
         { "Tree",    "ndps.tree",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Tree", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_reqframe,
         { "Request Frame",    "ndps.reqframe",
           FT_FRAMENUM,  BASE_NONE,   NULL,   0x0,
-          "Request Frame", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_error_val,
         { "Return Status",    "ndps.error_val",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Return Status", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_object,
         { "Object ID",    "ndps.object",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Object ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_cred_type,
         { "Credential Type",    "ndps.cred_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_credential_enum),   0x0,
-          "Credential Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_server_name,
         { "Server Name",    "ndps.server_name",
-          FT_STRING,    BASE_DEC,   NULL,   0x0,
-          "Server Name", HFILL }},
+          FT_STRING,    BASE_NONE,   NULL,   0x0,
+          NULL, HFILL }},
 
         { &hf_ndps_connection,
         { "Connection",    "ndps.connection",
           FT_UINT16,    BASE_DEC,   NULL,   0x0,
-          "Connection", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ext_error,
         { "Extended Error Code",    "ndps.ext_error",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Extended Error Code", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_auth_null,
         { "Auth Null",    "ndps.auth_null",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Auth Null", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_rpc_accept,
         { "RPC Accept or Deny",    "ndps.rpc_acc",
           FT_UINT32,    BASE_HEX,   VALS(true_false),   0x0,
-          "RPC Accept or Deny", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_rpc_acc_stat,
         { "RPC Accept Status",    "ndps.rpc_acc_stat",
           FT_UINT32,    BASE_HEX,   VALS(accept_stat),   0x0,
-          "RPC Accept Status", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_rpc_rej_stat,
         { "RPC Reject Status",    "ndps.rpc_rej_stat",
           FT_UINT32,    BASE_HEX,   VALS(reject_stat),   0x0,
-          "RPC Reject Status", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_rpc_acc_results,
         { "RPC Accept Results",    "ndps.rpc_acc_res",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "RPC Accept Results", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_problem_type,
         { "Problem Type",    "ndps.rpc_prob_type",
           FT_UINT32,    BASE_HEX,   VALS(error_type_enum),   0x0,
-          "Problem Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_security_problem_type,
         { "Security Problem",    "ndps.rpc_sec_prob",
           FT_UINT32,    BASE_HEX,   VALS(security_problem_enum),   0x0,
-          "Security Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_service_problem_type,
         { "Service Problem",    "ndps.rpc_serv_prob",
           FT_UINT32,    BASE_HEX,   VALS(service_problem_enum),   0x0,
-          "Service Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_access_problem_type,
         { "Access Problem",    "ndps.rpc_acc_prob",
           FT_UINT32,    BASE_HEX,   VALS(access_problem_enum),   0x0,
-          "Access Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_printer_problem_type,
         { "Printer Problem",    "ndps.rpc_print_prob",
           FT_UINT32,    BASE_HEX,   VALS(printer_problem_enum),   0x0,
-          "Printer Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_selection_problem_type,
         { "Selection Problem",    "ndps.rpc_sel_prob",
           FT_UINT32,    BASE_HEX,   VALS(selection_problem_enum),   0x0,
-          "Selection Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_doc_access_problem_type,
         { "Document Access Problem",    "ndps.rpc_doc_acc_prob",
           FT_UINT32,    BASE_HEX,   VALS(doc_access_problem_enum),   0x0,
-          "Document Access Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_attribute_problem_type,
         { "Attribute Problem",    "ndps.rpc_attr_prob",
           FT_UINT32,    BASE_HEX,   VALS(attribute_problem_enum),   0x0,
-          "Attribute Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_update_problem_type,
         { "Update Problem",    "ndps.rpc_update_prob",
           FT_UINT32,    BASE_HEX,   VALS(update_problem_enum),   0x0,
-          "Update Problem", HFILL }},
+          NULL, HFILL }},
 
         { &hf_obj_id_type,
         { "Object ID Type",    "ndps.rpc_obj_id_type",
           FT_UINT32,    BASE_HEX,   VALS(obj_identification_enum),   0x0,
-          "Object ID Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_oid_struct_size,
         { "OID Struct Size",    "ndps.rpc_oid_struct_size",
           FT_UINT16,    BASE_DEC,   NULL,   0x0,
-          "OID Struct Size", HFILL }},
+          NULL, HFILL }},
 
         { &hf_object_name,
         { "Object Name",    "ndps.ndps_object_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Object Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_document_number,
         { "Document Number",    "ndps.ndps_doc_num",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Document Number", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_doc_content,
         { "Document Content",    "ndps.ndps_doc_content",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Document Content", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_nameorid,
         { "Name or ID Type",    "ndps.ndps_nameorid",
           FT_UINT32,    BASE_HEX,   VALS(nameorid_enum),   0x0,
-          "Name or ID Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_local_object_name,
         { "Local Object Name",    "ndps.ndps_loc_object_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Local Object Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_printer_name,
         { "Printer Name",    "ndps.ndps_printer_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_qualified_name,
         { "Qualified Name Type",    "ndps.ndps_qual_name_type",
           FT_UINT32,    BASE_HEX,   VALS(qualified_name_enum),   0x0,
-          "Qualified Name Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_qualified_name2,
         { "Qualified Name Type",    "ndps.ndps_qual_name_type2",
           FT_UINT32,    BASE_HEX,   VALS(qualified_name_enum2),   0x0,
-          "Qualified Name Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_item_count,
         { "Number of Items",    "ndps.ndps_item_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Items", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_passwords,
         { "Number of Passwords",    "ndps.num_passwords",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Passwords", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_servers,
         { "Number of Servers",    "ndps.num_servers",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Servers", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_locations,
         { "Number of Locations",    "ndps.num_locations",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Locations", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_areas,
         { "Number of Areas",    "ndps.num_areas",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Areas", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_address_items,
         { "Number of Address Items",    "ndps.num_address_items",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Address Items", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_job_categories,
         { "Number of Job Categories",    "ndps.num_job_categories",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Job Categories", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_page_selects,
         { "Number of Page Select Items",    "ndps.num_page_selects",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Page Select Items", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_page_informations,
         { "Number of Page Information Items",    "ndps.num_page_informations",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Page Information Items", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_names,
         { "Number of Names",    "ndps.num_names",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Names", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_categories,
         { "Number of Categories",    "ndps.num_categories",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Categories", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_colorants,
         { "Number of Colorants",    "ndps.num_colorants",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Colorants", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_events,
         { "Number of Events",    "ndps.num_events",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Events", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_args,
         { "Number of Arguments",    "ndps.num_argss",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Arguments", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_transfer_methods,
         { "Number of Transfer Methods",    "ndps.num_transfer_methods",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Transfer Methods", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_doc_types,
         { "Number of Document Types",    "ndps.num_doc_types",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Document Types", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_destinations,
         { "Number of Destinations",    "ndps.num_destinations",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Destinations", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_qualifier,
         { "Qualifier",    "ndps.ndps_qual",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Qualifier", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_lib_error,
         { "Library Error",    "ndps.ndps_lib_error",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Library Error", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_other_error,
         { "Other Error",    "ndps.ndps_other_error",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Other Error", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_other_error_2,
         { "Other Error 2",    "ndps.ndps_other_error_2",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Other Error 2", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_session,
         { "Session Handle",    "ndps.ndps_session",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Session Handle", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_abort_flag,
         { "Abort?",    "ndps.ndps_abort",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Abort?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_obj_attribute_type,
         { "Value Syntax",    "ndps.ndps_attrib_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_attribute_enum),   0x0,
-          "Value Syntax", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_attribute_value,
         { "Value",    "ndps.attribue_value",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_lower_range,
         { "Lower Range",    "ndps.lower_range",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Lower Range", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_upper_range,
         { "Upper Range",    "ndps.upper_range",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Upper Range", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_n64,
         { "Value",    "ndps.n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_lower_range_n64,
         { "Lower Range",    "ndps.lower_range_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Lower Range", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_upper_range_n64,
         { "Upper Range",    "ndps.upper_range_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Upper Range", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_attrib_boolean,
         { "Value?",    "ndps.ndps_attrib_boolean",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Value?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_realization,
         { "Realization Type",    "ndps.ndps_realization",
           FT_UINT32,    BASE_HEX,   VALS(ndps_realization_enum),   0x0,
-          "Realization Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_xdimension_n64,
         { "X Dimension",    "ndps.xdimension_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "X Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ydimension_n64,
         { "Y Dimension",    "ndps.xdimension_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Y Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_dim_value,
         { "Dimension Value Type",    "ndps.ndps_dim_value",
           FT_UINT32,    BASE_HEX,   VALS(ndps_dim_value_enum),   0x0,
-          "Dimension Value Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_dim_flag,
         { "Dimension Flag",    "ndps.ndps_dim_falg",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Dimension Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_xydim_value,
         { "XY Dimension Value Type",    "ndps.ndps_xydim_value",
           FT_UINT32,    BASE_HEX,   VALS(ndps_xydim_value_enum),   0x0,
-          "XY Dimension Value Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_location_value,
         { "Location Value Type",    "ndps.ndps_location_value",
           FT_UINT32,    BASE_HEX,   VALS(ndps_location_value_enum),   0x0,
-          "Location Value Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_xmin_n64,
         { "Minimum X Dimension",    "ndps.xmin_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Minimum X Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_xmax_n64,
         { "Maximum X Dimension",    "ndps.xmax_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Maximum X Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ymin_n64,
         { "Minimum Y Dimension",    "ndps.ymin_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Minimum Y Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ymax_n64,
         { "Maximum Y Dimension",    "ndps.ymax_n64",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Maximum Y Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_edge_value,
         { "Edge Value",    "ndps.ndps_edge_value",
           FT_UINT32,    BASE_HEX,   VALS(ndps_edge_value_enum),   0x0,
-          "Edge Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_cardinal_or_oid,
         { "Cardinal or OID",    "ndps.ndps_car_or_oid",
           FT_UINT32,    BASE_HEX,   VALS(ndps_card_or_oid_enum),   0x0,
-          "Cardinal or OID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_cardinal_name_or_oid,
         { "Cardinal Name or OID",    "ndps.ndps_car_name_or_oid",
           FT_UINT32,    BASE_HEX,   VALS(ndps_card_name_or_oid_enum),   0x0,
-          "Cardinal Name or OID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_integer_or_oid,
         { "Integer or OID",    "ndps.ndps_integer_or_oid",
           FT_UINT32,    BASE_HEX,   VALS(ndps_integer_or_oid_enum),   0x0,
-          "Integer or OID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_profile_id,
         { "Profile ID",    "ndps.ndps_profile_id",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Profile ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_persistence,
         { "Persistence",    "ndps.ndps_persistence",
           FT_UINT32,    BASE_HEX,   VALS(ndps_persistence_enum),   0x0,
-          "Persistence", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_language_count,
         { "Number of Languages",    "ndps.ndps_language_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Languages", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_language_id,
         { "Language ID",    "ndps.ndps_lang_id",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Language ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_address_type,
         { "Address Type",    "ndps.ndps_address_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_address_type_enum),   0x0,
-          "Address Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_address,
         { "Address",    "ndps.ndps_address",
           FT_UINT32,    BASE_HEX,   VALS(ndps_address_enum),   0x0,
-          "Address", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_add_bytes,
         { "Address Bytes",    "ndps.add_bytes",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Address Bytes", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_event_type,
         { "Event Type",    "ndps.ndps_event_type",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Event Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_event_object_identifier,
         { "Event Object Type",    "ndps.ndps_event_object_identifier",
           FT_UINT32,    BASE_HEX,   VALS(ndps_event_object_enum),   0x0,
-          "Event Object Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_octet_string,
         { "Octet String",    "ndps.octet_string",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Octet String", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_scope,
         { "Scope",    "ndps.scope",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Scope", HFILL }},
+          NULL, HFILL }},
 
         { &hf_address_len,
         { "Address Length",    "ndps.addr_len",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Address Length", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_net,
         { "IPX Network",    "ndps.net",
@@ -8913,442 +8913,442 @@ proto_register_ndps(void)
         { &hf_ndps_node,
         { "Node",    "ndps.node",
           FT_ETHER,    BASE_NONE,   NULL,   0x0,
-          "Node", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_socket,
         { "IPX Socket",    "ndps.socket",
           FT_UINT16,    BASE_HEX,   NULL,   0x0,
-          "IPX Socket", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_port,
         { "IP Port",    "ndps.port",
           FT_UINT16,    BASE_DEC,   NULL,   0x0,
-          "IP Port", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ip,
         { "IP Address",    "ndps.ip",
-          FT_IPv4,    BASE_DEC,   NULL,   0x0,
-          "IP Address", HFILL }},
+          FT_IPv4,    BASE_NONE,   NULL,   0x0,
+          NULL, HFILL }},
 
         { &hf_ndps_server_type,
         { "NDPS Server Type",    "ndps.ndps_server_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_server_type_enum),   0x0,
-          "NDPS Server Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_services,
         { "Number of Services",    "ndps.ndps_num_services",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Services", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_service_type,
         { "NDPS Service Type",    "ndps.ndps_service_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_service_type_enum),   0x0,
-          "NDPS Service Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_service_enabled,
         { "Service Enabled?",    "ndps.ndps_service_enabled",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Service Enabled?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_method_name,
         { "Method Name",    "ndps.method_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Method Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_method_ver,
         { "Method Version",    "ndps.method_ver",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Method Version", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_file_name,
         { "File Name",    "ndps.file_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "File Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_admin_submit,
         { "Admin Submit Flag?",    "ndps.admin_submit_flag",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Admin Submit Flag?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_oid,
         { "Object ID",    "ndps.oid",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Object ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_object_op,
         { "Operation",    "ndps.ndps_object_op",
           FT_UINT32,    BASE_HEX,   VALS(ndps_object_op_enum),   0x0,
-          "Operation", HFILL }},
+          NULL, HFILL }},
 
         { &hf_answer_time,
         { "Answer Time",    "ndps.answer_time",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Answer Time", HFILL }},
+          NULL, HFILL }},
 
         { &hf_oid_asn1_type,
         { "ASN.1 Type",    "ndps.asn1_type",
           FT_UINT16,    BASE_DEC,   NULL,   0x0,
-          "ASN.1 Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_item_ptr,
         { "Item Pointer",    "ndps.item_ptr",
-          FT_BYTES,    BASE_DEC,   NULL,   0x0,
-          "Item Pointer", HFILL }},
+          FT_BYTES,    BASE_NONE,   NULL,   0x0,
+          NULL, HFILL }},
 
         { &hf_ndps_len,
         { "Length",    "ndps.ndps_len",
           FT_UINT16,    BASE_DEC,   NULL,   0x0,
-          "Length", HFILL }},
+          NULL, HFILL }},
 
         { &hf_limit_enc,
         { "Limit Encountered",    "ndps.ndps_limit_enc",
           FT_UINT32,    BASE_HEX,   VALS(ndps_limit_enc_enum),   0x0,
-          "Limit Encountered", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_delivery_add_count,
         { "Number of Delivery Addresses",    "ndps.delivery_add_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Delivery Addresses", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_delivery_add_type,
         { "Delivery Address Type",    "ndps.ndps_delivery_add_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_delivery_add_enum),   0x0,
-          "Delivery Address Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_criterion_type,
         { "Criterion Type",    "ndps.ndps_criterion_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_attribute_enum),   0x0,
-          "Criterion Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_ignored_attributes,
         { "Number of Ignored Attributes",    "ndps.num_ignored_attributes",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Ignored Attributes", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ignored_type,
         { "Ignored Type",    "ndps.ndps_ignored_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_attribute_enum),   0x0,
-          "Ignored Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_resources,
         { "Number of Resources",    "ndps.ndps_num_resources",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Resources", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_resource_type,
         { "Resource Type",    "ndps.ndps_resource_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_resource_enum),   0x0,
-          "Resource Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_identifier_type,
         { "Identifier Type",    "ndps.ndps_identifier_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_identifier_enum),   0x0,
-          "Identifier Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_page_flag,
         { "Page Flag",    "ndps.ndps_page_flag",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Page Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_media_type,
         { "Media Type",    "ndps.ndps_media_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_media_enum),   0x0,
-          "Media Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_page_size,
         { "Page Size",    "ndps.ndps_page_size",
           FT_UINT32,    BASE_HEX,   VALS(ndps_page_size_enum),   0x0,
-          "Page Size", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_direction,
         { "Direction",    "ndps.ndps_direction",
           FT_UINT32,    BASE_HEX,   VALS(ndps_pres_direction_enum),   0x0,
-          "Direction", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_page_order,
         { "Page Order",    "ndps.ndps_page_order",
           FT_UINT32,    BASE_HEX,   VALS(ndps_page_order_enum),   0x0,
-          "Page Order", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_medium_size,
         { "Medium Size",    "ndps.ndps_medium_size",
           FT_UINT32,    BASE_HEX,   VALS(ndps_medium_size_enum),   0x0,
-          "Medium Size", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_long_edge_feeds,
         { "Long Edge Feeds?",    "ndps.ndps_long_edge_feeds",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Long Edge Feeds?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_inc_across_feed,
         { "Increment Across Feed",    "ndps.inc_across_feed",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Increment Across Feed", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_size_inc_in_feed,
         { "Size Increment in Feed",    "ndps.size_inc_in_feed",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Size Increment in Feed", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_page_orientation,
         { "Page Orientation",    "ndps.ndps_page_orientation",
           FT_UINT32,    BASE_HEX,   VALS(ndps_page_orientation_enum),   0x0,
-          "Page Orientation", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_numbers_up,
         { "Numbers Up",    "ndps.ndps_numbers_up",
           FT_UINT32,    BASE_HEX,   VALS(ndps_numbers_up_enum),   0x0,
-          "Numbers Up", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_xdimension,
         { "X Dimension",    "ndps.ndps_xdimension",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "X Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ydimension,
         { "Y Dimension",    "ndps.ndps_ydimension",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Y Dimension", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_state_severity,
         { "State Severity",    "ndps.ndps_state_severity",
           FT_UINT32,    BASE_HEX,   VALS(ndps_state_severity_enum),   0x0,
-          "State Severity", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_training,
         { "Training",    "ndps.ndps_training",
           FT_UINT32,    BASE_HEX,   VALS(ndps_training_enum),   0x0,
-          "Training", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_colorant_set,
         { "Colorant Set",    "ndps.ndps_colorant_set",
           FT_UINT32,    BASE_HEX,   VALS(ndps_colorant_set_enum),   0x0,
-          "Colorant Set", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_card_enum_time,
         { "Cardinal, Enum, or Time",    "ndps.ndps_card_enum_time",
           FT_UINT32,    BASE_HEX,   VALS(ndps_card_enum_time_enum),   0x0,
-          "Cardinal, Enum, or Time", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_attrs_arg,
         { "List Attribute Operation",    "ndps.ndps_attrs_arg",
           FT_UINT32,    BASE_HEX,   VALS(ndps_attrs_arg_enum),   0x0,
-          "List Attribute Operation", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_context_len,
         { "Context Length",    "ndps.context_len",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Context Length", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_context,
         { "Context",    "ndps.context",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Context", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_filter,
         { "Filter Type",    "ndps.ndps_filter",
           FT_UINT32,    BASE_HEX,   VALS(ndps_filter_enum),   0x0,
-          "Filter Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_item_filter,
         { "Filter Item Operation",    "ndps.ndps_filter_item",
           FT_UINT32,    BASE_HEX,   VALS(ndps_filter_item_enum),   0x0,
-          "Filter Item Operation", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_substring_match,
         { "Substring Match",    "ndps.ndps_substring_match",
           FT_UINT32,    BASE_HEX,   VALS(ndps_match_criteria_enum),   0x0,
-          "Substring Match", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_time_limit,
         { "Time Limit",    "ndps.ndps_time_limit",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Time Limit", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_count_limit,
         { "Count Limit",    "ndps.ndps_count_limit",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Count Limit", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_operator,
         { "Operator Type",    "ndps.ndps_operator",
           FT_UINT32,    BASE_DEC,   VALS(ndps_operator_enum),   0x0,
-          "Operator Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_password,
         { "Password",    "ndps.password",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Password", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_retrieve_restrictions,
         { "Retrieve Restrictions",    "ndps.ndps_ret_restrict",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Retrieve Restrictions", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_bind_security_option_count,
         { "Number of Bind Security Options",    "ndps.ndps_bind_security_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Bind Security Options", HFILL }},
+          NULL, HFILL }},
 
         { &hf_bind_security,
         { "Bind Security Options",    "ndps.ndps_bind_security",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Bind Security Options", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_max_items,
         { "Maximum Items in List",    "ndps.ndps_max_items",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Maximum Items in List", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_status_flags,
         { "Status Flag",    "ndps.ndps_status_flags",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Status Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_resource_list_type,
         { "Resource Type",    "ndps.ndps_resource_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_resource_type_enum),   0x0,
-          "Resource Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_os_count,
         { "Number of OSes",    "ndps.os_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of OSes", HFILL }},
+          NULL, HFILL }},
 
         { &hf_os_type,
         { "OS Type",    "ndps.os_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_os_type_enum),   0x0,
-          "OS Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_printer_type_count,
         { "Number of Printer Types",    "ndps.printer_type_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Printer Types", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_printer_type,
         { "Printer Type",    "ndps.prn_type",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_printer_manuf,
         { "Printer Manufacturer",    "ndps.prn_manuf",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Manufacturer", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_inf_file_name,
         { "INF File Name",    "ndps.inf_file_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "INF File Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_vendor_dir,
         { "Vendor Directory",    "ndps.vendor_dir",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Vendor Directory", HFILL }},
+          NULL, HFILL }},
 
         { &hf_banner_type,
         { "Banner Type",    "ndps.banner_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_banner_type_enum),   0x0,
-          "Banner Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_font_type,
         { "Font Type",    "ndps.font_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_font_type_enum),   0x0,
-          "Font Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_printer_id,
         { "Printer ID",    "ndps.printer_id",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Printer ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_font_name,
         { "Font Name",    "ndps.font_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Font Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_return_code,
         { "Return Code",    "ndps.ret_code",
           FT_UINT32,    BASE_HEX,   VALS(ndps_error_types),   0x0,
-          "Return Code", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_banner_count,
         { "Number of Banners",    "ndps.banner_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Banners", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_banner_name,
         { "Banner Name",    "ndps.banner_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Banner Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_font_type_count,
         { "Number of Font Types",    "ndps.font_type_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Font Types", HFILL }},
+          NULL, HFILL }},
 
         { &hf_font_type_name,
         { "Font Type Name",    "ndps.font_type_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Font Type Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_font_file_count,
         { "Number of Font Files",    "ndps.font_file_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Font Files", HFILL }},
+          NULL, HFILL }},
 
         { &hf_font_file_name,
         { "Font File Name",    "ndps.font_file_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Font File Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_printer_def_count,
         { "Number of Printer Definitions",    "ndps.printer_def_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Printer Definitions", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_prn_file_name,
         { "Printer File Name",    "ndps.print_file_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer File Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_prn_dir_name,
         { "Printer Directory Name",    "ndps.print_dir_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Directory Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_def_file_name,
         { "Printer Definition Name",    "ndps.print_def_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Printer Definition Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_win31_keys,
         { "Number of Windows 3.1 Keys",    "ndps.num_win31_keys",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Windows 3.1 Keys", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_win95_keys,
         { "Number of Windows 95 Keys",    "ndps.num_win95_keys",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Windows 95 Keys", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_windows_keys,
         { "Number of Windows Keys",    "ndps.num_windows_keys",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Windows Keys", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_windows_key,
         { "Windows Key",    "ndps.windows_key",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Windows Key", HFILL }},
+          NULL, HFILL }},
 
         { &hf_archive_type,
         { "Archive Type",    "ndps.archive_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_archive_enum),   0x0,
-          "Archive Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_archive_file_size,
         { "Archive File Size",    "ndps.archive_size",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Archive File Size", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_segment_overlap,
           { "Segment overlap",	"ndps.segment.overlap", FT_BOOLEAN, BASE_NONE,
@@ -9374,374 +9374,374 @@ proto_register_ndps(void)
 
         { &hf_ndps_segment,
           { "NDPS Fragment",		"ndps.fragment", FT_FRAMENUM, BASE_NONE,
-    		NULL, 0x0, "NDPS Fragment", HFILL }},
+    		NULL, 0x0, NULL, HFILL }},
 
         { &hf_ndps_segments,
           { "NDPS Fragments",	"ndps.fragments", FT_NONE, BASE_NONE,
-    		NULL, 0x0, "NDPS Fragments", HFILL }},
+    		NULL, 0x0, NULL, HFILL }},
 
         { &hf_ndps_data,
           { "[Data]",	"ndps.data", FT_NONE, BASE_NONE,
-    		NULL, 0x0, "[Data]", HFILL }},
+    		NULL, 0x0, NULL, HFILL }},
 
         { &hf_get_status_flag,
         { "Get Status Flag",    "ndps.get_status_flags",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Get Status Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_res_type,
         { "Resource Type",    "ndps.res_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_res_type_enum),   0x0,
-          "Resource Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_file_timestamp,
         { "File Time Stamp",    "ndps.file_time_stamp",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "File Time Stamp", HFILL }},
+          NULL, HFILL }},
 
         { &hf_print_arg,
         { "Print Type",    "ndps.print_arg",
           FT_UINT32,    BASE_DEC,   VALS(ndps_print_arg_enum),   0x0,
-          "Print Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_sub_complete,
           { "Submission Complete?",	"ndps.sub_complete", FT_BOOLEAN, BASE_NONE,
-    		NULL, 0x0, "Submission Complete?", HFILL }},
+    		NULL, 0x0, NULL, HFILL }},
 
         { &hf_doc_content,
         { "Document Content",    "ndps.doc_content",
           FT_UINT32,    BASE_DEC,   VALS(ndps_doc_content_enum),   0x0,
-          "Document Content", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_doc_name,
         { "Document Name",    "ndps.doc_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Document Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_local_id,
         { "Local ID",    "ndps.local_id",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Local ID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_included_doc_len,
         { "Included Document Length",    "ndps.included_doc_len",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Included Document Length", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_included_doc,
         { "Included Document",    "ndps.included_doc",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Included Document", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_ref_name,
         { "Referenced Document Name",    "ndps.ref_doc_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Referenced Document Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_interrupt_job_type,
         { "Interrupt Job Identifier",    "ndps.interrupt_job_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_interrupt_job_enum),   0x0,
-          "Interrupt Job Identifier", HFILL }},
+          NULL, HFILL }},
 
         { &hf_pause_job_type,
         { "Pause Job Identifier",    "ndps.pause_job_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_pause_job_enum),   0x0,
-          "Pause Job Identifier", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_force,
         { "Force?",    "ndps.ndps_force",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Force?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_resubmit_op_type,
         { "Resubmit Operation Type",    "ndps.resubmit_op_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_resubmit_op_enum),   0x0,
-          "Resubmit Operation Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_shutdown_type,
         { "Shutdown Type",    "ndps.shutdown_type",
           FT_UINT32,    BASE_DEC,   VALS(ndps_shutdown_enum),   0x0,
-          "Shutdown Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_supplier_flag,
         { "Supplier Data?",    "ndps.supplier_flag",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Supplier Data?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_language_flag,
         { "Language Data?",    "ndps.language_flag",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Language Data?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_method_flag,
         { "Method Data?",    "ndps.method_flag",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Method Data?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_delivery_address_flag,
         { "Delivery Address Data?",    "ndps.delivery_flag",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Delivery Address Data?", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_list_profiles_type,
         { "List Profiles Type",    "ndps.ndps_list_profiles_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_attrs_arg_enum),   0x0,
-          "List Profiles Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_list_profiles_choice_type,
         { "List Profiles Choice Type",    "ndps.ndps_list_profiles_choice_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_list_profiles_choice_enum),   0x0,
-          "List Profiles Choice Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_list_profiles_result_type,
         { "List Profiles Result Type",    "ndps.ndps_list_profiles_result_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_list_profiles_result_enum),   0x0,
-          "List Profiles Result Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_integer_type_flag,
         { "Integer Type Flag",    "ndps.ndps_integer_type_flag",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Integer Type Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_integer_type_value,
         { "Integer Type Value",    "ndps.ndps_integer_type_value",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Integer Type Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_continuation_option,
         { "Continuation Option",    "ndps.ndps_continuation_option",
-          FT_BYTES,    BASE_HEX,   NULL,   0x0,
-          "Continuation Option", HFILL }},
+          FT_BYTES,    BASE_NONE,   NULL,   0x0,
+          NULL, HFILL }},
 
         { &hf_ndps_ds_info_type,
         { "DS Info Type",    "ndps.ndps_ds_info_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_ds_info_enum),   0x0,
-          "DS Info Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_guid,
         { "GUID",    "ndps.guid",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "GUID", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_list_services_type,
         { "Services Type",    "ndps.ndps_list_services_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_list_services_enum),   0x0,
-          "Services Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_item_bytes,
         { "Item Ptr",    "ndps.item_bytes",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Item Ptr", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_certified,
         { "Certified",    "ndps.certified",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Certified", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_attribute_set,
         { "Attribute Set",    "ndps.attribute_set",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Attribute Set", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_data_item_type,
         { "Item Type",    "ndps.ndps_data_item_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_data_item_enum),   0x0,
-          "Item Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_int,
         { "Integer Value",    "ndps.info_int",
           FT_UINT8,    BASE_HEX,   NULL,   0x0,
-          "Integer Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_int16,
         { "16 Bit Integer Value",    "ndps.info_int16",
           FT_UINT16,    BASE_HEX,   NULL,   0x0,
-          "16 Bit Integer Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_int32,
         { "32 Bit Integer Value",    "ndps.info_int32",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "32 Bit Integer Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_boolean,
         { "Boolean Value",    "ndps.info_boolean",
           FT_BOOLEAN,    BASE_NONE,   NULL,   0x0,
-          "Boolean Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_string,
         { "String Value",    "ndps.info_string",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "String Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_info_bytes,
         { "Byte Value",    "ndps.info_bytes",
           FT_BYTES,    BASE_NONE,   NULL,   0x0,
-          "Byte Value", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_list_local_servers_type,
         { "Server Type",    "ndps.ndps_list_local_server_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_list_local_servers_enum),   0x0,
-          "Server Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_registry_name,
         { "Registry Name",    "ndps.registry_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Registry Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_client_server_type,
         { "Client/Server Type",    "ndps.ndps_client_server_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_client_server_enum),   0x0,
-          "Client/Server Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_session_type,
         { "Session Type",    "ndps.ndps_session_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_session_type_enum),   0x0,
-          "Session Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_time,
         { "Time",    "ndps.time",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Time", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_supplier_name,
         { "Supplier Name",    "ndps.supplier_name",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Supplier Name", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_message,
         { "Message",    "ndps.message",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Message", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_delivery_method_count,
         { "Number of Delivery Methods",    "ndps.delivery_method_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Delivery Methods", HFILL }},
+          NULL, HFILL }},
 
         { &hf_delivery_method_type,
         { "Delivery Method Type",    "ndps.delivery_method_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_delivery_method_enum),   0x0,
-          "Delivery Method Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_get_session_type,
         { "Session Type",    "ndps.ndps_get_session_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_get_session_type_enum),   0x0,
-          "Session Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_packet_count,
         { "Packet Count",    "ndps.packet_count",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Packet Count", HFILL }},
+          NULL, HFILL }},
 
         { &hf_last_packet_flag,
         { "Last Packet Flag",    "ndps.last_packet_flag",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Last Packet Flag", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_get_resman_session_type,
         { "Session Type",    "ndps.ndps_get_resman_session_type",
           FT_UINT32,    BASE_HEX,   VALS(ndps_get_resman_session_type_enum),   0x0,
-          "Session Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_problem_type,
         { "Problem Type",    "ndps.ndps_get_resman_session_type",
           FT_UINT32,    BASE_HEX,   VALS(problem_type_enum),   0x0,
-          "Problem Type", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_num_values,
         { "Number of Values",    "ndps.num_values",
           FT_UINT32,    BASE_DEC,   NULL,   0x0,
-          "Number of Values", HFILL }},
+          NULL, HFILL }},
 
         { &hf_ndps_object_ids_7,
         { "Object ID Definition",    "ndps.objectid_def7",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_8,
         { "Object ID Definition",    "ndps.objectid_def8",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_9,
         { "Object ID Definition",    "ndps.objectid_def9",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_10,
         { "Object ID Definition",    "ndps.objectid_def10",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_11,
         { "Object ID Definition",    "ndps.objectid_def11",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_12,
         { "Object ID Definition",    "ndps.objectid_def12",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_13,
         { "Object ID Definition",    "ndps.objectid_def13",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_14,
         { "Object ID Definition",    "ndps.objectid_def14",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_15,
         { "Object ID Definition",    "ndps.objectid_def15",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_object_ids_16,
         { "Object ID Definition",    "ndps.objectid_def16",
-          FT_NONE,    BASE_HEX,   NULL,
-          0x0, "Object ID Definition", HFILL }},
+          FT_NONE,    BASE_NONE,   NULL,
+          0x0, NULL, HFILL }},
 
         { &hf_ndps_attribute_time,
         { "Time",    "ndps.attribute_time",
-          FT_ABSOLUTE_TIME,    BASE_DEC,   NULL,   0x0,
-          "Time", HFILL }},
+          FT_ABSOLUTE_TIME,    BASE_NONE,   NULL,   0x0,
+          NULL, HFILL }},
 
         { &hf_print_security,
         { "Printer Security",    "ndps.print_security",
           FT_UINT32,    BASE_HEX,   VALS(ndps_print_security),   0x0,
-          "Printer Security", HFILL }},
+          NULL, HFILL }},
 
         { &hf_notify_time_interval,
         { "Notify Time Interval",    "ndps.notify_time_interval",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Notify Time Interval", HFILL }},
+          NULL, HFILL }},
 
         { &hf_notify_sequence_number,
         { "Notify Sequence Number",    "ndps.notify_seq_number",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Notify Sequence Number", HFILL }},
+          NULL, HFILL }},
 
         { &hf_notify_lease_exp_time,
         { "Notify Lease Expiration Time",    "ndps.notify_lease_exp_time",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Notify Lease Expiration Time", HFILL }},
+          NULL, HFILL }},
 
         { &hf_notify_printer_uri,
         { "Notify Printer URI",    "ndps.notify_printer_uri",
           FT_STRING,    BASE_NONE,   NULL,   0x0,
-          "Notify Printer URI", HFILL }},
+          NULL, HFILL }},
 
         { &hf_level,
         { "Level",    "ndps.level",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Level", HFILL }},
+          NULL, HFILL }},
 
         { &hf_interval,
         { "Interval",    "ndps.interval",
           FT_UINT32,    BASE_HEX,   NULL,   0x0,
-          "Interval", HFILL }},
+          NULL, HFILL }},
     };
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-netbios.c b/epan/dissectors/packet-netbios.c
index 74f7b4bf16..465966e7ea 100644
--- a/epan/dissectors/packet-netbios.c
+++ b/epan/dissectors/packet-netbios.c
@@ -1274,99 +1274,99 @@ void proto_register_netbios(void)
 	static hf_register_info hf_netb[] = {
 		{ &hf_netb_cmd,
 		{ "Command", "netbios.command", FT_UINT8, BASE_HEX, VALS(cmd_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_hdr_len,
 		{ "Header Length", "netbios.hdr_len", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_xmit_corrl,
 		{ "Transmit Correlator", "netbios.xmit_corrl", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_resp_corrl,
 		{ "Response Correlator", "netbios.resp_corrl", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_call_name_type,
 		{ "Caller's Name Type", "netbios.call_name_type", FT_UINT8, BASE_HEX, VALS(name_types), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_nb_name_type,
 		{ "NetBIOS Name Type", "netbios.nb_name_type", FT_UINT8, BASE_HEX, VALS(nb_name_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_nb_name,
 		{ "NetBIOS Name", "netbios.nb_name", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_ack,
 		{ "Acknowledge", "netbios.ack", FT_BOOLEAN, 8, TFS( &tfs_set_notset), 0x08,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_ack_with_data,
 		{ "Acknowledge with data", "netbios.ack_with_data", FT_BOOLEAN, 8, TFS( &flags_allowed), 0x04,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_ack_expected,
 		{ "Acknowledge expected", "netbios.ack_expected", FT_BOOLEAN,  8,
-			TFS( &tfs_yes_no), 0x02, "", HFILL }},
+			TFS( &tfs_yes_no), 0x02, NULL, HFILL }},
 
 		{ &hf_netb_recv_cont_req,
 		{ "RECEIVE_CONTINUE requested", "netbios.recv_cont_req", FT_BOOLEAN,  8,
-			TFS( &tfs_yes_no), 0x01, "", HFILL }},
+			TFS( &tfs_yes_no), 0x01, NULL, HFILL }},
 
 		{ &hf_netb_send_no_ack,
 		{ "Handle SEND.NO.ACK", "netbios.send_no_ack", FT_BOOLEAN,  8,
-			TFS( &tfs_yes_no), 0x80, "", HFILL }},
+			TFS( &tfs_yes_no), 0x80, NULL, HFILL }},
 
 		{ &hf_netb_version,
 		{ "NetBIOS Version", "netbios.version", FT_BOOLEAN,  8,
-			TFS( &netb_version_str), 0x01, "", HFILL }},
+			TFS( &netb_version_str), 0x01, NULL, HFILL }},
 
 		{ &hf_netb_largest_frame,
 		{ "Largest Frame", "netbios.largest_frame", FT_UINT8, BASE_DEC, VALS(max_frame_size_vals), 0x0E,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_status_buffer_len,
 		{ "Length of status buffer", "netbios.status_buffer_len", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_status,
 		{ "Status", "netbios.status", FT_UINT8, BASE_DEC, VALS(status_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_name_type,
 		{ "Name type", "netbios.name_type", FT_UINT16, BASE_DEC, VALS(name_types), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_max_data_recv_size,
 		{ "Maximum data receive size", "netbios.max_data_recv_size", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_termination_indicator,
 		{ "Termination indicator", "netbios.termination_indicator", FT_UINT16, BASE_HEX, VALS(termination_indicator_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_num_data_bytes_accepted,
 		{ "Number of data bytes accepted", "netbios.num_data_bytes_accepted", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_local_ses_no,
 		{ "Local Session No.", "netbios.local_session", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_remote_ses_no,
 		{ "Remote Session No.", "netbios.remote_session", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_data1,
 		{ "DATA1 value", "netbios.data1", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_data2,
 		{ "DATA2 value", "netbios.data2", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_netb_fragment_overlap,
 		{ "Fragment overlap",	"netbios.fragment.overlap", FT_BOOLEAN, BASE_NONE,
@@ -1392,11 +1392,11 @@ void proto_register_netbios(void)
 
 		{ &hf_netb_fragment,
 		{ "NetBIOS Fragment",		"netbios.fragment", FT_FRAMENUM, BASE_NONE,
-			NULL, 0x0, "NetBIOS Fragment", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_netb_fragments,
 		{ "NetBIOS Fragments",	"netbios.fragments", FT_NONE, BASE_NONE,
-			NULL, 0x0, "NetBIOS Fragments", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 	};
 	module_t *netbios_module;
 
diff --git a/epan/dissectors/packet-netdump.c b/epan/dissectors/packet-netdump.c
index 58fa00e7f8..834ac19b49 100644
--- a/epan/dissectors/packet-netdump.c
+++ b/epan/dissectors/packet-netdump.c
@@ -184,7 +184,7 @@ void proto_register_netdump(void)
 		},
 		{ &hf_netdump_payload,
 			{"Netdump payload", "netdump.payload",
-			FT_BYTES, BASE_HEX,
+			FT_BYTES, BASE_NONE,
 			NULL, 0x0,
 			NULL, HFILL}
 		},
diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c
index 0e027238e6..7f88fe1a27 100644
--- a/epan/dissectors/packet-netflow.c
+++ b/epan/dissectors/packet-netflow.c
@@ -3432,7 +3432,7 @@ proto_register_netflow(void)
 		{&hf_cflow_flowset_id,
 		 {"FlowSet Id", "cflow.flowset_id",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "FlowSet Id", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_data_flowset_id,
 		 {"Data FlowSet (Template Id)", "cflow.data_flowset_id",
@@ -3447,12 +3447,12 @@ proto_register_netflow(void)
 		{&hf_cflow_options_flowset_id,
 		 {"Options FlowSet", "cflow.options_flowset_id",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Options FlowSet", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_template_flowset_id,
 		 {"Template FlowSet", "cflow.template_flowset_id",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Template FlowSet", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_flowset_length,
 		 {"FlowSet Length", "cflow.flowset_length",
@@ -3462,7 +3462,7 @@ proto_register_netflow(void)
 		{&hf_cflow_template_id,
 		 {"Template Id", "cflow.template_id",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Template Id", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_template_field_count,
 		 {"Field Count", "cflow.template_field_count",
@@ -3514,22 +3514,22 @@ proto_register_netflow(void)
 		{&hf_cflow_sampling_interval,
 		 {"Sampling interval", "cflow.sampling_interval",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Sampling interval", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_sampling_algorithm,
 		 {"Sampling algorithm", "cflow.sampling_algorithm",
 		  FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "Sampling algorithm", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_flow_active_timeout,
 		 {"Flow active timeout", "cflow.flow_active_timeout",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Flow active timeout", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_flow_inactive_timeout,
 		 {"Flow inactive timeout", "cflow.flow_inactive_timeout",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Flow inactive timeout", HFILL}
+		  NULL, HFILL}
 		},
 
 		/*
@@ -3673,7 +3673,7 @@ proto_register_netflow(void)
 		{&hf_cflow_tcpflags,
 		 {"TCP Flags", "cflow.tcpflags",
 		  FT_UINT8, BASE_HEX, NULL, 0x0,
-		  "TCP Flags", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_srcas,
 		 {"SrcAS", "cflow.srcas",
@@ -3726,7 +3726,7 @@ proto_register_netflow(void)
 		  "Octets exported", HFILL}
 		 },
 		{&hf_cflow_octets_exp64,
-		 {"OctetsExp ", "cflow.octetsexp",
+		 {"OctetsExp", "cflow.octetsexp",
 		  FT_UINT64, BASE_DEC, NULL, 0x0,
 		  "Octets exported", HFILL}
 		 },
@@ -3741,12 +3741,12 @@ proto_register_netflow(void)
 		  "Packets exported", HFILL}
 		 },
 		{&hf_cflow_flows_exp,
-		 {"FlowsExp  ", "cflow.flowsexp",
+		 {"FlowsExp", "cflow.flowsexp",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
 		  "Flows exported", HFILL}
 		},
 		{&hf_cflow_flows_exp64,
-		 {"FlowsExp  ", "cflow.flowsexp",
+		 {"FlowsExp", "cflow.flowsexp",
 		  FT_UINT64, BASE_DEC, NULL, 0x0,
 		  "Flows exported", HFILL}
 		},
@@ -3802,27 +3802,27 @@ proto_register_netflow(void)
 		 },
 		{&hf_cflow_ip_version ,
 		 {"IPVersion", "cflow.ip_version",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "IP Version", HFILL}
 		 },
 		{&hf_cflow_direction ,
 		 {"Direction", "cflow.direction",
 		  FT_UINT8, BASE_DEC, VALS(v9_direction), 0x0,
-		  "Direction", HFILL}
+		  NULL, HFILL}
 		 },
 		{&hf_cflow_if_name ,
 		 {"IfName", "cflow.if_name",
-		  FT_STRINGZ/*FT_BYTES*/, BASE_HEX, NULL, 0x0,
+		  FT_STRINGZ/*FT_BYTES*/, BASE_NONE, NULL, 0x0,
 		  "SNMP Interface Name", HFILL}
 		 },
 		{&hf_cflow_if_descr ,
 		 {"IfDescr", "cflow.if_descr",
-		  FT_STRINGZ/*FT_BYTES*/, BASE_HEX, NULL, 0x0,
+		  FT_STRINGZ/*FT_BYTES*/, BASE_NONE, NULL, 0x0,
 		  "SNMP Interface Description", HFILL}
 		 },
 		{&hf_cflow_sampler_name ,
 		 {"SamplerName", "cflow.sampler_name",
-		  FT_STRINGZ/*FT_BYTES*/, BASE_HEX, NULL, 0x0,
+		  FT_STRINGZ/*FT_BYTES*/, BASE_NONE, NULL, 0x0,
 		  "Sampler Name", HFILL}
 		 },
 		{&hf_cflow_forwarding_status ,
@@ -3847,7 +3847,7 @@ proto_register_netflow(void)
 		 },
 		{&hf_cflow_flow_exporter,
 		 {"FlowExporter", "cflow.flow_exporter",
-		  FT_BYTES/*FT_IPv4*/, BASE_HEX, NULL, 0x0,
+		  FT_BYTES/*FT_IPv4*/, BASE_NONE, NULL, 0x0,
 		  "Flow Exporter", HFILL}
 		 },
 		{&hf_cflow_icmp_ipv4_type,
@@ -3896,7 +3896,7 @@ proto_register_netflow(void)
 		  "IP DSCP", HFILL}
 		},
 		{&hf_cflow_octets_squared64,
-		 {"OctetsSquared  ", "cflow.octets_squared",
+		 {"OctetsSquared", "cflow.octets_squared",
 		  FT_UINT64, BASE_DEC, NULL, 0x0,
 		  "Octets Squared", HFILL}
 		},
@@ -3913,21 +3913,21 @@ proto_register_netflow(void)
 		{&hf_cflow_ip_header_words,
 		 {"IPHeaderLen", "cflow.ip_header_words",
 		  FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "IPHeaderLen", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_option_map,
 		 {"OptionMap", "cflow.option_map",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Option Map", HFILL}
 		},
 		{&hf_cflow_section_header ,
 		 {"SectionHeader", "cflow.section_header",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Header of Packet", HFILL}
 		 },
 		{&hf_cflow_section_payload ,
 		 {"SectionPayload", "cflow.section_payload",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Payload of Packet", HFILL}
 		 },
 		/* IPFIX Information Elements */
@@ -3969,46 +3969,46 @@ proto_register_netflow(void)
 		{&hf_cflow_srcmac,
 		 {"Source Mac Address", "cflow.srcmac",
 		  FT_ETHER, BASE_DEC, NULL, 0x0,
-		  "Source Mac Address", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_post_dstmac,
 		 {"Post Destination Mac Address", "cflow.post_dstmac",
 		  FT_ETHER, BASE_DEC, NULL, 0x0,
-		  "Post Destination Mac Address", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_vlanid,
 		 {"Vlan Id", "cflow.vlanid",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Vlan Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_post_vlanid,
 		 {"Post Vlan Id", "cflow.post_vlanid",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Post Vlan Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_ipv6_exthdr,
 		 {"IPv6 Extension Headers", "cflow.ipv6_exthdr",
 		  FT_UINT32, BASE_HEX, NULL, 0x0,
-		  "IPv6 Extension Headers", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_dstmac,
 		 {"Destination Mac Address", "cflow.dstmac",
 		  FT_ETHER, BASE_DEC, NULL, 0x0,
-		  "Destination Mac Address", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_post_srcmac,
 		 {"Post Source Mac Address", "cflow.post_srcmac",
 		  FT_ETHER, BASE_DEC, NULL, 0x0,
-		  "Post Source Mac Address", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_fragment_offset,
 		 {"Fragment Offset", "cflow.fragment_offset",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Fragment Offset", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_mpls_vpn_rd,
 		 {"MPLS VPN RD", "cflow.mpls_vpn_rd",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "MPLS VPN Route Distinguisher", HFILL}
 		},
 		{&hf_cflow_exporter_addr,
@@ -4044,17 +4044,17 @@ proto_register_netflow(void)
 		{&hf_cflow_flow_end_reason,
 		 {"Flow End Reason", "cflow.flow_end_reason",
 		  FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "Flow End Reason", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_common_properties_id,
 		 {"Common Properties Id", "cflow.common_properties_id",
 		  FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "Common Properties Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_observation_point_id,
 		 {"Observation Point Id", "cflow.observation_point_id",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Observation Point Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_mpls_pe_addr_v6,
 		 {"TopLabelAddr", "cflow.toplabeladdr",
@@ -4064,27 +4064,27 @@ proto_register_netflow(void)
 		{&hf_cflow_port_id,
 		 {"Port Id", "cflow.port_id",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Port Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_mp_id,
 		 {"Metering Process Id", "cflow.mp_id",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "Metering Process Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_wlan_channel_id,
 		 {"Wireless LAN Channel Id", "cflow.wlan_channel_id",
 		  FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "Wireless LAN Channel Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_wlan_ssid,
 		 {"Wireless LAN SSId", "cflow.wlan_ssid",
 		  FT_STRING, BASE_NONE, NULL, 0x0,
-		  "Wireless LAN SSId", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_flow_id,
 		 {"Flow Id", "cflow.flow_id",
 		  FT_UINT64, BASE_DEC, NULL, 0x0,
-		  "Flow Id", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_od_id,
 		 {"Observation Domain Id", "cflow.od_id",
@@ -4209,17 +4209,17 @@ proto_register_netflow(void)
 		{&hf_cflow_tcp_seq_num,
 		 {"TCP Sequence Number", "cflow.tcp_seq_num",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "TCP Sequence Number", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_tcp_ack_num,
 		 {"TCP Acknowledgement Number", "cflow.tcp_seq_num",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "TCP Acknowledgement Number", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_tcp_urg_ptr,
 		 {"TCP Urgent Pointer", "cflow.tcp_urg_ptr",
 		  FT_UINT32, BASE_DEC, NULL, 0x0,
-		  "TCP Urgent Pointer", HFILL}
+		  NULL, HFILL}
 		},
 		{&hf_cflow_tcp_header_length,
 		 {"TCP Header Length", "cflow.tcp_header_length",
@@ -4278,7 +4278,7 @@ proto_register_netflow(void)
 		},
 		{&hf_cflow_tcp_option_map,
 		 {"TCP OptionMap", "cflow.tcp_option_map",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "TCP Option Map", HFILL}
 		},
 		{&hf_cflow_collector_addr,
@@ -4354,14 +4354,14 @@ proto_register_netflow(void)
 		{&hf_cflow_biflow_direction,
 		 {"Biflow Direction", "cflow.biflow_direction",
 		  FT_UINT8, BASE_DEC, NULL, 0x0,
-		  "Biflow Direction", HFILL}
+		  NULL, HFILL}
 		},
 		/*
 		 * end pdu content storage
 		 */
 		{&hf_cflow_scope_system ,
 		 {"ScopeSystem", "cflow.scope_system",
-		  FT_IPv4, BASE_HEX, NULL, 0x0,
+		  FT_IPv4, BASE_NONE, NULL, 0x0,
 		  "Option Scope System", HFILL}
 		 },
 		{&hf_cflow_scope_interface ,
@@ -4371,17 +4371,17 @@ proto_register_netflow(void)
 		 },
 		{&hf_cflow_scope_linecard ,
 		 {"ScopeLinecard", "cflow.scope_linecard",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Option Scope Linecard", HFILL}
 		 },
 		{&hf_cflow_scope_cache ,
 		 {"ScopeCache", "cflow.scope_cache",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Option Scope Cache", HFILL}
 		 },
 		{&hf_cflow_scope_template ,
 		 {"ScopeTemplate", "cflow.scope_template",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Option Scope Template", HFILL}
 		 },
 		/* IPFIX */
@@ -4398,7 +4398,7 @@ proto_register_netflow(void)
 		},
 		{&hf_cflow_scope_unknown ,
 		 {"Scope Unknown", "cflow.scope",
-		  FT_BYTES, BASE_HEX, NULL, 0x0,
+		  FT_BYTES, BASE_NONE, NULL, 0x0,
 		  "Option Scope Unknown", HFILL}
 		 },
 
@@ -4407,25 +4407,25 @@ proto_register_netflow(void)
 		/* CACE Technologies, 32622 / 0 */
 		{&hf_pie_cace_local_ipv4_address,
 		 {"Local IPv4 Address", "cflow.pie.cace.localaddr4",
-		  FT_IPv4, BASE_HEX, NULL, 0x0,
+		  FT_IPv4, BASE_NONE, NULL, 0x0,
 		  "Local IPv4 Address (caceLocalIPv4Address)", HFILL}
 		},
 		/* CACE Technologies, 32622 / 1 */
 		{&hf_pie_cace_remote_ipv4_address,
 		 {"Remote IPv4 Address", "cflow.pie.cace.remoteaddr4",
-		  FT_IPv4, BASE_HEX, NULL, 0x0,
+		  FT_IPv4, BASE_NONE, NULL, 0x0,
 		  "Remote IPv4 Address (caceRemoteIPv4Address)", HFILL}
 		},
 		/* CACE Technologies, 32622 / 2 */
 		{&hf_pie_cace_local_ipv6_address,
 		 {"Local IPv6 Address", "cflow.pie.cace.localaddr6",
-		  FT_IPv6, BASE_HEX, NULL, 0x0,
+		  FT_IPv6, BASE_NONE, NULL, 0x0,
 		  "Local IPv6 Address (caceLocalIPv6Address)", HFILL}
 		},
 		/* CACE Technologies, 32622 / 3 */
 		{&hf_pie_cace_remote_ipv6_address,
 		 {"Remote IPv6 Address", "cflow.pie.cace.remoteaddr6",
-		  FT_IPv6, BASE_HEX, NULL, 0x0,
+		  FT_IPv6, BASE_NONE, NULL, 0x0,
 		  "Remote IPv6 Address (caceRemoteIPv6Address)", HFILL}
 		},
 		/* CACE Technologies, 32622 / 4 */
diff --git a/epan/dissectors/packet-netsync.c b/epan/dissectors/packet-netsync.c
index 068c124c05..a5685eb350 100644
--- a/epan/dissectors/packet-netsync.c
+++ b/epan/dissectors/packet-netsync.c
@@ -594,152 +594,152 @@ proto_register_netsync(void)
 		{ &hf_netsync_version,
 			{ "Version", "netsync.version",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Version", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_command,
 			{ "Command", "netsync.command",
 			  FT_UINT8, BASE_HEX, VALS(netsync_cmd_vals), 0x0,
-			  "Command", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_size,
 			{ "Size", "netsync.size",
 			  FT_UINT32, BASE_DEC, NULL, 0x0,
-			  "Size", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_data,
 			{ "Data", "netsync.data",
-			  FT_BYTES, BASE_HEX, NULL, 0x0,
-			  "Data", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_checksum,
 			{ "Checksum", "netsync.checksum",
 			  FT_UINT32, BASE_HEX, NULL, 0x0,
-			  "Checksum", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_hello_keyname,
 			{ "Key Name", "netsync.cmd.hello.keyname",
-			  FT_STRING, BASE_HEX, NULL, 0x0,
-			  "Key Name", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_hello_key,
 			{ "Key", "netsync.cmd.hello.key",
-			  FT_BYTES, BASE_HEX, NULL, 0x0,
-			  "Key", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_nonce,
 			{ "Nonce", "netsync.cmd.nonce",
-			  FT_BYTES, BASE_HEX, NULL, 0x0,
-			  "Nonce", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_anonymous_role,
 			{ "Role", "netsync.cmd.anonymous.role",
 			  FT_UINT8, BASE_DEC, VALS(netsync_role_vals), 0x0,
-			  "Role", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_anonymous_collection,
 			{ "Collection", "netsync.cmd.anonymous.collection",
-			  FT_STRING, BASE_DEC, NULL, 0x0,
-			  "Collection", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_confirm_sig,
 			{ "Signature", "netsync.cmd.confirm.signature",
-			  FT_BYTES, BASE_HEX, NULL, 0x0,
-			  "Signature", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_send_data_type,
 			{ "Type", "netsync.cmd.send_data.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_send_data_id,
 			{ "ID", "netsync.cmd.send_data.id",
-			  FT_BYTES, BASE_HEX, NULL, 0x0,
-			  "ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_error_msg,
 			{ "Message", "netsync.cmd.error.msg",
-			  FT_STRING, BASE_DEC, NULL, 0x0,
-			  "Message", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 
 		{ &hf_netsync_cmd_done_level,
 			{ "Level", "netsync.cmd.done.level",
 			  FT_UINT32, BASE_DEC, NULL, 0x0,
-			  "Level", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_role,
 			{ "Role", "netsync.cmd.auth.role",
 			  FT_UINT8, BASE_DEC, VALS(netsync_role_vals), 0x0,
-			  "Role", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_collection,
 			{ "Collection", "netsync.cmd.auth.collection",
-			  FT_STRING, BASE_DEC, NULL, 0x0,
-			  "Collection", HFILL } },
+			  FT_STRING, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_id,
 			{ "ID", "netsync.cmd.auth.id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_nonce1,
 			{ "Nonce 1", "netsync.cmd.auth.nonce1",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Nonce 1", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_nonce2,
 			{ "Nonce 2", "netsync.cmd.auth.nonce2",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Nonce 2", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_auth_sig,
 			{ "Signature", "netsync.cmd.auth.sig",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Signature", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_data_type,
 			{ "Type", "netsync.cmd.data.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_data_id,
 			{ "ID", "netsync.cmd.data.id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_data_compressed,
 			{ "Compressed", "netsync.cmd.data.compressed",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Compressed", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_data_payload,
 			{ "Payload", "netsync.cmd.data.payload",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Payload", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_delta_type,
 			{ "Type", "netsync.cmd.delta.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_delta_base_id,
 			{ "Base ID", "netsync.cmd.delta.base_id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Base ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_delta_ident_id,
 			{ "Ident ID", "netsync.cmd.delta.ident_id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Ident ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_delta_compressed,
 			{ "Compressed", "netsync.cmd.delta.compressed",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Compressed", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_delta_payload,
 			{ "Payload", "netsync.cmd.delta.payload",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Payload", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_refine_tree_node,
 			{ "Tree Node", "netsync.cmd.refine.tree_node",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Tree Node", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_send_delta_type,
 			{ "Type", "netsync.cmd.send_delta.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_send_delta_base_id,
 			{ "Base ID", "netsync.cmd.send_delta.base_id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Base ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_send_delta_ident_id,
 			{ "Ident ID", "netsync.cmd.send_delta.ident_id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "Ident ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_nonexistent_id,
 			{ "ID", "netsync.cmd.nonexistent.id",
-			  FT_BYTES, BASE_DEC, NULL, 0x0,
-			  "ID", HFILL } },
+			  FT_BYTES, BASE_NONE, NULL, 0x0,
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_nonexistent_type,
 			{ "Type", "netsync.cmd.nonexistent.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } },
+			  NULL, HFILL } },
 		{ &hf_netsync_cmd_done_type,
 			{ "Type", "netsync.cmd.done.type",
 			  FT_UINT8, BASE_DEC, NULL, 0x0,
-			  "Type", HFILL } }
+			  NULL, HFILL } }
 
 
 	};
diff --git a/epan/dissectors/packet-nfs.c b/epan/dissectors/packet-nfs.c
index a2be4738d0..b994c39d98 100644
--- a/epan/dissectors/packet-nfs.c
+++ b/epan/dissectors/packet-nfs.c
@@ -9771,18 +9771,18 @@ proto_register_nfs(void)
 			NULL, 0, "file handle flag", HFILL }},
 		{ &hf_nfs_fh_endianness, {
 			"endianness", "nfs.fh.endianness", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_endianness), 0, "server native endianness", HFILL }},
+			TFS(&tfs_endianness), 0x0, "server native endianness", HFILL }},
 		{ &hf_nfs_stat, {
 			"Status", "nfs.stat", FT_UINT32, BASE_DEC,
 			VALS(names_nfs_stat), 0, "Reply status", HFILL }},
 		{ &hf_nfs_full_name, {
-			"Full Name", "nfs.full_name", FT_STRING, BASE_DEC,
+			"Full Name", "nfs.full_name", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_name, {
-			"Name", "nfs.name", FT_STRING, BASE_DEC,
+			"Name", "nfs.name", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_readlink_data, {
-			"Data", "nfs.readlink.data", FT_STRING, BASE_DEC,
+			"Data", "nfs.readlink.data", FT_STRING, BASE_NONE,
 			NULL, 0, "Symbolic Link Data", HFILL }},
 		{ &hf_nfs_read_offset, {
 			"Offset", "nfs.read.offset", FT_UINT32, BASE_DEC,
@@ -9794,7 +9794,7 @@ proto_register_nfs(void)
 			"Total Count", "nfs.read.totalcount", FT_UINT32, BASE_DEC,
 			NULL, 0, "Total Count (obsolete)", HFILL }},
 		{ &hf_nfs_data, {
-			"Data", "nfs.data", FT_BYTES, BASE_DEC,
+			"Data", "nfs.data", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_write_beginoffset, {
 			"Begin Offset", "nfs.write.beginoffset", FT_UINT32, BASE_DEC,
@@ -9806,7 +9806,7 @@ proto_register_nfs(void)
 			"Total Count", "nfs.write.totalcount", FT_UINT32, BASE_DEC,
 			NULL, 0, "Total Count (obsolete)", HFILL }},
 		{ &hf_nfs_symlink_to, {
-			"To", "nfs.symlink.to", FT_STRING, BASE_DEC,
+			"To", "nfs.symlink.to", FT_STRING, BASE_NONE,
 			NULL, 0, "Symbolic link destination name", HFILL }},
 		{ &hf_nfs_readdir_cookie, {
 			"Cookie", "nfs.readdir.cookie", FT_UINT32, BASE_DEC,
@@ -9816,7 +9816,7 @@ proto_register_nfs(void)
 			NULL, 0, "Directory Count", HFILL }},
 
 		{ &hf_nfs_readdir_entry, {
-			"Entry", "nfs.readdir.entry", FT_NONE, 0,
+			"Entry", "nfs.readdir.entry", FT_NONE, BASE_NONE,
 			NULL, 0, "Directory Entry", HFILL }},
 
 		{ &hf_nfs_readdir_entry_fileid, {
@@ -9824,7 +9824,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdir_entry_name, {
-			"Name", "nfs.readdir.entry.name", FT_STRING, BASE_DEC,
+			"Name", "nfs.readdir.entry.name", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdir_entry_cookie, {
@@ -9836,7 +9836,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdir_entry3_name, {
-			"Name", "nfs.readdir.entry3.name", FT_STRING, BASE_DEC,
+			"Name", "nfs.readdir.entry3.name", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdir_entry3_cookie, {
@@ -9848,7 +9848,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdirplus_entry_name, {
-			"Name", "nfs.readdirplus.entry.name", FT_STRING, BASE_DEC,
+			"Name", "nfs.readdirplus.entry.name", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_readdirplus_entry_cookie, {
@@ -9882,7 +9882,7 @@ proto_register_nfs(void)
 			VALS(names_nfs_nfsstat3), 0, "Reply status", HFILL }},
 		{ &hf_nfs_read_eof, {
 			"EOF", "nfs.read.eof", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_nfs_write_stable, {
 			"Stable", "nfs.write.stable", FT_UINT32, BASE_DEC,
 			VALS(names_stable_how), 0, NULL, HFILL }},
@@ -9930,16 +9930,16 @@ proto_register_nfs(void)
 			NULL, 0, "Maximum file name length", HFILL }},
 		{ &hf_nfs_pathconf_no_trunc, {
 			"no_trunc", "nfs.pathconf.no_trunc", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "No long file name truncation", HFILL }},
+			TFS(&tfs_yes_no), 0x0, "No long file name truncation", HFILL }},
 		{ &hf_nfs_pathconf_chown_restricted, {
 			"chown_restricted", "nfs.pathconf.chown_restricted", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "chown is restricted to root", HFILL }},
+			TFS(&tfs_yes_no), 0x0, "chown is restricted to root", HFILL }},
 		{ &hf_nfs_pathconf_case_insensitive, {
 			"case_insensitive", "nfs.pathconf.case_insensitive", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "file names are treated case insensitive", HFILL }},
+			TFS(&tfs_yes_no), 0x0, "file names are treated case insensitive", HFILL }},
 		{ &hf_nfs_pathconf_case_preserving, {
 			"case_preserving", "nfs.pathconf.case_preserving", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "file name cases are preserved", HFILL }},
+			TFS(&tfs_yes_no), 0x0, "file name cases are preserved", HFILL }},
 
 		{ &hf_nfs_fattr_type, {
 			"type", "nfs.fattr.type", FT_UINT32, BASE_DEC,
@@ -10092,15 +10092,15 @@ proto_register_nfs(void)
 			VALS(names_nfsv4_operation), 0, NULL, HFILL }},
 
 		{ &hf_nfs_linktext4, {
-			"Name", "nfs.symlink.linktext", FT_STRING, BASE_DEC,
+			"Name", "nfs.symlink.linktext", FT_STRING, BASE_NONE,
 			NULL, 0, "Symbolic link contents", HFILL }},
 
 		{ &hf_nfs_component4, {
-			"Filename", "nfs.pathname.component", FT_STRING, BASE_DEC,
+			"Filename", "nfs.pathname.component", FT_STRING, BASE_NONE,
 			NULL, 0, "Pathname component", HFILL }},
 
 		{ &hf_nfs_tag4, {
-			"Tag", "nfs.tag", FT_STRING, BASE_DEC,
+			"Tag", "nfs.tag", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_clientid4, {
@@ -10108,12 +10108,12 @@ proto_register_nfs(void)
 			NULL, 0, "Client ID", HFILL }},
 
 		{ &hf_nfs_ace4, {
-			"ace", "nfs.ace", FT_STRING, BASE_DEC,
+			"ace", "nfs.ace", FT_STRING, BASE_NONE,
 			NULL, 0, "Access Control Entry", HFILL }},
 
 		{ &hf_nfs_recall, {
 			"Recall", "nfs.recall", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_open_claim_type4, {
 			"Claim Type", "nfs.open.claim_type", FT_UINT32, BASE_DEC,
@@ -10141,7 +10141,7 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_change_info4_atomic, {
 			"Atomic", "nfs.change_info.atomic", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_open4_share_access, {
 			"share_access", "nfs.open4.share_access", FT_UINT32, BASE_DEC,
@@ -10172,83 +10172,83 @@ proto_register_nfs(void)
 			VALS(names_time_how4), 0, "How To Set Time", HFILL }},
 
 		{ &hf_nfs_attrlist4, {
-			"attr_vals", "nfs.fattr4.attr_vals", FT_BYTES, BASE_DEC,
+			"attr_vals", "nfs.fattr4.attr_vals", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_link_support, {
 			"fattr4_link_support", "nfs.fattr4_link_support", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_symlink_support, {
 			"fattr4_symlink_support", "nfs.fattr4_symlink_support", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_named_attr, {
 			"fattr4_named_attr", "nfs.fattr4_named_attr", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_unique_handles, {
 			"fattr4_unique_handles", "nfs.fattr4_unique_handles", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_archive, {
 			"fattr4_archive", "nfs.fattr4_archive", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_cansettime, {
 			"fattr4_cansettime", "nfs.fattr4_cansettime", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_case_insensitive, {
 			"fattr4_case_insensitive", "nfs.fattr4_case_insensitive", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_case_preserving, {
 			"fattr4_case_preserving", "nfs.fattr4_case_preserving", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_chown_restricted, {
 			"fattr4_chown_restricted", "nfs.fattr4_chown_restricted", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_hidden, {
 			"fattr4_hidden", "nfs.fattr4_hidden", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_homogeneous, {
 			"fattr4_homogeneous", "nfs.fattr4_homogeneous", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_mimetype, {
-			"fattr4_mimetype", "nfs.fattr4_mimetype", FT_STRING, BASE_DEC,
+			"fattr4_mimetype", "nfs.fattr4_mimetype", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_no_trunc, {
 			"fattr4_no_trunc", "nfs.fattr4_no_trunc", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_system, {
 			"fattr4_system", "nfs.fattr4_system", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_who, {
-			"who", "nfs.who", FT_STRING, BASE_DEC,
+			"who", "nfs.who", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_server, {
-			"server", "nfs.server", FT_STRING, BASE_DEC,
+			"server", "nfs.server", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fslocation4, {
-			"fs_location4", "nfs.fattr4.fs_location", FT_STRING, BASE_DEC,
+			"fs_location4", "nfs.fattr4.fs_location", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_owner, {
-			"fattr4_owner", "nfs.fattr4_owner", FT_STRING, BASE_DEC,
+			"fattr4_owner", "nfs.fattr4_owner", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fattr4_owner_group, {
-			"fattr4_owner_group", "nfs.fattr4_owner_group", FT_STRING, BASE_DEC,
+			"fattr4_owner_group", "nfs.fattr4_owner_group", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_stable_how4, {
@@ -10257,7 +10257,7 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_dirlist4_eof, {
 			"eof", "nfs.dirlist4.eof", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_stateid4, {
 			"stateid", "nfs.stateid4", FT_UINT64, BASE_DEC,
@@ -10281,7 +10281,7 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_reclaim4, {
 			"reclaim", "nfs.reclaim4", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_length4, {
 			"length", "nfs.length4", FT_UINT64, BASE_DEC,
@@ -10457,7 +10457,7 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_recall4, {
 			"recall", "nfs.recall4", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_filesize, {
 			"filesize", "nfs.filesize", FT_UINT64, BASE_DEC,
@@ -10540,11 +10540,11 @@ proto_register_nfs(void)
 			NULL, 0, "Time Delta, Nano-seconds", HFILL }},
 
 		{ &hf_nfs_open_owner4, {
-			"owner", "nfs.open_owner4", FT_BYTES, BASE_DEC,
+			"owner", "nfs.open_owner4", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_lock_owner4, {
-			"owner", "nfs.lock_owner4", FT_BYTES, BASE_DEC,
+			"owner", "nfs.lock_owner4", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_createmode4, {
@@ -10557,18 +10557,18 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_attrdircreate, {
 			"attribute dir create", "nfs.openattr4.createdir", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_new_lock_owner, {
 			"new lock owner?", "nfs.lock.locker.new_lock_owner", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_lock4_reclaim, {
 			"reclaim?", "nfs.lock.reclaim", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_sec_oid4, {
-			"oid", "nfs.secinfo.flavor_info.rpcsec_gss_info.oid", FT_BYTES, BASE_DEC,
+			"oid", "nfs.secinfo.flavor_info.rpcsec_gss_info.oid", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_qop4, {
@@ -10576,11 +10576,11 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_client_id4_id, {
-			"id", "nfs.nfs_client_id4.id", FT_BYTES, BASE_DEC,
+			"id", "nfs.nfs_client_id4.id", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_stateid4_other, {
-			"Data", "nfs.stateid4.other", FT_BYTES, BASE_HEX,
+			"Data", "nfs.stateid4.other", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_acl4, {
@@ -10592,19 +10592,19 @@ proto_register_nfs(void)
 			NULL, 0, "Callback Identifier", HFILL }},
 
 		{ &hf_nfs_gsshandle4, {
-			"gsshandle4", "nfs.gsshandle4", FT_BYTES, BASE_DEC,
+			"gsshandle4", "nfs.gsshandle4", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_r_netid, {
-			"r_netid", "nfs.r_netid", FT_STRING, BASE_DEC,
+			"r_netid", "nfs.r_netid", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_r_addr, {
-			"r_addr", "nfs.r_addr", FT_STRING, BASE_DEC,
+			"r_addr", "nfs.r_addr", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_fh_fhandle_data, {
-			"filehandle", "nfs.fhandle", FT_BYTES, BASE_HEX,
+			"filehandle", "nfs.fhandle", FT_BYTES, BASE_NONE,
 			NULL, 0, "Opaque nfs filehandle", HFILL }},
 
 		{ &hf_nfs_secinfo_arr4, {
@@ -10644,19 +10644,19 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_gxfh3_ldsid, {
-			"  local dsid", "nfs.gxfh3.ldsid", FT_UINT32, BASE_HEX,
+			"local dsid", "nfs.gxfh3.ldsid", FT_UINT32, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_gxfh3_cid, {
-			"  cluster id", "nfs.gxfh3.cid", FT_UINT16, BASE_HEX,
+			"cluster id", "nfs.gxfh3.cid", FT_UINT16, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_gxfh3_resv, {
-			"  reserved", "nfs.gxfh3.reserved", FT_UINT16, BASE_HEX,
+			"reserved", "nfs.gxfh3.reserved", FT_UINT16, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_gxfh3_sfhflags, {
-			"  flags", "nfs.gxfh3.sfhflags", FT_UINT8, BASE_HEX,
+			"flags", "nfs.gxfh3.sfhflags", FT_UINT8, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_gxfh3_sfhflags_resv1, {
@@ -10724,7 +10724,7 @@ proto_register_nfs(void)
 			VALS(layoutreturn_names), 0, NULL, HFILL }},
 
 		{ &hf_nfs_lrf_body_content, {
-			"lrf_body_content", "nfs.lrf_body_content", FT_BYTES, BASE_HEX,
+			"lrf_body_content", "nfs.lrf_body_content", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_iomode4, {
@@ -10749,39 +10749,39 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_pattern_offset, {
 			"layout pattern offset", "nfs.patternoffset", FT_UINT64, BASE_DEC,
-			NULL, 0, "layout pattern offset", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_notification_bitmap4, {
 			"notification bitmap", "nfs.notificationbitmap", FT_UINT32, BASE_DEC,
-			NULL, 0, "notification bitmap", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_newtime4, {
 			"new time?", "nfs.newtime", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_newoffset4, {
 			"new offset?", "nfs.newoffset", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_newsize4, {
 			"new size?", "nfs.newsize", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_layout_avail4, {
 			"layout available?", "nfs.layoutavail", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_mdscommit4, {
 			"MDS commit?", "nfs.mdscommit", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_layoutupdate4, {
-			"layout update", "nfs.layoutupdate", FT_BYTES, BASE_DEC,
+			"layout update", "nfs.layoutupdate", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_deviceid4, {
-			"device ID", "nfs.deviceid", FT_BYTES, BASE_HEX,
-			NULL, 0, "device ID", HFILL }},
+			"device ID", "nfs.deviceid", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_devicenum4, {
 			"num devices", "nfs.devicenum4", FT_UINT32, BASE_DEC,
@@ -10792,7 +10792,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_layout4, {
-			"layout", "nfs.layout", FT_BYTES, BASE_DEC,
+			"layout", "nfs.layout", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_layout_count, {
@@ -10805,12 +10805,12 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_devaddr4, {
-			"device addr", "nfs.devaddr", FT_BYTES, BASE_DEC,
+			"device addr", "nfs.devaddr", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_return_on_close4, {
 			"return on close?", "nfs.retclose4", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_nfl_util, {
 			"nfl_util", "nfs.nfl_util", FT_UINT32, BASE_HEX,
@@ -10829,7 +10829,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_serverscope4, {
-			"server scope", "nfs.scope", FT_BYTES, BASE_DEC,
+			"server scope", "nfs.scope", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_minorid4, {
@@ -10837,7 +10837,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_majorid4, {
-			"major ID", "nfs.majorid4", FT_BYTES, BASE_DEC,
+			"major ID", "nfs.majorid4", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_padsize4, {
@@ -10846,7 +10846,7 @@ proto_register_nfs(void)
 
 		{ &hf_nfs_cbrenforce4, {
 			"binding enforce?", "nfs.cbrenforce4", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_hashalg4, {
 			"hash alg", "nfs.hashalg4", FT_UINT32, BASE_DEC,
@@ -10881,7 +10881,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_machinename4, {
-			"machine name", "nfs.machinename4", FT_STRING, BASE_DEC,
+			"machine name", "nfs.machinename4", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_flavor4, {
@@ -10905,7 +10905,7 @@ proto_register_nfs(void)
 			NULL, 0, NULL, HFILL }},
 
 		{ &hf_nfs_sessionid4, {
-			"sessionid", "nfs.session_id4", FT_BYTES, BASE_HEX,
+			"sessionid", "nfs.session_id4", FT_BYTES, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_exch_id_flags4, {
 			"EXCHANGE_ID flags", "nfs.exch_id_flags", FT_UINT32, BASE_HEX,
@@ -10929,21 +10929,21 @@ proto_register_nfs(void)
 			"State Protect num gss handles", "nfs.state_protect_num_gss_handles", FT_UINT32, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_nii_domain4, {
-			"Implementer Domain name", "nfs.nii_domain4", FT_STRING, BASE_DEC,
+			"Implementer Domain name", "nfs.nii_domain4", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_nii_name4, {
-			"Implementation name", "nfs.nii_name4", FT_STRING, BASE_DEC,
+			"Implementation name", "nfs.nii_name4", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_create_session_flags4, {
 			"CREATE_SESSION flags", "nfs.create_session_flags", FT_UINT32, BASE_HEX,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nfs_cachethis4, {
 			"Cache this?", "nfs.cachethis4", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 		{ &hf_nfs_lrs_present, {
 			"Stateid present?", "nfs.lrs_present", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, NULL, HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 
 	/* Hidden field for v2, v3, and v4 status */
 		{ &hf_nfs_nfsstat, {
diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
index f2b3be7182..c279844f84 100644
--- a/epan/dissectors/packet-nfsacl.c
+++ b/epan/dissectors/packet-nfsacl.c
@@ -556,39 +556,39 @@ proto_register_nfsacl(void)
 	static hf_register_info hf[] = {
 		{ &hf_nfsacl_procedure_v1, {
 			"V1 Procedure", "nfsacl.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(nfsacl1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(nfsacl1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nfsacl_procedure_v2, {
 			"V2 Procedure", "nfsacl.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(nfsacl2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(nfsacl2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nfsacl_procedure_v3, {
 			"V3 Procedure", "nfsacl.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(nfsacl3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(nfsacl3_proc_vals), 0, NULL, HFILL }},
 			/* generic */
 		{ &hf_nfsacl_entry, {
-			"ACL", "nfsacl.acl", FT_NONE, 0,
-			NULL, 0, "ACL", HFILL }},
+			"ACL", "nfsacl.acl", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nfsacl_aclcnt, {
 			"ACL count", "nfsacl.aclcnt", FT_UINT32, BASE_DEC,
-			NULL, 0, "ACL count", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nfsacl_dfaclcnt, {
 			"Default ACL count", "nfsacl.dfaclcnt", FT_UINT32, BASE_DEC,
-			NULL, 0, "Default ACL count", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nfsacl_aclent, {
-			"ACL Entry", "nfsacl.aclent", FT_NONE, 0,
+			"ACL Entry", "nfsacl.aclent", FT_NONE, BASE_NONE,
 			NULL, 0, "ACL", HFILL }},
 		{ &hf_nfsacl_aclent_type, {
 			"Type", "nfsacl.aclent.type", FT_UINT32, BASE_DEC,
-			VALS(names_nfsacl_aclent_type), 0, "Type", HFILL }},
+			VALS(names_nfsacl_aclent_type), 0, NULL, HFILL }},
 		{ &hf_nfsacl_aclent_uid, {
 			"UID", "nfsacl.aclent.uid", FT_UINT32, BASE_DEC,
-			NULL, 0, "UID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nfsacl_aclent_perm, {
 			"Permissions", "nfsacl.aclent.perm", FT_UINT32, BASE_DEC,
-			NULL, 0, "Permissions", HFILL }},
+			NULL, 0, NULL, HFILL }},
 			/* V2 */
 		{ &hf_nfsacl_create, {
 			"create", "nfsacl.create", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "Create?", HFILL }},
+			TFS(&tfs_yes_no), 0x0, "Create?", HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-nfsauth.c b/epan/dissectors/packet-nfsauth.c
index 004fde5fc0..e01f101174 100644
--- a/epan/dissectors/packet-nfsauth.c
+++ b/epan/dissectors/packet-nfsauth.c
@@ -63,7 +63,7 @@ proto_register_nfsauth(void)
 	static hf_register_info hf[] = {
 		{ &hf_nfsauth_procedure_v1, {
 			"V1 Procedure", "nfsauth.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(nfsauth1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(nfsauth1_proc_vals), 0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-nhrp.c b/epan/dissectors/packet-nhrp.c
index 97ad1dcbe2..0b2b16e7fa 100644
--- a/epan/dissectors/packet-nhrp.c
+++ b/epan/dissectors/packet-nhrp.c
@@ -881,48 +881,48 @@ proto_register_nhrp(void)
 	static hf_register_info hf[] = {
 		
 		{ &hf_nhrp_hdr_afn,
-		  { "Address Family Number", 		"nhrp.hdr.afn", 	FT_UINT16, BASE_HEX_DEC, VALS(afn_vals), 0x0, "", HFILL }},
+		  { "Address Family Number", 		"nhrp.hdr.afn", 	FT_UINT16, BASE_HEX_DEC, VALS(afn_vals), 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_pro_type,
-		  { "Protocol Type (short form)",	"nhrp.hdr.pro.type",FT_UINT16, BASE_HEX_DEC, NULL, 0x0, "", HFILL }},
+		  { "Protocol Type (short form)",	"nhrp.hdr.pro.type",FT_UINT16, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_pro_snap_oui,
-		  { "Protocol Type (long form) - OUI",	"nhrp.hdr.pro.snap.oui",FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, "", HFILL }},
+		  { "Protocol Type (long form) - OUI",	"nhrp.hdr.pro.snap.oui",FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_pro_snap_pid,
-		  { "Protocol Type (long form) - PID",	"nhrp.hdr.pro.snap.pid",FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Protocol Type (long form) - PID",	"nhrp.hdr.pro.snap.pid",FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_hopcnt,
-		  { "Hop Count", 					"nhrp.hdr.hopcnt", 	FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Hop Count", 					"nhrp.hdr.hopcnt", 	FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_pktsz,
-		  { "Packet Length", 				"nhrp.hdr.pktsz", 	FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Packet Length", 				"nhrp.hdr.pktsz", 	FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_chksum,
-		  { "Packet Checksum", 				"nhrp.hdr.chksum", 	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Packet Checksum", 				"nhrp.hdr.chksum", 	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_extoff,
-		  { "Extension Offset", 			"nhrp.hdr.extoff", 	FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Extension Offset", 			"nhrp.hdr.extoff", 	FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_version,
-		  { "Version", 						"nhrp.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Version", 						"nhrp.hdr.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_op_type,
-		  { "NHRP Packet Type", 			"nhrp.hdr.op.type", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "NHRP Packet Type", 			"nhrp.hdr.op.type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_shtl,
-		  { "Source Address Type/Len", 		"nhrp.hdr.shtl", 	FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Source Address Type/Len", 		"nhrp.hdr.shtl", 	FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_shtl_type,
-		  { "Type", 						"nhrp.hdr.shtl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }},
+		  { "Type", 						"nhrp.hdr.shtl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }},
 		{ &hf_nhrp_hdr_shtl_len,
-		  { "Length", 						"nhrp.hdr.shtl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }},
+		  { "Length", 						"nhrp.hdr.shtl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }},
 		{ &hf_nhrp_hdr_sstl,
-		  { "Source SubAddress Type/Len", 	"nhrp.hdr.sstl", 	FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Source SubAddress Type/Len", 	"nhrp.hdr.sstl", 	FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_hdr_sstl_type,
-		  { "Type", 						"nhrp.hdr.sstl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }},
+		  { "Type", 						"nhrp.hdr.sstl.type", FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }},
 		{ &hf_nhrp_hdr_sstl_len,
-		  { "Length", 						"nhrp.hdr.sstl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }},
+		  { "Length", 						"nhrp.hdr.sstl.len", FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }},
 
 		{ &hf_nhrp_src_proto_len,
-		  { "Source Protocol Len", 			"nhrp.src.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Source Protocol Len", 			"nhrp.src.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_dst_proto_len,
-		  { "Destination Protocol Len", 	"nhrp.dst.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Destination Protocol Len", 	"nhrp.dst.prot.len",FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_flags,
-		  { "Flags",						"nhrp.flags", 		FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Flags",						"nhrp.flags", 		FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_flag_Q,
-		  { "Is Router", 					"nhrp.flag.q", 		FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }},
+		  { "Is Router", 					"nhrp.flag.q", 		FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }},
 		{ &hf_nhrp_flag_N,
-		  { "Expected Purge Reply",			"nhrp.flag.n", 		FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }},
+		  { "Expected Purge Reply",			"nhrp.flag.n", 		FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }},
 		{ &hf_nhrp_flag_A,
 		  { "Authoritative", 				"nhrp.flag.a", 		FT_BOOLEAN, 16, NULL, 0x4000, "A bit", HFILL }},
 		{ &hf_nhrp_flag_D,
@@ -936,62 +936,62 @@ proto_register_nhrp(void)
 		{ &hf_nhrp_flag_NAT,
 		  { "Cisco NAT Supported",			"nhrp.flag.nat",	FT_BOOLEAN, 16, NULL, 0x0002, "NAT bit", HFILL }},
 		{ &hf_nhrp_request_id,
-		  { "Request ID", 					"nhrp.reqid",		FT_UINT32,	BASE_HEX_DEC, NULL, 0x0, "", HFILL }},
+		  { "Request ID", 					"nhrp.reqid",		FT_UINT32,	BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_src_nbma_addr,
-		  { "Source NBMA Address",			"nhrp.src.nbma.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Source NBMA Address",			"nhrp.src.nbma.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_src_nbma_saddr,
-		  { "Source NBMA Sub Address",		"nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Source NBMA Sub Address",		"nhrp.src.nbma.saddr",FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_src_prot_addr,
-		  { "Source Protocol Address",		"nhrp.src.prot.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Source Protocol Address",		"nhrp.src.prot.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_dst_prot_addr,
-		  { "Destination Protocol Address",	"nhrp.dst.prot.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Destination Protocol Address",	"nhrp.dst.prot.addr",FT_IPv4, 	BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_nhrp_code,
-		  { "Code", 					"nhrp.code", 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Code", 					"nhrp.code", 			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_prefix_len,
-		  { "Prefix Length", 			"nhrp.prefix", 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Prefix Length", 			"nhrp.prefix", 			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_unused,
-		  { "Unused", 					"nhrp.unused", 			FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Unused", 					"nhrp.unused", 			FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_mtu,
-		  { "Max Transmission Unit",	"nhrp.mtu", 			FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Max Transmission Unit",	"nhrp.mtu", 			FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_holding_time,
-		  { "Holding Time (s)",			"nhrp.htime", 			FT_UINT16,BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Holding Time (s)",			"nhrp.htime", 			FT_UINT16,BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_cli_addr_tl,
-		  { "Client Address Type/Len",	"nhrp.cli.addr_tl",		FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Client Address Type/Len",	"nhrp.cli.addr_tl",		FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_cli_addr_tl_type,
-		  { "Type", 				   	"nhrp.cli.addr_tl.type",	FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }},
+		  { "Type", 				   	"nhrp.cli.addr_tl.type",	FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }},
 		{ &hf_nhrp_cli_addr_tl_len,
-		  { "Length", 				   	"nhrp.cli.addr_tl.len",	FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }},
+		  { "Length", 				   	"nhrp.cli.addr_tl.len",	FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }},
 		{ &hf_nhrp_cli_saddr_tl,
-		  { "Client Sub Address Type/Len","nhrp.cli.saddr_tl", 	FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Client Sub Address Type/Len","nhrp.cli.saddr_tl", 	FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_cli_saddr_tl_type,
-		  { "Type", 				   	"nhrp.cli.saddr_tl.type",	FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, "", HFILL }},
+		  { "Type", 				   	"nhrp.cli.saddr_tl.type",	FT_UINT8, BASE_DEC, VALS(nhrp_shtl_type_vals), NHRP_SHTL_TYPE_MASK, NULL, HFILL }},
 		{ &hf_nhrp_cli_saddr_tl_len,
-		  { "Length", 				   	"nhrp.cli.saddr_tl.len",	FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, "", HFILL }},
+		  { "Length", 				   	"nhrp.cli.saddr_tl.len",	FT_UINT8, BASE_DEC, NULL, NHRP_SHTL_LEN_MASK, NULL, HFILL }},
 		{ &hf_nhrp_cli_prot_len,
-		  { "Client Protocol Length", 	"nhrp.prot.len", 		FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Client Protocol Length", 	"nhrp.prot.len", 		FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_pref,
-		  { "CIE Preference Value",		"nhrp.pref", 			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "CIE Preference Value",		"nhrp.pref", 			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_client_nbma_addr,
-		  { "Client NBMA Address",		"nhrp.client.nbma.addr", FT_IPv4, 		BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Client NBMA Address",		"nhrp.client.nbma.addr", FT_IPv4, 		BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_client_nbma_saddr,
-		  { "Client NBMA Sub Address",	"nhrp.client.nbma.saddr",FT_UINT_BYTES,	BASE_HEX,  NULL, 0x0, "", HFILL }},
+		  { "Client NBMA Sub Address",	"nhrp.client.nbma.saddr",FT_UINT_BYTES,	BASE_HEX,  NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_client_prot_addr,
-		  { "Client Protocol Address",	"nhrp.client.prot.addr", FT_IPv4, 		BASE_NONE, NULL, 0x0, "", HFILL }},
+		  { "Client Protocol Address",	"nhrp.client.prot.addr", FT_IPv4, 		BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_nhrp_ext_C,
-		  { "Compulsory Flag",			"nhrp.ext.c", 			FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }},
+		  { "Compulsory Flag",			"nhrp.ext.c", 			FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }},
 		{ &hf_nhrp_ext_type,
-		  { "Extension Type",			"nhrp.ext.type", 		FT_UINT16,	BASE_HEX, NULL, 0x3FFF, "", HFILL }},
+		  { "Extension Type",			"nhrp.ext.type", 		FT_UINT16,	BASE_HEX, NULL, 0x3FFF, NULL, HFILL }},
 		{ &hf_nhrp_ext_len,
-		  { "Extension length", 		"nhrp.ext.len",			FT_UINT16,	BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Extension length", 		"nhrp.ext.len",			FT_UINT16,	BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_ext_value,
-		  { "Extension Value", 			"nhrp.ext.val",			FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Extension Value", 			"nhrp.ext.val",			FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_nhrp_error_offset,
-		  { "Error Offset", 			"nhrp.err.offset",		FT_UINT16,	BASE_DEC, NULL, 0x0, "", HFILL }},
+		  { "Error Offset", 			"nhrp.err.offset",		FT_UINT16,	BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_nhrp_error_packet,
-		  { "Errored Packet", 			"nhrp.err.pkt",			FT_UINT_BYTES,BASE_HEX, NULL, 0x0, "", HFILL }},
+		  { "Errored Packet", 			"nhrp.err.pkt",			FT_UINT_BYTES,BASE_HEX, NULL, 0x0, NULL, HFILL }},
 	};
 	
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 6a5ec245c5..4cec28fe91 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -1927,7 +1927,7 @@ proto_register_niscb(void)
 	static hf_register_info hf[] = {
 		{ &hf_nispluscb_procedure_v1, {
 			"V1 Procedure", "nispluscb.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(nispluscb1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(nispluscb1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nispluscb_entries, {
 			"entries", "nispluscb.entries", FT_NONE, BASE_NONE,
 			NULL, 0, "NIS Callback Entries", HFILL }},
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 859d386cfd..2d88e8c1da 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -1137,82 +1137,82 @@ proto_register_nlm(void)
 	static hf_register_info hf[] = {
 		{ &hf_nlm_procedure_v1, {
 			"V1 Procedure", "nlm.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(nlm1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(nlm1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nlm_procedure_v2, {
 			"V2 Procedure", "nlm.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(nlm2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(nlm2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nlm_procedure_v3, {
 			"V3 Procedure", "nlm.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(nlm3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(nlm3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nlm_procedure_v4, {
 			"V4 Procedure", "nlm.procedure_v4", FT_UINT32, BASE_DEC,
-			VALS(nlm4_proc_vals), 0, "V4 Procedure", HFILL }},
+			VALS(nlm4_proc_vals), 0, NULL, HFILL }},
 		{ &hf_nlm_cookie, {
-			"cookie", "nlm.cookie", FT_BYTES, BASE_DEC,
-			NULL, 0, "cookie", HFILL }},
+			"cookie", "nlm.cookie", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_block, {
 			"block", "nlm.block", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "block", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_nlm_exclusive, {
 			"exclusive", "nlm.exclusive", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "exclusive", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_nlm_lock, {
-			"lock", "nlm.lock", FT_NONE, 0,
-			NULL, 0, "lock", HFILL }},
+			"lock", "nlm.lock", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_caller_name, {
 			"caller_name", "nlm.lock.caller_name", FT_STRING, BASE_NONE,
-			NULL, 0, "caller_name", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_owner, {
-			"owner", "nlm.lock.owner", FT_BYTES, BASE_DEC,
-			NULL, 0, "owner", HFILL }},
+			"owner", "nlm.lock.owner", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_svid, {
 			"svid", "nlm.lock.svid", FT_UINT32, BASE_DEC,
-			NULL, 0, "svid", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_offset64, {
 			"l_offset", "nlm.lock.l_offset", FT_UINT64, BASE_DEC,
-			NULL, 0, "l_offset", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_offset, {
 			"l_offset", "nlm.lock.l_offset", FT_UINT32, BASE_DEC,
-			NULL, 0, "l_offset", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_len64, {
 			"l_len", "nlm.lock.l_len", FT_UINT64, BASE_DEC,
-			NULL, 0, "l_len", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_len, {
 			"l_len", "nlm.lock.l_len", FT_UINT32, BASE_DEC,
-			NULL, 0, "l_len", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_reclaim, {
 			"reclaim", "nlm.reclaim", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "reclaim", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_nlm_state, {
 			"state", "nlm.state", FT_UINT32, BASE_DEC,
 			NULL, 0, "STATD state", HFILL }},
 		{ &hf_nlm_stat, {
 			"stat", "nlm.stat", FT_UINT32, BASE_DEC,
-			VALS(names_nlm_stats), 0, "stat", HFILL }},
+			VALS(names_nlm_stats), 0, NULL, HFILL }},
 		{ &hf_nlm_test_stat, {
-			"test_stat", "nlm.test_stat", FT_NONE, 0,
-			NULL, 0, "test_stat", HFILL }},
+			"test_stat", "nlm.test_stat", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_test_stat_stat, {
 			"stat", "nlm.test_stat.stat", FT_UINT32, BASE_DEC,
-			VALS(names_nlm_stats), 0, "stat", HFILL }},
+			VALS(names_nlm_stats), 0, NULL, HFILL }},
 		{ &hf_nlm_holder, {
-			"holder", "nlm.holder", FT_NONE, 0,
-			NULL, 0, "holder", HFILL }},
+			"holder", "nlm.holder", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_share, {
-			"share", "nlm.share", FT_NONE, 0,
-			NULL, 0, "share", HFILL }},
+			"share", "nlm.share", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_share_mode, {
 			"mode", "nlm.share.mode", FT_UINT32, BASE_DEC,
-			VALS(names_fsh_mode), 0, "mode", HFILL }},
+			VALS(names_fsh_mode), 0, NULL, HFILL }},
 		{ &hf_nlm_share_access, {
 			"access", "nlm.share.access", FT_UINT32, BASE_DEC,
-			VALS(names_fsh_access), 0, "access", HFILL }},
+			VALS(names_fsh_access), 0, NULL, HFILL }},
 		{ &hf_nlm_share_name, {
 			"name", "nlm.share.name", FT_STRING, BASE_NONE,
-			NULL, 0, "name", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_sequence, {
 			"sequence", "nlm.sequence", FT_INT32, BASE_DEC,
-			NULL, 0, "sequence", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_request_in, {
 			"Request MSG in", "nlm.msg_in", FT_UINT32, BASE_DEC,
 			NULL, 0, "The RES packet is a response to the MSG in this packet", HFILL }},
diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c
index b5a423854c..280f2bbeaa 100644
--- a/epan/dissectors/packet-nlsp.c
+++ b/epan/dissectors/packet-nlsp.c
@@ -1541,36 +1541,36 @@ proto_register_nlsp(void)
 	static hf_register_info hf[] = {
 	    { &hf_nlsp_irpd,
 	      { "NetWare Link Services Protocol Discriminator",	"nlsp.irpd",
-		FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_header_length,
 	      { "PDU Header Length", "nlsp.header_length",
-	        FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+	        FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_minor_version,
 	      { "Minor Version", "nlsp.minor_version", FT_UINT8,
-	         BASE_DEC, NULL, 0x0, "", HFILL }},
+	         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_nr,
 	      { "Multi-homed Non-routing Server", "nlsp.nr", FT_BOOLEAN, 8,
-	        NULL, 0x80, "", HFILL }},
+	        NULL, 0x80, NULL, HFILL }},
 
 	    { &hf_nlsp_type,
 	      { "Packet Type", "nlsp.type", FT_UINT8, BASE_DEC,
-	        VALS(nlsp_packet_type_vals), PACKET_TYPE_MASK, "", HFILL }},
+	        VALS(nlsp_packet_type_vals), PACKET_TYPE_MASK, NULL, HFILL }},
 
 	    { &hf_nlsp_major_version,
 	      { "Major Version", "nlsp.major_version", FT_UINT8,
-	         BASE_DEC, NULL, 0x0, "", HFILL }},
+	         BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_packet_length,
 	      { "Packet Length", "nlsp.packet_length",
-	        FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+	        FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_hello_state,
 	      { "State", "nlsp.hello.state", FT_UINT8, BASE_DEC,
 	        VALS(nlsp_hello_state_vals), NLSP_HELLO_STATE_MASK,
-		"", HFILL }},
+		NULL, HFILL }},
 
 	    { &hf_nlsp_hello_multicast,
 	      { "Multicast Routing", "nlsp.hello.multicast", FT_BOOLEAN, 8,
@@ -1580,24 +1580,24 @@ proto_register_nlsp(void)
 	    { &hf_nlsp_hello_circuit_type,
 	      { "Circuit Type", "nlsp.hello.circuit_type", FT_UINT8, BASE_DEC,
 	        VALS(nlsp_hello_circuit_type_vals), NLSP_HELLO_CTYPE_MASK,
-		"", HFILL }},
+		NULL, HFILL }},
 
 	    { &hf_nlsp_hello_holding_timer,
 	      { "Holding Timer", "nlsp.hello.holding_timer", FT_UINT8, BASE_DEC,
-	        NULL, 0x0, "", HFILL }},
+	        NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_hello_priority,
 	      { "Priority", "nlsp.hello.priority", FT_UINT8, BASE_DEC,
 	        NULL, NLSP_HELLO_PRIORITY_MASK,
-		"", HFILL }},
+		NULL, HFILL }},
 
 	    { &hf_nlsp_lsp_sequence_number,
 	      { "Sequence Number", "nlsp.sequence_number",
-	        FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+	        FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_lsp_checksum,
 	      { "Checksum", "nlsp.lsp.checksum",
-	        FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+	        FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 	    { &hf_nlsp_lsp_p,
 	      { "Partition Repair", "nlsp.lsp.partition_repair", FT_BOOLEAN, 8,
@@ -1606,16 +1606,16 @@ proto_register_nlsp(void)
 
 	    { &hf_nlsp_lsp_attached_flag,
 	      { "Attached Flag", "nlsp.lsp.attached_flag", FT_UINT8, BASE_DEC,
-	        VALS(nlsp_attached_flag_vals), NLSP_LSP_ATT_MASK, "", HFILL }},
+	        VALS(nlsp_attached_flag_vals), NLSP_LSP_ATT_MASK, NULL, HFILL }},
 
 	    { &hf_nlsp_lsp_lspdbol,
 	      { "LSP Database Overloaded", "nlsp.lsp.lspdbol", FT_BOOLEAN, 8,
-	        NULL, NLSP_LSP_OVERFLOW_MASK, "", HFILL }},
+	        NULL, NLSP_LSP_OVERFLOW_MASK, NULL, HFILL }},
 
 	    { &hf_nlsp_lsp_router_type,
 	      { "Router Type", "nlsp.lsp.router_type", FT_UINT8, BASE_DEC,
 	        VALS(nlsp_router_type_vals), NLSP_LSP_ROUTER_TYPE_MASK,
-	        "", HFILL }},
+	        NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_nlsp,
diff --git a/epan/dissectors/packet-ns_cert_exts.c b/epan/dissectors/packet-ns_cert_exts.c
index 63cbe0c72e..8afb86aa57 100644
--- a/epan/dissectors/packet-ns_cert_exts.c
+++ b/epan/dissectors/packet-ns_cert_exts.c
@@ -260,20 +260,20 @@ void proto_register_ns_cert_exts(void) {
         "ns_cert_exts.CertRenewalUrl", HFILL }},
     { &hf_ns_cert_exts_CertType_PDU,
       { "CertType", "ns_cert_exts.CertType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ns_cert_exts.CertType", HFILL }},
     { &hf_ns_cert_exts_CertType_client,
       { "client", "ns_cert_exts.client",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_server,
       { "server", "ns_cert_exts.server",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_ns_cert_exts_CertType_ca,
       { "ca", "ns_cert_exts.ca",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-ns_cert_exts-hfarr.c ---*/
 #line 58 "packet-ns_cert_exts-template.c"
diff --git a/epan/dissectors/packet-nsip.c b/epan/dissectors/packet-nsip.c
index c3ab3d7883..6a57d77480 100644
--- a/epan/dissectors/packet-nsip.c
+++ b/epan/dissectors/packet-nsip.c
@@ -974,7 +974,7 @@ proto_register_nsip(void)
     { &hf_nsip_cause,
       { "Cause", "nsip.cause",
 	FT_UINT8, BASE_OCT, VALS(tab_nsip_cause_values), 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ns_vci,
       { "NS-VCI", "nsip.ns_vci",
@@ -1009,82 +1009,82 @@ proto_register_nsip(void)
     { &hf_nsip_max_num_ns_vc,
       { "Maximum number of NS-VCs", "nsip.max_num_ns_vc",
 	FT_UINT16, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_num_ip4_endpoints,
       { "Number of IP4 endpoints", "nsip.num_ip4_endpoints",
 	FT_UINT16, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_num_ip6_endpoints,
       { "Number of IP6 endpoints", "nsip.num_ip6_endpoints",
 	FT_UINT16, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_reset_flag,
       { "Reset flag", "nsip.reset_flag",
 	FT_BOOLEAN, 8, TFS(&tfs_set_notset), NSIP_MASK_RESET_FLAG,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_address_type,
       { "IP Address Type", "nsip.ip_address_type",
 	FT_UINT8, BASE_DEC, VALS(ip_address_type_vals), 0x0,
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_address_ipv4,
       { "IP Address", "nsip.ip_address",
 	FT_IPv4, BASE_NONE, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_address_ipv6,
       { "IP Address", "nsip.ip_address",
 	FT_IPv6, BASE_NONE, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_end_flag,
       { "End flag", "nsip.end_flag",
 	FT_BOOLEAN, 8, TFS(&tfs_set_notset), NSIP_MASK_END_FLAG,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_control_bits_r,
       { "Request change flow", "nsip.control_bits.r",
 	FT_BOOLEAN, 8, TFS(&tfs_set_notset), NSIP_MASK_CONTROL_BITS_R,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_control_bits_c,
       { "Confirm change flow", "nsip.control_bits.c",
 	FT_BOOLEAN, 8, TFS(&tfs_set_notset), NSIP_MASK_CONTROL_BITS_C,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_transaction_id,
       { "Transaction ID", "nsip.transaction_id",
       FT_UINT8, BASE_DEC, NULL, 0x0,
-      "", HFILL }
+      NULL, HFILL }
     },
     { &hf_nsip_ip_element_ip_address_ipv4,
       { "IP Address", "nsip.ip_element.ip_address",
 	FT_IPv4, BASE_NONE, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_element_ip_address_ipv6,
       { "IP Address", "nsip.ip_element.ip_address",
 	FT_IPv6, BASE_NONE, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_element_udp_port,
       { "UDP Port", "nsip.ip_element.udp_port",
 	FT_UINT16, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_element_signalling_weight,
       { "Signalling Weight", "nsip.ip_element.signalling_weight",
 	FT_UINT8, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
     { &hf_nsip_ip_element_data_weight,
       { "Data Weight", "nsip.ip_element.data_weight",
 	FT_UINT8, BASE_DEC, NULL, 0x0,          
-	"", HFILL }
+	NULL, HFILL }
     },
   };
 
diff --git a/epan/dissectors/packet-nsrp.c b/epan/dissectors/packet-nsrp.c
index b261c26acd..6ac8616414 100644
--- a/epan/dissectors/packet-nsrp.c
+++ b/epan/dissectors/packet-nsrp.c
@@ -450,12 +450,12 @@ proto_register_nsrp(void)
 		{ &hf_nsrp_ns,
 	  { "Ns", "nsrp.ns",
 	    FT_UINT16, BASE_DEC, NULL, 0,
-	    "Ns", HFILL }
+	    NULL, HFILL }
 	},
 		{ &hf_nsrp_nr,
 	  { "Nr", "nsrp.nr",
 	    FT_UINT16, BASE_DEC, NULL, 0,
-	    "Nr", HFILL }
+	    NULL, HFILL }
 	},
 		{ &hf_nsrp_no_used,
 	  { "Reserved", "nsrp.reserved",
@@ -494,7 +494,7 @@ proto_register_nsrp(void)
 	},
 	{ &hf_nsrp_data,
 	  { "Data", "nsrp.data",
-	    FT_STRING, 0, NULL, 0,
+	    FT_STRING, BASE_NONE, NULL, 0,
 	    "PADDING", HFILL }
 	}
     };
diff --git a/epan/dissectors/packet-nt-tpcp.c b/epan/dissectors/packet-nt-tpcp.c
index 1095594f64..15bf04d592 100644
--- a/epan/dissectors/packet-nt-tpcp.c
+++ b/epan/dissectors/packet-nt-tpcp.c
@@ -203,35 +203,35 @@ proto_register_tpcp(void)
 		
 		{ &hf_tpcp_flags_xon,
 		{ "XON",		"tpcp.flags.xon", FT_BOOLEAN, 8, TFS(&flags_set_truth), TF_TPCP_XON,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_flags_xoff,
 		{ "XOFF",		"tpcp.flags.xoff", FT_BOOLEAN, 8, TFS(&flags_set_truth), TF_TPCP_XOFF,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_id,
 		{ "Client indent",	"tpcp.cid", FT_UINT16, BASE_DEC, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_cport,
 		{ "Client Source Port",	"tpcp.cport", FT_UINT16, BASE_DEC, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_caddr,
 		{ "Client Source IP address",	"tpcp.caddr", FT_IPv4, BASE_NONE, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_saddr,
 		{ "Server IP address",	"tpcp.saddr", FT_IPv4, BASE_NONE, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_vaddr,
 		{ "Virtual Server IP address", "tpcp.vaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 		{ &hf_tpcp_rasaddr,
 		{ "RAS server IP address", "tpcp.rasaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
-		"", HFILL }},
+		NULL, HFILL }},
 		
 	};
 	
diff --git a/epan/dissectors/packet-ntlmssp.c b/epan/dissectors/packet-ntlmssp.c
index 2175271d85..87172ff5bf 100644
--- a/epan/dissectors/packet-ntlmssp.c
+++ b/epan/dissectors/packet-ntlmssp.c
@@ -1560,183 +1560,183 @@ proto_register_ntlmssp(void)
 
   static hf_register_info hf[] = {
     { &hf_ntlmssp,
-      { "NTLMSSP", "ntlmssp", FT_NONE, BASE_NONE, NULL, 0x0, "NTLMSSP", HFILL }},
+      { "NTLMSSP", "ntlmssp", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth,
       { "NTLMSSP identifier", "ntlmssp.identifier", FT_STRING, BASE_NONE, NULL, 0x0, "NTLMSSP Identifier", HFILL }},
     { &hf_ntlmssp_message_type,
-      { "NTLM Message Type", "ntlmssp.messagetype", FT_UINT32, BASE_HEX, VALS(ntlmssp_message_types), 0x0, "", HFILL }},
+      { "NTLM Message Type", "ntlmssp.messagetype", FT_UINT32, BASE_HEX, VALS(ntlmssp_message_types), 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags,
-      { "Flags", "ntlmssp.negotiateflags", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Flags", "ntlmssp.negotiateflags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_01,
-      { "Negotiate UNICODE", "ntlmssp.negotiateunicode", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_UNICODE, "", HFILL }},
+      { "Negotiate UNICODE", "ntlmssp.negotiateunicode", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_UNICODE, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_02,
-      { "Negotiate OEM", "ntlmssp.negotiateoem", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM, "", HFILL }},
+      { "Negotiate OEM", "ntlmssp.negotiateoem", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_04,
-      { "Request Target", "ntlmssp.requesttarget", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_REQUEST_TARGET, "", HFILL }},
+      { "Request Target", "ntlmssp.requesttarget", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_REQUEST_TARGET, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_08,
-      { "Request 0x00000008", "ntlmssp.negotiate00000008", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000008, "", HFILL }},
+      { "Request 0x00000008", "ntlmssp.negotiate00000008", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000008, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_10,
-      { "Negotiate Sign", "ntlmssp.negotiatesign", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_SIGN, "", HFILL }},
+      { "Negotiate Sign", "ntlmssp.negotiatesign", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_SIGN, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_20,
-      { "Negotiate Seal", "ntlmssp.negotiateseal", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_SEAL, "", HFILL }},
+      { "Negotiate Seal", "ntlmssp.negotiateseal", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_SEAL, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_40,
-      { "Negotiate Datagram", "ntlmssp.negotiatedatagram", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_DATAGRAM, "", HFILL }},
+      { "Negotiate Datagram", "ntlmssp.negotiatedatagram", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_DATAGRAM, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_80,
-      { "Negotiate Lan Manager Key", "ntlmssp.negotiatelmkey", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_LM_KEY, "", HFILL }},
+      { "Negotiate Lan Manager Key", "ntlmssp.negotiatelmkey", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_LM_KEY, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_100,
-      { "Negotiate 0x00000100", "ntlmssp.negotiate00000100", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000100, "", HFILL }},
+      { "Negotiate 0x00000100", "ntlmssp.negotiate00000100", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000100, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_200,
-      { "Negotiate NTLM key", "ntlmssp.negotiatentlm", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NTLM, "", HFILL }},
+      { "Negotiate NTLM key", "ntlmssp.negotiatentlm", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NTLM, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_400,
-      { "Negotiate NT Only", "ntlmssp.negotiatentonly", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NT_ONLY, "", HFILL }},
+      { "Negotiate NT Only", "ntlmssp.negotiatentonly", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NT_ONLY, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_800,
-      { "Negotiate 0x00000800", "ntlmssp.negotiate00000800", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000800, "", HFILL }},
+      { "Negotiate 0x00000800", "ntlmssp.negotiate00000800", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00000800, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_1000,
-      { "Negotiate OEM Domain Supplied", "ntlmssp.negotiateoemdomainsupplied", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED, "", HFILL }},
+      { "Negotiate OEM Domain Supplied", "ntlmssp.negotiateoemdomainsupplied", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM_DOMAIN_SUPPLIED, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_2000,
-      { "Negotiate OEM Workstation Supplied", "ntlmssp.negotiateoemworkstationsupplied", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED, "", HFILL }},
+      { "Negotiate OEM Workstation Supplied", "ntlmssp.negotiateoemworkstationsupplied", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_OEM_WORKSTATION_SUPPLIED, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_4000,
-      { "Negotiate 0x00004000", "ntlmssp.negotiate00004000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00004000, "", HFILL }},
+      { "Negotiate 0x00004000", "ntlmssp.negotiate00004000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00004000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_8000,
-      { "Negotiate Always Sign", "ntlmssp.negotiatealwayssign", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_ALWAYS_SIGN, "", HFILL }},
+      { "Negotiate Always Sign", "ntlmssp.negotiatealwayssign", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_ALWAYS_SIGN, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_10000,
-      { "Target Type Domain", "ntlmssp.targettypedomain", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_DOMAIN, "", HFILL }},
+      { "Target Type Domain", "ntlmssp.targettypedomain", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_DOMAIN, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_20000,
-      { "Target Type Server", "ntlmssp.targettypeserver", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_SERVER, "", HFILL }},
+      { "Target Type Server", "ntlmssp.targettypeserver", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_SERVER, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_40000,
-      { "Target Type Share", "ntlmssp.targettypeshare", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_SHARE, "", HFILL }},
+      { "Target Type Share", "ntlmssp.targettypeshare", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_TARGET_TYPE_SHARE, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_80000,
-      { "Negotiate NTLM2 key", "ntlmssp.negotiatentlm2", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NTLM2, "", HFILL }},
+      { "Negotiate NTLM2 key", "ntlmssp.negotiatentlm2", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_NTLM2, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_100000,
-      { "Negotiate Identify", "ntlmssp.negotiateidentify", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_IDENTIFY, "", HFILL }},
+      { "Negotiate Identify", "ntlmssp.negotiateidentify", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_IDENTIFY, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_200000,
-      { "Negotiate 0x00200000", "ntlmssp.negotiatent00200000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00200000, "", HFILL }},
+      { "Negotiate 0x00200000", "ntlmssp.negotiatent00200000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_00200000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_400000,
-      { "Request Non-NT Session", "ntlmssp.requestnonntsession", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_REQUEST_NON_NT_SESSION, "", HFILL }},
+      { "Request Non-NT Session", "ntlmssp.requestnonntsession", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_REQUEST_NON_NT_SESSION, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_800000,
-      { "Negotiate Target Info", "ntlmssp.negotiatetargetinfo", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_TARGET_INFO, "", HFILL }},
+      { "Negotiate Target Info", "ntlmssp.negotiatetargetinfo", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_TARGET_INFO, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_1000000,
-      { "Negotiate 0x01000000", "ntlmssp.negotiatent01000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_01000000, "", HFILL }},
+      { "Negotiate 0x01000000", "ntlmssp.negotiatent01000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_01000000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_2000000,
-      { "Negotiate Version", "ntlmssp.negotiateversion", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_VERSION, "", HFILL }},
+      { "Negotiate Version", "ntlmssp.negotiateversion", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_VERSION, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_4000000,
-      { "Negotiate 0x04000000", "ntlmssp.negotiatent04000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_04000000, "", HFILL }},
+      { "Negotiate 0x04000000", "ntlmssp.negotiatent04000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_04000000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_8000000,
-      { "Negotiate 0x08000000", "ntlmssp.negotiatent08000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_08000000, "", HFILL }},
+      { "Negotiate 0x08000000", "ntlmssp.negotiatent08000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_08000000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_10000000,
-      { "Negotiate 0x10000000", "ntlmssp.negotiatent10000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_10000000, "", HFILL }},
+      { "Negotiate 0x10000000", "ntlmssp.negotiatent10000000", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_10000000, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_20000000,
       { "Negotiate 128", "ntlmssp.negotiate128", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_128, "128-bit encryption is supported", HFILL }},
     { &hf_ntlmssp_negotiate_flags_40000000,
-      { "Negotiate Key Exchange", "ntlmssp.negotiatekeyexch", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_KEY_EXCH, "", HFILL }},
+      { "Negotiate Key Exchange", "ntlmssp.negotiatekeyexch", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_KEY_EXCH, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_flags_80000000,
       { "Negotiate 56", "ntlmssp.negotiate56", FT_BOOLEAN, 32, TFS (&flags_set_truth), NTLMSSP_NEGOTIATE_56, "56-bit encryption is supported", HFILL }},
     { &hf_ntlmssp_negotiate_workstation_strlen,
-      { "Calling workstation name length", "ntlmssp.negotiate.callingworkstation.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Calling workstation name length", "ntlmssp.negotiate.callingworkstation.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_workstation_maxlen,
-      { "Calling workstation name max length", "ntlmssp.negotiate.callingworkstation.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Calling workstation name max length", "ntlmssp.negotiate.callingworkstation.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_workstation_buffer,
-      { "Calling workstation name buffer", "ntlmssp.negotiate.callingworkstation.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Calling workstation name buffer", "ntlmssp.negotiate.callingworkstation.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_workstation,
-      { "Calling workstation name", "ntlmssp.negotiate.callingworkstation", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Calling workstation name", "ntlmssp.negotiate.callingworkstation", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_domain_strlen,
-      { "Calling workstation domain length", "ntlmssp.negotiate.domain.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Calling workstation domain length", "ntlmssp.negotiate.domain.strlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_domain_maxlen,
-      { "Calling workstation domain max length", "ntlmssp.negotiate.domain.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Calling workstation domain max length", "ntlmssp.negotiate.domain.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_domain_buffer,
-      { "Calling workstation domain buffer", "ntlmssp.negotiate.domain.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Calling workstation domain buffer", "ntlmssp.negotiate.domain.buffer", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_negotiate_domain,
-      { "Calling workstation domain", "ntlmssp.negotiate.domain", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Calling workstation domain", "ntlmssp.negotiate.domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlm_challenge,
-      { "NTLM Challenge", "ntlmssp.ntlmchallenge", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "NTLM Challenge", "ntlmssp.ntlmchallenge", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_reserved,
-      { "Reserved", "ntlmssp.reserved", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Reserved", "ntlmssp.reserved", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_challenge_domain,
-      { "Domain", "ntlmssp.challenge.domain", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Domain", "ntlmssp.challenge.domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_domain,
-      { "Domain name", "ntlmssp.auth.domain", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Domain name", "ntlmssp.auth.domain", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_username,
-      { "User name", "ntlmssp.auth.username", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "User name", "ntlmssp.auth.username", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_hostname,
-      { "Host name", "ntlmssp.auth.hostname", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Host name", "ntlmssp.auth.hostname", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_lmresponse,
-      { "Lan Manager Response", "ntlmssp.auth.lmresponse", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Lan Manager Response", "ntlmssp.auth.lmresponse", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_ntresponse,
-      { "NTLM Response", "ntlmssp.auth.ntresponse", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "NTLM Response", "ntlmssp.auth.ntresponse", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_auth_sesskey,
-      { "Session Key", "ntlmssp.auth.sesskey", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Session Key", "ntlmssp.auth.sesskey", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_string_len,
-      { "Length", "ntlmssp.string.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Length", "ntlmssp.string.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_string_maxlen,
-      { "Maxlen", "ntlmssp.string.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Maxlen", "ntlmssp.string.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_string_offset,
-      { "Offset", "ntlmssp.string.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Offset", "ntlmssp.string.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_blob_len,
-      { "Length", "ntlmssp.blob.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Length", "ntlmssp.blob.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_blob_maxlen,
-      { "Maxlen", "ntlmssp.blob.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Maxlen", "ntlmssp.blob.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_blob_offset,
-      { "Offset", "ntlmssp.blob.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Offset", "ntlmssp.blob.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list,
-      { "Address List", "ntlmssp.challenge.addresslist", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL}},
+      { "Address List", "ntlmssp.challenge.addresslist", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_len,
-      { "Length", "ntlmssp.challenge.addresslist.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Length", "ntlmssp.challenge.addresslist.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_maxlen,
-      { "Maxlen", "ntlmssp.challenge.addresslist.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Maxlen", "ntlmssp.challenge.addresslist.maxlen", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_offset,
-      { "Offset", "ntlmssp.challenge.addresslist.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Offset", "ntlmssp.challenge.addresslist.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_item_type,
-      { "Target item type", "ntlmssp.targetitemtype", FT_UINT16, BASE_HEX, VALS(ntlm_name_types), 0x0, "", HFILL }},
+      { "Target item type", "ntlmssp.targetitemtype", FT_UINT16, BASE_HEX, VALS(ntlm_name_types), 0x0, NULL, HFILL }},
     { &hf_ntlmssp_address_list_item_len,
-      { "Target item Length", "ntlmssp.challenge.addresslist.item.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+      { "Target item Length", "ntlmssp.challenge.addresslist.item.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_item_content,
-      { "Target item Content", "ntlmssp.challenge.addresslist.item.content", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL}},
+      { "Target item Content", "ntlmssp.challenge.addresslist.item.content", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL}},
     { &hf_ntlmssp_address_list_server_nb,
-      { "Server NetBIOS Name", "ntlmssp.challenge.addresslist.servernb", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Server NetBIOS Name", "ntlmssp.challenge.addresslist.servernb", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_address_list_domain_nb,
-      { "Domain NetBIOS Name", "ntlmssp.challenge.addresslist.domainnb", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Domain NetBIOS Name", "ntlmssp.challenge.addresslist.domainnb", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_address_list_server_dns,
-      { "Server DNS Name", "ntlmssp.challenge.addresslist.serverdns", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Server DNS Name", "ntlmssp.challenge.addresslist.serverdns", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_address_list_domain_dns,
-      { "Domain DNS Name", "ntlmssp.challenge.addresslist.domaindns", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Domain DNS Name", "ntlmssp.challenge.addresslist.domaindns", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_address_list_terminator,
-      { "List Terminator", "ntlmssp.challenge.addresslist.terminator", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "List Terminator", "ntlmssp.challenge.addresslist.terminator", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf,
-      { "NTLMSSP Verifier", "ntlmssp.verf", FT_NONE, BASE_NONE, NULL, 0x0, "NTLMSSP Verifier", HFILL }},
+      { "NTLMSSP Verifier", "ntlmssp.verf", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf_vers,
-      { "Version Number", "ntlmssp.verf.vers", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Version Number", "ntlmssp.verf.vers", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf_body,
-      { "Verifier Body", "ntlmssp.verf.body", FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Verifier Body", "ntlmssp.verf.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_decrypted_payload,
-      { "NTLM Decrypted Payload", "ntlmssp.decrypted_payload", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "NTLM Decrypted Payload", "ntlmssp.decrypted_payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf_unknown1,
-      { "Unknown 1", "ntlmssp.verf.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Unknown 1", "ntlmssp.verf.unknown1", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf_crc32,
-      { "Verifier CRC32", "ntlmssp.verf.crc32", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Verifier CRC32", "ntlmssp.verf.crc32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_verf_sequence,
-      { "Verifier Sequence Number", "ntlmssp.verf.sequence", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Verifier Sequence Number", "ntlmssp.verf.sequence", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response,
-      { "NTLMv2 Response", "ntlmssp.ntlmv2response", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "NTLMv2 Response", "ntlmssp.ntlmv2response", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_hmac,
-      { "HMAC", "ntlmssp.ntlmv2response.hmac", FT_BYTES, BASE_HEX,  NULL, 0x0, "", HFILL }},
+      { "HMAC", "ntlmssp.ntlmv2response.hmac", FT_BYTES, BASE_NONE,  NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_header,
-      { "Header", "ntlmssp.ntlmv2response.header", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Header", "ntlmssp.ntlmv2response.header", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_reserved,
-      { "Reserved", "ntlmssp.ntlmv2response.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Reserved", "ntlmssp.ntlmv2response.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_time,
-      { "Time", "ntlmssp.ntlmv2response.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Time", "ntlmssp.ntlmv2response.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_chal,
-      { "Client challenge", "ntlmssp.ntlmv2response.chal", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Client challenge", "ntlmssp.ntlmv2response.chal", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_unknown,
-      { "Unknown", "ntlmssp.ntlmv2response.unknown", FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+      { "Unknown", "ntlmssp.ntlmv2response.unknown", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_name,
-      { "Name", "ntlmssp.ntlmv2response.name", FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Name", "ntlmssp.ntlmv2response.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_name_type,
-      { "Name type", "ntlmssp.ntlmv2response.name.type", FT_UINT32, BASE_DEC, VALS(ntlm_name_types), 0x0, "", HFILL }},
+      { "Name type", "ntlmssp.ntlmv2response.name.type", FT_UINT32, BASE_DEC, VALS(ntlm_name_types), 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_name_len,
-      { "Name len", "ntlmssp.ntlmv2response.name.len", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+      { "Name len", "ntlmssp.ntlmv2response.name.len", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_ntlmssp_ntlmv2_response_client_time,
-      { "Client Time", "ntlmssp.ntlmv2response.client_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, "", HFILL }}
+      { "Client Time", "ntlmssp.ntlmv2response.client_time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0, NULL, HFILL }}
   };
 
 
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index c2d1753b8e..3900bb6d58 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -835,130 +835,130 @@ proto_register_ntp(void)
 			NULL, 0, "Flags (Leap/Version/Mode)", HFILL }},
 		{ &hf_ntp_flags_li, {
 			"Leap Indicator", "ntp.flags.li", FT_UINT8, BASE_DEC,
-			VALS(li_types), NTP_LI_MASK, "Leap Indicator", HFILL }},
+			VALS(li_types), NTP_LI_MASK, NULL, HFILL }},
 		{ &hf_ntp_flags_vn, {
 			"Version number", "ntp.flags.vn", FT_UINT8, BASE_DEC,
-			VALS(ver_nums), NTP_VN_MASK, "Version number", HFILL }},
+			VALS(ver_nums), NTP_VN_MASK, NULL, HFILL }},
 		{ &hf_ntp_flags_mode, {
 			"Mode", "ntp.flags.mode", FT_UINT8, BASE_DEC,
-			VALS(mode_types), NTP_MODE_MASK, "Mode", HFILL }},
+			VALS(mode_types), NTP_MODE_MASK, NULL, HFILL }},
 		{ &hf_ntp_stratum, {
 			"Peer Clock Stratum", "ntp.stratum", FT_UINT8, BASE_DEC,
-			NULL, 0, "Peer Clock Stratum", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ppoll, {
 			"Peer Polling Interval", "ntp.ppoll", FT_UINT8, BASE_DEC,
-			NULL, 0, "Peer Polling Interval", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_precision, {
 			"Peer Clock Precision", "ntp.precision", FT_INT8, BASE_DEC,
-			NULL, 0, "Peer Clock Precision", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_rootdelay, {
 			"Root Delay", "ntp.rootdelay", FT_DOUBLE, BASE_DEC,
-			NULL, 0, "Root Delay", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_rootdispersion, {
 			"Root Dispersion", "ntp.rootdispersion", FT_DOUBLE, BASE_DEC,
-			NULL, 0, "Root Dispersion", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_refid, {
 			"Reference Clock ID", "ntp.refid", FT_BYTES, BASE_NONE,
-			NULL, 0, "Reference Clock ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_reftime, {
 			"Reference Clock Update Time", "ntp.reftime", FT_BYTES, BASE_NONE,
-			NULL, 0, "Reference Clock Update Time", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_org, {
 			"Originate Time Stamp", "ntp.org", FT_BYTES, BASE_NONE,
-			NULL, 0, "Originate Time Stamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_rec, {
 			"Receive Time Stamp", "ntp.rec", FT_BYTES, BASE_NONE,
-			NULL, 0, "Receive Time Stamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_xmt, {
 			"Transmit Time Stamp", "ntp.xmt", FT_BYTES, BASE_NONE,
-			NULL, 0, "Transmit Time Stamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_keyid, {
-			"Key ID", "ntp.keyid", FT_BYTES, BASE_HEX,
-			NULL, 0, "Key ID", HFILL }},
+			"Key ID", "ntp.keyid", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_mac, {
-			"Message Authentication Code", "ntp.mac", FT_BYTES, BASE_HEX,
-			NULL, 0, "Message Authentication Code", HFILL }},
+			"Message Authentication Code", "ntp.mac", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_ntp_ext, {
 			"Extension", "ntp.ext", FT_NONE, BASE_NONE,
-			NULL, 0, "Extension", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_flags, {
 			"Flags", "ntp.ext.flags", FT_UINT8, BASE_HEX,
 			NULL, 0, "Flags (Response/Error/Version)", HFILL }},
 		{ &hf_ntp_ext_flags_r, {
 			"Response bit", "ntp.ext.flags.r", FT_UINT8, BASE_DEC,
-			VALS(ext_r_types), NTP_EXT_R_MASK, "Response bit", HFILL }},
+			VALS(ext_r_types), NTP_EXT_R_MASK, NULL, HFILL }},
 		{ &hf_ntp_ext_flags_error, {
 			"Error bit", "ntp.ext.flags.error", FT_UINT8, BASE_DEC,
-			NULL, NTP_EXT_ERROR_MASK, "Error bit", HFILL }},
+			NULL, NTP_EXT_ERROR_MASK, NULL, HFILL }},
 		{ &hf_ntp_ext_flags_vn, {
 			"Version", "ntp.ext.flags.vn", FT_UINT8, BASE_DEC,
-			NULL, NTP_EXT_VN_MASK, "Version", HFILL }},
+			NULL, NTP_EXT_VN_MASK, NULL, HFILL }},
 		{ &hf_ntp_ext_op, {
 			"Opcode", "ntp.ext.op", FT_UINT8, BASE_DEC,
-			VALS(ext_op_types), 0, "Opcode", HFILL }},
+			VALS(ext_op_types), 0, NULL, HFILL }},
 		{ &hf_ntp_ext_len, {
 			"Extension length", "ntp.ext.len", FT_UINT16, BASE_DEC,
-			NULL, 0, "Extension length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_associd, {
 			"Association ID", "ntp.ext.associd", FT_UINT32, BASE_DEC,
-			NULL, 0, "Association ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_tstamp, {
 			"Timestamp", "ntp.ext.tstamp", FT_UINT32, BASE_HEX,
-			NULL, 0, "Timestamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_fstamp, {
 			"File Timestamp", "ntp.ext.fstamp", FT_UINT32, BASE_HEX,
-			NULL, 0, "File Timestamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_vallen, {
 			"Value length", "ntp.ext.vallen", FT_UINT32, BASE_DEC,
-			NULL, 0, "Value length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_val, {
-			"Value", "ntp.ext.val", FT_BYTES, BASE_HEX,
-			NULL, 0, "Value", HFILL }},
+			"Value", "ntp.ext.val", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_siglen, {
 			"Signature length", "ntp.ext.siglen", FT_UINT32, BASE_DEC,
-			NULL, 0, "Signature length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ntp_ext_sig, {
-			"Signature", "ntp.ext.sig", FT_BYTES, BASE_HEX,
-			NULL, 0, "Signature", HFILL }},
+			"Signature", "ntp.ext.sig", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_ntpctrl_flags2, {
 			"Flags 2", "ntpctrl.flags2", FT_UINT8, BASE_HEX,
 			NULL, 0, "Flags (Response/Error/More/Opcode)", HFILL }},
 		{ &hf_ntpctrl_flags2_r, {
 			"Response bit", "ntpctrl.flags2.r", FT_UINT8, BASE_DEC,
-			VALS(ctrl_r_types), NTPCTRL_R_MASK, "Response bit", HFILL }},
+			VALS(ctrl_r_types), NTPCTRL_R_MASK, NULL, HFILL }},
 		{ &hf_ntpctrl_flags2_error, {
 			"Error bit", "ntpctrl.flags2.error", FT_UINT8, BASE_DEC,
-			NULL, NTPCTRL_ERROR_MASK, "Error bit", HFILL }},
+			NULL, NTPCTRL_ERROR_MASK, NULL, HFILL }},
 		{ &hf_ntpctrl_flags2_more, {
 			"More bit", "ntpctrl.flags2.more", FT_UINT8, BASE_DEC,
-			NULL, NTPCTRL_MORE_MASK, "More bit", HFILL }},
+			NULL, NTPCTRL_MORE_MASK, NULL, HFILL }},
 		{ &hf_ntpctrl_flags2_opcode, {
 			"Opcode", "ntpctrl.flags2.opcode", FT_UINT8, BASE_DEC,
-			VALS(ctrl_op_types), NTPCTRL_OP_MASK, "Opcode", HFILL }},
+			VALS(ctrl_op_types), NTPCTRL_OP_MASK, NULL, HFILL }},
 
 		{ &hf_ntppriv_flags_r, {
 			"Response bit", "ntppriv.flags.r", FT_UINT8, BASE_DEC,
-			VALS(priv_r_types), NTPPRIV_R_MASK, "Response bit", HFILL }},
+			VALS(priv_r_types), NTPPRIV_R_MASK, NULL, HFILL }},
 		{ &hf_ntppriv_flags_more, {
 			"More bit", "ntppriv.flags.more", FT_UINT8, BASE_DEC,
-			NULL, NTPPRIV_MORE_MASK, "More bit", HFILL }},
+			NULL, NTPPRIV_MORE_MASK, NULL, HFILL }},
 		{ &hf_ntppriv_auth_seq, {
 			"Auth, sequence", "ntppriv.auth_seq", FT_UINT8, BASE_DEC,
 			NULL, 0, "Auth bit, sequence number", HFILL }},
 		{ &hf_ntppriv_auth, {
 			"Auth bit", "ntppriv.auth", FT_UINT8, BASE_DEC,
-			NULL, NTPPRIV_AUTH_MASK, "Auth bit", HFILL }},
+			NULL, NTPPRIV_AUTH_MASK, NULL, HFILL }},
 		{ &hf_ntppriv_seq, {
 			"Sequence number", "ntppriv.seq", FT_UINT8, BASE_DEC,
-			NULL, NTPPRIV_SEQ_MASK, "Sequence number", HFILL }},
+			NULL, NTPPRIV_SEQ_MASK, NULL, HFILL }},
 		{ &hf_ntppriv_impl, {
 			"Implementation", "ntppriv.impl", FT_UINT8, BASE_DEC,
-			VALS(priv_impl_types), 0, "Implementation", HFILL }},
+			VALS(priv_impl_types), 0, NULL, HFILL }},
 		{ &hf_ntppriv_reqcode, {
 			"Request code", "ntppriv.reqcode", FT_UINT8, BASE_DEC,
-			VALS(priv_rc_types), 0, "Request code", HFILL }}
+			VALS(priv_rc_types), 0, NULL, HFILL }}
         };
 	static gint *ett[] = {
 		&ett_ntp,
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 95bdb3d4a7..bb893b979b 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -464,11 +464,11 @@ proto_register_null(void)
 		/* registered here but handled in ethertype.c */
 		{ &hf_null_etype,
 		{ "Type",		"null.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_null_family,
 		{ "Family",		"null.family",	FT_UINT32, BASE_DEC, VALS(family_vals), 0x0,
-			"", HFILL }}
+			NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_null,
diff --git a/epan/dissectors/packet-ocsp.c b/epan/dissectors/packet-ocsp.c
index 45c628ddc0..5b9c901531 100644
--- a/epan/dissectors/packet-ocsp.c
+++ b/epan/dissectors/packet-ocsp.c
@@ -714,7 +714,7 @@ void proto_register_ocsp(void) {
     { &hf_ocsp_responseType_id,
       { "ResponseType Id", "x509af.responseType.id",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ResponseType Id", HFILL }},
+        NULL, HFILL }},
 
 /*--- Included file: packet-ocsp-hfarr.c ---*/
 #line 1 "packet-ocsp-hfarr.c"
@@ -776,7 +776,7 @@ void proto_register_ocsp(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_signature,
       { "signature", "ocsp.signature",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ocsp.BIT_STRING", HFILL }},
     { &hf_ocsp_certs,
       { "certs", "ocsp.certs",
@@ -800,11 +800,11 @@ void proto_register_ocsp(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_ocsp_issuerNameHash,
       { "issuerNameHash", "ocsp.issuerNameHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ocsp.OCTET_STRING", HFILL }},
     { &hf_ocsp_issuerKeyHash,
       { "issuerKeyHash", "ocsp.issuerKeyHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ocsp.OCTET_STRING", HFILL }},
     { &hf_ocsp_serialNumber,
       { "serialNumber", "ocsp.serialNumber",
@@ -824,7 +824,7 @@ void proto_register_ocsp(void) {
         "ocsp.T_responseType", HFILL }},
     { &hf_ocsp_response,
       { "response", "ocsp.response",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ocsp.T_response", HFILL }},
     { &hf_ocsp_tbsResponseData,
       { "tbsResponseData", "ocsp.tbsResponseData",
@@ -856,7 +856,7 @@ void proto_register_ocsp(void) {
         "pkix1explicit.Name", HFILL }},
     { &hf_ocsp_byKey,
       { "byKey", "ocsp.byKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ocsp.KeyHash", HFILL }},
     { &hf_ocsp_certID,
       { "certID", "ocsp.certID",
diff --git a/epan/dissectors/packet-oicq.c b/epan/dissectors/packet-oicq.c
index e94a827b2e..96a87ade1c 100644
--- a/epan/dissectors/packet-oicq.c
+++ b/epan/dissectors/packet-oicq.c
@@ -179,16 +179,16 @@ proto_register_oicq(void)
 			NULL, 0, "Version-zz", HFILL }},
 		{ &hf_oicq_command, {
 			"Command", "oicq.command", FT_UINT16, BASE_DEC,
-			VALS(oicq_command_vals), 0, "Command", HFILL }},
+			VALS(oicq_command_vals), 0, NULL, HFILL }},
 		{ &hf_oicq_seq, {
 			"Sequence", "oicq.seq", FT_UINT16, BASE_DEC,
-			NULL, 0, "Sequence", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_oicq_qqid, {
 			"Data(OICQ Number,if sender is client)", "oicq.qqid", FT_UINT32, BASE_DEC,
-			NULL, 0, "", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_oicq_data, {
-			"Data", "oicq.data", FT_STRING, 0,
-			NULL, 0, "Data", HFILL }},
+			"Data", "oicq.data", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_oicq,
diff --git a/epan/dissectors/packet-olsr.c b/epan/dissectors/packet-olsr.c
index 7e2c6b250f..af418f5e7e 100644
--- a/epan/dissectors/packet-olsr.c
+++ b/epan/dissectors/packet-olsr.c
@@ -721,7 +721,7 @@ void proto_register_olsr(void) {
 
     { &hf_olsr_message,
       { "Message", "olsr.message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL
       }
     },
@@ -805,7 +805,7 @@ void proto_register_olsr(void) {
 
     { &hf_olsr_neighbor,
       { "Neighbor Address", "olsr.neighbor",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL
       }
     },
@@ -847,7 +847,7 @@ void proto_register_olsr(void) {
 
     { &hf_olsr_neighbor6,
       { "Neighbor Address", "olsr.neighbor6",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL
       }
     },
@@ -889,7 +889,7 @@ void proto_register_olsr(void) {
 
     { &hf_olsr_data,
       { "Data", "olsr.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL
       }
     },
@@ -909,7 +909,7 @@ void proto_register_olsr(void) {
 
     { &hf_olsrorg_ns,
       { "Nameservice message", "olsr.ns",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL
       }
     },
diff --git a/epan/dissectors/packet-omapi.c b/epan/dissectors/packet-omapi.c
index 5f0c2b3231..c435d4d839 100644
--- a/epan/dissectors/packet-omapi.c
+++ b/epan/dissectors/packet-omapi.c
@@ -288,7 +288,7 @@ proto_register_omapi(void)
       	NULL, HFILL }},
     { &hf_omapi_signature,
       { "Signature", "omapi.signature",
-	FT_BYTES, BASE_HEX, NULL, 0x0,
+	FT_BYTES, BASE_NONE, NULL, 0x0,
       	NULL, HFILL }}
   };
 
diff --git a/epan/dissectors/packet-opsi.c b/epan/dissectors/packet-opsi.c
index 1876d33767..e317dec949 100644
--- a/epan/dissectors/packet-opsi.c
+++ b/epan/dissectors/packet-opsi.c
@@ -519,207 +519,207 @@ proto_register_opsi(void)
 		{ &hf_opsi_major_version,
 			{ "Major version",           "opsi.major",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_minor_version,
 			{ "Minor version",           "opsi.minor",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_opcode,
 		        { "Operation code",		"opsi.opcode",
 		        FT_UINT8, BASE_DEC, VALS(opsi_opcode), 0x0,
-		        "", HFILL }
+		        NULL, HFILL }
 		},
 		{ &hf_opsi_hook_id,
 			{ "Hook ID",			"opsi.hook",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_length,
 			{ "Message length",		"opsi.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_session_id,
 			{ "Session ID",			"opsi.session_id",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_user_name_att,
 			{ "User name",			"opsi.attr.user_name",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_password_att,
 			{ "User password",		"opsi.attr.password",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_chap_password_att,
 			{ "CHAP password attribute",	"opsi.attr.chap_password",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_nas_ip_add_att,
 			{ "NAS IP address",		"opsi.attr.nas_ip_addr",
-			FT_IPv4, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x00,
+			NULL, HFILL }
 		},
 		{ &hf_nas_port_att,
 			{ "NAS port",			"opsi.attr.nas_port",
 			FT_UINT32, BASE_HEX, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_service_type_att,
 		        { "Service type",		"opsi.attr.service_type",
 			FT_UINT32, BASE_DEC, VALS(opsi_service_type_code), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_framed_protocol_att,
 			{ "Framed protocol",		"opsi.attr.framed_protocol",
 			FT_UINT32, BASE_DEC, VALS(opsi_framed_protocol_code), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_framed_address_att,
 			{ "Framed address",		"opsi.attr.framed_address",
-			FT_IPv4, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x00,
+			NULL, HFILL }
 		},
 		{ &hf_framed_netmask_att,
 			{ "Framed netmask",		"opsi.attr.framed_netmask",
-			FT_IPv4, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x00,
+			NULL, HFILL }
 		},
 		{ &hf_framed_routing_att,
 			{ "Framed routing",		"opsi.attr.framed_routing",
 			FT_UINT32, BASE_DEC, VALS(opsi_framed_routing_code), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_framed_filter_att,
 			{ "Framed filter",		"opsi.attr.framed_filter",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_framed_mtu_att,
 			{ "Framed MTU",		"opsi.attr.framed_mtu",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_framed_compression_att,
 			{ "Framed compression",		"opsi.attr.framed_compression",
 			FT_UINT32, BASE_DEC, VALS(opsi_framed_compression_code), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_called_station_att,
 			{ "Called station ID",		"opsi.attr.called_station_id",
 			FT_STRING, BASE_NONE, NULL, 0x00,	
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_calling_station_att,
 			{ "Calling station ID",		"opsi.attr.calling_station_id",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_nas_identifier_att,
 			{ "NAS ID",			"opsi.attr.nas_id",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_accounting_att,
 			{ "Accounting",			"opsi.attr.accounting",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_acct_session_id_att,
 			{ "Accounting session ID",	"opsi.attr.acct.session_id",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_chap_challenge_att,
 			{ "CHAP challenge",		"opsi.attr.chap_challenge",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_nas_port_type_att,
 			{ "NAS port type",		"opsi.attr.nas_port_type",
 			FT_UINT32, BASE_DEC, VALS(opsi_nas_port_type_code), 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_designation_num_att,
 			{ "Designation number",		"opsi.attr.designation_number",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_nas_port_id_att,
 			{ "NAS port ID", 		"opsi.attr.nas_port_id",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_aaa_id_att,
 			{ "SMC AAA ID",			"opsi.attr.smc_aaa_id",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_vpn_id_att,	
 			{ "SMC VPN ID",			"opsi.attr.smc_vpn_id",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_vpn_name_att,
 			{ "SMC VPN name",		"opsi.attr.smc_vpn_name",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_ran_id_att,
 			{ "SMC RAN ID",			"opsi.attr.smc_ran_id",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_ran_ip_att,	
 			{ "SMC RAN IP address",		"opsi.attr.smc_ran_ip",
-			FT_IPv4, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x00,
+			NULL, HFILL }
 		},
 		{ &hf_smc_ran_name_att,
 			{ "SMC RAN name",		"opsi.attr.smc_ran_name",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_pop_id_att,
 			{ "SMC POP id",			"opsi.attr.smc_pop_id",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_pop_name_att,
 			{ "SMC POP name",		"opsi.attr.smc_pop_name",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_id_att,        
 			{ "SMC ID",			"opsi.attr.smc_id",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_receive_time_att,
 			{ "SMC receive time",		"opsi.attr.smc_receive_time",
 			FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_smc_stat_time_att,
 			{ "SMC stat time",		"opsi.attr.smc_stat_time",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_flags_att,
 			{ "OPSI flags",			"opsi.attr.flags",
 			FT_UINT32, BASE_DEC, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_opsi_application_name_att,
 			{ "OPSI application name",	"opsi.attr.application_name",
 			FT_STRING, BASE_NONE, NULL, 0x00,
-			"", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-ositp.c b/epan/dissectors/packet-ositp.c
index e508c4597d..c9fa8e45b4 100644
--- a/epan/dissectors/packet-ositp.c
+++ b/epan/dissectors/packet-ositp.c
@@ -1857,7 +1857,7 @@ void proto_register_cltp(void)
         "Length Indicator, length of this header", HFILL}},
     { &hf_cltp_type,
       { "PDU Type", "cltp.type", FT_UINT8, BASE_HEX, VALS(cltp_tpdu_type_abbrev_vals), 0x0,
-        "PDU Type", HFILL}},
+        NULL, HFILL}},
   };
   static gint *ett[] = {
 	&ett_cltp,
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index 42a6408101..387d50a010 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -4427,7 +4427,7 @@ void proto_register_p7(void) {
         "p7.Restrictions", HFILL }},
     { &hf_p7_ms_configuration_request,
       { "ms-configuration-request", "p7.ms_configuration_request",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_ua_registration_identifier,
       { "ua-registration-identifier", "p7.ua_registration_identifier",
@@ -4479,7 +4479,7 @@ void proto_register_p7(void) {
         "p7.AttributeType", HFILL }},
     { &hf_p7_alert_indication,
       { "alert-indication", "p7.alert_indication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_content_types_supported,
       { "content-types-supported", "p7.content_types_supported",
@@ -4527,7 +4527,7 @@ void proto_register_p7(void) {
         "p7.OBJECT_IDENTIFIER", HFILL }},
     { &hf_p7_ua_registration_id_unknown,
       { "ua-registration-id-unknown", "p7.ua_registration_id_unknown",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_service_information,
       { "service-information", "p7.service_information",
@@ -4683,7 +4683,7 @@ void proto_register_p7(void) {
         "p7.T_attribute_value", HFILL }},
     { &hf_p7_child_entries,
       { "child-entries", "p7.child_entries",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_range,
       { "range", "p7.range",
@@ -4699,7 +4699,7 @@ void proto_register_p7(void) {
         "p7.INTEGER_1_ub_messages", HFILL }},
     { &hf_p7_override,
       { "override", "p7.override",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.OverrideRestrictions", HFILL }},
     { &hf_p7_EntryInformationSelection_item,
       { "AttributeSelection", "p7.AttributeSelection",
@@ -4743,7 +4743,7 @@ void proto_register_p7(void) {
         "p7.EntryClass", HFILL }},
     { &hf_p7_disable_auto_modify,
       { "disable-auto-modify", "p7.disable_auto_modify",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_add_message_group_names,
       { "add-message-group-names", "p7.add_message_group_names",
@@ -5051,7 +5051,7 @@ void proto_register_p7(void) {
         "p7.GeneralString_SIZE_1_ub_group_descriptor_length", HFILL }},
     { &hf_p7_registrations,
       { "registrations", "p7.registrations",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.T_registrations", HFILL }},
     { &hf_p7_extended_registrations,
       { "extended-registrations", "p7.extended_registrations",
@@ -5071,11 +5071,11 @@ void proto_register_p7(void) {
         "p7.MessageGroupName", HFILL }},
     { &hf_p7_immediate_descendants_only,
       { "immediate-descendants-only", "p7.immediate_descendants_only",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_omit_descriptors,
       { "omit-descriptors", "p7.omit_descriptors",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_algorithm_identifier,
       { "algorithm-identifier", "p7.algorithm_identifier",
@@ -5087,7 +5087,7 @@ void proto_register_p7(void) {
         "x411.InitiatorCredentials", HFILL }},
     { &hf_p7_password_delta,
       { "password-delta", "p7.password_delta",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.BIT_STRING", HFILL }},
     { &hf_p7_no_status_information,
       { "no-status-information", "p7.no_status_information",
@@ -5159,7 +5159,7 @@ void proto_register_p7(void) {
         "p7.MSExtensions", HFILL }},
     { &hf_p7_strict,
       { "strict", "p7.strict",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "p7.BOOLEAN", HFILL }},
     { &hf_p7_modification,
       { "modification", "p7.modification",
@@ -5215,7 +5215,7 @@ void proto_register_p7(void) {
         "x411.MessageSubmissionEnvelope", HFILL }},
     { &hf_p7_content,
       { "content", "p7.content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Content", HFILL }},
     { &hf_p7_submission_options,
       { "submission-options", "p7.submission_options",
@@ -5271,7 +5271,7 @@ void proto_register_p7(void) {
         "x411.ContentLength", HFILL }},
     { &hf_p7_per_message_indicators,
       { "per-message-indicators", "p7.per_message_indicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PerMessageIndicators", HFILL }},
     { &hf_p7_per_recipient_fields,
       { "per-recipient-fields", "p7.per_recipient_fields",
@@ -5427,7 +5427,7 @@ void proto_register_p7(void) {
         "p7.ModifyProblem", HFILL }},
     { &hf_p7_entry_class_problem,
       { "problem", "p7.problem",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.T_entry_class_problem", HFILL }},
     { &hf_p7_no_correlated_reports,
       { "no-correlated-reports", "p7.no_correlated_reports",
@@ -5539,7 +5539,7 @@ void proto_register_p7(void) {
         "p7.RTTPapdu", HFILL }},
     { &hf_p7_rttr_apdu,
       { "rttr-apdu", "p7.rttr_apdu",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.RTTRapdu", HFILL }},
     { &hf_p7_rtab_apdu,
       { "rtab-apdu", "p7.rtab_apdu",
@@ -5551,7 +5551,7 @@ void proto_register_p7(void) {
         "p7.AbortReason", HFILL }},
     { &hf_p7_reflectedParameter,
       { "reflectedParameter", "p7.reflectedParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "p7.BIT_STRING", HFILL }},
     { &hf_p7_userdataAB,
       { "userdataAB", "p7.userdataAB",
@@ -5560,51 +5560,51 @@ void proto_register_p7(void) {
     { &hf_p7_OverrideRestrictions_override_content_types_restriction,
       { "override-content-types-restriction", "p7.override-content-types-restriction",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_EITs_restriction,
       { "override-EITs-restriction", "p7.override-EITs-restriction",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_OverrideRestrictions_override_attribute_length_restriction,
       { "override-attribute-length-restriction", "p7.override-attribute-length-restriction",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_auto_action_registrations,
       { "auto-action-registrations", "p7.auto-action-registrations",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_list_attribute_defaults,
       { "list-attribute-defaults", "p7.list-attribute-defaults",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_fetch_attribute_defaults,
       { "fetch-attribute-defaults", "p7.fetch-attribute-defaults",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_ua_registrations,
       { "ua-registrations", "p7.ua-registrations",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_submission_defaults,
       { "submission-defaults", "p7.submission-defaults",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_registrations_message_group_registrations,
       { "message-group-registrations", "p7.message-group-registrations",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_unsupported_entry_class,
       { "unsupported-entry-class", "p7.unsupported-entry-class",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_entry_class_not_subscribed,
       { "entry-class-not-subscribed", "p7.entry-class-not-subscribed",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_p7_T_entry_class_problem_inappropriate_entry_class,
       { "inappropriate-entry-class", "p7.inappropriate-entry-class",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-p7-hfarr.c ---*/
 #line 95 "packet-p7-template.c"
diff --git a/epan/dissectors/packet-p_mul.c b/epan/dissectors/packet-p_mul.c
index 25e61bee0c..c143b9ef3a 100644
--- a/epan/dissectors/packet-p_mul.c
+++ b/epan/dissectors/packet-p_mul.c
@@ -1351,63 +1351,61 @@ void proto_register_p_mul (void)
   static hf_register_info hf[] = {
     { &hf_length,
       { "Length of PDU", "p_mul.length", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Length of PDU", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_priority,
       { "Priority", "p_mul.priority", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "Priority", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_map_first,
       { "First", "p_mul.first", FT_BOOLEAN, 8,
-        TFS (&yes_no), 0x80, "First", HFILL } },
+        TFS (&yes_no), 0x80, NULL, HFILL } },
     { &hf_map_last,
       { "Last", "p_mul.last", FT_BOOLEAN, 8,
-        TFS (&yes_no), 0x40, "Last", HFILL } },
+        TFS (&yes_no), 0x40, NULL, HFILL } },
     { &hf_map_unused,
       { "MAP unused", "p_mul.unused", FT_UINT8, BASE_DEC,
-        NULL, 0xC0, "MAP unused", HFILL } },
+        NULL, 0xC0, NULL, HFILL } },
     { &hf_pdu_type,
       { "PDU Type", "p_mul.pdu_type", FT_UINT8, BASE_DEC,
-        VALS (pdu_vals), 0x3F, "PDU Type", HFILL } },
+        VALS (pdu_vals), 0x3F, NULL, HFILL } },
     { &hf_no_pdus,
       { "Total Number of PDUs", "p_mul.no_pdus", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Total Number of PDUs", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_seq_no,
       { "Sequence Number of PDUs", "p_mul.seq_no", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Sequence Number of PDUs", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_unused8,
       { "Unused", "p_mul.unused", FT_UINT8, BASE_DEC,
-        NULL, 0x0, "Unused", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_unused16,
       { "Unused", "p_mul.unused", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Unused", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_checksum,
       { "Checksum", "p_mul.checksum", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "Checksum", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_checksum_good,
       { "Good", "p_mul.checksum_good", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "True: checksum matches packet content; "
-        "False: doesn't match content or not checked", HFILL } },
+        NULL, 0x0, "True: checksum matches packet content; False: doesn't match content or not checked", HFILL } },
     { &hf_checksum_bad,
       { "Bad", "p_mul.checksum_bad", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "True: checksum doesn't match packet content; "
-        "False: matches content or not checked", HFILL } },
+        NULL, 0x0, "True: checksum doesn't match packet content; False: matches content or not checked", HFILL } },
     { &hf_source_id_ack,
-      { "Source ID of Ack Sender", "p_mul.source_id_ack", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Source ID of Ack Sender", HFILL } },
+      { "Source ID of Ack Sender", "p_mul.source_id_ack", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_source_id,
-      { "Source ID", "p_mul.source_id", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Source ID", HFILL } },
+      { "Source ID", "p_mul.source_id", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_message_id,
       { "Message ID (MSID)", "p_mul.message_id", FT_UINT32, BASE_DEC,
         NULL, 0x0, "Message ID", HFILL } },
     { &hf_expiry_time,
-      { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, BASE_DEC,
-        NULL, 0x0, "Expiry Time", HFILL } },
+      { "Expiry Time", "p_mul.expiry_time", FT_ABSOLUTE_TIME, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_mc_group,
       { "Multicast Group", "p_mul.mc_group", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "Multicast Group", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ann_mc_group,
       { "Announced Multicast Group", "p_mul.ann_mc_group", FT_UINT32, BASE_DEC,
-        NULL, 0x0, "Announced Multicast Group", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_fec_len,
       { "FEC Parameter Length", "p_mul.fec.length", FT_UINT8, BASE_DEC,
         NULL, 0x0, "Forward Error Correction Parameter Length", HFILL } },
@@ -1419,76 +1417,76 @@ void proto_register_p_mul (void)
         NULL, 0x0, "Forward Error Correction Parameters", HFILL } },
     { &hf_count_of_dest,
       { "Count of Destination Entries", "p_mul.dest_count", FT_UINT16,BASE_DEC,
-        NULL, 0x0, "Count of Destination Entries", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_length_of_res,
       { "Length of Reserved Field", "p_mul.reserved_length",FT_UINT16,BASE_DEC,
-        NULL, 0x0, "Length of Reserved Field", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_count,
       { "Count of Ack Info Entries", "p_mul.ack_count", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Count of Ack Info Entries", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_entry,
       { "Ack Info Entry", "p_mul.ack_info_entry", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Ack Info Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_ack_length,
       { "Length of Ack Info Entry", "p_mul.ack_length", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Length of Ack Info Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_miss_seq_no,
       { "Missing Data PDU Seq Number", "p_mul.missing_seq_no", FT_UINT16,
-        BASE_DEC, NULL, 0x0, "Missing Data PDU Seq Number", HFILL } },
+        BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_miss_seq_range,
       { "Missing Data PDU Seq Range", "p_mul.missing_seq_range", FT_BYTES,
-        BASE_DEC, NULL, 0x0, "Missing Data PDU Seq Range", HFILL } },
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_tot_miss_seq_no,
       { "Total Number of Missing Data PDU Sequence Numbers", 
         "p_mul.no_missing_seq_no", FT_UINT16, BASE_DEC, NULL, 0x0, 
-        "Total Number of Missing Data PDU Sequence Numbers", HFILL } },
+        NULL, HFILL } },
     { &hf_timestamp_option,
       { "Timestamp Option", "p_mul.timestamp", FT_UINT64, BASE_DEC,
         NULL, 0x0, "Timestamp Option (in units of 100ms)", HFILL } },
     { &hf_dest_entry,
       { "Destination Entry", "p_mul.dest_entry", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Destination Entry", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_dest_id,
-      { "Destination ID", "p_mul.dest_id", FT_IPv4, BASE_DEC,
-        NULL, 0x0, "Destination ID", HFILL } },
+      { "Destination ID", "p_mul.dest_id", FT_IPv4, BASE_NONE,
+        NULL, 0x0, NULL, HFILL } },
     { &hf_msg_seq_no,
       { "Message Sequence Number", "p_mul.msg_seq_no", FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Message Sequence Number", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_sym_key,
       { "Symmetric Key", "p_mul.sym_key", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Symmetric Key", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_data_fragment,
       { "Fragment of Data", "p_mul.data_fragment", FT_NONE, BASE_NONE,
-        NULL, 0x0, "Fragment of Data", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
 
     /* Fragment entries */
     { &hf_msg_fragments,
       { "Message fragments", "p_mul.fragments", FT_NONE, BASE_NONE,
-        NULL, 0x00, "Message fragments", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
     { &hf_msg_fragment,
       { "Message fragment", "p_mul.fragment", FT_FRAMENUM, BASE_NONE,
-        NULL, 0x00, "Message fragment", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
     { &hf_msg_fragment_overlap,
       { "Message fragment overlap", "p_mul.fragment.overlap", FT_BOOLEAN,
-        BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
+        BASE_NONE, NULL, 0x0, NULL, HFILL } },
     { &hf_msg_fragment_overlap_conflicts,
       { "Message fragment overlapping with conflicting data",
         "p_mul.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
-        0x00, "Message fragment overlapping with conflicting data", HFILL } },
+        0x0, NULL, HFILL } },
     { &hf_msg_fragment_multiple_tails,
       { "Message has multiple tail fragments",
         "p_mul.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x00, "Message has multiple tail fragments", HFILL } },
+        NULL, 0x0, NULL, HFILL } },
     { &hf_msg_fragment_too_long_fragment,
       { "Message fragment too long", "p_mul.fragment.too_long_fragment",
-        FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL,
         HFILL } },
     { &hf_msg_fragment_error,
       { "Message defragmentation error", "p_mul.fragment.error", FT_FRAMENUM,
-        BASE_NONE, NULL, 0x00, "Message defragmentation error", HFILL } },
+        BASE_NONE, NULL, 0x00, NULL, HFILL } },
     { &hf_msg_reassembled_in,
       { "Reassembled in", "p_mul.reassembled.in", FT_FRAMENUM, BASE_NONE,
-        NULL, 0x00, "Reassembled in", HFILL } },
+        NULL, 0x00, NULL, HFILL } },
 
     /*
     ** Ack matching / Resend
diff --git a/epan/dissectors/packet-packetlogger.c b/epan/dissectors/packet-packetlogger.c
index eda0385262..cad406693b 100644
--- a/epan/dissectors/packet-packetlogger.c
+++ b/epan/dissectors/packet-packetlogger.c
@@ -139,7 +139,7 @@ void proto_register_packetlogger (void)
     { &hf_type,
       { "Type", "packetlogger.type", FT_UINT8, BASE_HEX, VALS(type_vals), 0x0, NULL, HFILL } },
     { &hf_info,
-      { "Info", "packetlogger.info", FT_STRING, BASE_DEC, NULL, 0x0, NULL, HFILL } },
+      { "Info", "packetlogger.info", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL } },
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-pcap.c b/epan/dissectors/packet-pcap.c
index 37bfeb94fd..74f7892494 100644
--- a/epan/dissectors/packet-pcap.c
+++ b/epan/dissectors/packet-pcap.c
@@ -11399,7 +11399,7 @@ void proto_register_pcap(void) {
         "pcap.PositioningMethod", HFILL }},
     { &hf_pcap_GNSS_PositioningMethod_PDU,
       { "GNSS-PositioningMethod", "pcap.GNSS_PositioningMethod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.GNSS_PositioningMethod", HFILL }},
     { &hf_pcap_PositioningPriority_PDU,
       { "PositioningPriority", "pcap.PositioningPriority",
@@ -11647,11 +11647,11 @@ void proto_register_pcap(void) {
         "pcap.GPS_AlmanacAndSatelliteHealth", HFILL }},
     { &hf_pcap_satMask,
       { "satMask", "pcap.satMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_1_32", HFILL }},
     { &hf_pcap_lsbTOW,
       { "lsbTOW", "pcap.lsbTOW",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_iE_Extensions,
       { "iE-Extensions", "pcap.iE_Extensions",
@@ -11731,15 +11731,15 @@ void proto_register_pcap(void) {
         "pcap.ExtendedRoundTripTime", HFILL }},
     { &hf_pcap_stdResolution,
       { "stdResolution", "pcap.stdResolution",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_numberOfMeasurements,
       { "numberOfMeasurements", "pcap.numberOfMeasurements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_3", HFILL }},
     { &hf_pcap_stdOfMeasurements,
       { "stdOfMeasurements", "pcap.stdOfMeasurements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_pcap_geographicalCoordinates,
       { "geographicalCoordinates", "pcap.geographicalCoordinates",
@@ -11807,23 +11807,23 @@ void proto_register_pcap(void) {
         "pcap.T_fdd", HFILL }},
     { &hf_pcap_roundTripTimeInfoWanted,
       { "roundTripTimeInfoWanted", "pcap.roundTripTimeInfoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_pathlossWanted,
       { "pathlossWanted", "pcap.pathlossWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_roundTripTimeInfoWithType1Wanted,
       { "roundTripTimeInfoWithType1Wanted", "pcap.roundTripTimeInfoWithType1Wanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_cpichRSCPWanted,
       { "cpichRSCPWanted", "pcap.cpichRSCPWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_cpicEcNoWanted,
       { "cpicEcNoWanted", "pcap.cpicEcNoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_tdd,
       { "tdd", "pcap.tdd",
@@ -11831,27 +11831,27 @@ void proto_register_pcap(void) {
         "pcap.T_tdd", HFILL }},
     { &hf_pcap_rxTimingDeviationInfoWanted,
       { "rxTimingDeviationInfoWanted", "pcap.rxTimingDeviationInfoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_rxTimingDeviationLCRInfoWanted,
       { "rxTimingDeviationLCRInfoWanted", "pcap.rxTimingDeviationLCRInfoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_rxTimingDeviation768InfoWanted,
       { "rxTimingDeviation768InfoWanted", "pcap.rxTimingDeviation768InfoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_rxTimingDeviation384extInfoWanted,
       { "rxTimingDeviation384extInfoWanted", "pcap.rxTimingDeviation384extInfoWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_angleOfArrivalLCRWanted,
       { "angleOfArrivalLCRWanted", "pcap.angleOfArrivalLCRWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_timingAdvanceLCRWanted,
       { "timingAdvanceLCRWanted", "pcap.timingAdvanceLCRWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_procedureCode,
       { "procedureCode", "pcap.procedureCode",
@@ -12059,7 +12059,7 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_4095", HFILL }},
     { &hf_pcap_positioningDataDiscriminator,
       { "positioningDataDiscriminator", "pcap.positioningDataDiscriminator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.PositioningDataDiscriminator", HFILL }},
     { &hf_pcap_positioningDataSet,
       { "positioningDataSet", "pcap.positioningDataSet",
@@ -12067,11 +12067,11 @@ void proto_register_pcap(void) {
         "pcap.PositioningDataSet", HFILL }},
     { &hf_pcap_GANSS_PositioningDataSet_item,
       { "GANSS-PositioningMethodAndUsage", "pcap.GANSS_PositioningMethodAndUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.GANSS_PositioningMethodAndUsage", HFILL }},
     { &hf_pcap_PositioningDataSet_item,
       { "PositioningMethodAndUsage", "pcap.PositioningMethodAndUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.PositioningMethodAndUsage", HFILL }},
     { &hf_pcap_gps_TOW_1msec,
       { "gps-TOW-1msec", "pcap.gps_TOW_1msec",
@@ -12167,7 +12167,7 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_63", HFILL }},
     { &hf_pcap_gANSS_iod,
       { "gANSS-iod", "pcap.gANSS_iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_pcap_ganss_prc,
       { "ganss-prc", "pcap.ganss_prc",
@@ -12183,7 +12183,7 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_255", HFILL }},
     { &hf_pcap_ganss_sat_id,
       { "ganss-sat-id", "pcap.ganss_sat_id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_36", HFILL }},
     { &hf_pcap_gANSS_AlmanacModel,
       { "gANSS-AlmanacModel", "pcap.gANSS_AlmanacModel",
@@ -12235,7 +12235,7 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_1_1024", HFILL }},
     { &hf_pcap_ganssDataBits,
       { "ganssDataBits", "pcap.ganssDataBits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_1_1024", HFILL }},
     { &hf_pcap_dopplerFirstOrder,
       { "dopplerFirstOrder", "pcap.dopplerFirstOrder",
@@ -12303,15 +12303,15 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_7", HFILL }},
     { &hf_pcap_alpha_zero_ionos,
       { "alpha-zero-ionos", "pcap.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_pcap_alpha_one_ionos,
       { "alpha-one-ionos", "pcap.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_pcap_alpha_two_ionos,
       { "alpha-two-ionos", "pcap.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_pcap_gANSS_IonosphereRegionalStormFlags,
       { "gANSS-IonosphereRegionalStormFlags", "pcap.gANSS_IonosphereRegionalStormFlags",
@@ -12319,23 +12319,23 @@ void proto_register_pcap(void) {
         "pcap.GANSS_IonosphereRegionalStormFlags", HFILL }},
     { &hf_pcap_storm_flag_one,
       { "storm-flag-one", "pcap.storm_flag_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_storm_flag_two,
       { "storm-flag-two", "pcap.storm_flag_two",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_storm_flag_three,
       { "storm-flag-three", "pcap.storm_flag_three",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_storm_flag_four,
       { "storm-flag-four", "pcap.storm_flag_four",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_storm_flag_five,
       { "storm-flag-five", "pcap.storm_flag_five",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_t_oa,
       { "t-oa", "pcap.t_oa",
@@ -12355,19 +12355,19 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_511", HFILL }},
     { &hf_pcap_ganss_omega_nav,
       { "ganss-omega-nav", "pcap.ganss_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_delta_n_nav,
       { "delta-n-nav", "pcap.delta_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_m_zero_nav,
       { "m-zero-nav", "pcap.m_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_omegadot_nav,
       { "omegadot-nav", "pcap.omegadot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_ganss_e_lsb_nav,
       { "ganss-e-lsb-nav", "pcap.ganss_e_lsb_nav",
@@ -12375,7 +12375,7 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_33554431", HFILL }},
     { &hf_pcap_idot_nav,
       { "idot-nav", "pcap.idot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_pcap_a_sqrt_lsb_nav,
       { "a-sqrt-lsb-nav", "pcap.a_sqrt_lsb_nav",
@@ -12383,35 +12383,35 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_67108863", HFILL }},
     { &hf_pcap_i_zero_nav,
       { "i-zero-nav", "pcap.i_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_omega_zero_nav,
       { "omega-zero-nav", "pcap.omega_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_c_rs_nav,
       { "c-rs-nav", "pcap.c_rs_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_c_is_nav,
       { "c-is-nav", "pcap.c_is_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_c_us_nav,
       { "c-us-nav", "pcap.c_us_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_c_rc_nav,
       { "c-rc-nav", "pcap.c_rc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_c_ic_nav,
       { "c-ic-nav", "pcap.c_ic_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_c_uc_nav,
       { "c-uc-nav", "pcap.c_uc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_GANSS_MeasurementParameters_item,
       { "GANSS-MeasurementParametersItem", "pcap.GANSS_MeasurementParametersItem",
@@ -12427,7 +12427,7 @@ void proto_register_pcap(void) {
         "pcap.T_multipathIndicator", HFILL }},
     { &hf_pcap_carrierQualityIndication,
       { "carrierQualityIndication", "pcap.carrierQualityIndication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_codePhase_01,
       { "codePhase", "pcap.codePhase",
@@ -12551,19 +12551,19 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_511", HFILL }},
     { &hf_pcap_a_i2,
       { "a-i2", "pcap.a_i2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_pcap_a_i1,
       { "a-i1", "pcap.a_i1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_18", HFILL }},
     { &hf_pcap_a_i0,
       { "a-i0", "pcap.a_i0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_pcap_t_gd,
       { "t-gd", "pcap.t_gd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_pcap_model_id,
       { "model-id", "pcap.model_id",
@@ -12607,43 +12607,43 @@ void proto_register_pcap(void) {
         "pcap.GANSS_SatelliteInformationKPItem", HFILL }},
     { &hf_pcap_ganss_e_alm,
       { "ganss-e-alm", "pcap.ganss_e_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_ganss_delta_I_alm,
       { "ganss-delta-I-alm", "pcap.ganss_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_ganss_omegadot_alm,
       { "ganss-omegadot-alm", "pcap.ganss_omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_ganss_svhealth_alm,
       { "ganss-svhealth-alm", "pcap.ganss_svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_pcap_ganss_delta_a_sqrt_alm,
       { "ganss-delta-a-sqrt-alm", "pcap.ganss_delta_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_pcap_ganss_omegazero_alm,
       { "ganss-omegazero-alm", "pcap.ganss_omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_ganss_m_zero_alm,
       { "ganss-m-zero-alm", "pcap.ganss_m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_ganss_omega_alm,
       { "ganss-omega-alm", "pcap.ganss_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_ganss_af_zero_alm,
       { "ganss-af-zero-alm", "pcap.ganss_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_pcap_ganss_af_one_alm,
       { "ganss-af-one-alm", "pcap.ganss_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_GANSS_Sat_Info_Nav_item,
       { "GANSS-Sat-Info-Nav item", "pcap.GANSS_Sat_Info_Nav_item",
@@ -12651,11 +12651,11 @@ void proto_register_pcap(void) {
         "pcap.GANSS_Sat_Info_Nav_item", HFILL }},
     { &hf_pcap_svHealth,
       { "svHealth", "pcap.svHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_pcap_iod,
       { "iod", "pcap.iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_pcap_ganssClockModel,
       { "ganssClockModel", "pcap.ganssClockModel",
@@ -12699,35 +12699,35 @@ void proto_register_pcap(void) {
         "pcap.GANSS_UTRAN_TimeRelationshipUncertainty", HFILL }},
     { &hf_pcap_a_one_utc,
       { "a-one-utc", "pcap.a_one_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_a_zero_utc,
       { "a-zero-utc", "pcap.a_zero_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_t_ot_utc,
       { "t-ot-utc", "pcap.t_ot_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_w_n_t_utc,
       { "w-n-t-utc", "pcap.w_n_t_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_delta_t_ls_utc,
       { "delta-t-ls-utc", "pcap.delta_t_ls_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_w_n_lsf_utc,
       { "w-n-lsf-utc", "pcap.w_n_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_dn_utc,
       { "dn-utc", "pcap.dn_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_delta_t_lsf_utc,
       { "delta-t-lsf-utc", "pcap.delta_t_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_utran_GANSSTimingOfCellFrames,
       { "utran-GANSSTimingOfCellFrames", "pcap.utran_GANSSTimingOfCellFrames",
@@ -12747,7 +12747,7 @@ void proto_register_pcap(void) {
         "pcap.GANSSID", HFILL }},
     { &hf_pcap_wn_a,
       { "wn-a", "pcap.wn_a",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_almanacSatInfoList,
       { "almanacSatInfoList", "pcap.almanacSatInfoList",
@@ -12755,7 +12755,7 @@ void proto_register_pcap(void) {
         "pcap.AlmanacSatInfoList", HFILL }},
     { &hf_pcap_svGlobalHealth,
       { "svGlobalHealth", "pcap.svGlobalHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_364", HFILL }},
     { &hf_pcap_AlmanacSatInfoList_item,
       { "AlmanacSatInfo", "pcap.AlmanacSatInfo",
@@ -12763,71 +12763,71 @@ void proto_register_pcap(void) {
         "pcap.AlmanacSatInfo", HFILL }},
     { &hf_pcap_dataID,
       { "dataID", "pcap.dataID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_e,
       { "e", "pcap.e",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_t_oa_01,
       { "t-oa", "pcap.t_oa",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_deltaI,
       { "deltaI", "pcap.deltaI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_omegaDot,
       { "omegaDot", "pcap.omegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_satHealth,
       { "satHealth", "pcap.satHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_a_Sqrt,
       { "a-Sqrt", "pcap.a_Sqrt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_omega0,
       { "omega0", "pcap.omega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_m0,
       { "m0", "pcap.m0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_omega,
       { "omega", "pcap.omega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_af0,
       { "af0", "pcap.af0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_af1,
       { "af1", "pcap.af1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_pcap_codeOnL2,
       { "codeOnL2", "pcap.codeOnL2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_uraIndex,
       { "uraIndex", "pcap.uraIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_pcap_satHealth_01,
       { "satHealth", "pcap.satHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_6", HFILL }},
     { &hf_pcap_iodc,
       { "iodc", "pcap.iodc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_pcap_l2Pflag,
       { "l2Pflag", "pcap.l2Pflag",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_pcap_sf1Revd,
       { "sf1Revd", "pcap.sf1Revd",
@@ -12835,143 +12835,143 @@ void proto_register_pcap(void) {
         "pcap.SubFrame1Reserved", HFILL }},
     { &hf_pcap_t_GD,
       { "t-GD", "pcap.t_GD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_t_oc,
       { "t-oc", "pcap.t_oc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_af2,
       { "af2", "pcap.af2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_af1_01,
       { "af1", "pcap.af1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_af0_01,
       { "af0", "pcap.af0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_pcap_c_rs,
       { "c-rs", "pcap.c_rs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_delta_n,
       { "delta-n", "pcap.delta_n",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_m0_01,
       { "m0", "pcap.m0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_c_uc,
       { "c-uc", "pcap.c_uc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_e_01,
       { "e", "pcap.e",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_c_us,
       { "c-us", "pcap.c_us",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_a_Sqrt_01,
       { "a-Sqrt", "pcap.a_Sqrt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_t_oe,
       { "t-oe", "pcap.t_oe",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_fitInterval,
       { "fitInterval", "pcap.fitInterval",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_pcap_aodo,
       { "aodo", "pcap.aodo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_pcap_c_ic,
       { "c-ic", "pcap.c_ic",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_omega0_01,
       { "omega0", "pcap.omega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_c_is,
       { "c-is", "pcap.c_is",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_i0,
       { "i0", "pcap.i0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_c_rc,
       { "c-rc", "pcap.c_rc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_omega_01,
       { "omega", "pcap.omega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_omegaDot_01,
       { "omegaDot", "pcap.omegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_iDot,
       { "iDot", "pcap.iDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_pcap_reserved1,
       { "reserved1", "pcap.reserved1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_23", HFILL }},
     { &hf_pcap_reserved2,
       { "reserved2", "pcap.reserved2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_reserved3,
       { "reserved3", "pcap.reserved3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_reserved4,
       { "reserved4", "pcap.reserved4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_pcap_alfa0,
       { "alfa0", "pcap.alfa0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_alfa1,
       { "alfa1", "pcap.alfa1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_alfa2,
       { "alfa2", "pcap.alfa2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_alfa3,
       { "alfa3", "pcap.alfa3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_beta0,
       { "beta0", "pcap.beta0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_beta1,
       { "beta1", "pcap.beta1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_beta2,
       { "beta2", "pcap.beta2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_beta3,
       { "beta3", "pcap.beta3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_MeasuredResultsList_item,
       { "GPS-MeasuredResults", "pcap.GPS_MeasuredResults",
@@ -13051,19 +13051,19 @@ void proto_register_pcap(void) {
         "pcap.GPS_TOW_Assist", HFILL }},
     { &hf_pcap_tlm_Message,
       { "tlm-Message", "pcap.tlm_Message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_pcap_antiSpoof,
       { "antiSpoof", "pcap.antiSpoof",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_alert,
       { "alert", "pcap.alert",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_tlm_Reserved,
       { "tlm-Reserved", "pcap.tlm_Reserved",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_pcap_gps_RefTimeUNC,
       { "gps-RefTimeUNC", "pcap.gps_RefTimeUNC",
@@ -13071,71 +13071,71 @@ void proto_register_pcap(void) {
         "pcap.INTEGER_0_127", HFILL }},
     { &hf_pcap_a1,
       { "a1", "pcap.a1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_pcap_a0,
       { "a0", "pcap.a0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_pcap_t_ot,
       { "t-ot", "pcap.t_ot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_delta_t_LS,
       { "delta-t-LS", "pcap.delta_t_LS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_wn_t,
       { "wn-t", "pcap.wn_t",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_wn_lsf,
       { "wn-lsf", "pcap.wn_lsf",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_dn,
       { "dn", "pcap.dn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_delta_t_LSF,
       { "delta-t-LSF", "pcap.delta_t_LSF",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_almanacRequest,
       { "almanacRequest", "pcap.almanacRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_utcModelRequest,
       { "utcModelRequest", "pcap.utcModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ionosphericModelRequest,
       { "ionosphericModelRequest", "pcap.ionosphericModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_navigationModelRequest,
       { "navigationModelRequest", "pcap.navigationModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_dgpsCorrectionsRequest,
       { "dgpsCorrectionsRequest", "pcap.dgpsCorrectionsRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_referenceLocationRequest,
       { "referenceLocationRequest", "pcap.referenceLocationRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_referenceTimeRequest,
       { "referenceTimeRequest", "pcap.referenceTimeRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_aquisitionAssistanceRequest,
       { "aquisitionAssistanceRequest", "pcap.aquisitionAssistanceRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_realTimeIntegrityRequest,
       { "realTimeIntegrityRequest", "pcap.realTimeIntegrityRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_navModelAddDataRequest,
       { "navModelAddDataRequest", "pcap.navModelAddDataRequest",
@@ -13143,15 +13143,15 @@ void proto_register_pcap(void) {
         "pcap.NavModelAdditionalData", HFILL }},
     { &hf_pcap_ganssReferenceTime,
       { "ganssReferenceTime", "pcap.ganssReferenceTime",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssreferenceLocation,
       { "ganssreferenceLocation", "pcap.ganssreferenceLocation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssIonosphericModel,
       { "ganssIonosphericModel", "pcap.ganssIonosphericModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssRequestedGenericAssistanceDataList,
       { "ganssRequestedGenericAssistanceDataList", "pcap.ganssRequestedGenericAssistanceDataList",
@@ -13163,27 +13163,27 @@ void proto_register_pcap(void) {
         "pcap.GanssReqGenericData", HFILL }},
     { &hf_pcap_ganssRealTimeIntegrity,
       { "ganssRealTimeIntegrity", "pcap.ganssRealTimeIntegrity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssDifferentialCorrection,
       { "ganssDifferentialCorrection", "pcap.ganssDifferentialCorrection",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.DGANSS_Sig_Id_Req", HFILL }},
     { &hf_pcap_ganssAlmanac,
       { "ganssAlmanac", "pcap.ganssAlmanac",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssNavigationModel,
       { "ganssNavigationModel", "pcap.ganssNavigationModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssTimeModels,
       { "ganssTimeModels", "pcap.ganssTimeModels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_9", HFILL }},
     { &hf_pcap_ganssReferenceMeasurementInfo,
       { "ganssReferenceMeasurementInfo", "pcap.ganssReferenceMeasurementInfo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssDataBits_01,
       { "ganssDataBits", "pcap.ganssDataBits",
@@ -13191,7 +13191,7 @@ void proto_register_pcap(void) {
         "pcap.GanssDataBits", HFILL }},
     { &hf_pcap_ganssUTCModel,
       { "ganssUTCModel", "pcap.ganssUTCModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssNavigationModelAdditionalData,
       { "ganssNavigationModelAdditionalData", "pcap.ganssNavigationModelAdditionalData",
@@ -13207,7 +13207,7 @@ void proto_register_pcap(void) {
         "pcap.ReqDataBitAssistanceList_item", HFILL }},
     { &hf_pcap_ganssDataBitAssistance,
       { "ganssDataBitAssistance", "pcap.ganssDataBitAssistance",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_type,
       { "type", "pcap.type",
@@ -13343,7 +13343,7 @@ void proto_register_pcap(void) {
         "pcap.NavigationModelGANSS", HFILL }},
     { &hf_pcap_ganssTimeModelGnssGnssExt,
       { "ganssTimeModelGnssGnssExt", "pcap.ganssTimeModelGnssGnssExt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_9", HFILL }},
     { &hf_pcap_transmissionTOWIndicator,
       { "transmissionTOWIndicator", "pcap.transmissionTOWIndicator",
@@ -13627,11 +13627,11 @@ void proto_register_pcap(void) {
         "pcap.RequestTypeAccuracyCode", HFILL }},
     { &hf_pcap_standAloneLocationMethodsSupported,
       { "standAloneLocationMethodsSupported", "pcap.standAloneLocationMethodsSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ueBasedOTDOASupported,
       { "ueBasedOTDOASupported", "pcap.ueBasedOTDOASupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_networkAssistedGPSSupport,
       { "networkAssistedGPSSupport", "pcap.networkAssistedGPSSupport",
@@ -13639,23 +13639,23 @@ void proto_register_pcap(void) {
         "pcap.NetworkAssistedGPSSuport", HFILL }},
     { &hf_pcap_supportGPSTimingOfCellFrame,
       { "supportGPSTimingOfCellFrame", "pcap.supportGPSTimingOfCellFrame",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_supportForIPDL,
       { "supportForIPDL", "pcap.supportForIPDL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_supportForRxTxTimeDiff,
       { "supportForRxTxTimeDiff", "pcap.supportForRxTxTimeDiff",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_supportForUEAGPSinCellPCH,
       { "supportForUEAGPSinCellPCH", "pcap.supportForUEAGPSinCellPCH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_supportForSFNSFNTimeDiff,
       { "supportForSFNSFNTimeDiff", "pcap.supportForSFNSFNTimeDiff",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_NetworkAssistedGANSSSupport_item,
       { "NetworkAssistedGANSSSupport item", "pcap.NetworkAssistedGANSSSupport_item",
@@ -13671,11 +13671,11 @@ void proto_register_pcap(void) {
         "pcap.GANSS_SignalID", HFILL }},
     { &hf_pcap_supportGANSSTimingOfCellFrame,
       { "supportGANSSTimingOfCellFrame", "pcap.supportGANSSTimingOfCellFrame",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_supportGANSSCarrierPhaseMeasurement,
       { "supportGANSSCarrierPhaseMeasurement", "pcap.supportGANSSCarrierPhaseMeasurement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_utdoa_BitCount,
       { "utdoa-BitCount", "pcap.utdoa_BitCount",
@@ -13699,11 +13699,11 @@ void proto_register_pcap(void) {
         "pcap.VerticalAccuracyCode", HFILL }},
     { &hf_pcap_gpsTimingOfCellWanted,
       { "gpsTimingOfCellWanted", "pcap.gpsTimingOfCellWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_additionalAssistanceDataRequest,
       { "additionalAssistanceDataRequest", "pcap.additionalAssistanceDataRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_ganssPositioningInstructions,
       { "ganssPositioningInstructions", "pcap.ganssPositioningInstructions",
@@ -13711,11 +13711,11 @@ void proto_register_pcap(void) {
         "pcap.GANSS_PositioningInstructions", HFILL }},
     { &hf_pcap_ganssTimingOfCellWanted,
       { "ganssTimingOfCellWanted", "pcap.ganssTimingOfCellWanted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_additionalAssistanceDataRequest_01,
       { "additionalAssistanceDataRequest", "pcap.additionalAssistanceDataRequest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_pcap_uE_Positioning_OTDOA_AssistanceData,
       { "uE-Positioning-OTDOA-AssistanceData", "pcap.uE_Positioning_OTDOA_AssistanceData",
@@ -13963,7 +13963,7 @@ void proto_register_pcap(void) {
         "pcap.UL_ScramblingCode", HFILL }},
     { &hf_pcap_tfci_Existence,
       { "tfci-Existence", "pcap.tfci_Existence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_numberOfFBI_Bits,
       { "numberOfFBI-Bits", "pcap.numberOfFBI_Bits",
@@ -14167,7 +14167,7 @@ void proto_register_pcap(void) {
         "pcap.MidambleShiftAndBurstType", HFILL }},
     { &hf_pcap_tFCI_Presence,
       { "tFCI-Presence", "pcap.tFCI_Presence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pcap.BOOLEAN", HFILL }},
     { &hf_pcap_uL_Code_InformationList,
       { "uL-Code-InformationList", "pcap.uL_Code_InformationList",
@@ -14235,7 +14235,7 @@ void proto_register_pcap(void) {
         "pcap.PRACHparameters", HFILL }},
     { &hf_pcap_cRNTI,
       { "cRNTI", "pcap.cRNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.C_RNTI", HFILL }},
     { &hf_pcap_uschParameters,
       { "uschParameters", "pcap.uschParameters",
@@ -14259,7 +14259,7 @@ void proto_register_pcap(void) {
         "pcap.T_fdd_05", HFILL }},
     { &hf_pcap_availableSignatures,
       { "availableSignatures", "pcap.availableSignatures",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.AvailableSignatures", HFILL }},
     { &hf_pcap_availableSF,
       { "availableSF", "pcap.availableSF",
@@ -14275,7 +14275,7 @@ void proto_register_pcap(void) {
         "pcap.PuncturingLimit", HFILL }},
     { &hf_pcap_availableSubChannelNumbers,
       { "availableSubChannelNumbers", "pcap.availableSubChannelNumbers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pcap.AvailableSubChannelNumbers", HFILL }},
     { &hf_pcap_tdd_06,
       { "tdd", "pcap.tdd",
@@ -14540,115 +14540,115 @@ void proto_register_pcap(void) {
     { &hf_pcap_AvailableSignatures_signature15,
       { "signature15", "pcap.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature14,
       { "signature14", "pcap.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature13,
       { "signature13", "pcap.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature12,
       { "signature12", "pcap.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature11,
       { "signature11", "pcap.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature10,
       { "signature10", "pcap.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature9,
       { "signature9", "pcap.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature8,
       { "signature8", "pcap.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature7,
       { "signature7", "pcap.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature6,
       { "signature6", "pcap.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature5,
       { "signature5", "pcap.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature4,
       { "signature4", "pcap.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature3,
       { "signature3", "pcap.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature2,
       { "signature2", "pcap.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature1,
       { "signature1", "pcap.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSignatures_signature0,
       { "signature0", "pcap.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh11,
       { "subCh11", "pcap.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh10,
       { "subCh10", "pcap.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh9,
       { "subCh9", "pcap.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh8,
       { "subCh8", "pcap.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh7,
       { "subCh7", "pcap.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh6,
       { "subCh6", "pcap.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh5,
       { "subCh5", "pcap.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh4,
       { "subCh4", "pcap.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh3,
       { "subCh3", "pcap.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh2,
       { "subCh2", "pcap.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh1,
       { "subCh1", "pcap.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pcap_AvailableSubChannelNumbers_subCh0,
       { "subCh0", "pcap.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-pcap-hfarr.c ---*/
 #line 190 "packet-pcap-template.c"
diff --git a/epan/dissectors/packet-pcnfsd.c b/epan/dissectors/packet-pcnfsd.c
index 2c491e5f5c..755771fa46 100644
--- a/epan/dissectors/packet-pcnfsd.c
+++ b/epan/dissectors/packet-pcnfsd.c
@@ -370,48 +370,48 @@ proto_register_pcnfsd(void)
 	static hf_register_info hf[] = {
 		{ &hf_pcnfsd_procedure_v1, {
 			"V1 Procedure", "pcnfsd.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(pcnfsd1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(pcnfsd1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_pcnfsd_procedure_v2, {
 			"V2 Procedure", "pcnfsd.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(pcnfsd2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(pcnfsd2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_pcnfsd_auth_client, {
-			"Authentication Client", "pcnfsd.auth.client", FT_STRING, BASE_DEC,
-			NULL, 0, "Authentication Client", HFILL }},
+			"Authentication Client", "pcnfsd.auth.client", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_auth_ident_obscure, {
-			"Obscure Ident", "pcnfsd.auth.ident.obscure", FT_STRING, BASE_DEC,
+			"Obscure Ident", "pcnfsd.auth.ident.obscure", FT_STRING, BASE_NONE,
 			NULL, 0, "Authentication Obscure Ident", HFILL }},
 		{ &hf_pcnfsd_auth_ident_clear, {
-			"Clear Ident", "pcnfsd.auth.ident.clear", FT_STRING, BASE_DEC,
+			"Clear Ident", "pcnfsd.auth.ident.clear", FT_STRING, BASE_NONE,
 			NULL, 0, "Authentication Clear Ident", HFILL }},
 		{ &hf_pcnfsd_auth_password_obscure, {
-			"Obscure Password", "pcnfsd.auth.password.obscure", FT_STRING, BASE_DEC,
+			"Obscure Password", "pcnfsd.auth.password.obscure", FT_STRING, BASE_NONE,
 			NULL, 0, "Authentication Obscure Password", HFILL }},
 		{ &hf_pcnfsd_auth_password_clear, {
-			"Clear Password", "pcnfsd.auth.password.clear", FT_STRING, BASE_DEC,
+			"Clear Password", "pcnfsd.auth.password.clear", FT_STRING, BASE_NONE,
 			NULL, 0, "Authentication Clear Password", HFILL }},
 		{ &hf_pcnfsd_comment, {
-			"Comment", "pcnfsd.comment", FT_STRING, BASE_DEC,
-			NULL, 0, "Comment", HFILL }},
+			"Comment", "pcnfsd.comment", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_status, {
                         "Reply Status", "pcnfsd.status", FT_UINT32, BASE_DEC,
                         NULL, 0, "Status", HFILL }},
 		{ &hf_pcnfsd_uid, {
                         "User ID", "pcnfsd.uid", FT_UINT32, BASE_DEC,
-                        NULL, 0, "User ID", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_gid, {
                         "Group ID", "pcnfsd.gid", FT_UINT32, BASE_DEC,
-                        NULL, 0, "Group ID", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_gids_count, {
                         "Group ID Count", "pcnfsd.gids.count", FT_UINT32, BASE_DEC,
-                        NULL, 0, "Group ID Count", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_homedir, {
-			"Home Directory", "pcnfsd.homedir", FT_STRING, BASE_DEC,
-			NULL, 0, "Home Directory", HFILL }},
+			"Home Directory", "pcnfsd.homedir", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_def_umask, {
                         "def_umask", "pcnfsd.def_umask", FT_UINT32, BASE_OCT,
-                        NULL, 0, "def_umask", HFILL }},
+                        NULL, 0, NULL, HFILL }},
 		{ &hf_pcnfsd_username, {
-			"User name", "pcnfsd.username", FT_STRING, BASE_DEC,
+			"User name", "pcnfsd.username", FT_STRING, BASE_NONE,
 			NULL, 0, "pcnfsd.username", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 3943d01442..8e90b62d58 100644
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -1914,7 +1914,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_no_header_pdu,
             { "No Header PDU",
               "pdcp-lte.no-header_pdu", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "No Header PDU", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_plane,
@@ -1934,13 +1934,13 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_cid_inclusion_info,
             { "CID Inclusion Info",
               "pdcp-lte.cid-inclusion-info", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "CID Inclusion Info", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_large_cid_present,
             { "Large CID Present",
               "pdcp-lte.large-cid-present", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "Large CID Present", HFILL
+              NULL, HFILL
             }
         },
 
@@ -1970,14 +1970,14 @@ void proto_register_pdcp(void)
         },
         { &hf_pdcp_lte_signalling_data,
             { "Signalling Data",
-              "pdcp-lte.signalling-data", FT_BYTES, BASE_HEX, NULL, 0x0,
-              "Signalling Data", HFILL
+              "pdcp-lte.signalling-data", FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_mac,
             { "MAC",
               "pdcp-lte.mac", FT_UINT32, BASE_HEX_DEC, NULL, 0x0,
-              "MAC", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_data_control,
@@ -1988,8 +1988,8 @@ void proto_register_pdcp(void)
         },
         { &hf_pdcp_lte_user_plane_data,
             { "User-Plane Data",
-              "pdcp-lte.user-data", FT_BYTES, BASE_HEX, NULL, 0x0,
-              "User-Plane Data", HFILL
+              "pdcp-lte.user-data", FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_control_pdu_type,
@@ -2020,7 +2020,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc,
             { "ROHC Message",
               "pdcp-lte.rohc", FT_NONE, BASE_NONE, NULL, 0,
-              "ROHC Message", HFILL
+              NULL, HFILL
             }
         },
 
@@ -2033,7 +2033,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_r_0_crc,
             { "R-0-CRC Packet",
               "pdcp-lte.r-0-crc", FT_NONE, BASE_NONE, NULL, 0,
-              "R-0-CRC Packet", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_feedback,
@@ -2078,51 +2078,51 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_static_ipv4,
             { "Static IPv4 chain",
               "pdcp-lte.rohc.static.ipv4", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Static IPv4 chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_ip_version,
             { "IP Version",
               "pdcp-lte.rohc.ip-version", FT_UINT8, BASE_HEX, NULL, 0xf0,
-              "IP Version", HFILL
+              NULL, HFILL
             }
         },
         /* TODO: create/use value_string */
         { &hf_pdcp_lte_rohc_ip_protocol,
             { "IP Protocol",
               "pdcp-lte.rohc.ip-protocol", FT_UINT8, BASE_DEC, VALS(ip_protocol_vals), 0x0,
-              "IP Protocol", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_ip_src,
             { "IP Source address",
-              "pdcp-lte.rohc.ip-src", FT_IPv4, BASE_DEC, NULL, 0x0,
-              "IP Source address", HFILL
+              "pdcp-lte.rohc.ip-src", FT_IPv4, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_ip_dst,
             { "IP Destination address",
-              "pdcp-lte.rohc.ip-dst", FT_IPv4, BASE_DEC, NULL, 0x0,
-              "IP Destination address", HFILL
+              "pdcp-lte.rohc.ip-dst", FT_IPv4, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
 
         { &hf_pdcp_lte_rohc_static_udp,
             { "Static UDP chain",
               "pdcp-lte.rohc.static.udp", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Static UDP chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_static_udp_src_port,
             { "Static UDP source port",
               "pdcp-lte.rohc.static.udp.src-port", FT_UINT16, BASE_DEC, NULL, 0x0,
-              "Static UDP source port", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_static_udp_dst_port,
             { "Static UDP destination port",
               "pdcp-lte.rohc.static.udp.dst-port", FT_UINT16, BASE_DEC, NULL, 0x0,
-              "Static UDP destination port", HFILL
+              NULL, HFILL
             }
         },
 
@@ -2130,7 +2130,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_static_rtp,
             { "Static RTP chain",
               "pdcp-lte.rohc.static.rtp", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Static RTP chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_static_rtp_ssrc,
@@ -2143,7 +2143,7 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_dynamic_ipv4,
             { "Dynamic IPv4 chain",
               "pdcp-lte.rohc.dynamic.ipv4", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Dynamic IPv4 chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_ipv4_tos,
@@ -2173,45 +2173,45 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_dynamic_ipv4_rnd,
             { "Random IP-ID field",
               "pdcp-lte.rohc.ip.rnd", FT_UINT8, BASE_HEX, NULL, 0x40,
-              "Random IP-ID field", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_ipv4_nbo,
             { "Network Byte Order IP-ID field",
               "pdcp-lte.rohc.ip.nbo", FT_UINT8, BASE_HEX, NULL, 0x20,
-              "Network Byte Order IP-ID field", HFILL
+              NULL, HFILL
             }
         },
 
         { &hf_pdcp_lte_rohc_dynamic_udp,
             { "Dynamic UDP chain",
               "pdcp-lte.rohc.dynamic.udp", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Dynamic UDP chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_udp_checksum,
             { "UDP Checksum",
               "pdcp-lte.rohc.dynamic.udp.checksum", FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
-              "UDP Checksum", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_udp_seqnum,
             { "UDP Sequence Number",
               "pdcp-lte.rohc.dynamic.udp.seqnum", FT_UINT16, BASE_HEX, NULL, 0x0,
-              "UDP Sequence Number", HFILL
+              NULL, HFILL
             }
         },
 
         { &hf_pdcp_lte_rohc_dynamic_rtp,
             { "Dynamic RTP chain",
               "pdcp-lte.rohc.dynamic.rtp", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Dynamic RTP chain", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_rtp_rx,
             { "RX",
               "pdcp-lte.rohc.dynamic.rtp.rx", FT_UINT8, BASE_DEC, NULL, 0x10,
-              "RX", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_rtp_cc,
@@ -2242,13 +2242,13 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_dynamic_rtp_x,
             { "X",
               "pdcp-lte.rohc.dynamic.rtp.x", FT_UINT8, BASE_DEC, NULL, 0x10,
-              "X", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_rtp_mode,
             { "Mode",
               "pdcp-lte.rohc.dynamic.rtp.mode", FT_UINT8, BASE_HEX, VALS(rohc_mode_vals), 0x0c,
-              "Mode", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_dynamic_rtp_tis,
@@ -2272,44 +2272,44 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_ts,
             { "TS",
               "pdcp-lte.rohc.ts", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "TS", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_m,
             { "M",
               "pdcp-lte.rohc.m", FT_UINT8, BASE_DEC, NULL, 0x40,
-              "M", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_uor2_sn,
             { "SN",
               "pdcp-lte.rohc.uor2.sn", FT_UINT8, BASE_DEC, NULL, 0x3f,
-              "SN", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_uor2_x,
             { "X",
               "pdcp-lte.rohc.uor2.x", FT_UINT8, BASE_DEC, NULL, 0x80,
-              "X", HFILL
+              NULL, HFILL
             }
         },
 
         { &hf_pdcp_lte_rohc_add_cid,
             { "Add-CID",
               "pdcp-lte.rohc.add-cid", FT_UINT8, BASE_DEC, NULL, 0x0f,
-              "Add-CID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_large_cid,
             { "Large-CID",
               "pdcp-lte.rohc.large-cid", FT_UINT16, BASE_DEC, NULL, 0x07ff,
-              "Large-CID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_uo0_sn,
             { "SN",
               "pdcp-lte.rohc.uo0.sn", FT_UINT8, BASE_DEC, NULL, 0x78,
-              "SN", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_uo0_crc,
@@ -2321,13 +2321,13 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_r0_sn,
             { "SN",
               "pdcp-lte.rohc.r0.sn", FT_UINT8, BASE_DEC, NULL, 0x3f,
-              "SN", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_r0_crc_sn,
             { "SN",
               "pdcp-lte.rohc.r0-crc.sn", FT_UINT16, BASE_DEC, NULL, 0x0,
-              "SN", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_r0_crc_crc,
@@ -2415,19 +2415,19 @@ void proto_register_pdcp(void)
         { &hf_pdcp_lte_rohc_ip_id,
             { "IP-ID",
               "pdcp-lte.rohc.ip-id", FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
-              "IP-ID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_udp_checksum,
             { "UDP Checksum",
               "pdcp-lte.rohc.udp-checksum", FT_UINT16, BASE_HEX_DEC, NULL, 0x0,
-              "UDP Checksum", HFILL
+              NULL, HFILL
             }
         },
         { &hf_pdcp_lte_rohc_payload,
             { "Payload",
-              "pdcp-lte.rohc.payload", FT_BYTES, BASE_HEX, NULL, 0x0,
-              "Payload", HFILL
+              "pdcp-lte.rohc.payload", FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
 
diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c
index ee5e8c623a..d989e15cd8 100644
--- a/epan/dissectors/packet-per.c
+++ b/epan/dissectors/packet-per.c
@@ -2461,11 +2461,11 @@ proto_register_per(void)
         "per.T_single_ASN1_type", HFILL }},
     { &hf_per_octet_aligned,
       { "octet-aligned", "per.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "per.T_octet_aligned", HFILL }},
     { &hf_per_arbitrary,
       { "arbitrary", "per.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "per.T_arbitrary", HFILL }},
     { &hf_per_integer_length,
       { "integer length", "per.integer_length",
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index bce720a354..edcb00a17b 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -360,7 +360,7 @@ proto_register_old_pflog(void)
         "Protocol (IPv4 vs IPv6)", HFILL }},
     { &hf_old_pflog_ifname,
       { "Interface", "pflog.ifname", FT_STRING, BASE_NONE, NULL, 0x0,
-        "Interface", HFILL }},
+        NULL, HFILL }},
     { &hf_old_pflog_rnr,
       { "Rule Number", "pflog.rnr", FT_INT16, BASE_DEC, NULL, 0x0,
         "Last matched firewall rule number", HFILL }},
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 91c3beed56..95e6db6ce1 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -1091,269 +1091,269 @@ proto_register_pgm(void)
   static hf_register_info hf[] = {
     { &hf_pgm_main_sport,
       { "Source Port", "pgm.hdr.sport", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_dport,
       { "Destination Port", "pgm.hdr.dport", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_port,
       { "Port", "pgm.port", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_type,
       { "Type", "pgm.hdr.type", FT_UINT8, BASE_HEX,
-	  VALS(type_vals), 0x0, "", HFILL }},
+	  VALS(type_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_main_opts,
       { "Options", "pgm.hdr.opts", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_opts_opt,
       { "Options", "pgm.hdr.opts.opt", FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT, NULL, HFILL }},
     { &hf_pgm_main_opts_netsig,
       { "Network Significant Options", "pgm.hdr.opts.netsig",
 	  FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_NETSIG, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_NETSIG, NULL, HFILL }},
     { &hf_pgm_main_opts_varlen,
       { "Variable length Parity Packet Option", "pgm.hdr.opts.varlen",
 	  FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_VAR_PKTLEN, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_VAR_PKTLEN, NULL, HFILL }},
     { &hf_pgm_main_opts_parity,
       { "Parity", "pgm.hdr.opts.parity", FT_BOOLEAN, 8,
-	  TFS(&opts_present), PGM_OPT_PARITY, "", HFILL }},
+	  TFS(&opts_present), PGM_OPT_PARITY, NULL, HFILL }},
     { &hf_pgm_main_cksum,
       { "Checksum", "pgm.hdr.cksum", FT_UINT16, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_cksum_bad,
       { "Bad Checksum", "pgm.hdr.cksum_bad", FT_BOOLEAN, BASE_NONE,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_gsi,
-      { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+      { "Global Source Identifier", "pgm.hdr.gsi", FT_BYTES, BASE_NONE,
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_main_tsdulen,
       { "Transport Service Data Unit Length", "pgm.hdr.tsdulen", FT_UINT16,
-	  BASE_DEC, NULL, 0x0, "", HFILL }},
+	  BASE_DEC, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_sqn,
       { "Sequence number", "pgm.spm.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_trail,
       { "Trailing Edge Sequence Number", "pgm.spm.trail", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_lead,
       { "Leading Edge Sequence Number", "pgm.spm.lead", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_pathafi,
       { "Path NLA AFI", "pgm.spm.pathafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_spm_res,
       { "Reserved", "pgm.spm.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_path,
       { "Path NLA", "pgm.spm.path", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_spm_path6,
       { "Path NLA", "pgm.spm.path", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_data_sqn,
       { "Data Packet Sequence Number", "pgm.data.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_data_trail,
       { "Trailing Edge Sequence Number", "pgm.data.trail", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_sqn,
       { "Requested Sequence Number", "pgm.nak.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_srcafi,
       { "Source NLA AFI", "pgm.nak.srcafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_nak_srcres,
       { "Reserved", "pgm.nak.srcres", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_src,
       { "Source NLA", "pgm.nak.src", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_src6,
       { "Source NLA", "pgm.nak.src", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grpafi,
       { "Multicast Group AFI", "pgm.nak.grpafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grpres,
       { "Reserved", "pgm.nak.grpres", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grp,
       { "Multicast Group NLA", "pgm.nak.grp", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_nak_grp6,
       { "Multicast Group NLA", "pgm.nak.grp", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_sqn,
       { "Sequence Number", "pgm.poll.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_round,
       { "Round", "pgm.poll.round", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_subtype,
       { "Subtype", "pgm.poll.subtype", FT_UINT16, BASE_HEX,
-	  VALS(poll_subtype_vals), 0x0, "", HFILL }},
+	  VALS(poll_subtype_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_poll_pathafi,
       { "Path NLA AFI", "pgm.poll.pathafi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_poll_res,
       { "Reserved", "pgm.poll.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_path,
       { "Path NLA", "pgm.poll.path", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_path6,
       { "Path NLA", "pgm.poll.path", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_backoff_ivl,
       { "Back-off Interval", "pgm.poll.backoff_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_rand_str,
       { "Random String", "pgm.poll.rand_str", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_poll_matching_bmask,
       { "Matching Bitmask", "pgm.poll.matching_bmask", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_sqn,
       { "Sequence Number", "pgm.polr.sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_round,
       { "Round", "pgm.polr.round", FT_UINT16, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_polr_res,
       { "Reserved", "pgm.polr.res", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_ack_sqn,
       { "Maximum Received Sequence Number", "pgm.ack.maxsqn", FT_UINT32,
-	  BASE_HEX, NULL, 0x0, "", HFILL }},
+	  BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_ack_bitmap,
       { "Packet Bitmap", "pgm.ack.bitmap", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_type,
       { "Type", "pgm.opts.type", FT_UINT8, BASE_HEX,
-          VALS(opt_vals), 0x0, "", HFILL }},
+          VALS(opt_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_len,
       { "Length", "pgm.opts.len", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_tlen,
       { "Total Length", "pgm.opts.tlen", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_type,
       { "Type", "pgm.genopts.type", FT_UINT8, BASE_HEX,
-          VALS(opt_vals), 0x0, "", HFILL }},
+          VALS(opt_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_len,
       { "Length", "pgm.genopts.len", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_genopt_opx,
       { "Option Extensibility Bits", "pgm.genopts.opx", FT_UINT8, BASE_HEX,
-          VALS(opx_vals), 0x0, "", HFILL }},
+          VALS(opx_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_prm_po,
       { "Parity Parameters", "pgm.opts.parity_prm.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_prm_prmtgsz,
       { "Transmission Group Size", "pgm.opts.parity_prm.prm_grp",
           FT_UINT32, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_join_res,
       { "Reserved", "pgm.opts.join.res", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_join_minjoin,
       { "Minimum Sequence Number", "pgm.opts.join.min_join",
-          FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+          FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_grp_res,
       { "Reserved", "pgm.opts.parity_prm.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_parity_grp_prmgrp,
       { "Transmission Group Size", "pgm.opts.parity_prm.prm_grp",
           FT_UINT32, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_res,
       { "Reserved", "pgm.opts.nak.op", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_list,
       { "List", "pgm.opts.nak.list", FT_BYTES, BASE_NONE,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_res,
       { "Reserved", "pgm.opts.ccdata.res", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_tsp,
       { "Time Stamp", "pgm.opts.ccdata.tstamp", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_afi,
       { "Acker AFI", "pgm.opts.ccdata.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_res2,
       { "Reserved", "pgm.opts.ccdata.res2", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_acker,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccdata_acker6,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_res,
       { "Reserved", "pgm.opts.ccdata.res", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_tsp,
       { "Time Stamp", "pgm.opts.ccdata.tstamp", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_afi,
       { "Acker AFI", "pgm.opts.ccdata.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_lossrate,
       { "Loss Rate", "pgm.opts.ccdata.lossrate", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_acker,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_ccfeedbk_acker6,
       { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_res,
       { "Reserved", "pgm.opts.nak_bo_ivl.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_bo_ivl,
       { "Back-off Interval", "pgm.opts.nak_bo_ivl.bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_ivl_bo_ivl_sqn,
       { "Back-off Interval Sequence Number", "pgm.opts.nak_bo_ivl.bo_ivl_sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_res,
       { "Reserved", "pgm.opts.nak_bo_rng.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_min_bo_ivl,
       { "Min Back-off Interval", "pgm.opts.nak_bo_rng.min_bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_nak_bo_rng_max_bo_ivl,
       { "Max Back-off Interval", "pgm.opts.nak_bo_rng.max_bo_ivl", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_res,
       { "Reserved", "pgm.opts.redirect.res", FT_UINT8, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_afi,
       { "DLR AFI", "pgm.opts.redirect.afi", FT_UINT16, BASE_DEC,
-	  VALS(afn_vals), 0x0, "", HFILL }},
+	  VALS(afn_vals), 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_res2,
       { "Reserved", "pgm.opts.redirect.res2", FT_UINT16, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_dlr,
       { "DLR", "pgm.opts.redirect.dlr", FT_IPv4, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_redirect_dlr6,
       { "DLR", "pgm.opts.redirect.dlr", FT_IPv6, BASE_NONE,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_res,
       { "Reserved", "pgm.opts.fragment.res", FT_UINT8, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_first_sqn,
       { "First Sequence Number", "pgm.opts.fragment.first_sqn", FT_UINT32, BASE_HEX,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_offset,
       { "Fragment Offset", "pgm.opts.fragment.fragment_offset", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }},
+	  NULL, 0x0, NULL, HFILL }},
     { &hf_pgm_opt_fragment_total_length,
       { "Total Length", "pgm.opts.fragment.total_length", FT_UINT32, BASE_DEC,
-	  NULL, 0x0, "", HFILL }}
+	  NULL, 0x0, NULL, HFILL }}
   };
   static gint *ett[] = {
 	&ett_pgm,
diff --git a/epan/dissectors/packet-pgsql.c b/epan/dissectors/packet-pgsql.c
index fb1a9f9e85..874b02b88c 100644
--- a/epan/dissectors/packet-pgsql.c
+++ b/epan/dissectors/packet-pgsql.c
@@ -674,7 +674,7 @@ proto_register_pgsql(void)
 {
     static hf_register_info hf[] = {
         { &hf_frontend,
-          { "Frontend", "pgsql.frontend", FT_BOOLEAN, BASE_NONE, NULL, 0,
+          { "Frontend", "pgsql.frontend", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             "True for messages from the frontend, false otherwise.",
             HFILL }
         },
@@ -711,7 +711,7 @@ proto_register_pgsql(void)
             "The type of authentication requested by the backend.", HFILL }
         },
         { &hf_salt,
-          { "Salt value", "pgsql.salt", FT_BYTES, BASE_HEX, NULL, 0,
+          { "Salt value", "pgsql.salt", FT_BYTES, BASE_NONE, NULL, 0,
             "The salt to use while encrypting a password.", HFILL }
         },
         { &hf_statement,
diff --git a/epan/dissectors/packet-pim.c b/epan/dissectors/packet-pim.c
index 005f751042..ccb6b5a582 100644
--- a/epan/dissectors/packet-pim.c
+++ b/epan/dissectors/packet-pim.c
@@ -1233,16 +1233,16 @@ proto_register_pim(void)
     static hf_register_info hf[] = {
       { &hf_pim_version,
 	{ "Version",		"pim.version",
-				FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+				FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_pim_type,
 	{ "Type",		"pim.type",
-				FT_UINT8, BASE_DEC, VALS(type2vals), 0x0, "", HFILL }},
+				FT_UINT8, BASE_DEC, VALS(type2vals), 0x0, NULL, HFILL }},
       { &hf_pim_code,
 	{ "Code",		"pim.code",
-				FT_UINT8, BASE_DEC, VALS(type1vals), 0x0, "", HFILL }},
+				FT_UINT8, BASE_DEC, VALS(type1vals), 0x0, NULL, HFILL }},
       { &hf_pim_cksum,
 	{ "Checksum",		"pim.cksum",
-				FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+				FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_pim,
diff --git a/epan/dissectors/packet-pingpongprotocol.c b/epan/dissectors/packet-pingpongprotocol.c
index e5a70c944f..d755f7f7cf 100644
--- a/epan/dissectors/packet-pingpongprotocol.c
+++ b/epan/dissectors/packet-pingpongprotocol.c
@@ -173,14 +173,14 @@ proto_register_pingpongprotocol(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,     { "Type",      "pingpongprotocol.message_type",   FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
-    { &hf_message_flags,    { "Flags",     "pingpongprotocol.message_flags",  FT_UINT8,  BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_length,   { "Length",    "pingpongprotocol.message_length", FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_ping_messageno,   { "MessageNo", "pingpongprotocol.ping_messageno", FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_ping_data,        { "Ping_Data", "pingpongprotocol.ping_data",      FT_BYTES,  BASE_HEX, NULL,                      0x0, "", HFILL } },
-    { &hf_pong_messageno,   { "MessageNo", "pingpongprotocol.pong_messageno", FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_pong_replyno,     { "ReplyNo",   "pingpongprotocol.pong_replyno",   FT_UINT64, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_pong_data,        { "Pong_Data", "pingpongprotocol.pong_data",      FT_BYTES,  BASE_HEX, NULL,                      0x0, "", HFILL } },
+    { &hf_message_type,     { "Type",      "pingpongprotocol.message_type",   FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } },
+    { &hf_message_flags,    { "Flags",     "pingpongprotocol.message_flags",  FT_UINT8,  BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_length,   { "Length",    "pingpongprotocol.message_length", FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_ping_messageno,   { "MessageNo", "pingpongprotocol.ping_messageno", FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_ping_data,        { "Ping_Data", "pingpongprotocol.ping_data",      FT_BYTES,  BASE_NONE, NULL,                      0x0, NULL, HFILL } },
+    { &hf_pong_messageno,   { "MessageNo", "pingpongprotocol.pong_messageno", FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_pong_replyno,     { "ReplyNo",   "pingpongprotocol.pong_replyno",   FT_UINT64, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_pong_data,        { "Pong_Data", "pingpongprotocol.pong_data",      FT_BYTES,  BASE_NONE, NULL,                      0x0, NULL, HFILL } },
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-pkcs1.c b/epan/dissectors/packet-pkcs1.c
index f804df4931..64630f55da 100644
--- a/epan/dissectors/packet-pkcs1.c
+++ b/epan/dissectors/packet-pkcs1.c
@@ -229,7 +229,7 @@ void proto_register_pkcs1(void) {
         "pkcs1.DigestAlgorithmIdentifier", HFILL }},
     { &hf_pkcs1_digest,
       { "digest", "pkcs1.digest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs1.Digest", HFILL }},
 
 /*--- End of included file: packet-pkcs1-hfarr.c ---*/
diff --git a/epan/dissectors/packet-pkcs12.c b/epan/dissectors/packet-pkcs12.c
index 5e5e0e9ccc..63af09fea4 100644
--- a/epan/dissectors/packet-pkcs12.c
+++ b/epan/dissectors/packet-pkcs12.c
@@ -1273,7 +1273,7 @@ void proto_register_pkcs12(void) {
         "pkcs12.DigestInfo", HFILL }},
     { &hf_pkcs12_macSalt,
       { "macSalt", "pkcs12.macSalt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs12.OCTET_STRING", HFILL }},
     { &hf_pkcs12_iterations,
       { "iterations", "pkcs12.iterations",
@@ -1285,7 +1285,7 @@ void proto_register_pkcs12(void) {
         "cms.DigestAlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_digest,
       { "digest", "pkcs12.digest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "cms.Digest", HFILL }},
     { &hf_pkcs12_AuthenticatedSafe_item,
       { "ContentInfo", "pkcs12.ContentInfo",
@@ -1357,7 +1357,7 @@ void proto_register_pkcs12(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_privateKey,
       { "privateKey", "pkcs12.privateKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs12.PrivateKey", HFILL }},
     { &hf_pkcs12_attributes,
       { "attributes", "pkcs12.attributes",
@@ -1373,11 +1373,11 @@ void proto_register_pkcs12(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_pkcs12_encryptedData,
       { "encryptedData", "pkcs12.encryptedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs12.EncryptedData", HFILL }},
     { &hf_pkcs12_salt,
       { "salt", "pkcs12.salt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs12.OCTET_STRING", HFILL }},
     { &hf_pkcs12_iterationCount,
       { "iterationCount", "pkcs12.iterationCount",
@@ -1389,7 +1389,7 @@ void proto_register_pkcs12(void) {
         "pkcs12.T_saltChoice", HFILL }},
     { &hf_pkcs12_specified,
       { "specified", "pkcs12.specified",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkcs12.OCTET_STRING", HFILL }},
     { &hf_pkcs12_otherSource,
       { "otherSource", "pkcs12.otherSource",
diff --git a/epan/dissectors/packet-pkinit.c b/epan/dissectors/packet-pkinit.c
index f4e4646250..eb0db1777f 100644
--- a/epan/dissectors/packet-pkinit.c
+++ b/epan/dissectors/packet-pkinit.c
@@ -394,7 +394,7 @@ void proto_register_pkinit(void) {
         "cms.ContentInfo", HFILL }},
     { &hf_pkinit_subjectPublicKey,
       { "subjectPublicKey", "pkinit.subjectPublicKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkinit.BIT_STRING", HFILL }},
     { &hf_pkinit_dhNonce,
       { "nonce", "pkinit.nonce",
diff --git a/epan/dissectors/packet-pkix1explicit.c b/epan/dissectors/packet-pkix1explicit.c
index 5465ece255..7a01494328 100644
--- a/epan/dissectors/packet-pkix1explicit.c
+++ b/epan/dissectors/packet-pkix1explicit.c
@@ -828,7 +828,7 @@ void proto_register_pkix1explicit(void) {
 
     { &hf_pkix1explicit_addressFamily_afn,
       { "Address family(AFN)", "pkix1explicit.addressfamily", FT_UINT16, BASE_DEC, VALS(afn_vals), 0,
-	"Address family(AFN)", HFILL }},
+	NULL, HFILL }},
 
     { &hf_pkix1explicit_addressFamily_safi,
       { "Subsequent Address Family Identifiers (SAFI)", "pkix1explicit.addressfamily.safi", FT_UINT16, BASE_DEC, NULL, 0,
@@ -870,11 +870,11 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.T_extnId", HFILL }},
     { &hf_pkix1explicit_critical,
       { "critical", "pkix1explicit.critical",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pkix1explicit.BOOLEAN", HFILL }},
     { &hf_pkix1explicit_extnValue,
       { "extnValue", "pkix1explicit.extnValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.T_extnValue", HFILL }},
     { &hf_pkix1explicit_p,
       { "p", "pkix1explicit.p",
@@ -898,7 +898,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.ValidationParms", HFILL }},
     { &hf_pkix1explicit_seed,
       { "seed", "pkix1explicit.seed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.BIT_STRING", HFILL }},
     { &hf_pkix1explicit_pgenCounter,
       { "pgenCounter", "pkix1explicit.pgenCounter",
@@ -942,7 +942,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressFamily", HFILL }},
     { &hf_pkix1explicit_addressFamily,
       { "addressFamily", "pkix1explicit.addressFamily",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.T_addressFamily", HFILL }},
     { &hf_pkix1explicit_ipAddressChoice,
       { "ipAddressChoice", "pkix1explicit.ipAddressChoice",
@@ -962,7 +962,7 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressOrRange", HFILL }},
     { &hf_pkix1explicit_addressPrefix,
       { "addressPrefix", "pkix1explicit.addressPrefix",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_addressRange,
       { "addressRange", "pkix1explicit.addressRange",
@@ -970,11 +970,11 @@ void proto_register_pkix1explicit(void) {
         "pkix1explicit.IPAddressRange", HFILL }},
     { &hf_pkix1explicit_min,
       { "min", "pkix1explicit.min",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_max,
       { "max", "pkix1explicit.max",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkix1explicit.IPAddress", HFILL }},
     { &hf_pkix1explicit_asnum,
       { "asnum", "pkix1explicit.asnum",
diff --git a/epan/dissectors/packet-pkixproxy.c b/epan/dissectors/packet-pkixproxy.c
index a1060bf1ee..b365090d29 100644
--- a/epan/dissectors/packet-pkixproxy.c
+++ b/epan/dissectors/packet-pkixproxy.c
@@ -175,7 +175,7 @@ void proto_register_pkixproxy(void) {
         "pkixproxy.OBJECT_IDENTIFIER", HFILL }},
     { &hf_pkixproxy_policy,
       { "policy", "pkixproxy.policy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkixproxy.OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-pkixproxy-hfarr.c ---*/
diff --git a/epan/dissectors/packet-pkixqualified.c b/epan/dissectors/packet-pkixqualified.c
index 31392c989a..e25b4d7565 100644
--- a/epan/dissectors/packet-pkixqualified.c
+++ b/epan/dissectors/packet-pkixqualified.c
@@ -409,7 +409,7 @@ void proto_register_pkixqualified(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_pkixqualified_biometricDataHash,
       { "biometricDataHash", "pkixqualified.biometricDataHash",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkixqualified.OCTET_STRING", HFILL }},
     { &hf_pkixqualified_sourceDataUri,
       { "sourceDataUri", "pkixqualified.sourceDataUri",
diff --git a/epan/dissectors/packet-pkixtsp.c b/epan/dissectors/packet-pkixtsp.c
index 6a048e1dfa..78ce6cf27e 100644
--- a/epan/dissectors/packet-pkixtsp.c
+++ b/epan/dissectors/packet-pkixtsp.c
@@ -450,7 +450,7 @@ void proto_register_pkixtsp(void) {
         "pkixtsp.INTEGER", HFILL }},
     { &hf_pkixtsp_certReq,
       { "certReq", "pkixtsp.certReq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pkixtsp.BOOLEAN", HFILL }},
     { &hf_pkixtsp_extensions,
       { "extensions", "pkixtsp.extensions",
@@ -462,7 +462,7 @@ void proto_register_pkixtsp(void) {
         "pkix1explicit.AlgorithmIdentifier", HFILL }},
     { &hf_pkixtsp_hashedMessage,
       { "hashedMessage", "pkixtsp.hashedMessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkixtsp.OCTET_STRING", HFILL }},
     { &hf_pkixtsp_status,
       { "status", "pkixtsp.status",
@@ -478,7 +478,7 @@ void proto_register_pkixtsp(void) {
         "pkixtsp.PKIStatus", HFILL }},
     { &hf_pkixtsp_failInfo,
       { "failInfo", "pkixtsp.failInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pkixtsp.PKIFailureInfo", HFILL }},
     { &hf_pkixtsp_tst_version,
       { "version", "pkixtsp.version",
@@ -502,7 +502,7 @@ void proto_register_pkixtsp(void) {
         "pkixtsp.Accuracy", HFILL }},
     { &hf_pkixtsp_ordering,
       { "ordering", "pkixtsp.ordering",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "pkixtsp.BOOLEAN", HFILL }},
     { &hf_pkixtsp_tsa,
       { "tsa", "pkixtsp.tsa",
@@ -523,35 +523,35 @@ void proto_register_pkixtsp(void) {
     { &hf_pkixtsp_PKIFailureInfo_badAlg,
       { "badAlg", "pkixtsp.badAlg",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badRequest,
       { "badRequest", "pkixtsp.badRequest",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_badDataFormat,
       { "badDataFormat", "pkixtsp.badDataFormat",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_timeNotAvailable,
       { "timeNotAvailable", "pkixtsp.timeNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_unacceptedPolicy,
       { "unacceptedPolicy", "pkixtsp.unacceptedPolicy",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_unacceptedExtension,
       { "unacceptedExtension", "pkixtsp.unacceptedExtension",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_addInfoNotAvailable,
       { "addInfoNotAvailable", "pkixtsp.addInfoNotAvailable",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pkixtsp_PKIFailureInfo_systemFailure,
       { "systemFailure", "pkixtsp.systemFailure",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-pkixtsp-hfarr.c ---*/
 #line 118 "packet-pkixtsp-template.c"
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index d9f92a5d36..eb04eb0984 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -758,16 +758,16 @@ proto_register_pktc_mtafqdn(void)
            VALS(pktc_mtafqdn_msgtype_vals), 0, "MTA FQDN Message Type", HFILL }},
        { &hf_pktc_mtafqdn_enterprise, {
            "Enterprise Number", "pktc.mtafqdn.enterprise", FT_UINT32, BASE_DEC,
-           NULL, 0, "Enterprise Number", HFILL }},
+           NULL, 0, NULL, HFILL }},
        { &hf_pktc_mtafqdn_version, {
            "Protocol Version", "pktc.mtafqdn.version", FT_UINT8, BASE_DEC,
            NULL, 0, "MTA FQDN Protocol Version", HFILL }},
        /* MTA FQDN REQ */
        { &hf_pktc_mtafqdn_mac, {
            "MTA MAC address", "pktc.mtafqdn.mac", FT_ETHER, BASE_NONE,
-           NULL, 0, "MTA MAC address", HFILL }},
+           NULL, 0, NULL, HFILL }},
        { &hf_pktc_mtafqdn_pub_key_hash, {
-           "MTA Public Key Hash", "pktc.mtafqdn.pub_key_hash", FT_BYTES, BASE_HEX,
+           "MTA Public Key Hash", "pktc.mtafqdn.pub_key_hash", FT_BYTES, BASE_NONE,
            NULL, 0, "MTA Public Key Hash (SHA-1)", HFILL }},
        { &hf_pktc_mtafqdn_manu_cert_revoked, {
            "Manufacturer Cert Revocation Time", "pktc.mtafqdn.manu_cert_revoked", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -775,7 +775,7 @@ proto_register_pktc_mtafqdn(void)
        /* MTA FQDN REP */
        { &hf_pktc_mtafqdn_fqdn, {
            "MTA FQDN", "pktc.mtafqdn.fqdn", FT_STRING, BASE_NONE,
-           NULL, 0, "MTA FQDN", HFILL }},
+           NULL, 0, NULL, HFILL }},
        { &hf_pktc_mtafqdn_ip, {
            "MTA IP Address", "pktc.mtafqdn.ip", FT_IPv4, BASE_NONE,
            NULL, 0, "MTA IP Address (all zeros if not supplied)", HFILL }},
diff --git a/epan/dissectors/packet-pktgen.c b/epan/dissectors/packet-pktgen.c
index 60fe4e9b8a..9f78499849 100644
--- a/epan/dissectors/packet-pktgen.c
+++ b/epan/dissectors/packet-pktgen.c
@@ -152,7 +152,7 @@ void proto_register_pktgen(void)
 	  { 
 	      "Sequence number", "pktgen.seqnum", 
 	      FT_UINT32, BASE_DEC, NULL, 0x0, 
-	      "Sequence number", HFILL
+	      NULL, HFILL
 	  }
 	},
 
@@ -175,8 +175,8 @@ void proto_register_pktgen(void)
 	{ &hf_pktgen_timestamp,
 	  { 
 	      "Timestamp", "pktgen.timestamp", 
-	      FT_ABSOLUTE_TIME, BASE_HEX, NULL, 0x0,
-	      "Timestamp", HFILL
+	      FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
+	      NULL, HFILL
 	  }
 	}		
     };
diff --git a/epan/dissectors/packet-pop.c b/epan/dissectors/packet-pop.c
index 42dd5317a5..f1a960eab3 100644
--- a/epan/dissectors/packet-pop.c
+++ b/epan/dissectors/packet-pop.c
@@ -379,15 +379,15 @@ proto_register_pop(void)
     { &hf_pop_response,
       { "Response",           "pop.response",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Response", HFILL }},
+      	NULL, HFILL }},
     { &hf_pop_response_indicator,
       { "Response indicator",           "pop.response.indicator",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Response indicator", HFILL }},
+      	NULL, HFILL }},
     { &hf_pop_response_description,
       { "Response description",           "pop.response.description",
 	     FT_STRING, BASE_NONE, NULL, 0x0,
-	     "Response description", HFILL }},
+	     NULL, HFILL }},
     { &hf_pop_response_data,
       { "Data",           "pop.response.data",
 	     FT_STRING, BASE_NONE, NULL, 0x0,
@@ -395,15 +395,15 @@ proto_register_pop(void)
     { &hf_pop_request,
       { "Request",           "pop.request",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Request", HFILL }},
+      	NULL, HFILL }},
     { &hf_pop_request_command,
       { "Request command",            "pop.request.command",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Request command", HFILL }},
+      	NULL, HFILL }},
     { &hf_pop_request_parameter,
       { "Request parameter",            "pop.request.parameter",
 	    FT_STRING, BASE_NONE, NULL, 0x0,
-      	"Request parameter", HFILL }},
+      	NULL, HFILL }},
     { &hf_pop_request_data,
       { "Data",           "pop.request.data",
 	     FT_STRING, BASE_NONE, NULL, 0x0,
@@ -417,18 +417,18 @@ proto_register_pop(void)
 	NULL, 0x00, "Message fragment", HFILL } },
     { &hf_pop_data_fragment_overlap,
       { "DATA fragment overlap", "pop.data.fragment.overlap", FT_BOOLEAN,
-	BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
+	BASE_NONE, NULL, 0x0, "Message fragment overlap", HFILL } },
     { &hf_pop_data_fragment_overlap_conflicts,
       { "DATA fragment overlapping with conflicting data",
 	"pop.data.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
-	0x00, "Message fragment overlapping with conflicting data", HFILL } },
+	0x0, "Message fragment overlapping with conflicting data", HFILL } },
     { &hf_pop_data_fragment_multiple_tails,
       { "DATA has multiple tail fragments",
 	"pop.data.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x00, "Message has multiple tail fragments", HFILL } },
+	NULL, 0x0, "Message has multiple tail fragments", HFILL } },
     { &hf_pop_data_fragment_too_long_fragment,
       { "DATA fragment too long", "pop.data.fragment.too_long_fragment",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Message fragment too long",
 	HFILL } },
     { &hf_pop_data_fragment_error,
       { "DATA defragmentation error", "pop.data.fragment.error", FT_FRAMENUM,
diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index ff36c319df..6e05938722 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -582,61 +582,61 @@ proto_register_portmap(void)
 	static hf_register_info hf[] = {
 		{ &hf_portmap_procedure_v1, {
 			"V1 Procedure", "portmap.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(portmap1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(portmap1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_portmap_procedure_v2, {
 			"V2 Procedure", "portmap.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(portmap2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(portmap2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_portmap_procedure_v3, {
 			"V3 Procedure", "portmap.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(portmap3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(portmap3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_portmap_procedure_v4, {
 			"V4 Procedure", "portmap.procedure_v4", FT_UINT32, BASE_DEC,
-			VALS(portmap4_proc_vals), 0, "V4 Procedure", HFILL }},
+			VALS(portmap4_proc_vals), 0, NULL, HFILL }},
 		{ &hf_portmap_prog, {
 			"Program", "portmap.prog", FT_UINT32, BASE_DEC,
-			NULL, 0, "Program", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_port, {
 			"Port", "portmap.port", FT_UINT32, BASE_DEC,
-			NULL, 0, "Port", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_proc, {
 			"Procedure", "portmap.proc", FT_UINT32, BASE_DEC,
-			NULL, 0, "Procedure", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_proto, {
 			"Protocol", "portmap.proto", FT_UINT32, BASE_DEC,
-			NULL, 0, "Protocol", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_version, {
 			"Version", "portmap.version", FT_UINT32, BASE_DEC,
-			NULL, 0, "Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_answer, {
 			"Answer", "portmap.answer", FT_BOOLEAN, BASE_NONE,
-			NULL, 0, "Answer", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_portmap_args, {
-			"Arguments", "portmap.args", FT_BYTES, BASE_HEX,
-			NULL, 0, "Arguments", HFILL }},
+			"Arguments", "portmap.args", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_result, {
-			"Result", "portmap.result", FT_BYTES, BASE_HEX,
-			NULL, 0, "Result", HFILL }},
+			"Result", "portmap.result", FT_BYTES, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb, {
-			"RPCB", "portmap.rpcb", FT_NONE, 0,
-			NULL, 0, "RPCB", HFILL }},
+			"RPCB", "portmap.rpcb", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb_prog, {
 			"Program", "portmap.rpcb.prog", FT_UINT32, BASE_DEC,
-			NULL, 0, "Program", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb_version, {
 			"Version", "portmap.rpcb.version", FT_UINT32, BASE_DEC,
-			NULL, 0, "Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb_netid, {
-			"Network Id", "portmap.rpcb.netid", FT_STRING, BASE_DEC,
-			NULL, 0, "Network Id", HFILL }},
+			"Network Id", "portmap.rpcb.netid", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb_addr, {	/* address in rpcb structure in request */
-			"Universal Address", "portmap.rpcb.addr", FT_STRING, BASE_DEC,
-			NULL, 0, "Universal Address", HFILL }},
+			"Universal Address", "portmap.rpcb.addr", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_rpcb_owner, {
-			"Owner of this Service", "portmap.rpcb.owner", FT_STRING, BASE_DEC,
-			NULL, 0, "Owner of this Service", HFILL }},
+			"Owner of this Service", "portmap.rpcb.owner", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_portmap_uaddr, {	/* address in RPCBPROC_GETADDR reply */
-			"Universal Address", "portmap.uaddr", FT_STRING, BASE_DEC,
-			NULL, 0, "Universal Address", HFILL }},
+			"Universal Address", "portmap.uaddr", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_portmap,
diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c
index d4712dfdf8..898ce3b70b 100644
--- a/epan/dissectors/packet-ppi.c
+++ b/epan/dissectors/packet-ppi.c
@@ -1224,13 +1224,13 @@ proto_register_ppi(void)
 
     { &hf_spectrum_map,
        { "Radio spectrum map", "ppi.spectrum-map",
-            FT_BYTES, 0, NULL, 0x0, "PPI Radio spectrum map", HFILL } },
+            FT_BYTES, BASE_NONE, NULL, 0x0, "PPI Radio spectrum map", HFILL } },
     { &hf_process_info,
        { "Process information", "ppi.proc-info",
-            FT_BYTES, 0, NULL, 0x0, "PPI Process information", HFILL } },
+            FT_BYTES, BASE_NONE, NULL, 0x0, "PPI Process information", HFILL } },
     { &hf_capture_info,
        { "Capture information", "ppi.cap-info",
-            FT_BYTES, 0, NULL, 0x0, "PPI Capture information", HFILL } },
+            FT_BYTES, BASE_NONE, NULL, 0x0, "PPI Capture information", HFILL } },
 
     /* Aggregtion Extension */
     { &hf_aggregation_extension_interface_id,
diff --git a/epan/dissectors/packet-pppoe.c b/epan/dissectors/packet-pppoe.c
index 5aceffc4fd..a1f1b09246 100644
--- a/epan/dissectors/packet-pppoe.c
+++ b/epan/dissectors/packet-pppoe.c
@@ -871,27 +871,27 @@ void proto_register_pppoe(void)
 		/* These fields common to discovery and session protocols */
 		{ &hf_pppoe_version,
 			{ "Version", "pppoe.version", FT_UINT8, BASE_DEC,
-				 NULL, 0xf0, "", HFILL
+				 NULL, 0xf0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoe_type,
 			{ "Type", "pppoe.type", FT_UINT8, BASE_DEC,
-				 NULL, 0x0f, "", HFILL
+				 NULL, 0x0f, NULL, HFILL
 			}
 		},
 		{ &hf_pppoe_code,
 			{ "Code", "pppoe.code", FT_UINT8, BASE_HEX,
-				 VALS(code_vals), 0x0, "", HFILL
+				 VALS(code_vals), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoe_session_id,
 			{ "Session ID", "pppoe.session_id", FT_UINT16, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_pppoe_payload_length,
 			{ "Payload Length", "pppoe.payload_length", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		}
 	};
diff --git a/epan/dissectors/packet-pres.c b/epan/dissectors/packet-pres.c
index ea9e843803..8d925e326a 100644
--- a/epan/dissectors/packet-pres.c
+++ b/epan/dissectors/packet-pres.c
@@ -1458,23 +1458,23 @@ void proto_register_pres(void) {
     { &hf_pres_CP_type,
       { "CP-type", "pres.cptype",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_CPA_PPDU,
       { "CPA-PPDU", "pres.cpapdu",
         FT_NONE, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Abort_type,
       { "Abort type", "pres.aborttype",
         FT_UINT32, BASE_DEC, VALS(pres_Abort_type_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_CPR_PPDU,
       { "CPR-PPDU", "pres.cprtype",
         FT_UINT32, BASE_DEC, VALS(pres_CPR_PPDU_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Typed_data_type,
       { "Typed data type", "pres.Typed_data_type",
         FT_UINT32, BASE_DEC, VALS(pres_Typed_data_type_vals), 0,
-        "", HFILL }},
+        NULL, HFILL }},
 
 
 
@@ -1494,15 +1494,15 @@ void proto_register_pres(void) {
         "pres.T_normal_mode_parameters", HFILL }},
     { &hf_pres_protocol_version,
       { "protocol-version", "pres.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Protocol_version", HFILL }},
     { &hf_pres_calling_presentation_selector,
       { "calling-presentation-selector", "pres.calling_presentation_selector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Calling_presentation_selector", HFILL }},
     { &hf_pres_called_presentation_selector,
       { "called-presentation-selector", "pres.called_presentation_selector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Called_presentation_selector", HFILL }},
     { &hf_pres_presentation_context_definition_list,
       { "presentation-context-definition-list", "pres.presentation_context_definition_list",
@@ -1514,15 +1514,15 @@ void proto_register_pres(void) {
         "pres.Default_context_name", HFILL }},
     { &hf_pres_presentation_requirements,
       { "presentation-requirements", "pres.presentation_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Presentation_requirements", HFILL }},
     { &hf_pres_user_session_requirements,
       { "user-session-requirements", "pres.user_session_requirements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.User_session_requirements", HFILL }},
     { &hf_pres_protocol_options,
       { "protocol-options", "pres.protocol_options",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Protocol_options", HFILL }},
     { &hf_pres_initiators_nominated_context,
       { "initiators-nominated-context", "pres.initiators_nominated_context",
@@ -1546,7 +1546,7 @@ void proto_register_pres(void) {
         "pres.T_CPA_PPDU_normal_mode_parameters", HFILL }},
     { &hf_pres_responding_presentation_selector,
       { "responding-presentation-selector", "pres.responding_presentation_selector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Responding_presentation_selector", HFILL }},
     { &hf_pres_presentation_context_definition_result_list,
       { "presentation-context-definition-result-list", "pres.presentation_context_definition_result_list",
@@ -1682,7 +1682,7 @@ void proto_register_pres(void) {
         "pres.T_provider_reason", HFILL }},
     { &hf_pres_simply_encoded_data,
       { "simply-encoded-data", "pres.simply_encoded_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.Simply_encoded_data", HFILL }},
     { &hf_pres_fully_encoded_data,
       { "fully-encoded-data", "pres.fully_encoded_data",
@@ -1698,92 +1698,92 @@ void proto_register_pres(void) {
         "pres.T_presentation_data_values", HFILL }},
     { &hf_pres_single_ASN1_type,
       { "single-ASN1-type", "pres.single_ASN1_type",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.T_single_ASN1_type", HFILL }},
     { &hf_pres_octet_aligned,
       { "octet-aligned", "pres.octet_aligned",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.T_octet_aligned", HFILL }},
     { &hf_pres_arbitrary,
       { "arbitrary", "pres.arbitrary",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "pres.BIT_STRING", HFILL }},
     { &hf_pres_Presentation_requirements_context_management,
       { "context-management", "pres.context-management",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Presentation_requirements_restoration,
       { "restoration", "pres.restoration",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Protocol_options_nominated_context,
       { "nominated-context", "pres.nominated-context",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Protocol_options_short_encoding,
       { "short-encoding", "pres.short-encoding",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Protocol_options_packed_encoding_rules,
       { "packed-encoding-rules", "pres.packed-encoding-rules",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_Protocol_version_version_1,
       { "version-1", "pres.version-1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_half_duplex,
       { "half-duplex", "pres.half-duplex",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_duplex,
       { "duplex", "pres.duplex",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_expedited_data,
       { "expedited-data", "pres.expedited-data",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_minor_synchronize,
       { "minor-synchronize", "pres.minor-synchronize",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_major_synchronize,
       { "major-synchronize", "pres.major-synchronize",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_resynchronize,
       { "resynchronize", "pres.resynchronize",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_activity_management,
       { "activity-management", "pres.activity-management",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_negotiated_release,
       { "negotiated-release", "pres.negotiated-release",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_capability_data,
       { "capability-data", "pres.capability-data",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_exceptions,
       { "exceptions", "pres.exceptions",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_typed_data,
       { "typed-data", "pres.typed-data",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_symmetric_synchronize,
       { "symmetric-synchronize", "pres.symmetric-synchronize",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_pres_User_session_requirements_data_separation,
       { "data-separation", "pres.data-separation",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-pres-hfarr.c ---*/
 #line 376 "packet-pres-template.c"
diff --git a/epan/dissectors/packet-prp.c b/epan/dissectors/packet-prp.c
index 9d9d462865..cbe12f3748 100644
--- a/epan/dissectors/packet-prp.c
+++ b/epan/dissectors/packet-prp.c
@@ -274,66 +274,66 @@ void proto_register_prp(void)
         { &hf_prp_supervision_frame_version,
             { "version", "prp.supervision_frame.version",
             FT_UINT16, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_type,
             { "type", "prp.supervision_frame.type",
             FT_UINT8, BASE_DEC, VALS(prp_type_vals), 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_length,
             { "length", "prp.supervision_frame.length",
             FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_source_mac_address_A,
             { "sourceMacAddressA", "prp.supervision_frame.prp_source_mac_address_A",
             FT_ETHER, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_source_mac_address_B,
             { "sourceMacAddressB", "prp.supervision_frame.prp_source_mac_address_B",
             FT_ETHER, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
 	{ &hf_prp_supervision_frame_type2,
             { "type2", "prp.supervision_frame.type2",
             FT_UINT8, BASE_DEC, VALS(prp_type_vals), 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_length2,
             { "length2", "prp.supervision_frame.length2",
             FT_UINT8, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_red_box_mac_address,
             { "redBoxMacAddress", "prp.supervision_frame.prp_red_box_mac_address",
             FT_ETHER, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
         { &hf_prp_supervision_frame_vdan_mac_address,
             { "vdanMacAddress", "prp.supervision_frame.prp_vdan_mac_address",
             FT_ETHER, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         /*trailer*/
         { &hf_prp_redundancy_control_trailer_sequence_nr,
             { "sequenceNr", "prp.trailer.prp_sequence_nr",
             FT_UINT16, BASE_DEC, NULL, 0x00,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         { &hf_prp_redundancy_control_trailer_lan,
             { "lan", "prp.trailer.prp_lan",
             FT_UINT16, BASE_DEC, VALS(prp_lan_vals), 0xf000,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         { &hf_prp_redundancy_control_trailer_size,
             { "size", "prp.trailer.prp_size",
             FT_UINT16, BASE_DEC, NULL, 0x0fff,
-            "", HFILL }
+            NULL, HFILL }
         }
     };
 
diff --git a/epan/dissectors/packet-ptp.c b/epan/dissectors/packet-ptp.c
index 7d069e3cd2..aa546c03ee 100644
--- a/epan/dissectors/packet-ptp.c
+++ b/epan/dissectors/packet-ptp.c
@@ -3475,7 +3475,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_subdomain,
             { "subdomain",           "ptp.subdomain",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_messagetype,
@@ -3604,7 +3604,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_sdr_grandmasterclockidentifier,
             { "grandmasterClockIdentifier",           "ptp.sdr.grandmasterclockidentifier",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_sdr_grandmasterclockvariance,
@@ -3644,7 +3644,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_sdr_localclockidentifier,
             { "localClockIdentifier",           "ptp.sdr.localclockidentifier",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_sdr_parentcommunicationtechnology,
@@ -3674,7 +3674,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_sdr_utcreasonable,
             { "utcReasonable",           "ptp.sdr.utcreasonable",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         /*offsets for follow_up (=fu) messages*/
@@ -3773,7 +3773,7 @@ proto_register_ptp(void)
         /*parameterlength > 0*/
         { &hf_ptp_mm_messageparameters,
             { "messageParameters",           "ptp.mm.messageparameters",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         /*ptp_mm_clock_identity (parameterlength = 64)*/
@@ -3794,7 +3794,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_clock_identity_manufactureridentity,
             { "manufacturerIdentity",           "ptp.mm.clock.identity.manufactureridentity",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
 
@@ -3807,7 +3807,7 @@ proto_register_ptp(void)
         /*ptp_mm_set_subdomain (parameterlength = 16)*/
         { &hf_ptp_mm_set_subdomain_subdomainname,
             { "subdomainName",           "ptp.mm.set.subdomain.subdomainname",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         /*ptp_mm_default_data_set (parameterlength = 76)*/
@@ -3833,7 +3833,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_default_data_set_clockidentifier,
             { "clockIdentifier",           "ptp.mm.default.data.set.clockidentifier",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_clockvariance,
@@ -3843,27 +3843,27 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_default_data_set_clockfollowupcapable,
             { "clockFollowupCapable",           "ptp.mm.default.data.set.clockfollowupcapable",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_preferred,
             { "preferred",           "ptp.mm.default.data.set.preferred",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_initializable,
             { "initializable",           "ptp.mm.default.data.set.initializable",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_externaltiming,
             { "externalTiming",           "ptp.mm.default.data.set.externaltiming",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_isboundaryclock,
             { "isBoundaryClock",           "ptp.mm.default.data.set.isboundaryclock",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_syncinterval,
@@ -3873,7 +3873,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_default_data_set_subdomainname,
             { "subDomainName",           "ptp.mm.default.data.set.subdomainname",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_default_data_set_numberports,
@@ -3894,7 +3894,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_update_default_data_set_clockidentifier,
             { "clockIdentifier",           "ptp.mm.update.default.data.set.clockidentifier",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_update_default_data_set_clockvariance,
@@ -3904,7 +3904,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_update_default_data_set_preferred,
             { "preferred",           "ptp.mm.update.default.data.set.preferred",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_update_default_data_set_syncinterval,
@@ -3914,7 +3914,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_update_default_data_set_subdomainname,
             { "subdomainName",           "ptp.mm.update.default.data.set.subdomainname",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         /*ptp_mm_current_data_set (parameterlength = 20)*/
@@ -3976,12 +3976,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_parent_data_set_parentfollowupcapable,
             { "parentFollowupCapable",           "ptp.mm.parent.data.set.parentfollowupcapable",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_parentexternaltiming,
             { "parentExternalTiming",           "ptp.mm.parent.data.set.parentexternaltiming",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_parentvariance,
@@ -3991,7 +3991,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_parent_data_set_parentstats,
             { "parentStats",           "ptp.mm.parent.data.set.parentstats",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_observedvariance,
@@ -4006,7 +4006,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_parent_data_set_utcreasonable,
             { "utcReasonable",           "ptp.mm.parent.data.set.utcreasonable",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_grandmastercommunicationtechnology,
@@ -4031,7 +4031,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_parent_data_set_grandmasteridentifier,
             { "grandmasterIdentifier",           "ptp.mm.parent.data.set.grandmasteridentifier",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_grandmastervariance,
@@ -4041,12 +4041,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_parent_data_set_grandmasterpreferred,
             { "grandmasterPreferred",           "ptp.mm.parent.data.set.grandmasterpreferred",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_grandmasterisboundaryclock,
             { "grandmasterIsBoundaryClock",           "ptp.mm.parent.data.set.grandmasterisboundaryclock",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_parent_data_set_grandmastersequencenumber,
@@ -4092,7 +4092,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_port_data_set_burstenabled,
             { "burstEnabled",           "ptp.mm.port.data.set.burstenabled",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_port_data_set_subdomainaddressoctets,
@@ -4112,17 +4112,17 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_port_data_set_subdomainaddress,
             { "subdomainAddress",           "ptp.mm.port.data.set.subdomainaddress",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_port_data_set_eventportaddress,
             { "eventPortAddress",           "ptp.mm.port.data.set.eventportaddress",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_mm_port_data_set_generalportaddress,
             { "generalPortAddress",           "ptp.mm.port.data.set.generalportaddress",
-            FT_BYTES, BASE_DEC, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         /*ptp_mm_global_time_data_set (parameterlength = 24)*/
@@ -4148,12 +4148,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_global_time_data_set_leap59,
             { "leap59",           "ptp.mm.global.time.data.set.leap59",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_global_time_data_set_leap61,
             { "leap61",           "ptp.mm.global.time.data.set.leap61",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_global_time_data_set_epochnumber,
@@ -4169,12 +4169,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_mm_update_global_time_properties_leap59,
             { "leap59",           "ptp.mm.update.global.time.properties.leap59",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_update_global_time_properties_leap61,
             { "leap61",           "ptp.mm.update.global.time.properties.leap61",
-            FT_BOOLEAN, BASE_NONE, NULL, 0x00,
+            FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_mm_update_global_time_properties_epochnumber,
@@ -4684,7 +4684,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_data,
             { "data",           "ptp.v2.mm.data",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         /* Management TLV dataField */
@@ -4726,7 +4726,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_physicalLayerProtocol,
             { "physicalLayerProtocol",           "ptp.v2.mm.physicalLayerProtocol",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_physicalLayerProtocol_length,
@@ -4741,12 +4741,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_physicalAddress,
             { "physical address",  "ptp.v2.mm.physicalAddress",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_protocolAddress,
             { "protocol address",  "ptp.v2.mm.protocolAddress",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_protocolAddress_networkProtocol,
@@ -4761,17 +4761,17 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_manufacturerIdentity,
             { "manufacturer identity",  "ptp.v2.mm.manufacturerIdentity",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_reserved,
             { "reserved",  "ptp.v2.mm.reserved",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_productDescription,
             { "product description",  "ptp.v2.mm.productDescription",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_productDescription_length,
@@ -4781,7 +4781,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_revisionData,
             { "revision data",  "ptp.v2.mm.revisionData",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_revisionData_length,
@@ -4791,7 +4791,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_userDescription,
             { "user description",  "ptp.v2.mm.userDescription",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_userDescription_length,
@@ -4801,12 +4801,12 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_profileIdentity,
             { "profileIdentity",           "ptp.v2.mm.profileIdentity",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_pad,
             { "Pad",           "ptp.v2.mm.pad",
-            FT_BYTES, BASE_HEX, NULL, 0x01,
+            FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_initializationKey,
@@ -4821,7 +4821,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_faultRecord,
             { "fault record",  "ptp.v2.mm.faultRecord",
-            FT_BYTES, BASE_HEX, NULL, 0x00,
+            FT_BYTES, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_faultRecordLength,
@@ -4836,7 +4836,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_faultName,
             { "faultName",  "ptp.v2.mm.faultName",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_faultName_length,
@@ -4846,7 +4846,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_faultValue,
             { "faultValue",  "ptp.v2.mm.faultValue",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_faultValue_length,
@@ -4856,7 +4856,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_faultDescription,
             { "faultDescription",  "ptp.v2.mm.faultDescription",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_faultDescription_length,
@@ -5143,7 +5143,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_displayData,
                 { "Display data",           "ptp.v2.mm.displayData",
-                FT_STRING, BASE_DEC, NULL, 0x00,
+                FT_STRING, BASE_NONE, NULL, 0x00,
                 NULL, HFILL }
         },
         { &hf_ptp_v2_mm_displayData_length,
@@ -5173,7 +5173,7 @@ proto_register_ptp(void)
         },
         { &hf_ptp_v2_mm_displayName,
             { "Display name",           "ptp.v2.mm.displayName",
-            FT_STRING, BASE_DEC, NULL, 0x00,
+            FT_STRING, BASE_NONE, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_ptp_v2_mm_displayName_length,
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index b81d0bd793..4d439dfd4e 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -3248,35 +3248,35 @@ proto_register_pvfs(void)
 	static hf_register_info hf[] = {
 		{ &hf_pvfs_magic_nr, 
 			{ "Magic Number", "pvfs.magic_nr", FT_UINT32, BASE_HEX, 
-				NULL, 0, "Magic Number", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_mode,
 			{ "Mode", "pvfs.mode", FT_UINT32, BASE_DEC, 
-				VALS(names_pvfs_mode), 0, "Mode", HFILL }},
+				VALS(names_pvfs_mode), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_tag,
 			{ "Tag", "pvfs.tag", FT_UINT64, BASE_DEC,
-				NULL, 0, "Tag", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_size,
 			{ "Size", "pvfs.size", FT_UINT64, BASE_DEC,
-				NULL, 0, "Size", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_release_number,
 			{ "Release Number", "pvfs.release_number", FT_UINT32, BASE_DEC,
-				NULL, 0, "Release Number", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_encoding,
 			{ "Encoding", "pvfs.encoding", FT_UINT32, BASE_DEC, 
-				VALS(names_pvfs_encoding), 0, "Encoding", HFILL }},
+				VALS(names_pvfs_encoding), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_server_op,
 			{ "Server Operation", "pvfs.server_op", FT_UINT32, BASE_DEC,
-				VALS(names_pvfs_server_op), 0, "Server Operation", HFILL }},
+				VALS(names_pvfs_server_op), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_handle,
-			{ "Handle", "pvfs.handle", FT_BYTES, BASE_HEX,
-				NULL, 0, "Handle", HFILL }},
+			{ "Handle", "pvfs.handle", FT_BYTES, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_fs_id,
 			{ "fs_id", "pvfs.fs_id", FT_UINT32, BASE_HEX,
@@ -3296,7 +3296,7 @@ proto_register_pvfs(void)
 
 		{ &hf_pvfs_error,
 			{ "Result", "pvfs.error", FT_UINT32, BASE_HEX,
-				VALS(names_pvfs_error), 0, "Result", HFILL }},
+				VALS(names_pvfs_error), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_atime,
 			{ "atime", "pvfs.atime", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -3376,83 +3376,83 @@ proto_register_pvfs(void)
 
 		{ &hf_pvfs_directory_version,
 			{ "Directory Version", "pvfs.directory_version", FT_UINT64, BASE_HEX,
-				NULL, 0, "Directory Version", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_path,
-			{ "Path", "pvfs.path", FT_STRING, BASE_DEC, 
-				NULL, 0, "Path", HFILL }},
+			{ "Path", "pvfs.path", FT_STRING, BASE_NONE, 
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_total_completed,
 			{ "Bytes Completed", "pvfs.bytes_completed", FT_UINT64, BASE_DEC,
-				NULL, 0, "Bytes Completed", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_io_dist,
-			 { "Name", "pvfs.distribution.name", FT_STRING, BASE_DEC,
+			 { "Name", "pvfs.distribution.name", FT_STRING, BASE_NONE,
 				 NULL, 0, "Distribution Name", HFILL }},
 
 		{ &hf_pvfs_aggregate_size,
 			{ "Aggregate Size", "pvfs.aggregate_size", FT_UINT64, BASE_DEC,
-				NULL, 0, "Aggregate Size", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_io_type,
 			{ "I/O Type", "pvfs.io_type", FT_UINT32, BASE_DEC,
-				VALS(names_pvfs_io_type), 0, "I/O Type", HFILL }},
+				VALS(names_pvfs_io_type), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_flowproto_type,
 			{ "Flow Protocol Type", "pvfs.flowproto_type", FT_UINT32, BASE_DEC,
-				VALS(names_pvfs_flowproto_type), 0, "Flow Protocol Type", HFILL }},
+				VALS(names_pvfs_flowproto_type), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_server_param,
 			{ "Server Parameter", "pvfs.server_param", FT_UINT32, BASE_DEC,
-				VALS(names_pvfs_server_param), 0, "Server Parameter", HFILL }},
+				VALS(names_pvfs_server_param), 0, NULL, HFILL }},
 
 		{ &hf_pvfs_prev_value,
 			{ "Previous Value", "pvfs.prev_value", FT_UINT64, BASE_DEC,
-				NULL, 0, "Previous Value", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_ram_free_bytes,
 			{ "RAM Free Bytes", "pvfs.ram.free_bytes", FT_UINT64, BASE_DEC,
-				NULL, 0, "RAM Free Bytes", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_bytes_available,
 			{ "Bytes Available", "pvfs.bytes_available", FT_UINT64, BASE_DEC,
-				NULL, 0, "Bytes Available", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_bytes_total,
 			{ "Bytes Total", "pvfs.bytes_total", FT_UINT64, BASE_DEC,
-				NULL, 0, "Bytes Total", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_ram_bytes_total,
 			{ "RAM Bytes Total", "pvfs.ram_bytes_total", FT_UINT64, BASE_DEC,
-				NULL, 0, "RAM Bytes Total", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_ram_bytes_free,
 			{ "RAM Bytes Free", "pvfs.ram_bytes_free", FT_UINT64, BASE_DEC,
-				NULL, 0, "RAM Bytes Free", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_load_average_1s,
 			{ "Load Average (1s)", "pvfs.load_average.1s", FT_UINT64, BASE_DEC,
-				NULL, 0, "Load Average (1s)", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_load_average_5s,
 			{ "Load Average (5s)", "pvfs.load_average.5s", FT_UINT64, BASE_DEC,
-				NULL, 0, "Load Average (5s)", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_load_average_15s,
 			{ "Load Average (15s)", "pvfs.load_average.15s", FT_UINT64, BASE_DEC,
-				NULL, 0, "Load Average (15s)", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_uptime_seconds,
 			{ "Uptime (seconds)", "pvfs.uptime", FT_UINT64, BASE_DEC,
-				NULL, 0, "Uptime (seconds)", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_handles_available,
 			{ "Handles Available", "pvfs.handles_available", FT_UINT64, BASE_DEC,
-				NULL, 0, "Handles Available", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_handles_total,
 			{ "Total Handles", "pvfs.total_handles", FT_UINT64, BASE_DEC,
-				NULL, 0, "Total Handles", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		/*
 		 * This is used when the field returns 64-bits but we're only interested
@@ -3460,55 +3460,55 @@ proto_register_pvfs(void)
 		 */
 		{ &hf_pvfs_unused,
 			{ "Unused", "", FT_UINT32, BASE_DEC,
-				NULL, 0, "Unused", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_context_id,
 			{ "Context ID", "pvfs.context_id", FT_UINT32, BASE_DEC,
-				NULL, 0, "Context ID", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_offset,
 			{ "Offset", "pvfs.offset", FT_UINT64, BASE_DEC,
-				NULL, 0, "Offset", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_stride,
 			{ "Stride", "pvfs.stride", FT_UINT64, BASE_DEC,
-				NULL, 0, "Stride", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_ub,
 			{ "ub", "pvfs.ub", FT_UINT64, BASE_DEC,
-				NULL, 0, "ub", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_lb,
 			{ "lb", "pvfs.lb", FT_UINT64, BASE_DEC,
-				NULL, 0, "lb", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_end_time_ms,
 			{ "end_time_ms", "pvfs.end_time_ms", FT_UINT64, BASE_DEC,
-				NULL, 0, "end_time_ms", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_cur_time_ms,
 			{ "cur_time_ms", "pvfs.cur_time_ms", FT_UINT64, BASE_DEC,
-				NULL, 0, "cur_time_ms", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_start_time_ms,
 			{ "start_time_ms", "pvfs.start_time_ms", FT_UINT64, BASE_DEC,
-				NULL, 0, "start_time_ms", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_bytes_written,
 			{ "bytes_written", "pvfs.bytes_written", FT_UINT64, BASE_DEC,
-				NULL, 0, "bytes_written", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_bytes_read,
 			{ "bytes_read", "pvfs.bytes_read", FT_UINT64, BASE_DEC,
-				NULL, 0, "bytes_read", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_metadata_write,
 			{ "metadata_write", "pvfs.metadata_write", FT_UINT64, BASE_DEC,
-				NULL, 0, "metadata_write", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_metadata_read,
 			{ "metadata_read", "pvfs.metadata_read", FT_UINT64, BASE_DEC,
-				NULL, 0, "metadata_read", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_b_size,
 			{ "Size of bstream (if applicable)", "pvfs.b_size", FT_UINT64,
@@ -3520,15 +3520,15 @@ proto_register_pvfs(void)
 
 		{ &hf_pvfs_id_gen_t,
 			{ "id_gen_t", "pvfs.id_gen_t", FT_UINT64, BASE_DEC,
-				NULL, 0, "id_gen_t", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_attribute_key,
-			{ "Attribute key", "pvfs.attribute.key", FT_STRING, BASE_DEC,
-				NULL, 0, "Attribute key", HFILL }},
+			{ "Attribute key", "pvfs.attribute.key", FT_STRING, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_attribute_value,
-			{ "Attribute value", "pvfs.attribute.value", FT_STRING, BASE_DEC,
-				NULL, 0, "Attribute value", HFILL }},
+			{ "Attribute value", "pvfs.attribute.value", FT_STRING, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_strip_size,
 			{ "Strip size", "pvfs.strip_size", FT_UINT64, BASE_DEC,
@@ -3537,32 +3537,32 @@ proto_register_pvfs(void)
 		/* TODO: need description */
 		{ &hf_pvfs_ereg,
 			{ "ereg", "pvfs.ereg", FT_INT32, BASE_DEC,
-				NULL, 0, "ereg", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		/* TODO: need description */
 		{ &hf_pvfs_sreg,
 			{ "sreg", "pvfs.sreg", FT_INT32, BASE_DEC,
-				NULL, 0, "sreg", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_num_eregs,
 			{ "Number of eregs", "pvfs.num_eregs", FT_UINT32, BASE_DEC,
-				NULL, 0, "Number of eregs", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_num_blocks,
 			{ "Number of blocks", "pvfs.num_blocks", FT_UINT32, BASE_DEC,
-				NULL, 0, "Number of blocks", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_num_contig_chunks,
 			{ "Number of contig_chunks", "pvfs.num_contig_chunks", FT_UINT32, 
-				BASE_DEC, NULL, 0, "Number of contig_chunks", HFILL }},
+				BASE_DEC, NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_server_nr,
 			{ "Server #", "pvfs.server_nr", FT_UINT32, BASE_DEC,
-				NULL, 0, "Server #", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_server_count,
 			{ "Number of servers", "pvfs.server_count", FT_UINT32, BASE_DEC,
-				NULL, 0, "Number of servers", HFILL }},
+				NULL, 0, NULL, HFILL }},
 
 		{ &hf_pvfs_fh_length,
 			{ "length", "pvfs.fh.length", FT_UINT32, BASE_DEC,
diff --git a/epan/dissectors/packet-pw-atm.c b/epan/dissectors/packet-pw-atm.c
index c5fb4cfebb..c281b70dd5 100644
--- a/epan/dissectors/packet-pw-atm.c
+++ b/epan/dissectors/packet-pw-atm.c
@@ -305,7 +305,7 @@ proto_register_pw_atm(void)
                         {
                                 "ATM PW, N-to-one Cell Mode (with CW)", 
                                 "pw_atm_n2o_cw", FT_BOOLEAN, 
-                                0, NULL, 0x0, NULL, HFILL
+                                BASE_NONE, NULL, 0x0, NULL, HFILL
                         }
                 },
                 {
@@ -313,7 +313,7 @@ proto_register_pw_atm(void)
                         {
                                 "ATM PW, N-to-one Cell Mode (no CW)", 
                                 "pw_atm_n2o_nocw", FT_BOOLEAN, 
-                                0, NULL, 0x0, NULL, HFILL
+                                BASE_NONE, NULL, 0x0, NULL, HFILL
                         }
                 },
 #if 0
diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index 42665d5eb8..e8656adb1a 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -394,13 +394,13 @@ void proto_register_pw_cesopsn(void)
 				,FT_UINT16			,BASE_DEC		,NULL
 				,0				,NULL			,HFILL }}
 		,{&hf_payload	,{"TDM payload"			,"pwcesopsn.payload"	
-				,FT_BYTES			,BASE_HEX		,NULL			
+				,FT_BYTES			,BASE_NONE		,NULL			
 				,0				,NULL			,HFILL }}
 		,{&hf_padding	,{"Padding"			,"pwcesopsn.padding"	
-				,FT_BYTES			,BASE_HEX		,NULL			
+				,FT_BYTES			,BASE_NONE		,NULL			
 				,0				,NULL			,HFILL }}
 		,{&hf_padding_f	,{"Padding (formatted)"		,""
-				,FT_BYTES			,BASE_HEX		,NULL
+				,FT_BYTES			,BASE_NONE		,NULL
 				,0				,NULL			,HFILL }}
 	};
 	
diff --git a/epan/dissectors/packet-pw-eth.c b/epan/dissectors/packet-pw-eth.c
index fa9ce27253..6cc3c64795 100644
--- a/epan/dissectors/packet-pw-eth.c
+++ b/epan/dissectors/packet-pw-eth.c
@@ -146,7 +146,7 @@ proto_register_pw_eth(void)
                         {
                                 "PW (ethernet)", 
                                 "pweth", FT_BOOLEAN, 
-                                0, NULL, 0x0, NULL, HFILL
+                                BASE_NONE, NULL, 0x0, NULL, HFILL
                         }
                 },
                 {
@@ -154,7 +154,7 @@ proto_register_pw_eth(void)
                         {
                                 "PW Control Word (ethernet)", 
                                 "pweth.cw", FT_BOOLEAN, 
-                                0, NULL, 0x0, NULL, HFILL
+                                BASE_NONE, NULL, 0x0, NULL, HFILL
                         }
                 },
                 {
diff --git a/epan/dissectors/packet-pw-hdlc.c b/epan/dissectors/packet-pw-hdlc.c
index e0f6425a57..afe4b3ba6f 100644
--- a/epan/dissectors/packet-pw-hdlc.c
+++ b/epan/dissectors/packet-pw-hdlc.c
@@ -189,7 +189,7 @@ void proto_register_pw_hdlc(void)
 		{
 			&hf_pw_hdlc,
 			{
-				"PW HDLC", "pw_hdlc", FT_NONE, 0, NULL, 0x0, NULL, HFILL
+				"PW HDLC", "pw_hdlc", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index 39b3f92a3b..65eacb6a9b 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -419,13 +419,13 @@ void proto_register_pw_satop(void)
 				,FT_UINT16			,BASE_DEC		,NULL
 				,0				,NULL			,HFILL }}
 		,{&hf_payload	,{"TDM payload"			,"pwsatop.payload"	
-				,FT_BYTES			,BASE_HEX		,NULL			
+				,FT_BYTES			,BASE_NONE		,NULL			
 				,0				,NULL			,HFILL }}
 		,{&hf_padding	,{"Padding"			,"pwsatop.padding"	
-				,FT_BYTES			,BASE_HEX		,NULL			
+				,FT_BYTES			,BASE_NONE		,NULL			
 				,0				,NULL			,HFILL }}
 		,{&hf_padding_f	,{"Padding (formatted)"		,""
-				,FT_BYTES			,BASE_HEX		,NULL
+				,FT_BYTES			,BASE_NONE		,NULL
 				,0				,NULL			,HFILL }}
 	};
 	
diff --git a/epan/dissectors/packet-q2931.c b/epan/dissectors/packet-q2931.c
index ae4f05d9d1..42a5238dee 100644
--- a/epan/dissectors/packet-q2931.c
+++ b/epan/dissectors/packet-q2931.c
@@ -2139,39 +2139,39 @@ proto_register_q2931(void)
 	static hf_register_info hf[] = {
 		{ &hf_q2931_discriminator,
 		  { "Protocol discriminator", "q2931.disc", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_call_ref_len,
 		  { "Call reference value length", "q2931.call_ref_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_call_ref_flag,
 		  { "Call reference flag", "q2931.call_ref_flag", FT_BOOLEAN, BASE_NONE, TFS(&tfs_call_ref_flag), 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_call_ref,
-		  { "Call reference value", "q2931.call_ref", FT_BYTES, BASE_HEX, NULL, 0x0,
-		  	"", HFILL }},
+		  { "Call reference value", "q2931.call_ref", FT_BYTES, BASE_NONE, NULL, 0x0,
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_message_type,
 		  { "Message type", "q2931.message_type", FT_UINT8, BASE_HEX, VALS(q2931_message_type_vals), 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_message_type_ext,
 		  { "Message type extension", "q2931.message_type_ext", FT_UINT8, BASE_HEX, NULL, 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_message_flag,
 		  { "Flag", "q2931.message_flag", FT_BOOLEAN, 8, TFS(&tos_msg_flag), Q2931_MSG_TYPE_EXT_FOLLOW_INST,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_message_action_indicator,
 		  { "Action indicator", "q2931.message_action_indicator", FT_UINT8, BASE_DEC, VALS(msg_action_ind_vals), Q2931_MSG_TYPE_EXT_ACTION_IND,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 		{ &hf_q2931_message_len,
 		  { "Message length", "q2931.message_len", FT_UINT16, BASE_DEC, NULL, 0x0,
-		  	"", HFILL }},
+		  	NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-q931.c b/epan/dissectors/packet-q931.c
index 824fc40cc7..31e98c007b 100644
--- a/epan/dissectors/packet-q931.c
+++ b/epan/dissectors/packet-q931.c
@@ -3253,100 +3253,100 @@ proto_register_q931(void)
 	static hf_register_info hf[] = {
 		{ &hf_q931_discriminator,
 		  { "Protocol discriminator", "q931.disc", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_call_ref_len,
 		  { "Call reference value length", "q931.call_ref_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_call_ref_flag,
 		  { "Call reference flag", "q931.call_ref_flag", FT_BOOLEAN, BASE_NONE, TFS(&tfs_call_ref_flag), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_call_ref,
-		  { "Call reference value", "q931.call_ref", FT_BYTES, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+		  { "Call reference value", "q931.call_ref", FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 
 		{ &hf_q931_message_type,
 		  { "Message type", "q931.message_type", FT_UINT8, BASE_HEX, VALS(q931_message_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_maintenance_message_type,
 		  { "Maintenance message type", "q931.maintenance_message_type", FT_UINT8, BASE_HEX, VALS(dms_message_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_segment_type,
 		  { "Segmented message type", "q931.segment_type", FT_UINT8, BASE_HEX, VALS(q931_message_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_coding_standard,
 		  { "Coding standard", "q931.coding_standard", FT_UINT8, BASE_HEX,
-			 VALS(q931_coding_standard_vals), 0x60,"", HFILL }},
+			 VALS(q931_coding_standard_vals), 0x60,NULL, HFILL }},
 
 		{ &hf_q931_information_transfer_capability,
 		  { "Information transfer capability", "q931.information_transfer_capability", FT_UINT8, BASE_HEX,
-			 VALS(q931_information_transfer_capability_vals), 0x1f,"", HFILL }},
+			 VALS(q931_information_transfer_capability_vals), 0x1f,NULL, HFILL }},
 
 		{ &hf_q931_transfer_mode,
 		  { "Transfer mode", "q931.transfer_mode", FT_UINT8, BASE_HEX,
-			 VALS(q931_transfer_mode_vals), 0x60,"", HFILL }},
+			 VALS(q931_transfer_mode_vals), 0x60,NULL, HFILL }},
 
 		{ &hf_q931_information_transfer_rate,
 		  { "Information transfer rate", "q931.information_transfer_rate", FT_UINT8, BASE_HEX,
-			 VALS(q931_information_transfer_rate_vals), 0x1f,"", HFILL }},
+			 VALS(q931_information_transfer_rate_vals), 0x1f,NULL, HFILL }},
 
 		{ &hf_q931_layer_ident,
 		  { "Layer identification", "q931.layer_ident", FT_UINT8, BASE_HEX,
-			 VALS(q931_bearer_capability_layer_ident_vals), 0x60, "", HFILL }},
+			 VALS(q931_bearer_capability_layer_ident_vals), 0x60, NULL, HFILL }},
 
 		{ &hf_q931_uil1,
 		  { "User information layer 1 protocol", "q931.uil1", FT_UINT8, BASE_HEX,
-			 VALS(q931_uil1_vals), 0x1f,"", HFILL }},
+			 VALS(q931_uil1_vals), 0x1f,NULL, HFILL }},
 
 		{ &hf_q931_cause_location,
 		  { "Cause location", "q931.cause_location", FT_UINT8, BASE_DEC, VALS(q931_cause_location_vals), 0x0f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_cause_value,
 		  { "Cause value", "q931.cause_value", FT_UINT8, BASE_DEC, VALS(q931_cause_code_vals), 0x7f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_number_type,
 		  { "Number type", "q931.number_type", FT_UINT8, BASE_HEX, VALS(q931_number_type_vals), 0x70,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_numbering_plan,
 		  { "Numbering plan", "q931.numbering_plan", FT_UINT8, BASE_HEX, VALS(q931_numbering_plan_vals), 0x0f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_screening_ind,
 		  { "Screening indicator", "q931.screening_ind", FT_UINT8, BASE_HEX, VALS(q931_screening_indicator_vals), 0x03,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_presentation_ind,
 		  { "Presentation indicator", "q931.presentation_ind", FT_UINT8, BASE_HEX, VALS(q931_presentation_indicator_vals), 0x60,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_extension_ind,
 		  { "Extension indicator",  "q931.extension_ind",
 			FT_BOOLEAN, 8, TFS(&q931_extension_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_calling_party_number,
 		  { "Calling party number digits", "q931.calling_party_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_called_party_number,
 		  { "Called party number digits", "q931.called_party_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_connected_number,
 		  { "Connected party number digits", "q931.connected_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_redirecting_number,
 		  { "Redirecting party number digits", "q931.redirecting_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
     /* fields for channel identification IE */
 		/* 0x80 is the extension bit */
@@ -3387,7 +3387,7 @@ proto_register_q931(void)
 
 		{ &hf_q931_channel_number,
 		  { "Channel number", "q931.channel.number", FT_UINT8, BASE_DEC, NULL, 0x7F,
-		    "Channel number", HFILL }},
+		    NULL, HFILL }},
 
     /* desegmentation fields */
 		{ &hf_q931_segment_overlap,
@@ -3412,11 +3412,11 @@ proto_register_q931(void)
 
 		{ &hf_q931_segment,
 		  { "Q.931 Segment", "q931.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"Q.931 Segment", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_segments,
 		  { "Q.931 Segments", "q931.segments", FT_NONE, BASE_NONE, NULL, 0x0,
-			"Q.931 Segments", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q931_reassembled_in,
 		  { "Reassembled Q.931 in frame", "q931.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-q932-ros.c b/epan/dissectors/packet-q932-ros.c
index a27fe9fc50..50130006e7 100644
--- a/epan/dissectors/packet-q932-ros.c
+++ b/epan/dissectors/packet-q932-ros.c
@@ -732,7 +732,7 @@ void proto_register_q932_ros(void) {
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_argument,
       { "argument", "q932.ros.argument",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932_ros.InvokeArgument", HFILL }},
     { &hf_q932_ros_result,
       { "result", "q932.ros.result",
@@ -740,7 +740,7 @@ void proto_register_q932_ros(void) {
         "q932_ros.T_result", HFILL }},
     { &hf_q932_ros_resultArgument,
       { "result", "q932.ros.result",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932_ros.ResultArgument", HFILL }},
     { &hf_q932_ros_errcode,
       { "errcode", "q932.ros.errcode",
@@ -748,7 +748,7 @@ void proto_register_q932_ros(void) {
         "q932_ros.Code", HFILL }},
     { &hf_q932_ros_parameter,
       { "parameter", "q932.ros.parameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932_ros.T_parameter", HFILL }},
     { &hf_q932_ros_problem,
       { "problem", "q932.ros.problem",
diff --git a/epan/dissectors/packet-q932.c b/epan/dissectors/packet-q932.c
index 8a0c63f6ab..c4ce325a6f 100644
--- a/epan/dissectors/packet-q932.c
+++ b/epan/dissectors/packet-q932.c
@@ -795,14 +795,14 @@ void proto_register_q932(void) {
                           FT_UINT8, BASE_DEC, NULL, 0x0,
                           "Information Element Length", HFILL }},
     { &hf_q932_ie_data, { "Data", "q932.ie.data",
-                          FT_BYTES, BASE_HEX, NULL, 0x0,
-                          "Data", HFILL }},
+                          FT_BYTES, BASE_NONE, NULL, 0x0,
+                          NULL, HFILL }},
     { &hf_q932_pp,      { "Protocol profile", "q932.pp",
                           FT_UINT8, BASE_HEX, VALS(str_pp), 0x1F,
-                          "Protocol profile", HFILL }},
+                          NULL, HFILL }},
     { &hf_q932_nd,      { "Notification description", "q932.nd",
                           FT_UINT8, BASE_HEX, VALS(str_nd), 0x0,
-                          "Notification description", HFILL }},
+                          NULL, HFILL }},
 
 /*--- Included file: packet-q932-hfarr.c ---*/
 #line 1 "packet-q932-hfarr.c"
@@ -888,7 +888,7 @@ void proto_register_q932(void) {
         "q932.PublicPartyNumber", HFILL }},
     { &hf_q932_nsapEncodedNumber,
       { "nsapEncodedNumber", "q932.nsapEncodedNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932.NsapEncodedNumber", HFILL }},
     { &hf_q932_dataPartyNumber,
       { "dataPartyNumber", "q932.dataPartyNumber",
@@ -928,15 +928,15 @@ void proto_register_q932(void) {
         "q932.UserSpecifiedSubaddress", HFILL }},
     { &hf_q932_nSAPSubaddress,
       { "nSAPSubaddress", "q932.nSAPSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932.NSAPSubaddress", HFILL }},
     { &hf_q932_subaddressInformation,
       { "subaddressInformation", "q932.subaddressInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "q932.SubaddressInformation", HFILL }},
     { &hf_q932_oddCountIndicator,
       { "oddCountIndicator", "q932.oddCountIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "q932.BOOLEAN", HFILL }},
     { &hf_q932_sourceEntity,
       { "sourceEntity", "q932.sourceEntity",
diff --git a/epan/dissectors/packet-q933.c b/epan/dissectors/packet-q933.c
index 27db4245d8..9a0148ecfc 100644
--- a/epan/dissectors/packet-q933.c
+++ b/epan/dissectors/packet-q933.c
@@ -2173,94 +2173,94 @@ proto_register_q933(void)
 	static hf_register_info hf[] = {
 		{ &hf_q933_discriminator,
 		  { "Protocol discriminator", "q933.disc", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_call_ref_flag,
 		  { "Call reference flag", "q933.call_ref_flag", FT_BOOLEAN, BASE_NONE, TFS(&tfs_call_ref_flag), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_call_ref,
-		  { "Call reference value", "q933.call_ref", FT_BYTES, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+		  { "Call reference value", "q933.call_ref", FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 
 
 		{ &hf_q933_coding_standard,
 		  { "Coding standard", "q933.coding_standard", FT_UINT8, BASE_HEX,
-			 VALS(q933_coding_standard_vals), 0x60,"", HFILL }},
+			 VALS(q933_coding_standard_vals), 0x60,NULL, HFILL }},
 
 		{ &hf_q933_information_transfer_capability,
 		  { "Information transfer capability", "q933.information_transfer_capability", FT_UINT8, BASE_HEX,
-			 VALS(q933_information_transfer_capability_vals), 0x1f,"", HFILL }},
+			 VALS(q933_information_transfer_capability_vals), 0x1f,NULL, HFILL }},
 
 		{ &hf_q933_transfer_mode,
 		  { "Transfer mode", "q933.transfer_mode", FT_UINT8, BASE_HEX,
-			 VALS(q933_transfer_mode_vals), 0x60,"", HFILL }},
+			 VALS(q933_transfer_mode_vals), 0x60,NULL, HFILL }},
 
 		{ &hf_q933_uil1,
 		  { "User information layer 1 protocol", "q933.uil1", FT_UINT8, BASE_HEX,
-			 VALS(q933_uil1_vals), 0x1f,"", HFILL }},
+			 VALS(q933_uil1_vals), 0x1f,NULL, HFILL }},
 
 		{ &hf_q933_call_ref_len,
 		  { "Call reference value length", "q933.call_ref_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_message_type,
 		  { "Message type", "q933.message_type", FT_UINT8, BASE_HEX, VALS(q933_message_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_cause_location,
 		  { "Cause location", "q933.cause_location", FT_UINT8, BASE_DEC, VALS(q933_cause_location_vals), 0x0f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_cause_value,
 		  { "Cause value", "q933.cause_value", FT_UINT8, BASE_DEC, VALS(q933_cause_code_vals), 0x7f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_number_type,
 		  { "Number type", "q933.number_type", FT_UINT8, BASE_HEX, VALS(q933_number_type_vals), 0x70,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_numbering_plan,
 		  { "numbering plan", "q933.numbering_plan", FT_UINT8, BASE_HEX, VALS(q933_numbering_plan_vals), 0x0f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_screening_ind,
 		  { "Screening indicator", "q933.screening_ind", FT_UINT8, BASE_HEX, VALS(q933_screening_indicator_vals), 0x03,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_presentation_ind,
 		  { "Presentation indicator", "q933.presentation_ind", FT_UINT8, BASE_HEX, VALS(q933_presentation_indicator_vals), 0x60,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_extension_ind,
 		  { "Extension indicator",  "q933.extension_ind",
 			FT_BOOLEAN, 8, TFS(&q933_extension_ind_value), 0x80,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_calling_party_number,
 		  { "Calling party number digits", "q933.calling_party_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_called_party_number,
 		  { "Called party number digits", "q933.called_party_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_connected_number,
 		  { "Connected party number digits", "q933.connected_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_q933_redirecting_number,
 		  { "Redirecting party number digits", "q933.redirecting_number.digits", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_q933_report_type,
 		  { "Report type", "q933.report_type", FT_UINT8, BASE_DEC, VALS(q933_report_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_q933_link_verf_txseq,
 		  { "TX Sequence", "q933.link_verification.txseq", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_q933_link_verf_rxseq,
 		  { "RX Sequence", "q933.link_verification.rxseq", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index 4b2db281c4..ac23ba1948 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -173,11 +173,11 @@ proto_register_qllc(void)
 	static hf_register_info hf[] = {
 	    { &hf_qllc_address,
 		{ "Address Field",	"qllc.address", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_qllc_control,
 		{ "Control Field",	"qllc.control", FT_UINT8, BASE_HEX,
-		  VALS(qllc_control_vals), 0x0, "", HFILL }},
+		  VALS(qllc_control_vals), 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-qsig.c b/epan/dissectors/packet-qsig.c
index 90d9a68c59..fe85c9efad 100644
--- a/epan/dissectors/packet-qsig.c
+++ b/epan/dissectors/packet-qsig.c
@@ -12542,13 +12542,13 @@ void proto_register_qsig(void) {
   static hf_register_info hf[] = {
     { &hf_qsig_operation, { "Operation", "qsig.operation",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_operation), 0x0,
-                           "Operation", HFILL }},
+                           NULL, HFILL }},
     { &hf_qsig_service,   { "Service", "qsig.service",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_service), 0x0,
                            "Supplementary Service", HFILL }},
     { &hf_qsig_error,     { "Error", "qsig.error",
                            FT_UINT8, BASE_DEC, VALS(qsig_str_error), 0x0,
-                           "Error", HFILL }},
+                           NULL, HFILL }},
     { &hf_qsig_ie_type, { "Type", "qsig.ie.type",
                           FT_UINT8, BASE_HEX, NULL, 0x0,
                           "Information Element Type", HFILL }},
@@ -12562,14 +12562,14 @@ void proto_register_qsig(void) {
                           FT_UINT8, BASE_DEC, NULL, 0x0,
                           "Information Element Length", HFILL }},
     { &hf_qsig_ie_data, { "Data", "qsig.ie.data",
-                          FT_BYTES, BASE_HEX, NULL, 0x0,
-                          "Data", HFILL }},
+                          FT_BYTES, BASE_NONE, NULL, 0x0,
+                          NULL, HFILL }},
     { &hf_qsig_tc,      { "Transit count", "qsig.tc",
                           FT_UINT8, BASE_DEC, NULL, 0x1F,
-                          "Transit count", HFILL }},
+                          NULL, HFILL }},
     { &hf_qsig_pc,      { "Party category", "qsig.pc",
                           FT_UINT8, BASE_HEX, VALS(qsig_str_pc), 0x07,
-                          "Party category", HFILL }},
+                          NULL, HFILL }},
 
 /*--- Included file: packet-qsig-hfarr.c ---*/
 #line 1 "packet-qsig-hfarr.c"
@@ -12682,15 +12682,15 @@ void proto_register_qsig(void) {
         "qsig.UserSpecifiedSubaddress", HFILL }},
     { &hf_qsig_nSAPSubaddress,
       { "nSAPSubaddress", "qsig.nSAPSubaddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.NSAPSubaddress", HFILL }},
     { &hf_qsig_subaddressInformation,
       { "subaddressInformation", "qsig.subaddressInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.SubaddressInformation", HFILL }},
     { &hf_qsig_oddCountIndicator,
       { "oddCountIndicator", "qsig.oddCountIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig.BOOLEAN", HFILL }},
 
 /* --- Module Name-Operations-asn1-97 --- --- ---                             */
@@ -12908,7 +12908,7 @@ void proto_register_qsig(void) {
         "qsig_cf.INTEGER_1_15", HFILL }},
     { &hf_qsig_cf_pSS1InfoElement,
       { "pSS1InfoElement", "qsig.cf.pSS1InfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_cf_lastRerouteingNr,
       { "lastRerouteingNr", "qsig.cf.lastRerouteingNr",
@@ -12972,7 +12972,7 @@ void proto_register_qsig(void) {
         "qsig_cf.DLI2Extension", HFILL }},
     { &hf_qsig_cf_presentationAllowedIndicator,
       { "presentationAllowedIndicator", "qsig.cf.presentationAllowedIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig.PresentationAllowedIndicator", HFILL }},
     { &hf_qsig_cf_redirectionName,
       { "redirectionName", "qsig.cf.redirectionName",
@@ -12988,7 +12988,7 @@ void proto_register_qsig(void) {
         "qsig_cf.IntResult", HFILL }},
     { &hf_qsig_cf_remoteEnabled,
       { "remoteEnabled", "qsig.cf.remoteEnabled",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cf.BOOLEAN", HFILL }},
     { &hf_qsig_cf_extensionIR,
       { "extension", "qsig.cf.extension",
@@ -13142,7 +13142,7 @@ void proto_register_qsig(void) {
         "qsig.PresentedAddressScreened", HFILL }},
     { &hf_qsig_ct_basicCallInfoElements,
       { "basicCallInfoElements", "qsig.ct.basicCallInfoElements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_ct_connectedName,
       { "connectedName", "qsig.ct.connectedName",
@@ -13217,7 +13217,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_cc_service,
       { "service", "qsig.cc.service",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_cc_subaddrA,
       { "subaddrA", "qsig.cc.subaddrA",
@@ -13229,11 +13229,11 @@ void proto_register_qsig(void) {
         "qsig.PartySubaddress", HFILL }},
     { &hf_qsig_cc_can_retain_service,
       { "can-retain-service", "qsig.cc.can_retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_retain_sig_connection,
       { "retain-sig-connection", "qsig.cc.retain_sig_connection",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_extension,
       { "extension", "qsig.cc.extension",
@@ -13241,11 +13241,11 @@ void proto_register_qsig(void) {
         "qsig_cc.CcExtension", HFILL }},
     { &hf_qsig_cc_no_path_reservation,
       { "no-path-reservation", "qsig.cc.no_path_reservation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_retain_service,
       { "retain-service", "qsig.cc.retain_service",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_cc.BOOLEAN", HFILL }},
     { &hf_qsig_cc_fullArg,
       { "fullArg", "qsig.cc.fullArg",
@@ -13300,7 +13300,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_co_serviceList,
       { "serviceList", "qsig.co.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_co.ServiceList", HFILL }},
     { &hf_qsig_co_extendedServiceList,
       { "extendedServiceList", "qsig.co.extendedServiceList",
@@ -13329,7 +13329,7 @@ void proto_register_qsig(void) {
     { &hf_qsig_co_ServiceList_callOffer,
       { "callOffer", "qsig.co.callOffer",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Do-Not-Disturb-Operations-asn1-97 --- --- ---                   */
 
@@ -13451,7 +13451,7 @@ void proto_register_qsig(void) {
         "qsig_dnd.DNDOargumentExtension", HFILL }},
     { &hf_qsig_dnd_serviceList,
       { "serviceList", "qsig.dnd.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_dnd.ServiceList", HFILL }},
     { &hf_qsig_dnd_extendedServiceList,
       { "extendedServiceList", "qsig.dnd.extendedServiceList",
@@ -13464,15 +13464,15 @@ void proto_register_qsig(void) {
     { &hf_qsig_dnd_ServiceList_dndo_low,
       { "dndo-low", "qsig.dnd.dndo-low",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_medium,
       { "dndo-medium", "qsig.dnd.dndo-medium",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_dnd_ServiceList_dndo_high,
       { "dndo-high", "qsig.dnd.dndo-high",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Call-Intrusion-Operations-asn1-97 --- --- ---                   */
 
@@ -13510,7 +13510,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_ci_serviceList,
       { "serviceList", "qsig.ci.serviceList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_ci.ServiceList", HFILL }},
     { &hf_qsig_ci_extendedServiceList,
       { "extendedServiceList", "qsig.ci.extendedServiceList",
@@ -13563,15 +13563,15 @@ void proto_register_qsig(void) {
     { &hf_qsig_ci_ServiceList_ci_low,
       { "ci-low", "qsig.ci.ci-low",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_medium,
       { "ci-medium", "qsig.ci.ci-medium",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_ci_ServiceList_ci_high,
       { "ci-high", "qsig.ci.ci-high",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module SS-AOC-Operations-asn1-97 --- --- ---                           */
 
@@ -13927,7 +13927,7 @@ void proto_register_qsig(void) {
         "qsig_sync.ArgExtension", HFILL }},
     { &hf_qsig_sync_response,
       { "response", "qsig.sync.response",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sync.BOOLEAN", HFILL }},
     { &hf_qsig_sync_stateinfo,
       { "stateinfo", "qsig.sync.stateinfo",
@@ -14025,7 +14025,7 @@ void proto_register_qsig(void) {
         "qsig_cmn.CmnArg", HFILL }},
     { &hf_qsig_cmn_featureIdentifier,
       { "featureIdentifier", "qsig.cmn.featureIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cmn.FeatureIdList", HFILL }},
     { &hf_qsig_cmn_ssDNDOprotectionLevel,
       { "ssDNDOprotectionLevel", "qsig.cmn.ssDNDOprotectionLevel",
@@ -14078,75 +14078,75 @@ void proto_register_qsig(void) {
     { &hf_qsig_cmn_FeatureIdList_reserved,
       { "reserved", "qsig.cmn.reserved",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCFreRoutingSupported,
       { "ssCFreRoutingSupported", "qsig.cmn.ssCFreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCTreRoutingSupported,
       { "ssCTreRoutingSupported", "qsig.cmn.ssCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCBSpossible,
       { "ssCCBSpossible", "qsig.cmn.ssCCBSpossible",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCCNRpossible,
       { "ssCCNRpossible", "qsig.cmn.ssCCNRpossible",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCOsupported,
       { "ssCOsupported", "qsig.cmn.ssCOsupported",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIforcedRelease,
       { "ssCIforcedRelease", "qsig.cmn.ssCIforcedRelease",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIisolation,
       { "ssCIisolation", "qsig.cmn.ssCIisolation",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssCIwaitOnBusy,
       { "ssCIwaitOnBusy", "qsig.cmn.ssCIwaitOnBusy",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportChargeRateProvAtGatewPinx,
       { "ssAOCsupportChargeRateProvAtGatewPinx", "qsig.cmn.ssAOCsupportChargeRateProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportInterimChargeProvAtGatewPinx,
       { "ssAOCsupportInterimChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportInterimChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssAOCsupportFinalChargeProvAtGatewPinx,
       { "ssAOCsupportFinalChargeProvAtGatewPinx", "qsig.cmn.ssAOCsupportFinalChargeProvAtGatewPinx",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPRsupportedAtCooperatingPinx,
       { "anfPRsupportedAtCooperatingPinx", "qsig.cmn.anfPRsupportedAtCooperatingPinx",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptImmediate,
       { "anfCINTcanInterceptImmediate", "qsig.cmn.anfCINTcanInterceptImmediate",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfCINTcanInterceptDelayed,
       { "anfCINTcanInterceptDelayed", "qsig.cmn.anfCINTcanInterceptDelayed",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfWTMIreRoutingSupported,
       { "anfWTMIreRoutingSupported", "qsig.cmn.anfWTMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_anfPUMIreRoutingSupported,
       { "anfPUMIreRoutingSupported", "qsig.cmn.anfPUMIreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_cmn_FeatureIdList_ssSSCTreRoutingSupported,
       { "ssSSCTreRoutingSupported", "qsig.cmn.ssSSCTreRoutingSupported",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module Call-Interruption-Operations-asn1-97 --- --- ---                */
 
@@ -14231,7 +14231,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_pumr_alternativeId,
       { "alternativeId", "qsig.pumr.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.AlternativeId", HFILL }},
     { &hf_qsig_pumr_basicService,
       { "basicService", "qsig.pumr.basicService",
@@ -14259,11 +14259,11 @@ void proto_register_qsig(void) {
         "qsig_pumr.T_userPin", HFILL }},
     { &hf_qsig_pumr_pumUserPin,
       { "pumUserPin", "qsig.pumr.pumUserPin",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.UserPin", HFILL }},
     { &hf_qsig_pumr_activatingUserPin,
       { "activatingUserPin", "qsig.pumr.activatingUserPin",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumr.UserPin", HFILL }},
     { &hf_qsig_pumr_argExtension,
       { "argExtension", "qsig.pumr.argExtension",
@@ -14303,7 +14303,7 @@ void proto_register_qsig(void) {
         "qsig_pumr.IpumUserId", HFILL }},
     { &hf_qsig_pumr_homeInfoOnly,
       { "homeInfoOnly", "qsig.pumr.homeInfoOnly",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_pumr.BOOLEAN", HFILL }},
     { &hf_qsig_pumr_userPin_02,
       { "userPin", "qsig.pumr.userPin",
@@ -14362,7 +14362,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_pumch_qSIGInfoElement,
       { "qSIGInfoElement", "qsig.pumch.qSIGInfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_pumch_argExtension,
       { "argExtension", "qsig.pumch.argExtension",
@@ -14430,7 +14430,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_pumch_alternativeId,
       { "alternativeId", "qsig.pumch.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_pumch.AlternativeId", HFILL }},
     { &hf_qsig_pumch_both,
       { "both", "qsig.pumch.both",
@@ -14513,7 +14513,7 @@ void proto_register_qsig(void) {
         "qsig.PresentedAddressScreened", HFILL }},
     { &hf_qsig_ssct_awaitConnect,
       { "awaitConnect", "qsig.ssct.awaitConnect",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_ssct.AwaitConnect", HFILL }},
     { &hf_qsig_ssct_transferredName,
       { "transferredName", "qsig.ssct.transferredName",
@@ -14628,7 +14628,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_wtmlr_alternativeId,
       { "alternativeId", "qsig.wtmlr.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmlr.AlternativeId", HFILL }},
     { &hf_qsig_wtmlr_resExtension,
       { "resExtension", "qsig.wtmlr.resExtension",
@@ -14683,7 +14683,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_wtmch_qSIGInfoElement,
       { "qSIGInfoElement", "qsig.wtmch.qSIGInfoElement",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig.PSS1InformationElement", HFILL }},
     { &hf_qsig_wtmch_argExtension,
       { "argExtension", "qsig.wtmch.argExtension",
@@ -14751,7 +14751,7 @@ void proto_register_qsig(void) {
         "qsig.Extension", HFILL }},
     { &hf_qsig_wtmch_alternativeId,
       { "alternativeId", "qsig.wtmch.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmch.AlternativeId", HFILL }},
     { &hf_qsig_wtmch_both,
       { "both", "qsig.wtmch.both",
@@ -14838,7 +14838,7 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CanCompute", HFILL }},
     { &hf_qsig_wtmau_authChallenge,
       { "authChallenge", "qsig.wtmau.authChallenge",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthChallenge", HFILL }},
     { &hf_qsig_wtmau_wtatParamInfo,
       { "wtatParamInfo", "qsig.wtmau.wtatParamInfo",
@@ -14854,7 +14854,7 @@ void proto_register_qsig(void) {
         "qsig.PartyNumber", HFILL }},
     { &hf_qsig_wtmau_alternativeId,
       { "alternativeId", "qsig.wtmau.alternativeId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AlternativeId", HFILL }},
     { &hf_qsig_wtmau_wtanParamInfo,
       { "wtanParamInfo", "qsig.wtmau.wtanParamInfo",
@@ -14870,7 +14870,7 @@ void proto_register_qsig(void) {
         "qsig_wtmau.AuthSessionKeyInfo", HFILL }},
     { &hf_qsig_wtmau_authKey,
       { "authKey", "qsig.wtmau.authKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthKey", HFILL }},
     { &hf_qsig_wtmau_challLen,
       { "challLen", "qsig.wtmau.challLen",
@@ -14882,11 +14882,11 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CalcWtanInfo", HFILL }},
     { &hf_qsig_wtmau_authSessionKey,
       { "authSessionKey", "qsig.wtmau.authSessionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthSessionKey", HFILL }},
     { &hf_qsig_wtmau_calculationParam,
       { "calculationParam", "qsig.wtmau.calculationParam",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.CalculationParam", HFILL }},
     { &hf_qsig_wtmau_CalcWtatInfo_item,
       { "CalcWtatInfoUnit", "qsig.wtmau.CalcWtatInfoUnit",
@@ -14894,11 +14894,11 @@ void proto_register_qsig(void) {
         "qsig_wtmau.CalcWtatInfoUnit", HFILL }},
     { &hf_qsig_wtmau_authResponse,
       { "authResponse", "qsig.wtmau.authResponse",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.AuthResponse", HFILL }},
     { &hf_qsig_wtmau_derivedCipherKey,
       { "derivedCipherKey", "qsig.wtmau.derivedCipherKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_wtmau.DerivedCipherKey", HFILL }},
     { &hf_qsig_wtmau_extension,
       { "extension", "qsig.wtmau.extension",
@@ -14945,15 +14945,15 @@ void proto_register_qsig(void) {
         "qsig_sd.SDExtension", HFILL }},
     { &hf_qsig_sd_displayStringNormal,
       { "displayStringNormal", "qsig.sd.displayStringNormal",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringNormal", HFILL }},
     { &hf_qsig_sd_displayStringExtended,
       { "displayStringExtended", "qsig.sd.displayStringExtended",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringExtended", HFILL }},
     { &hf_qsig_sd_keypadString,
       { "keypadString", "qsig.sd.keypadString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sd.BMPStringNormal", HFILL }},
     { &hf_qsig_sd_extension,
       { "extension", "qsig.sd.extension",
@@ -15004,11 +15004,11 @@ void proto_register_qsig(void) {
         "qsig_cidl.T_linkageID", HFILL }},
     { &hf_qsig_cidl_subDomainID,
       { "subDomainID", "qsig.cidl.subDomainID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cidl.SubDomainID", HFILL }},
     { &hf_qsig_cidl_globallyUniqueID,
       { "globallyUniqueID", "qsig.cidl.globallyUniqueID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_cidl.GloballyUniqueID", HFILL }},
     { &hf_qsig_cidl_timeStamp,
       { "timeStamp", "qsig.cidl.timeStamp",
@@ -15151,15 +15151,15 @@ void proto_register_qsig(void) {
         "qsig_sms.Status", HFILL }},
     { &hf_qsig_sms_priority,
       { "priority", "qsig.sms.priority",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_moreMessagesToSend,
       { "moreMessagesToSend", "qsig.sms.moreMessagesToSend",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_statusReportQualifier,
       { "statusReportQualifier", "qsig.sms.statusReportQualifier",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_smsStatusReportResponseChoice,
       { "smsStatusReportResponseChoice", "qsig.sms.smsStatusReportResponseChoice",
@@ -15175,11 +15175,11 @@ void proto_register_qsig(void) {
         "qsig_sms.CommandType", HFILL }},
     { &hf_qsig_sms_commandData,
       { "commandData", "qsig.sms.commandData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.CommandData", HFILL }},
     { &hf_qsig_sms_statusReportRequest,
       { "statusReportRequest", "qsig.sms.statusReportRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_null,
       { "null", "qsig.sms.null",
@@ -15191,15 +15191,15 @@ void proto_register_qsig(void) {
         "qsig_sms.ValidityPeriod", HFILL }},
     { &hf_qsig_sms_replyPath,
       { "replyPath", "qsig.sms.replyPath",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_rejectDuplicates,
       { "rejectDuplicates", "qsig.sms.rejectDuplicates",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_statusReportIndication,
       { "statusReportIndication", "qsig.sms.statusReportIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_resChoiceSeq,
       { "resChoiceSeq", "qsig.sms.resChoiceSeq",
@@ -15231,7 +15231,7 @@ void proto_register_qsig(void) {
         "qsig_sms.ValidityPeriodEnh", HFILL }},
     { &hf_qsig_sms_singleShotSM,
       { "singleShotSM", "qsig.sms.singleShotSM",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_enhancedVP,
       { "enhancedVP", "qsig.sms.enhancedVP",
@@ -15243,7 +15243,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_255", HFILL }},
     { &hf_qsig_sms_validityPeriodSemi,
       { "validityPeriodSemi", "qsig.sms.validityPeriodSemi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.ValidityPeriodSemi", HFILL }},
     { &hf_qsig_sms_userDataHeader,
       { "userDataHeader", "qsig.sms.userDataHeader",
@@ -15255,7 +15255,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_3", HFILL }},
     { &hf_qsig_sms_compressed,
       { "compressed", "qsig.sms.compressed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_shortMessageText,
       { "shortMessageText", "qsig.sms.shortMessageText",
@@ -15267,7 +15267,7 @@ void proto_register_qsig(void) {
         "qsig_sms.ShortMessageTextType", HFILL }},
     { &hf_qsig_sms_shortMessageTextData,
       { "shortMessageTextData", "qsig.sms.shortMessageTextData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.ShortMessageTextData", HFILL }},
     { &hf_qsig_sms_UserDataHeader_item,
       { "UserDataHeaderChoice", "qsig.sms.UserDataHeaderChoice",
@@ -15275,7 +15275,7 @@ void proto_register_qsig(void) {
         "qsig_sms.UserDataHeaderChoice", HFILL }},
     { &hf_qsig_sms_smscControlParameterHeader,
       { "smscControlParameterHeader", "qsig.sms.smscControlParameterHeader",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.SmscControlParameterHeader", HFILL }},
     { &hf_qsig_sms_concatenated8BitSMHeader,
       { "concatenated8BitSMHeader", "qsig.sms.concatenated8BitSMHeader",
@@ -15299,7 +15299,7 @@ void proto_register_qsig(void) {
         "qsig_sms.DataHeaderSourceIndicator", HFILL }},
     { &hf_qsig_sms_wirelessControlHeader,
       { "wirelessControlHeader", "qsig.sms.wirelessControlHeader",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.WirelessControlHeader", HFILL }},
     { &hf_qsig_sms_genericUserValue,
       { "genericUserValue", "qsig.sms.genericUserValue",
@@ -15351,7 +15351,7 @@ void proto_register_qsig(void) {
         "qsig_sms.INTEGER_0_255", HFILL }},
     { &hf_qsig_sms_genericUserData,
       { "genericUserData", "qsig.sms.genericUserData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "qsig_sms.OCTET_STRING", HFILL }},
     { &hf_qsig_sms_failureCause,
       { "failureCause", "qsig.sms.failureCause",
@@ -15359,32 +15359,32 @@ void proto_register_qsig(void) {
         "qsig_sms.FailureCause", HFILL }},
     { &hf_qsig_sms_scAddressSaved,
       { "scAddressSaved", "qsig.sms.scAddressSaved",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_sms.BOOLEAN", HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTransactionCompleted,
       { "sRforTransactionCompleted", "qsig.sms.sRforTransactionCompleted",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforPermanentError,
       { "sRforPermanentError", "qsig.sms.sRforPermanentError",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCnotTrying,
       { "sRforTempErrorSCnotTrying", "qsig.sms.sRforTempErrorSCnotTrying",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_sRforTempErrorSCstillTrying,
       { "sRforTempErrorSCstillTrying", "qsig.sms.sRforTempErrorSCstillTrying",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_cancelSRRforConcatenatedSM,
       { "cancelSRRforConcatenatedSM", "qsig.sms.cancelSRRforConcatenatedSM",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_qsig_sms_SmscControlParameterHeader_includeOrigUDHintoSR,
       { "includeOrigUDHintoSR", "qsig.sms.includeOrigUDHintoSR",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /* --- Module SS-MCR-Operations-asn97 --- --- ---                             */
 
@@ -15414,7 +15414,7 @@ void proto_register_qsig(void) {
         "qsig_mcr.CallType", HFILL }},
     { &hf_qsig_mcr_retainOrigCall,
       { "retainOrigCall", "qsig.mcr.retainOrigCall",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_mcr.BOOLEAN", HFILL }},
     { &hf_qsig_mcr_destinationAddress,
       { "destinationAddress", "qsig.mcr.destinationAddress",
@@ -15641,7 +15641,7 @@ void proto_register_qsig(void) {
         "qsig_mcm.UpdateInfo", HFILL }},
     { &hf_qsig_mcm_moreInfoFollows,
       { "moreInfoFollows", "qsig.mcm.moreInfoFollows",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "qsig_mcm.BOOLEAN", HFILL }},
     { &hf_qsig_mcm_argumentExtMCMUpdArg,
       { "argumentExt", "qsig.mcm.argumentExt",
diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c
index e9481f32ab..b670eb96ba 100644
--- a/epan/dissectors/packet-quake.c
+++ b/epan/dissectors/packet-quake.c
@@ -541,7 +541,7 @@ proto_register_quake(void)
     { &hf_quake_header_flags,
       { "Flags", "quake.header.flags",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"Flags", HFILL }},
+	NULL, HFILL }},
     { &hf_quake_header_length,
       { "Length", "quake.header.length",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -573,7 +573,7 @@ proto_register_quake(void)
     { &hf_quake_CCREQ_PLAYER_INFO_player,
       { "Player", "quake.control.player_info.player",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"Player", HFILL }},
+	NULL, HFILL }},
     { &hf_quake_CCREQ_RULE_INFO_lastrule,
       { "Last Rule", "quake.control.rule_info.lastrule",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
@@ -605,7 +605,7 @@ proto_register_quake(void)
     { &hf_quake_CCREP_SERVER_INFO_max_player,
       { "Maximal Number of Players", "quake.control.server_info.max_player",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"Maximal Number of Players", HFILL }},
+	NULL, HFILL }},
     { &hf_quake_CCREP_PLAYER_INFO_name,
       { "Name", "quake.control.player_info.name",
 	FT_STRINGZ, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 8051d3f4db..4849fd647c 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -791,27 +791,27 @@ proto_register_quake2(void)
 		{ &hf_quake2_c2s,
 			{ "Client to Server", "quake2.c2s",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Client to Server", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake2_s2c,
 			{ "Server to Client", "quake2.s2c",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Server to Client", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake2_connectionless,
 			{ "Connectionless", "quake2.connectionless",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Connectionless", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake2_game,
 			{ "Game", "quake2.game",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Game", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake2_connectionless_marker,
 			{ "Marker", "quake2.connectionless.marker",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Marker", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake2_connectionless_text,
 			{ "Text", "quake2.connectionless.text",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Text", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quake2_game_seq1,
 			{ "Sequence Number", "quake2.game.seq1",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -856,42 +856,42 @@ proto_register_quake2(void)
 			{ "Angles (pitch)", "quake2.game.client.command.move.angles",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_ANGLE1, "", HFILL }},
+			CM_ANGLE1, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_angles2,
 			{ "Angles (yaw)", "quake2.game.client.command.move.angles",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_ANGLE2, "", HFILL }},
+			CM_ANGLE2, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_angles3,
 			{ "Angles (roll)", "quake2.game.client.command.move.angles",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_ANGLE3, "", HFILL }},
+			CM_ANGLE3, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_movement_fwd,
 			{ "Movement (fwd)", "quake2.game.client.command.move.movement",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_FORWARD, "", HFILL }},
+			CM_FORWARD, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_movement_side,
 			{ "Movement (side)", "quake2.game.client.command.move.movement",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_SIDE, "", HFILL }},
+			CM_SIDE, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_movement_up,
 			{ "Movement (up)", "quake2.game.client.command.move.movement",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_UP, "", HFILL }},
+			CM_UP, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_buttons,
 			{ "Buttons", "quake2.game.client.command.move.buttons",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_BUTTONS, "", HFILL }},
+			CM_BUTTONS, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_bitfield_impulse,
 			{ "Impulse", "quake2.game.client.command.move.impulse",
 			FT_UINT8, BASE_HEX,
 			VALS(hf_quake2_game_client_command_move_vals),
-			CM_IMPULSE, "", HFILL }},
+			CM_IMPULSE, NULL, HFILL }},
 		{ &hf_quake2_game_client_command_move_msec,
 			{ "Msec", "quake2.game.client.command.move.msec",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-quake3.c b/epan/dissectors/packet-quake3.c
index e6655e81cb..0ad6c78e63 100644
--- a/epan/dissectors/packet-quake3.c
+++ b/epan/dissectors/packet-quake3.c
@@ -582,31 +582,31 @@ proto_register_quake3(void)
 	static hf_register_info hf[] = {
 		{ &hf_quake3_direction,
 			{ "Direction", "quake3.direction",
-			FT_NONE, BASE_DEC, NULL, 0x0,
+			FT_NONE, BASE_NONE, NULL, 0x0,
 			"Packet Direction", HFILL }},
 		{ &hf_quake3_connectionless,
 			{ "Connectionless", "quake3.connectionless",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Connectionless", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake3_game,
 			{ "Game", "quake3.game",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Game", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake3_connectionless_marker,
 			{ "Marker", "quake3.connectionless.marker",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Marker", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quake3_connectionless_text,
 			{ "Text", "quake3.connectionless.text",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Text", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quake3_connectionless_command,
 			{ "Command", "quake3.connectionless.command",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Command", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quake3_server_addr,
 			{ "Server Address", "quake3.server.addr",
-			FT_IPv4, BASE_DEC, NULL, 0x0,
+			FT_IPv4, BASE_NONE, NULL, 0x0,
 			"Server IP Address", HFILL }},
 		{ &hf_quake3_server_port,
 			{ "Server Port", "quake3.server.port",
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index ee93b7fca3..1fe751f7bc 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -798,35 +798,35 @@ proto_register_quakeworld(void)
 		{ &hf_quakeworld_c2s,
 			{ "Client to Server", "quakeworld.c2s",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Client to Server", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quakeworld_s2c,
 			{ "Server to Client", "quakeworld.s2c",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Server to Client", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless,
 			{ "Connectionless", "quakeworld.connectionless",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Connectionless", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quakeworld_game,
 			{ "Game", "quakeworld.game",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Game", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless_marker,
 			{ "Marker", "quakeworld.connectionless.marker",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Marker", HFILL }},
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless_text,
 			{ "Text", "quakeworld.connectionless.text",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Text", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless_command,
 			{ "Command", "quakeworld.connectionless.command",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Command", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless_arguments,
 			{ "Arguments", "quakeworld.connectionless.arguments",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Arguments", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quakeworld_connectionless_connect_version,
 			{ "Version", "quakeworld.connectionless.connect.version",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -841,28 +841,28 @@ proto_register_quakeworld(void)
 			"Challenge from the server", HFILL }},
 		{ &hf_quakeworld_connectionless_connect_infostring,
 			{ "Infostring", "quakeworld.connectionless.connect.infostring",
-			FT_STRING, BASE_DEC, NULL, 0x0,
+			FT_STRING, BASE_NONE, NULL, 0x0,
 			"Infostring with additional variables", HFILL }},
 		{ &hf_quakeworld_connectionless_connect_infostring_key_value,
 			{ "Key/Value", "quakeworld.connectionless.connect.infostring.key_value",
-			FT_STRING, BASE_DEC, NULL, 0x0,
+			FT_STRING, BASE_NONE, NULL, 0x0,
 			"Key and Value", HFILL }},
 		{ &hf_quakeworld_connectionless_connect_infostring_key,
 			{ "Key", "quakeworld.connectionless.connect.infostring.key",
-			FT_STRING, BASE_DEC, NULL, 0x0,
+			FT_STRING, BASE_NONE, NULL, 0x0,
 			"Infostring Key", HFILL }},
 		{ &hf_quakeworld_connectionless_connect_infostring_value,
 			{ "Value", "quakeworld.connectionless.connect.infostring.value",
-			FT_STRING, BASE_DEC, NULL, 0x0,
+			FT_STRING, BASE_NONE, NULL, 0x0,
 			"Infostring Value", HFILL }},
 		{ &hf_quakeworld_connectionless_rcon_password,
 			{ "Password", "quakeworld.connectionless.rcon.password",
-			FT_STRING, BASE_DEC, NULL, 0x0,
+			FT_STRING, BASE_NONE, NULL, 0x0,
 			"Rcon Password", HFILL }},
 		{ &hf_quakeworld_connectionless_rcon_command,
 			{ "Command", "quakeworld.connectionless.rcon.command",
-			FT_STRING, BASE_DEC, NULL, 0x0,
-			"Command", HFILL }},
+			FT_STRING, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 		{ &hf_quakeworld_game_seq1,
 			{ "Sequence Number", "quakeworld.game.seq1",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-radiotap.c b/epan/dissectors/packet-radiotap.c
index b67f50e556..8c0ed706f3 100644
--- a/epan/dissectors/packet-radiotap.c
+++ b/epan/dissectors/packet-radiotap.c
@@ -542,7 +542,7 @@ proto_register_radiotap(void)
     /* Boolean 'present.flags' flags */
     { &hf_radiotap_flags,
       { "Flags", "radiotap.flags",
-	FT_UINT8, BASE_HEX, NULL,  0x0, "", HFILL } },
+	FT_UINT8, BASE_HEX, NULL,  0x0, NULL, HFILL } },
 
     { &hf_radiotap_flags_cfp,
       { "CFP", "radiotap.flags.cfp",
@@ -588,7 +588,7 @@ proto_register_radiotap(void)
     { &hf_radiotap_mactime,
        { "MAC timestamp", "radiotap.mactime",
 	 FT_UINT64, BASE_DEC, NULL, 0x0,
-	 " Value in microseconds of the MAC's Time Synchronization Function timer when the first bit of the MPDU arrived at the MAC.", HFILL } },
+	 "Value in microseconds of the MAC's Time Synchronization Function timer when the first bit of the MPDU arrived at the MAC.", HFILL } },
 
     { &hf_radiotap_quality,
        { "Signal Quality", "radiotap.quality",
@@ -613,7 +613,7 @@ proto_register_radiotap(void)
     { &hf_radiotap_channel_flags,
       { "Channel type", "radiotap.channel.type",
 	FT_UINT16, BASE_HEX, VALS(phy_type), 0x0,
-	"Channel type", HFILL } },
+	NULL, HFILL } },
 
     { &hf_radiotap_channel_flags_turbo,
        { "Turbo", "radiotap.channel.type.turbo",
@@ -654,7 +654,7 @@ proto_register_radiotap(void)
 
     { &hf_radiotap_rxflags,
       { "RX flags", "radiotap.rxflags",
-	FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL } },
+	FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL } },
 
     { &hf_radiotap_rxflags_badplcp,
        { "Bad PLCP", "radiotap.rxflags.badplcp",
@@ -663,13 +663,13 @@ proto_register_radiotap(void)
 
     { &hf_radiotap_xchannel,
       { "Channel number", "radiotap.xchannel",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } },
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_radiotap_xchannel_frequency,
       { "Channel frequency", "radiotap.xchannel.freq",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL } },
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL } },
     { &hf_radiotap_xchannel_flags,
       { "Channel type", "radiotap.xchannel.flags",
-	FT_UINT32, BASE_HEX, VALS(phy_type), 0x0, "", HFILL } },
+	FT_UINT32, BASE_HEX, VALS(phy_type), 0x0, NULL, HFILL } },
 
     { &hf_radiotap_xchannel_flags_turbo,
        { "Turbo", "radiotap.xchannel.type.turbo",
diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c
index 34fa46bfaa..c215c30829 100644
--- a/epan/dissectors/packet-radius.c
+++ b/epan/dissectors/packet-radius.c
@@ -1850,58 +1850,58 @@ static void register_radius_fields(const char* unused _U_) {
 			 "TRUE if RADIUS response", HFILL }},
 		 { &hf_radius_req_frame,
 		 { "Request Frame", "radius.reqframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-			 "Request Frame", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_rsp_frame,
 		 { "Response Frame", "radius.rspframe", FT_FRAMENUM, BASE_NONE, NULL, 0,
-			 "Response Frame", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_time,
 		 { "Time from request", "radius.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0,
 			 "Timedelta between Request and Response", HFILL }},
 		 { &hf_radius_code,
 		 { "Code","radius.code", FT_UINT8, BASE_DEC, VALS(radius_vals), 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_id,
 		 { "Identifier",	"radius.id", FT_UINT8, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_authenticator,
-		 { "Authenticator",	"radius.authenticator", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "", HFILL }},
+		 { "Authenticator",	"radius.authenticator", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }},
 		 { &hf_radius_length,
 		 { "Length","radius.length", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &(no_dictionary_entry.hf),
-		 { "Unknown-Attribute","radius.Unknown_Attribute", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "", HFILL }},
+		 { "Unknown-Attribute","radius.Unknown_Attribute", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }},
 		 { &(no_dictionary_entry.hf_len),
 		 { "Unknown-Attribute Length","radius.Unknown_Attribute.length", FT_UINT8, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_framed_ip_address,
 		 { "Framed-IP-Address","radius.Framed-IP-Address", FT_IPv4, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_login_ip_host,
 		 { "Login-IP-Host","radius.Login-IP-Host", FT_IPv4, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_framed_ipx_network,
 		 { "Framed-IPX-Network","radius.Framed-IPX-Network", FT_IPXNET, BASE_NONE, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_cosine_vpi,
 		 { "Cosine-VPI","radius.Cosine-Vpi", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_cosine_vci,
 		 { "Cosine-VCI","radius.Cosine-Vci", FT_UINT16, BASE_DEC, NULL, 0x0,
-			 "", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_dup,
 		 { "Duplicate Message", "radius.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Message", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_req_dup,
 		 { "Duplicate Request", "radius.req.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Request", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_rsp_dup,
 		 { "Duplicate Response", "radius.rsp.dup", FT_UINT32, BASE_DEC, NULL, 0x0,
-			 "Duplicate Response", HFILL }},
+			 NULL, HFILL }},
 		 { &hf_radius_ascend_data_filter,
-		 { "Ascend Data Filter", "radius.ascenddatafilter", FT_BYTES, BASE_HEX, NULL, 0x0,
-			 "Ascend Data Filter", HFILL }}
+		 { "Ascend Data Filter", "radius.ascenddatafilter", FT_BYTES, BASE_NONE, NULL, 0x0,
+			 NULL, HFILL }}
 	 };
 	 
 	 gint *base_ett[] = {
diff --git a/epan/dissectors/packet-radius_packetcable.c b/epan/dissectors/packet-radius_packetcable.c
index a341e73a2f..0960af7d2b 100644
--- a/epan/dissectors/packet-radius_packetcable.c
+++ b/epan/dissectors/packet-radius_packetcable.c
@@ -709,12 +709,12 @@ void proto_register_packetcable(void) {
 		},
 		{ &hf_packetcable_electronic_surveillance_indication_df_cdc_address,
 		{ "DF_CDC_Address","radius.vendor.pkt.esi.dfcdca",
-			FT_IPv4, BASE_DEC, NULL, 0x0,
+			FT_IPv4, BASE_NONE, NULL, 0x0,
 			"PacketCable Electronic-Surveillance-Indication DF_CDC_Address", HFILL }
 		},
 		{ &hf_packetcable_electronic_surveillance_indication_df_ccc_address,
 		{ "DF_CDC_Address","radius.vendor.pkt.esi.dfccca",
-			FT_IPv4, BASE_DEC, NULL, 0x0,
+			FT_IPv4, BASE_NONE, NULL, 0x0,
 			"PacketCable Electronic-Surveillance-Indication DF_CCC_Address", HFILL }
 		},
 		{ &hf_packetcable_electronic_surveillance_indication_cdc_port,
diff --git a/epan/dissectors/packet-ranap.c b/epan/dissectors/packet-ranap.c
index 6e7c0805b8..b9b15ea832 100644
--- a/epan/dissectors/packet-ranap.c
+++ b/epan/dissectors/packet-ranap.c
@@ -11703,7 +11703,7 @@ void proto_register_ranap(void) {
 	{ &hf_ranap_imsi_digits,
       { "IMSI digits", "ranap.imsi_digits",
         FT_STRING, BASE_NONE, NULL, 0,
-        "IMSI digits", HFILL }},
+        NULL, HFILL }},
     { &hf_ranap_transportLayerAddress_ipv4,
       { "transportLayerAddress IPv4", "ranap.transportLayerAddress_ipv4",
         FT_IPv4, BASE_NONE, NULL, 0,
@@ -11747,7 +11747,7 @@ void proto_register_ranap(void) {
         "ranap.AlternativeRABConfigurationRequest", HFILL }},
     { &hf_ranap_APN_PDU,
       { "APN", "ranap.APN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.APN", HFILL }},
     { &hf_ranap_AreaIdentity_PDU,
       { "AreaIdentity", "ranap.AreaIdentity",
@@ -11799,11 +11799,11 @@ void proto_register_ranap(void) {
         "ranap.ChosenIntegrityProtectionAlgorithm", HFILL }},
     { &hf_ranap_ClassmarkInformation2_PDU,
       { "ClassmarkInformation2", "ranap.ClassmarkInformation2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.ClassmarkInformation2", HFILL }},
     { &hf_ranap_ClassmarkInformation3_PDU,
       { "ClassmarkInformation3", "ranap.ClassmarkInformation3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.ClassmarkInformation3", HFILL }},
     { &hf_ranap_CN_DomainIndicator_PDU,
       { "CN-DomainIndicator", "ranap.CN_DomainIndicator",
@@ -11811,7 +11811,7 @@ void proto_register_ranap(void) {
         "ranap.CN_DomainIndicator", HFILL }},
     { &hf_ranap_CSG_Id_PDU,
       { "CSG-Id", "ranap.CSG_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.CSG_Id", HFILL }},
     { &hf_ranap_DeltaRAListofIdleModeUEs_PDU,
       { "DeltaRAListofIdleModeUEs", "ranap.DeltaRAListofIdleModeUEs",
@@ -11831,7 +11831,7 @@ void proto_register_ranap(void) {
         "ranap.EncryptionInformation", HFILL }},
     { &hf_ranap_EncryptionKey_PDU,
       { "EncryptionKey", "ranap.EncryptionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.EncryptionKey", HFILL }},
     { &hf_ranap_ExtendedRNC_ID_PDU,
       { "ExtendedRNC-ID", "ranap.ExtendedRNC_ID",
@@ -11847,11 +11847,11 @@ void proto_register_ranap(void) {
         "ranap.GANSS_PositioningDataSet", HFILL }},
     { &hf_ranap_GERAN_BSC_Container_PDU,
       { "GERAN-BSC-Container", "ranap.GERAN_BSC_Container",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.GERAN_BSC_Container", HFILL }},
     { &hf_ranap_GERAN_Classmark_PDU,
       { "GERAN-Classmark", "ranap.GERAN_Classmark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.GERAN_Classmark", HFILL }},
     { &hf_ranap_GlobalCN_ID_PDU,
       { "GlobalCN-ID", "ranap.GlobalCN_ID",
@@ -11899,7 +11899,7 @@ void proto_register_ranap(void) {
         "ranap.IntegrityProtectionInformation", HFILL }},
     { &hf_ranap_IntegrityProtectionKey_PDU,
       { "IntegrityProtectionKey", "ranap.IntegrityProtectionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IntegrityProtectionKey", HFILL }},
     { &hf_ranap_InterSystemInformationTransferType_PDU,
       { "InterSystemInformationTransferType", "ranap.InterSystemInformationTransferType",
@@ -11911,11 +11911,11 @@ void proto_register_ranap(void) {
         "ranap.InterSystemInformation_TransparentContainer", HFILL }},
     { &hf_ranap_IPMulticastAddress_PDU,
       { "IPMulticastAddress", "ranap.IPMulticastAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IPMulticastAddress", HFILL }},
     { &hf_ranap_IuSignallingConnectionIdentifier_PDU,
       { "IuSignallingConnectionIdentifier", "ranap.IuSignallingConnectionIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IuSignallingConnectionIdentifier", HFILL }},
     { &hf_ranap_IuTransportAssociation_PDU,
       { "IuTransportAssociation", "ranap.IuTransportAssociation",
@@ -11943,7 +11943,7 @@ void proto_register_ranap(void) {
         "ranap.LocationRelatedDataRequestTypeSpecificToGERANIuMode", HFILL }},
     { &hf_ranap_L3_Information_PDU,
       { "L3-Information", "ranap.L3_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.L3_Information", HFILL }},
     { &hf_ranap_MBMSBearerServiceType_PDU,
       { "MBMSBearerServiceType", "ranap.MBMSBearerServiceType",
@@ -11967,31 +11967,31 @@ void proto_register_ranap(void) {
         "ranap.MBMSRegistrationRequestType", HFILL }},
     { &hf_ranap_MBMSServiceArea_PDU,
       { "MBMSServiceArea", "ranap.MBMSServiceArea",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.MBMSServiceArea", HFILL }},
     { &hf_ranap_MBMSSessionDuration_PDU,
       { "MBMSSessionDuration", "ranap.MBMSSessionDuration",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.MBMSSessionDuration", HFILL }},
     { &hf_ranap_MBMSSessionIdentity_PDU,
       { "MBMSSessionIdentity", "ranap.MBMSSessionIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.MBMSSessionIdentity", HFILL }},
     { &hf_ranap_MBMSSessionRepetitionNumber_PDU,
       { "MBMSSessionRepetitionNumber", "ranap.MBMSSessionRepetitionNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.MBMSSessionRepetitionNumber", HFILL }},
     { &hf_ranap_NAS_PDU_PDU,
       { "NAS-PDU", "ranap.NAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.NAS_PDU", HFILL }},
     { &hf_ranap_NAS_SequenceNumber_PDU,
       { "NAS-SequenceNumber", "ranap.NAS_SequenceNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.NAS_SequenceNumber", HFILL }},
     { &hf_ranap_NewBSS_To_OldBSS_Information_PDU,
       { "NewBSS-To-OldBSS-Information", "ranap.NewBSS_To_OldBSS_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.NewBSS_To_OldBSS_Information", HFILL }},
     { &hf_ranap_NonSearchingIndication_PDU,
       { "NonSearchingIndication", "ranap.NonSearchingIndication",
@@ -12003,11 +12003,11 @@ void proto_register_ranap(void) {
         "ranap.NumberOfSteps", HFILL }},
     { &hf_ranap_OldBSS_ToNewBSS_Information_PDU,
       { "OldBSS-ToNewBSS-Information", "ranap.OldBSS_ToNewBSS_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.OldBSS_ToNewBSS_Information", HFILL }},
     { &hf_ranap_OMC_ID_PDU,
       { "OMC-ID", "ranap.OMC_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.OMC_ID", HFILL }},
     { &hf_ranap_PagingAreaID_PDU,
       { "PagingAreaID", "ranap.PagingAreaID",
@@ -12031,7 +12031,7 @@ void proto_register_ranap(void) {
         "ranap.PermanentNAS_UE_ID", HFILL }},
     { &hf_ranap_PLMNidentity_PDU,
       { "PLMNidentity", "ranap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.PLMNidentity", HFILL }},
     { &hf_ranap_PositioningPriority_PDU,
       { "PositioningPriority", "ranap.PositioningPriority",
@@ -12043,7 +12043,7 @@ void proto_register_ranap(void) {
         "ranap.PositionData", HFILL }},
     { &hf_ranap_PositionDataSpecificToGERANIuMode_PDU,
       { "PositionDataSpecificToGERANIuMode", "ranap.PositionDataSpecificToGERANIuMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.PositionDataSpecificToGERANIuMode", HFILL }},
     { &hf_ranap_ProvidedData_PDU,
       { "ProvidedData", "ranap.ProvidedData",
@@ -12063,7 +12063,7 @@ void proto_register_ranap(void) {
         "ranap.RAB_Parameters", HFILL }},
     { &hf_ranap_RAC_PDU,
       { "RAC", "ranap.RAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAC", HFILL }},
     { &hf_ranap_RAListofIdleModeUEs_PDU,
       { "RAListofIdleModeUEs", "ranap.RAListofIdleModeUEs",
@@ -12095,7 +12095,7 @@ void proto_register_ranap(void) {
         "ranap.RelocationType", HFILL }},
     { &hf_ranap_RequestedGANSSAssistanceData_PDU,
       { "RequestedGANSSAssistanceData", "ranap.RequestedGANSSAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RequestedGANSSAssistanceData", HFILL }},
     { &hf_ranap_Requested_RAB_Parameter_ExtendedMaxBitrateList_PDU,
       { "Requested-RAB-Parameter-ExtendedMaxBitrateList", "ranap.Requested_RAB_Parameter_ExtendedMaxBitrateList",
@@ -12115,7 +12115,7 @@ void proto_register_ranap(void) {
         "ranap.ResponseTime", HFILL }},
     { &hf_ranap_RRC_Container_PDU,
       { "RRC-Container", "ranap.RRC_Container",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RRC_Container", HFILL }},
     { &hf_ranap_SAI_PDU,
       { "SAI", "ranap.SAI",
@@ -12139,11 +12139,11 @@ void proto_register_ranap(void) {
         "ranap.SNA_Access_Information", HFILL }},
     { &hf_ranap_Source_ToTarget_TransparentContainer_PDU,
       { "Source-ToTarget-TransparentContainer", "ranap.Source_ToTarget_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.Source_ToTarget_TransparentContainer", HFILL }},
     { &hf_ranap_SourceBSS_ToTargetBSS_TransparentContainer_PDU,
       { "SourceBSS-ToTargetBSS-TransparentContainer", "ranap.SourceBSS_ToTargetBSS_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.SourceBSS_ToTargetBSS_TransparentContainer", HFILL }},
     { &hf_ranap_SourceID_PDU,
       { "SourceID", "ranap.SourceID",
@@ -12175,11 +12175,11 @@ void proto_register_ranap(void) {
         "ranap.SRVCC_Information", HFILL }},
     { &hf_ranap_Target_ToSource_TransparentContainer_PDU,
       { "Target-ToSource-TransparentContainer", "ranap.Target_ToSource_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.Target_ToSource_TransparentContainer", HFILL }},
     { &hf_ranap_TargetBSS_ToSourceBSS_TransparentContainer_PDU,
       { "TargetBSS-ToSourceBSS-TransparentContainer", "ranap.TargetBSS_ToSourceBSS_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TargetBSS_ToSourceBSS_TransparentContainer", HFILL }},
     { &hf_ranap_TargetID_PDU,
       { "TargetID", "ranap.TargetID",
@@ -12195,7 +12195,7 @@ void proto_register_ranap(void) {
         "ranap.TemporaryUE_ID", HFILL }},
     { &hf_ranap_TimeToMBMSDataTransfer_PDU,
       { "TimeToMBMSDataTransfer", "ranap.TimeToMBMSDataTransfer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TimeToMBMSDataTransfer", HFILL }},
     { &hf_ranap_TMGI_PDU,
       { "TMGI", "ranap.TMGI",
@@ -12211,19 +12211,19 @@ void proto_register_ranap(void) {
         "ranap.TraceRecordingSessionInformation", HFILL }},
     { &hf_ranap_TraceReference_PDU,
       { "TraceReference", "ranap.TraceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TraceReference", HFILL }},
     { &hf_ranap_TraceType_PDU,
       { "TraceType", "ranap.TraceType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TraceType", HFILL }},
     { &hf_ranap_TransportLayerAddress_PDU,
       { "TransportLayerAddress", "ranap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TransportLayerAddress", HFILL }},
     { &hf_ranap_TriggerID_PDU,
       { "TriggerID", "ranap.TriggerID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TriggerID", HFILL }},
     { &hf_ranap_TypeOfError_PDU,
       { "TypeOfError", "ranap.TypeOfError",
@@ -12231,7 +12231,7 @@ void proto_register_ranap(void) {
         "ranap.TypeOfError", HFILL }},
     { &hf_ranap_UE_History_Information_PDU,
       { "UE-History-Information", "ranap.UE_History_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.UE_History_Information", HFILL }},
     { &hf_ranap_UE_ID_PDU,
       { "UE-ID", "ranap.UE_ID",
@@ -13071,7 +13071,7 @@ void proto_register_ranap(void) {
         "ranap.AuthorisedPLMNs_item", HFILL }},
     { &hf_ranap_pLMNidentity,
       { "pLMNidentity", "ranap.pLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.PLMNidentity", HFILL }},
     { &hf_ranap_authorisedSNAsList,
       { "authorisedSNAsList", "ranap.authorisedSNAsList",
@@ -13083,15 +13083,15 @@ void proto_register_ranap(void) {
         "ranap.SNAC", HFILL }},
     { &hf_ranap_cipheringKeyFlag,
       { "cipheringKeyFlag", "ranap.cipheringKeyFlag",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_ranap_currentDecipheringKey,
       { "currentDecipheringKey", "ranap.currentDecipheringKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_56", HFILL }},
     { &hf_ranap_nextDecipheringKey,
       { "nextDecipheringKey", "ranap.nextDecipheringKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_56", HFILL }},
     { &hf_ranap_radioNetwork,
       { "radioNetwork", "ranap.radioNetwork",
@@ -13191,11 +13191,11 @@ void proto_register_ranap(void) {
         "ranap.RepetitionNumber1", HFILL }},
     { &hf_ranap_lAC,
       { "lAC", "ranap.lAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.LAC", HFILL }},
     { &hf_ranap_cI,
       { "cI", "ranap.cI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.CI", HFILL }},
     { &hf_ranap_newRAListofIdleModeUEs,
       { "newRAListofIdleModeUEs", "ranap.newRAListofIdleModeUEs",
@@ -13207,19 +13207,19 @@ void proto_register_ranap(void) {
         "ranap.RAListwithNoIdleModeUEsAnyMore", HFILL }},
     { &hf_ranap_NewRAListofIdleModeUEs_item,
       { "RAC", "ranap.RAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAC", HFILL }},
     { &hf_ranap_RAListwithNoIdleModeUEsAnyMore_item,
       { "RAC", "ranap.RAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAC", HFILL }},
     { &hf_ranap_macroENB_ID,
       { "macroENB-ID", "ranap.macroENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_ranap_homeENB_ID,
       { "homeENB-ID", "ranap.homeENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_ranap_eNB_ID,
       { "eNB-ID", "ranap.eNB_ID",
@@ -13235,7 +13235,7 @@ void proto_register_ranap(void) {
         "ranap.PermittedEncryptionAlgorithms", HFILL }},
     { &hf_ranap_key,
       { "key", "ranap.key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.EncryptionKey", HFILL }},
     { &hf_ranap_iMEIlist,
       { "iMEIlist", "ranap.iMEIlist",
@@ -13255,7 +13255,7 @@ void proto_register_ranap(void) {
         "ranap.IMEISVGroup", HFILL }},
     { &hf_ranap_GANSS_PositioningDataSet_item,
       { "GANSS-PositioningMethodAndUsage", "ranap.GANSS_PositioningMethodAndUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.GANSS_PositioningMethodAndUsage", HFILL }},
     { &hf_ranap_point,
       { "point", "ranap.point",
@@ -13367,7 +13367,7 @@ void proto_register_ranap(void) {
         "ranap.LAI", HFILL }},
     { &hf_ranap_rAC,
       { "rAC", "ranap.rAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAC", HFILL }},
     { &hf_ranap_cN_ID,
       { "cN-ID", "ranap.cN_ID",
@@ -13379,27 +13379,27 @@ void proto_register_ranap(void) {
         "ranap.RNC_ID", HFILL }},
     { &hf_ranap_iMEI,
       { "iMEI", "ranap.iMEI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEI", HFILL }},
     { &hf_ranap_iMEIMask,
       { "iMEIMask", "ranap.iMEIMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_ranap_IMEIList_item,
       { "IMEI", "ranap.IMEI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEI", HFILL }},
     { &hf_ranap_iMEISV,
       { "iMEISV", "ranap.iMEISV",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEISV", HFILL }},
     { &hf_ranap_iMEISVMask,
       { "iMEISVMask", "ranap.iMEISVMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_7", HFILL }},
     { &hf_ranap_IMEISVList_item,
       { "IMEISV", "ranap.IMEISV",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEISV", HFILL }},
     { &hf_ranap_requestedMBMSIPMulticastAddressandAPNRequest,
       { "requestedMBMSIPMulticastAddressandAPNRequest", "ranap.requestedMBMSIPMulticastAddressandAPNRequest",
@@ -13427,7 +13427,7 @@ void proto_register_ranap(void) {
         "ranap.PermittedIntegrityProtectionAlgorithms", HFILL }},
     { &hf_ranap_key_01,
       { "key", "ranap.key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IntegrityProtectionKey", HFILL }},
     { &hf_ranap_rIM_Transfer,
       { "rIM-Transfer", "ranap.rIM_Transfer",
@@ -13439,7 +13439,7 @@ void proto_register_ranap(void) {
         "ranap.GTP_TEI", HFILL }},
     { &hf_ranap_bindingID,
       { "bindingID", "ranap.bindingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BindingID", HFILL }},
     { &hf_ranap_LA_LIST_item,
       { "LA-LIST item", "ranap.LA_LIST_item",
@@ -13471,7 +13471,7 @@ void proto_register_ranap(void) {
         "ranap.RequestedLocationRelatedDataType", HFILL }},
     { &hf_ranap_requestedGPSAssistanceData,
       { "requestedGPSAssistanceData", "ranap.requestedGPSAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RequestedGPSAssistanceData", HFILL }},
     { &hf_ranap_MBMSIPMulticastAddressandAPNRequest_item,
       { "TMGI", "ranap.TMGI",
@@ -13495,7 +13495,7 @@ void proto_register_ranap(void) {
         "ranap.INTEGER_1_8639999_", HFILL }},
     { &hf_ranap_iMSI,
       { "iMSI", "ranap.iMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMSI", HFILL }},
     { &hf_ranap_PermittedEncryptionAlgorithms_item,
       { "EncryptionAlgorithm", "ranap.EncryptionAlgorithm",
@@ -13515,11 +13515,11 @@ void proto_register_ranap(void) {
         "ranap.LA_LIST", HFILL }},
     { &hf_ranap_PositioningDataSet_item,
       { "PositioningMethodAndUsage", "ranap.PositioningMethodAndUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.PositioningMethodAndUsage", HFILL }},
     { &hf_ranap_positioningDataDiscriminator,
       { "positioningDataDiscriminator", "ranap.positioningDataDiscriminator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.PositioningDataDiscriminator", HFILL }},
     { &hf_ranap_positioningDataSet,
       { "positioningDataSet", "ranap.positioningDataSet",
@@ -13599,7 +13599,7 @@ void proto_register_ranap(void) {
         "ranap.RAB_TrCH_MappingItem", HFILL }},
     { &hf_ranap_rAB_ID,
       { "rAB-ID", "ranap.rAB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAB_ID", HFILL }},
     { &hf_ranap_trCH_ID_List,
       { "trCH-ID-List", "ranap.trCH_ID_List",
@@ -13619,7 +13619,7 @@ void proto_register_ranap(void) {
         "ranap.RAofIdleModeUEs", HFILL }},
     { &hf_ranap_RAofIdleModeUEs_item,
       { "RAC", "ranap.RAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RAC", HFILL }},
     { &hf_ranap_LAListofIdleModeUEs_item,
       { "LAI", "ranap.LAI",
@@ -13635,11 +13635,11 @@ void proto_register_ranap(void) {
         "ranap.TMGI", HFILL }},
     { &hf_ranap_iPMulticastAddress,
       { "iPMulticastAddress", "ranap.iPMulticastAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IPMulticastAddress", HFILL }},
     { &hf_ranap_aPN,
       { "aPN", "ranap.aPN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.APN", HFILL }},
     { &hf_ranap_RequestedMulticastServiceList_item,
       { "TMGI", "ranap.TMGI",
@@ -13691,7 +13691,7 @@ void proto_register_ranap(void) {
         "ranap.INTEGER_1_8", HFILL }},
     { &hf_ranap_rIMInformation,
       { "rIMInformation", "ranap.rIMInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RIMInformation", HFILL }},
     { &hf_ranap_rIMRoutingAddress,
       { "rIMRoutingAddress", "ranap.rIMRoutingAddress",
@@ -13707,7 +13707,7 @@ void proto_register_ranap(void) {
         "ranap.GERAN_Cell_ID", HFILL }},
     { &hf_ranap_traceReference,
       { "traceReference", "ranap.traceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TraceReference", HFILL }},
     { &hf_ranap_traceActivationIndicator,
       { "traceActivationIndicator", "ranap.traceActivationIndicator",
@@ -13719,7 +13719,7 @@ void proto_register_ranap(void) {
         "ranap.EquipmentsToBeTraced", HFILL }},
     { &hf_ranap_sAC,
       { "sAC", "ranap.sAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.SAC", HFILL }},
     { &hf_ranap_pLMNs_in_shared_network,
       { "pLMNs-in-shared-network", "ranap.pLMNs_in_shared_network",
@@ -13779,7 +13779,7 @@ void proto_register_ranap(void) {
         "ranap.SourceRNC_ID", HFILL }},
     { &hf_ranap_rRC_Container,
       { "rRC-Container", "ranap.rRC_Container",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.RRC_Container", HFILL }},
     { &hf_ranap_numberOfIuInstances,
       { "numberOfIuInstances", "ranap.numberOfIuInstances",
@@ -13795,7 +13795,7 @@ void proto_register_ranap(void) {
         "ranap.ChosenIntegrityProtectionAlgorithm", HFILL }},
     { &hf_ranap_integrityProtectionKey,
       { "integrityProtectionKey", "ranap.integrityProtectionKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IntegrityProtectionKey", HFILL }},
     { &hf_ranap_chosenEncryptionAlgorithForSignalling,
       { "chosenEncryptionAlgorithForSignalling", "ranap.chosenEncryptionAlgorithForSignalling",
@@ -13803,7 +13803,7 @@ void proto_register_ranap(void) {
         "ranap.ChosenEncryptionAlgorithm", HFILL }},
     { &hf_ranap_cipheringKey,
       { "cipheringKey", "ranap.cipheringKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.EncryptionKey", HFILL }},
     { &hf_ranap_chosenEncryptionAlgorithForCS,
       { "chosenEncryptionAlgorithForCS", "ranap.chosenEncryptionAlgorithForCS",
@@ -13843,11 +13843,11 @@ void proto_register_ranap(void) {
         "ranap.TrCH_ID", HFILL }},
     { &hf_ranap_nonce,
       { "nonce", "ranap.nonce",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.BIT_STRING_SIZE_128", HFILL }},
     { &hf_ranap_tAC,
       { "tAC", "ranap.tAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TAC", HFILL }},
     { &hf_ranap_cGI,
       { "cGI", "ranap.cGI",
@@ -13859,15 +13859,15 @@ void proto_register_ranap(void) {
         "ranap.Global_ENB_ID", HFILL }},
     { &hf_ranap_tMSI,
       { "tMSI", "ranap.tMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TMSI", HFILL }},
     { &hf_ranap_p_TMSI,
       { "p-TMSI", "ranap.p_TMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.P_TMSI", HFILL }},
     { &hf_ranap_serviceID,
       { "serviceID", "ranap.serviceID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_ranap_traceRecordingSessionReference,
       { "traceRecordingSessionReference", "ranap.traceRecordingSessionReference",
@@ -13899,23 +13899,23 @@ void proto_register_ranap(void) {
         "ranap.TrCH_ID", HFILL }},
     { &hf_ranap_imsi,
       { "imsi", "ranap.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMSI", HFILL }},
     { &hf_ranap_imei,
       { "imei", "ranap.imei",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEI", HFILL }},
     { &hf_ranap_imeisv,
       { "imeisv", "ranap.imeisv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IMEISV", HFILL }},
     { &hf_ranap_uESBI_IuA,
       { "uESBI-IuA", "ranap.uESBI_IuA",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.UESBI_IuA", HFILL }},
     { &hf_ranap_uESBI_IuB,
       { "uESBI-IuB", "ranap.uESBI_IuB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.UESBI_IuB", HFILL }},
     { &hf_ranap_horizontalVelocity,
       { "horizontalVelocity", "ranap.horizontalVelocity",
@@ -13991,7 +13991,7 @@ void proto_register_ranap(void) {
         "ranap.UL_GTP_PDU_SequenceNumber", HFILL }},
     { &hf_ranap_transportLayerAddress,
       { "transportLayerAddress", "ranap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TransportLayerAddress", HFILL }},
     { &hf_ranap_iuTransportAssociation,
       { "iuTransportAssociation", "ranap.iuTransportAssociation",
@@ -13999,7 +13999,7 @@ void proto_register_ranap(void) {
         "ranap.IuTransportAssociation", HFILL }},
     { &hf_ranap_nAS_SynchronisationIndicator,
       { "nAS-SynchronisationIndicator", "ranap.nAS_SynchronisationIndicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.NAS_SynchronisationIndicator", HFILL }},
     { &hf_ranap_rAB_Parameters,
       { "rAB-Parameters", "ranap.rAB_Parameters",
@@ -14027,7 +14027,7 @@ void proto_register_ranap(void) {
         "ranap.UserPlaneMode", HFILL }},
     { &hf_ranap_uP_ModeVersions,
       { "uP-ModeVersions", "ranap.uP_ModeVersions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.UP_ModeVersions", HFILL }},
     { &hf_ranap_joinedMBMSBearerService_IEs,
       { "joinedMBMSBearerService-IEs", "ranap.joinedMBMSBearerService_IEs",
@@ -14039,7 +14039,7 @@ void proto_register_ranap(void) {
         "ranap.JoinedMBMSBearerService_IEs_item", HFILL }},
     { &hf_ranap_mBMS_PTP_RAB_ID,
       { "mBMS-PTP-RAB-ID", "ranap.mBMS_PTP_RAB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.MBMS_PTP_RAB_ID", HFILL }},
     { &hf_ranap_cause,
       { "cause", "ranap.cause",
@@ -14063,11 +14063,11 @@ void proto_register_ranap(void) {
         "ranap.UL_N_PDU_SequenceNumber", HFILL }},
     { &hf_ranap_iuSigConId,
       { "iuSigConId", "ranap.iuSigConId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.IuSignallingConnectionIdentifier", HFILL }},
     { &hf_ranap_transportLayerAddressReq1,
       { "transportLayerAddressReq1", "ranap.transportLayerAddressReq1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TransportLayerAddress", HFILL }},
     { &hf_ranap_iuTransportAssociationReq1,
       { "iuTransportAssociationReq1", "ranap.iuTransportAssociationReq1",
@@ -14079,7 +14079,7 @@ void proto_register_ranap(void) {
         "ranap.Ass_RAB_Parameters", HFILL }},
     { &hf_ranap_transportLayerAddressRes1,
       { "transportLayerAddressRes1", "ranap.transportLayerAddressRes1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TransportLayerAddress", HFILL }},
     { &hf_ranap_iuTransportAssociationRes1,
       { "iuTransportAssociationRes1", "ranap.iuTransportAssociationRes1",
@@ -14111,7 +14111,7 @@ void proto_register_ranap(void) {
         "ranap.DataVolumeReference", HFILL }},
     { &hf_ranap_gERAN_Classmark,
       { "gERAN-Classmark", "ranap.gERAN_Classmark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.GERAN_Classmark", HFILL }},
     { &hf_ranap_privateIEs,
       { "privateIEs", "ranap.privateIEs",
@@ -14119,7 +14119,7 @@ void proto_register_ranap(void) {
         "ranap.PrivateIE_Container", HFILL }},
     { &hf_ranap_nAS_PDU,
       { "nAS-PDU", "ranap.nAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.NAS_PDU", HFILL }},
     { &hf_ranap_sAPI,
       { "sAPI", "ranap.sAPI",
@@ -14147,7 +14147,7 @@ void proto_register_ranap(void) {
         "ranap.TNLInformationEnhRelInfoRes", HFILL }},
     { &hf_ranap_dl_forwardingTransportLayerAddress,
       { "dl-forwardingTransportLayerAddress", "ranap.dl_forwardingTransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ranap.TransportLayerAddress", HFILL }},
     { &hf_ranap_dl_forwardingTransportAssociation,
       { "dl-forwardingTransportAssociation", "ranap.dl_forwardingTransportAssociation",
diff --git a/epan/dissectors/packet-rdm.c b/epan/dissectors/packet-rdm.c
index 424c1d6d71..fb2b1fb972 100644
--- a/epan/dissectors/packet-rdm.c
+++ b/epan/dissectors/packet-rdm.c
@@ -195,12 +195,12 @@ proto_register_rdm(void)
 
 		{ &hf_rdm_dest_uid,
 			{ "Destination UID", "rdm.dst",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }},
 
 		{ &hf_rdm_src_uid,
 			{ "Source UID", "rdm.src",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }},
 
 		{ &hf_rdm_transaction_number,
@@ -240,12 +240,12 @@ proto_register_rdm(void)
 
 		{ &hf_rdm_parameter_data,
 			{ "Parameter data", "rdm.pd",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }},
 
 		{ &hf_rdm_intron,
 			{ "Intron", "rdm.intron",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }},
 
 		{ &hf_rdm_checksum,
@@ -255,7 +255,7 @@ proto_register_rdm(void)
 
 		{ &hf_rdm_trailer,
 			{ "Trailer", "rdm.trailer",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				NULL, HFILL }}
 	};
 
diff --git a/epan/dissectors/packet-rdt.c b/epan/dissectors/packet-rdt.c
index fd9b6a2caa..cc79adf3e6 100644
--- a/epan/dissectors/packet-rdt.c
+++ b/epan/dissectors/packet-rdt.c
@@ -1372,7 +1372,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT packet", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1384,7 +1384,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT data flags 1", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1396,7 +1396,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x80,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1408,7 +1408,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x40,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1420,7 +1420,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x3e,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1432,7 +1432,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x01,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1456,7 +1456,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x80,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1468,7 +1468,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x40,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1480,7 +1480,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x3f,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1504,7 +1504,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x7c,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1516,7 +1516,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1528,7 +1528,7 @@ void proto_register_rdt(void)
                 BASE_HEX,
                 VALS(packet_type_vals),
                 0x0,
-                "Packet type", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1540,7 +1540,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT ack flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1552,7 +1552,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x40,
-                "Lost high", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1564,7 +1564,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT latency report flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1576,7 +1576,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT bandwidth report flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1588,7 +1588,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT stream end flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1624,7 +1624,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT congestion flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1636,7 +1636,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT report flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1648,7 +1648,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT transport info request flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1660,7 +1660,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT transport info response flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1672,7 +1672,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT bw probing flags", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1684,7 +1684,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1696,7 +1696,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "Timestamp", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1708,7 +1708,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "Stream-id expansion", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1720,7 +1720,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "Asm rule expansion", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1732,7 +1732,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "Total reliable", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1744,7 +1744,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-               "", HFILL
+               NULL, HFILL
             }
         },
         {
@@ -1756,7 +1756,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1768,7 +1768,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1780,7 +1780,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1792,7 +1792,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1804,7 +1804,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1816,7 +1816,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1828,7 +1828,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1840,7 +1840,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1852,7 +1852,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x80,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1864,7 +1864,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x7c,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1876,7 +1876,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x02,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1888,7 +1888,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x01,
-                "", HFILL
+                NULL, HFILL
             }
         },
 
@@ -1901,7 +1901,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1913,7 +1913,7 @@ void proto_register_rdt(void)
                 BASE_HEX,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1925,7 +1925,7 @@ void proto_register_rdt(void)
                 BASE_HEX,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1937,7 +1937,7 @@ void proto_register_rdt(void)
                 BASE_HEX,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1949,7 +1949,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1961,7 +1961,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x2,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1973,7 +1973,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x1,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1985,7 +1985,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -1997,7 +1997,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x4,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2009,7 +2009,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x2,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2021,7 +2021,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x1,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2033,7 +2033,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2045,7 +2045,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2057,7 +2057,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2069,7 +2069,7 @@ void proto_register_rdt(void)
                 BASE_NONE,
                 NULL,
                 0x0,
-                "RDT buffer info", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2081,7 +2081,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2093,7 +2093,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2105,7 +2105,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2117,7 +2117,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2129,7 +2129,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2141,7 +2141,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
         {
@@ -2189,7 +2189,7 @@ void proto_register_rdt(void)
                 BASE_DEC,
                 NULL,
                 0x0,
-                "", HFILL
+                NULL, HFILL
             }
         },
     };
diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 4d91c51be6..18152389e9 100644
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -254,10 +254,10 @@ void proto_register_redbackli(void) {
 			{ "Acctid", "redbackli.acctid", FT_BYTES, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }},
 		{ &hf_redbackli_eohpad,
-			{ "End of Header Padding", "redbackli.eohpad", FT_BYTES, BASE_HEX, NULL, 0x0,
+			{ "End of Header Padding", "redbackli.eohpad", FT_BYTES, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }},
 		{ &hf_redbackli_unknownavp,
-			{ "Unknown AVP", "redbackli.unknownavp", FT_BYTES, BASE_HEX, NULL, 0x0,
+			{ "Unknown AVP", "redbackli.unknownavp", FT_BYTES, BASE_NONE, NULL, 0x0,
 			NULL, HFILL }}
 		};
 
diff --git a/epan/dissectors/packet-retix-bpdu.c b/epan/dissectors/packet-retix-bpdu.c
index d18a5bbc5e..e63ce962cd 100644
--- a/epan/dissectors/packet-retix-bpdu.c
+++ b/epan/dissectors/packet-retix-bpdu.c
@@ -101,23 +101,23 @@ proto_register_retix_bpdu(void)
   static hf_register_info hf[] = {
     { &hf_retix_bpdu_root_mac,
     { "Root MAC",  "rstp.root.hw", FT_ETHER, BASE_NONE, NULL, 0x0,
-    "", HFILL}},
+    NULL, HFILL}},
 
     { &hf_retix_bpdu_bridge_mac,
     { "Bridge MAC", "rstp.bridge.hw", FT_ETHER, BASE_NONE, NULL, 0x0,
-    "", HFILL}},
+    NULL, HFILL}},
 
     { &hf_retix_bpdu_max_age,
     { "Max Age", "rstp.maxage", FT_UINT16, BASE_DEC, NULL, 0x0,
-    "", HFILL}},
+    NULL, HFILL}},
 
     { &hf_retix_bpdu_hello_time,
     { "Hello Time", "rstp.hello", FT_UINT16, BASE_DEC, NULL, 0x0,
-    "", HFILL}},
+    NULL, HFILL}},
 
     { &hf_retix_bpdu_forward_delay,
     { "Forward Delay", "rstp.forward", FT_UINT16, BASE_DEC, NULL, 0x0,
-    "", HFILL}},
+    NULL, HFILL}},
   };
 
   static gint *ett[] ={
diff --git a/epan/dissectors/packet-rfc2190.c b/epan/dissectors/packet-rfc2190.c
index 4e71200151..1d8e8fe1c1 100644
--- a/epan/dissectors/packet-rfc2190.c
+++ b/epan/dissectors/packet-rfc2190.c
@@ -449,7 +449,7 @@ proto_register_rfc2190(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"Horizontal motion vector predictor for the first MB in this packet ", HFILL
+				"Horizontal motion vector predictor for the first MB in this packet", HFILL
 			}
 		},
 		{
@@ -461,7 +461,7 @@ proto_register_rfc2190(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"Vertical motion vector predictor for the first MB in this packet ", HFILL
+				"Vertical motion vector predictor for the first MB in this packet", HFILL
 			}
 		},
 		{
diff --git a/epan/dissectors/packet-rgmp.c b/epan/dissectors/packet-rgmp.c
index 916c5a1cd0..49f28563b0 100644
--- a/epan/dissectors/packet-rgmp.c
+++ b/epan/dissectors/packet-rgmp.c
@@ -117,17 +117,17 @@ proto_register_rgmp(void)
 
 	{ &hf_checksum,
 	  { "Checksum", "rgmp.checksum", FT_UINT16, BASE_HEX,
-	    NULL, 0, "Checksum", HFILL }
+	    NULL, 0, NULL, HFILL }
 	},
 
 	{ &hf_checksum_bad,
 	  { "Bad Checksum", "rgmp.checksum_bad", FT_BOOLEAN, BASE_NONE,
-	    NULL, 0, "Bad Checksum", HFILL }
+	    NULL, 0x0, NULL, HFILL }
 	},
 
 	{ &hf_maddr,
 	  { "Multicast group address", "rgmp.maddr", FT_IPv4, BASE_NONE,
-	    NULL, 0, "Multicast group address", HFILL }
+	    NULL, 0, NULL, HFILL }
 	}
     };
 
diff --git a/epan/dissectors/packet-rip.c b/epan/dissectors/packet-rip.c
index 5e019bb9b8..635d7c03a6 100644
--- a/epan/dissectors/packet-rip.c
+++ b/epan/dissectors/packet-rip.c
@@ -349,11 +349,11 @@ proto_register_rip(void)
 
 		{ &hf_rip_ip,
 			{ "IP Address", "rip.ip", FT_IPv4, BASE_NONE,
-			NULL, 0, "IP Address", HFILL}},
+			NULL, 0, NULL, HFILL}},
 
 		{ &hf_rip_netmask,
 			{ "Netmask", "rip.netmask", FT_IPv4, BASE_NONE,
-			NULL, 0, "Netmask", HFILL}},
+			NULL, 0, NULL, HFILL}},
 
 		{ &hf_rip_next_hop,
 			{ "Next Hop", "rip.next_hop", FT_IPv4, BASE_NONE,
@@ -368,12 +368,12 @@ proto_register_rip(void)
 			VALS(rip_auth_type), 0, "Type of authentication", HFILL }},
 
 		{ &hf_rip_auth_passwd,
-			{ "Password", "rip.auth.passwd", FT_STRING, BASE_DEC,
+			{ "Password", "rip.auth.passwd", FT_STRING, BASE_NONE,
 			NULL, 0, "Authentication password", HFILL }},
 
 		{ &hf_rip_route_tag,
 			{ "Route Tag", "rip.route_tag", FT_UINT16, BASE_DEC,
-			NULL, 0, "Route Tag", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ripng.c b/epan/dissectors/packet-ripng.c
index 0ba56a49f0..d4a764673a 100644
--- a/epan/dissectors/packet-ripng.c
+++ b/epan/dissectors/packet-ripng.c
@@ -129,11 +129,11 @@ proto_register_ripng(void)
       { &hf_ripng_cmd,
 	{ "Command",		"ripng.cmd",
 				FT_UINT8, BASE_DEC, VALS(cmdvals),
-				0x0, "", HFILL }},
+				0x0, NULL, HFILL }},
       { &hf_ripng_version,
 	{ "Version",		"ripng.version",
 				FT_UINT8, BASE_DEC, NULL,
-				0x0, "", HFILL }},
+				0x0, NULL, HFILL }},
     };
     static gint *ett[] = {
       &ett_ripng,
diff --git a/epan/dissectors/packet-rlc-lte.c b/epan/dissectors/packet-rlc-lte.c
index 42ed9c5b8e..66c8d24d22 100644
--- a/epan/dissectors/packet-rlc-lte.c
+++ b/epan/dissectors/packet-rlc-lte.c
@@ -1179,7 +1179,7 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_context_mode,
             { "RLC Mode",
               "rlc-lte.mode", FT_UINT8, BASE_DEC, VALS(rlc_mode_vals), 0x0,
-              "RLC Mode", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_context_direction,
@@ -1191,7 +1191,7 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_context_priority,
             { "Priority",
               "rlc-lte.priority", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Priority", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_context_ueid,
@@ -1229,7 +1229,7 @@ void proto_register_rlc_lte(void)
         /* Transparent mode fields */
         { &hf_rlc_lte_tm_data,
             { "TM Data",
-              "rlc-lte.tm.data", FT_BYTES, BASE_HEX, 0, 0x0,
+              "rlc-lte.tm.data", FT_BYTES, BASE_NONE, 0, 0x0,
               "Transparent Mode Data", HFILL
             }
         },
@@ -1244,7 +1244,7 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_um_fi,
             { "Framing Info",
               "rlc-lte.um.fi", FT_UINT8, BASE_HEX, VALS(framing_info_vals), 0x0,
-              "Framing Info", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_um_fixed_e,
@@ -1267,14 +1267,14 @@ void proto_register_rlc_lte(void)
         },
         { &hf_rlc_lte_um_data,
             { "UM Data",
-              "rlc-lte.um.data", FT_BYTES, BASE_HEX, 0, 0x0,
+              "rlc-lte.um.data", FT_BYTES, BASE_NONE, 0, 0x0,
               "Unacknowledged Mode Data", HFILL
             }
         },
         { &hf_rlc_lte_extension_part,
             { "Extension Part",
               "rlc-lte.extension-part", FT_STRING, BASE_NONE, 0, 0x0,
-              "Extension Part", HFILL
+              NULL, HFILL
             }
         },
 
@@ -1288,7 +1288,7 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_extension_li,
             { "Length Indicator",
               "rlc-lte.extension.li", FT_UINT16, BASE_DEC, 0, 0x0,
-              "Length Indicator", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_extension_padding,
@@ -1320,7 +1320,7 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_am_p,
             { "Polling Bit",
               "rlc-lte.am.p", FT_UINT8, BASE_HEX, VALS(polling_bit_vals), 0x20,
-              "Polling Bit", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_fi,
@@ -1344,18 +1344,18 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_am_segment_lsf,
             { "Last Segment Flag",
               "rlc-lte.am.segment.lsf", FT_UINT8, BASE_HEX, VALS(lsf_vals), 0x80,
-              "Last Segment Flag", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_segment_so,
             { "Segment Offset",
               "rlc-lte.am.segment.offset", FT_UINT16, BASE_DEC, 0, 0x7fff,
-              "Segment Offset", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_data,
             { "AM Data",
-              "rlc-lte.am.data", FT_BYTES, BASE_HEX, 0, 0x0,
+              "rlc-lte.am.data", FT_BYTES, BASE_NONE, 0, 0x0,
               "Acknowledged Mode Data", HFILL
             }
         },
@@ -1376,13 +1376,13 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_am_e1,
             { "Extension bit 1",
               "rlc-lte.am.e1", FT_UINT8, BASE_HEX, VALS(am_e1_vals), 0x0,
-              "Extension bit 1", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_e2,
             { "Extension bit 2",
               "rlc-lte.am.e2", FT_UINT8, BASE_HEX, VALS(am_e2_vals), 0x0,
-              "Extension bit 2", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_nack_sn,
@@ -1394,19 +1394,19 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_am_so_start,
             { "SO Start",
               "rlc-lte.am.so-start", FT_UINT16, BASE_DEC, 0, 0x0,
-              "SO Start", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_am_so_end,
             { "SO End",
               "rlc-lte.am.so-end", FT_UINT16, BASE_DEC, 0, 0x0,
-              "SO End", HFILL
+              NULL, HFILL
             }
         },
 
         { &hf_rlc_lte_predefined_pdu,
             { "Predefined data",
-              "rlc-lte.predefined-data", FT_BYTES, BASE_HEX, 0, 0x0,
+              "rlc-lte.predefined-data", FT_BYTES, BASE_NONE, 0, 0x0,
               "Predefined test data", HFILL
             }
         },
@@ -1414,25 +1414,25 @@ void proto_register_rlc_lte(void)
         { &hf_rlc_lte_sequence_analysis,
             { "Sequence Analysis",
               "rlc-lte.sequence-analysis", FT_STRING, BASE_NONE, 0, 0x0,
-              "Sequence Analysis", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_sequence_analysis_previous_frame,
             { "Previous frame for channel",
               "rlc-lte.sequence-analysis.previous-frame", FT_FRAMENUM, BASE_NONE, 0, 0x0,
-              "Previous frame for channel", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_sequence_analysis_expected_sn,
             { "Expected SN",
               "rlc-lte.sequence-analysis.expected-sn", FT_UINT16, BASE_DEC, 0, 0x0,
-              "Expected SN", HFILL
+              NULL, HFILL
             }
         },
         { &hf_rlc_lte_sequence_analysis_framing_info_correct,
             { "Frame info continued correctly",
               "rlc-lte.sequence-analysis.framing-info-correct", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Frame info continued correctly", HFILL
+              NULL, HFILL
             }
         },
     };
diff --git a/epan/dissectors/packet-rlm.c b/epan/dissectors/packet-rlm.c
index db05bab821..ce64b4af0c 100644
--- a/epan/dissectors/packet-rlm.c
+++ b/epan/dissectors/packet-rlm.c
@@ -208,27 +208,27 @@ proto_register_rlm(void)
 		{ &hf_rlm_version,
 			{ "Version",           "rlm.version",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rlm_type,
 			{ "Type",           "rlm.type",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rlm_unknown,
 			{ "Unknown",           "rlm.unknown",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rlm_tid,
 			{ "Transaction ID",           "rlm.tid",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rlm_unknown2,
 			{ "Unknown",           "rlm.unknown2",
 			FT_UINT16, BASE_HEX, NULL, 0x0,          
-			"", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-rlogin.c b/epan/dissectors/packet-rlogin.c
index 3d189a1ff0..0ed58d7503 100644
--- a/epan/dissectors/packet-rlogin.c
+++ b/epan/dissectors/packet-rlogin.c
@@ -515,77 +515,77 @@ void proto_register_rlogin(void)
 	{
 		{ &hf_user_info,
 			{ "User Info", "rlogin.user_info", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_client_startup_flag,
 			{ "Client startup flag", "rlogin.client_startup_flag", FT_UINT8, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_startup_info_received_flag,
 			{ "Startup info received flag", "rlogin.startup_info_received_flag", FT_UINT8, BASE_HEX,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_user_info_client_user_name,
 			{ "Client-user-name", "rlogin.client_user_name", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_user_info_server_user_name,
 			{ "Server-user-name", "rlogin.server_user_name", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_user_info_terminal_type,
 			{ "Terminal-type", "rlogin.terminal_type", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_user_info_terminal_speed,
 			{ "Terminal-speed", "rlogin.terminal_speed", FT_UINT32, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_control_message,
 			{ "Control message", "rlogin.control_message", FT_UINT8, BASE_HEX,
-				 VALS(control_message_vals), 0x0, "", HFILL
+				 VALS(control_message_vals), 0x0, NULL, HFILL
 			}
 		},		
 		{ &hf_window_info,
 			{ "Window Info", "rlogin.window_size", FT_NONE, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_window_info_ss,
 			{ "Window size marker", "rlogin.window_size.ss", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},		
 		{ &hf_window_info_rows,
 			{ "Rows", "rlogin.window_size.rows", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_window_info_cols,
 			{ "Columns", "rlogin.window_size.cols", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_window_info_x_pixels,
 			{ "X Pixels", "rlogin.window_size.x_pixels", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_window_info_y_pixels,
 			{ "Y Pixels", "rlogin.window_size.y_pixels", FT_UINT16, BASE_DEC,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_data,
 			{ "Data", "rlogin.data", FT_STRING, BASE_NONE,
-				 NULL, 0x0, "", HFILL
+				 NULL, 0x0, NULL, HFILL
 			}
 		}
 	};
diff --git a/epan/dissectors/packet-rmi.c b/epan/dissectors/packet-rmi.c
index b99a667917..68382f15fd 100644
--- a/epan/dissectors/packet-rmi.c
+++ b/epan/dissectors/packet-rmi.c
@@ -334,7 +334,7 @@ proto_register_rmi(void)
 	    "RMI Endpointidentifier Length", HFILL }},
 	{ &hf_rmi_epid_hostname,
 	  { "Hostname", "rmi.endpoint_id.hostname",
-	    FT_STRING, BASE_HEX, NULL, 0x0,
+	    FT_STRING, BASE_NONE, NULL, 0x0,
 	    "RMI Endpointidentifier Hostname", HFILL }},
 	{ &hf_rmi_epid_port,
 	  { "Port", "rmi.endpoint_id.port",
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 1227f1cb5f..db74e2ddc8 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -219,31 +219,31 @@ proto_register_rmp(void)
 	static hf_register_info hf[] = {
 		{ &hf_rmp_type,
 		{ "Type", "rmp.type", FT_UINT8, BASE_HEX,
-			VALS(rmp_type_vals), 0x0, "", HFILL }},
+			VALS(rmp_type_vals), 0x0, NULL, HFILL }},
 		{ &hf_rmp_retcode,
 		{ "Returncode", "rmp.retcode", FT_UINT8, BASE_HEX,
-			VALS(rmp_error_vals), 0x0, "", HFILL }},
+			VALS(rmp_error_vals), 0x0, NULL, HFILL }},
 		{ &hf_rmp_seqnum,
 		{ "Sequence Number", "rmp.seqnum", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_sessionid,
 		{ "Session ID", "rmp.sessionid", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_version,
 		{ "Version", "rmp.version", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_machtype,
-		{ "Machine Type", "rmp.machtype", FT_STRING, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+		{ "Machine Type", "rmp.machtype", FT_STRING, BASE_NONE,
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_filename,
 		{ "Filename", "rmp.filename", FT_UINT_STRING, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_offset,
 		{ "Offset", "rmp.offset", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_rmp_size,
 		{ "Size", "rmp.size", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_rmp,
diff --git a/epan/dissectors/packet-rmt-alc.c b/epan/dissectors/packet-rmt-alc.c
index 348990fc3b..cb30467560 100644
--- a/epan/dissectors/packet-rmt-alc.c
+++ b/epan/dissectors/packet-rmt-alc.c
@@ -250,13 +250,13 @@ void proto_register_alc(void)
 	static hf_register_info hf_ptr[] = {
 		
 		{ &hf.version,
-			{ "Version", "alc.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+			{ "Version", "alc.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		
 		LCT_FIELD_ARRAY(hf.lct, "alc"),
 		FEC_FIELD_ARRAY(hf.fec, "alc"),
 
 		{ &hf.payload,
-			{ "Payload", "alc.payload", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}
+			{ "Payload", "alc.payload", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-rmt-norm.c b/epan/dissectors/packet-rmt-norm.c
index 0ab32b8e99..75638b7438 100644
--- a/epan/dissectors/packet-rmt-norm.c
+++ b/epan/dissectors/packet-rmt-norm.c
@@ -689,116 +689,116 @@ void proto_register_norm(void)
 	static hf_register_info hf_ptr[] = {
 
 		{ &hf.version,
-			{ "Version", "norm.version", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+			{ "Version", "norm.version", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf.type,
-			{ "Message Type", "norm.type", FT_UINT8, BASE_DEC, VALS(string_norm_type), 0x0, "", HFILL }},
+			{ "Message Type", "norm.type", FT_UINT8, BASE_DEC, VALS(string_norm_type), 0x0, NULL, HFILL }},
 		{ &hf.hlen,
-			{ "Header length", "norm.hlen", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+			{ "Header length", "norm.hlen", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf.sequence,
-			{ "Sequence", "norm.sequence", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+			{ "Sequence", "norm.sequence", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf.source_id,
-			{ "Source ID", "norm.source_id", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL }},
+			{ "Source ID", "norm.source_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf.instance_id,
-			{ "Instance", "norm.instance_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Instance", "norm.instance_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.grtt,
-			{ "grtt", "norm.grtt", FT_DOUBLE, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "grtt", "norm.grtt", FT_DOUBLE, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.backoff,
-			{ "Backoff", "norm.backoff", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Backoff", "norm.backoff", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.gsize,
-			{ "Group Size", "norm.gsize", FT_DOUBLE, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Group Size", "norm.gsize", FT_DOUBLE, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.flags,
-			{ "Flags", "norm.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL}},
+			{ "Flags", "norm.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 		{ &hf.flag.repair,
-			{ "Repair Flag", "norm.flag.repair", FT_BOOLEAN, 8, NULL, NORM_FLAG_REPAIR, "", HFILL }},
+			{ "Repair Flag", "norm.flag.repair", FT_BOOLEAN, 8, NULL, NORM_FLAG_REPAIR, NULL, HFILL }},
 		{ &hf.flag.explicit,
-			{ "Explicit Flag", "norm.flag.explicit", FT_BOOLEAN, 8, NULL, NORM_FLAG_EXPLICIT, "", HFILL }},
+			{ "Explicit Flag", "norm.flag.explicit", FT_BOOLEAN, 8, NULL, NORM_FLAG_EXPLICIT, NULL, HFILL }},
 		{ &hf.flag.info,
-			{ "Info Flag", "norm.flag.info", FT_BOOLEAN, 8, NULL, NORM_FLAG_INFO, "", HFILL }},
+			{ "Info Flag", "norm.flag.info", FT_BOOLEAN, 8, NULL, NORM_FLAG_INFO, NULL, HFILL }},
 		{ &hf.flag.unreliable,
-			{ "Unreliable Flag", "norm.flag.unreliable", FT_BOOLEAN, 8, NULL, NORM_FLAG_UNRELIABLE, "", HFILL }},
+			{ "Unreliable Flag", "norm.flag.unreliable", FT_BOOLEAN, 8, NULL, NORM_FLAG_UNRELIABLE, NULL, HFILL }},
 		{ &hf.flag.file,
-			{ "File Flag", "norm.flag.file", FT_BOOLEAN, 8, NULL, NORM_FLAG_FILE, "", HFILL }},
+			{ "File Flag", "norm.flag.file", FT_BOOLEAN, 8, NULL, NORM_FLAG_FILE, NULL, HFILL }},
 		{ &hf.flag.stream,
-			{ "Stream Flag", "norm.flag.stream", FT_BOOLEAN, 8, NULL, NORM_FLAG_STREAM, "", HFILL }},
+			{ "Stream Flag", "norm.flag.stream", FT_BOOLEAN, 8, NULL, NORM_FLAG_STREAM, NULL, HFILL }},
 		{ &hf.flag.msgstart,
-			{ "Msg Start Flag", "norm.flag.msgstart", FT_BOOLEAN, 8, NULL, NORM_FLAG_MSG_START, "", HFILL }},
+			{ "Msg Start Flag", "norm.flag.msgstart", FT_BOOLEAN, 8, NULL, NORM_FLAG_MSG_START, NULL, HFILL }},
 		{ &hf.object_transport_id,
-			{ "Object Transport ID", "norm.object_transport_id", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL}},
+			{ "Object Transport ID", "norm.object_transport_id", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL}},
 		{ &hf.extension,
-			{ "Hdr Extension", "norm.hexext", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Hdr Extension", "norm.hexext", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.reserved,
-			{ "Reserved", "norm.reserved", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL}},
+			{ "Reserved", "norm.reserved", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 		{ &hf.payload_len,
-			{ "Payload Len", "norm.payload.len", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Payload Len", "norm.payload.len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.payload_offset,
-			{ "Payload Offset", "norm.payload.offset", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Payload Offset", "norm.payload.offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf.cmd_flavor,
-			{ "Flavor", "norm.flavor", FT_UINT8, BASE_DEC, VALS(string_norm_cmd_type), 0x0, "", HFILL}},
+			{ "Flavor", "norm.flavor", FT_UINT8, BASE_DEC, VALS(string_norm_cmd_type), 0x0, NULL, HFILL}},
 		{ &hf.cc_sequence,
-			{ "CC Sequence", "norm.ccsequence", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "CC Sequence", "norm.ccsequence", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_sts,
-			{ "Send Time secs", "norm.cc_sts", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Send Time secs", "norm.cc_sts", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_stus,
-			{ "Send Time usecs", "norm.cc_stus", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Send Time usecs", "norm.cc_stus", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_node_id,
-			{ "CC Node ID", "norm.cc_node_id", FT_IPv4, BASE_NONE, NULL, 0x0, "", HFILL}},
+			{ "CC Node ID", "norm.cc_node_id", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_flags,
-			{ "CC Flags", "norm.cc_flags", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "CC Flags", "norm.cc_flags", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_flags_clr,
-			{ "CLR", "norm.cc_flags.clr", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_CLR, "", HFILL}},
+			{ "CLR", "norm.cc_flags.clr", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_CLR, NULL, HFILL}},
 		{ &hf.cc_flags_plr,
-			{ "PLR", "norm.cc_flags.plr", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_PLR, "", HFILL}},
+			{ "PLR", "norm.cc_flags.plr", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_PLR, NULL, HFILL}},
 		{ &hf.cc_flags_rtt,
-			{ "RTT", "norm.cc_flags.rtt", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_RTT, "", HFILL}},
+			{ "RTT", "norm.cc_flags.rtt", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_RTT, NULL, HFILL}},
 		{ &hf.cc_flags_start,
-			{ "Start", "norm.cc_flags.start", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_START, "", HFILL}},
+			{ "Start", "norm.cc_flags.start", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_START, NULL, HFILL}},
 		{ &hf.cc_flags_leave,
-			{ "Leave", "norm.cc_flags.leave", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_LEAVE, "", HFILL}},
+			{ "Leave", "norm.cc_flags.leave", FT_BOOLEAN, 8, NULL, NORM_FLAG_CC_LEAVE, NULL, HFILL}},
 		{ &hf.cc_rtt,
-			{ "CC RTT", "norm.cc_rtt", FT_DOUBLE, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "CC RTT", "norm.cc_rtt", FT_DOUBLE, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_rate,
-			{ "CC Rate", "norm.cc_rate", FT_DOUBLE, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "CC Rate", "norm.cc_rate", FT_DOUBLE, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.cc_transport_id,
-			{ "CC Transport ID", "norm.cc_transport_id", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "CC Transport ID", "norm.cc_transport_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf.ack_source,
-			{ "Ack Source", "norm.ack.source", FT_IPv4, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Ack Source", "norm.ack.source", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 		{ &hf.ack_type,
-			{ "Ack Type", "norm.ack.type", FT_UINT8, BASE_DEC, VALS(string_norm_ack_type), 0x0, "", HFILL}},
+			{ "Ack Type", "norm.ack.type", FT_UINT8, BASE_DEC, VALS(string_norm_ack_type), 0x0, NULL, HFILL}},
 		{ &hf.ack_id,
-			{ "Ack ID", "norm.ack.id", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Ack ID", "norm.ack.id", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.ack_grtt_sec,
-			{ "Ack GRTT Sec", "norm.ack.grtt_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Ack GRTT Sec", "norm.ack.grtt_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.ack_grtt_usec,
-			{ "Ack GRTT usec", "norm.ack.grtt_usec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "Ack GRTT usec", "norm.ack.grtt_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf.nack_server,
-			{ "NAck Server", "norm.nack.server", FT_IPv4, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "NAck Server", "norm.nack.server", FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL}},
 		{ &hf.nack_grtt_sec,
-			{ "NAck GRTT Sec", "norm.nack.grtt_sec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "NAck GRTT Sec", "norm.nack.grtt_sec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.nack_grtt_usec,
-			{ "NAck GRTT usec", "norm.nack.grtt_usec", FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "NAck GRTT usec", "norm.nack.grtt_usec", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.nack_form,
-			{ "NAck FORM", "norm.nack.form", FT_UINT8, BASE_DEC, VALS(string_norm_nack_form), 0x0, "", HFILL}},
+			{ "NAck FORM", "norm.nack.form", FT_UINT8, BASE_DEC, VALS(string_norm_nack_form), 0x0, NULL, HFILL}},
 		{ &hf.nack_flags,
-			{ "NAck Flags", "norm.nack.flags", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "NAck Flags", "norm.nack.flags", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 		{ &hf.nack_flags_segment,
-			{ "Segment", "norm.nack.flags.segment", FT_BOOLEAN, 8, NULL, NORM_NACK_SEGMENT, "", HFILL}},
+			{ "Segment", "norm.nack.flags.segment", FT_BOOLEAN, 8, NULL, NORM_NACK_SEGMENT, NULL, HFILL}},
 		{ &hf.nack_flags_block,
-			{ "Block", "norm.nack.flags.block", FT_BOOLEAN, 8, NULL, NORM_NACK_BLOCK, "", HFILL}},
+			{ "Block", "norm.nack.flags.block", FT_BOOLEAN, 8, NULL, NORM_NACK_BLOCK, NULL, HFILL}},
 		{ &hf.nack_flags_info,
-			{ "Info", "norm.nack.flags.info", FT_BOOLEAN, 8, NULL, NORM_NACK_INFO, "", HFILL}},
+			{ "Info", "norm.nack.flags.info", FT_BOOLEAN, 8, NULL, NORM_NACK_INFO, NULL, HFILL}},
 		{ &hf.nack_flags_object,
-			{ "Object", "norm.nack.flags.object", FT_BOOLEAN, 8, NULL, NORM_NACK_OBJECT, "", HFILL}},
+			{ "Object", "norm.nack.flags.object", FT_BOOLEAN, 8, NULL, NORM_NACK_OBJECT, NULL, HFILL}},
 		{ &hf.nack_length,
-			{ "NAck Length", "norm.nack.length", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL}},
+			{ "NAck Length", "norm.nack.length", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 
 		FEC_FIELD_ARRAY(hf.fec, "NORM"),
 
 		{ &hf.payload,
-			{ "Payload", "norm.payload", FT_NONE, BASE_NONE, NULL, 0x0, "", HFILL }}
+			{ "Payload", "norm.payload", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }}
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-rnsap.c b/epan/dissectors/packet-rnsap.c
index 5ced848e5e..67a77647a2 100644
--- a/epan/dissectors/packet-rnsap.c
+++ b/epan/dissectors/packet-rnsap.c
@@ -35693,7 +35693,7 @@ void proto_register_rnsap(void) {
         "rnsap.AntennaColocationIndicator", HFILL }},
     { &hf_rnsap_BindingID_PDU,
       { "BindingID", "rnsap.BindingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BindingID", HFILL }},
     { &hf_rnsap_Cause_PDU,
       { "Cause", "rnsap.Cause",
@@ -35701,19 +35701,19 @@ void proto_register_rnsap(void) {
         "rnsap.Cause", HFILL }},
     { &hf_rnsap_CellCapabilityContainer_FDD_PDU,
       { "CellCapabilityContainer-FDD", "rnsap.CellCapabilityContainer_FDD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.CellCapabilityContainer_FDD", HFILL }},
     { &hf_rnsap_CellCapabilityContainer_TDD_PDU,
       { "CellCapabilityContainer-TDD", "rnsap.CellCapabilityContainer_TDD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.CellCapabilityContainer_TDD", HFILL }},
     { &hf_rnsap_CellCapabilityContainer_TDD_LCR_PDU,
       { "CellCapabilityContainer-TDD-LCR", "rnsap.CellCapabilityContainer_TDD_LCR",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.CellCapabilityContainer_TDD_LCR", HFILL }},
     { &hf_rnsap_CellCapabilityContainer_TDD768_PDU,
       { "CellCapabilityContainer-TDD768", "rnsap.CellCapabilityContainer_TDD768",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.CellCapabilityContainer_TDD768", HFILL }},
     { &hf_rnsap_C_ID_PDU,
       { "C-ID", "rnsap.C_ID",
@@ -35961,7 +35961,7 @@ void proto_register_rnsap(void) {
         "rnsap.EDPCH_Information_RLReconfRequest_FDD", HFILL }},
     { &hf_rnsap_E_DPDCH_PowerInterpolation_PDU,
       { "E-DPDCH-PowerInterpolation", "rnsap.E_DPDCH_PowerInterpolation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.E_DPDCH_PowerInterpolation", HFILL }},
     { &hf_rnsap_E_Serving_Grant_Value_PDU,
       { "E-Serving-Grant-Value", "rnsap.E_Serving_Grant_Value",
@@ -36125,11 +36125,11 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_Information", HFILL }},
     { &hf_rnsap_GERAN_Cell_Capability_PDU,
       { "GERAN-Cell-Capability", "rnsap.GERAN_Cell_Capability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.GERAN_Cell_Capability", HFILL }},
     { &hf_rnsap_GERAN_Classmark_PDU,
       { "GERAN-Classmark", "rnsap.GERAN_Classmark",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.GERAN_Classmark", HFILL }},
     { &hf_rnsap_Satellite_Almanac_Information_ExtItem_PDU,
       { "Satellite-Almanac-Information-ExtItem", "rnsap.Satellite_Almanac_Information_ExtItem",
@@ -36257,7 +36257,7 @@ void proto_register_rnsap(void) {
         "rnsap.HSDSCH_TDD_Update_Information", HFILL }},
     { &hf_rnsap_IMSI_PDU,
       { "IMSI", "rnsap.IMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.IMSI", HFILL }},
     { &hf_rnsap_InformationExchangeID_PDU,
       { "InformationExchangeID", "rnsap.InformationExchangeID",
@@ -36293,7 +36293,7 @@ void proto_register_rnsap(void) {
         "rnsap.IPDL_TDD_ParametersLCR", HFILL }},
     { &hf_rnsap_L3_Information_PDU,
       { "L3-Information", "rnsap.L3_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.L3_Information", HFILL }},
     { &hf_rnsap_Load_Value_IncrDecrThres_PDU,
       { "Load-Value-IncrDecrThres", "rnsap.Load_Value_IncrDecrThres",
@@ -36485,7 +36485,7 @@ void proto_register_rnsap(void) {
         "rnsap.UpPCH_InformationItem_LCRTDD", HFILL }},
     { &hf_rnsap_RANAP_RelocationInformation_PDU,
       { "RANAP-RelocationInformation", "rnsap.RANAP_RelocationInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.RANAP_RelocationInformation", HFILL }},
     { &hf_rnsap_Received_Total_Wideband_Power_Value_PDU,
       { "Received-Total-Wideband-Power-Value", "rnsap.Received_Total_Wideband_Power_Value",
@@ -36669,7 +36669,7 @@ void proto_register_rnsap(void) {
         "rnsap.TraceRecordingSessionReference", HFILL }},
     { &hf_rnsap_TraceReference_PDU,
       { "TraceReference", "rnsap.TraceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.TraceReference", HFILL }},
     { &hf_rnsap_TrafficClass_PDU,
       { "TrafficClass", "rnsap.TrafficClass",
@@ -36717,7 +36717,7 @@ void proto_register_rnsap(void) {
         "rnsap.TransportBearerNotSetupIndicator", HFILL }},
     { &hf_rnsap_TransportLayerAddress_PDU,
       { "TransportLayerAddress", "rnsap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.TransportLayerAddress", HFILL }},
     { &hf_rnsap_TrCH_SrcStatisticsDescr_PDU,
       { "TrCH-SrcStatisticsDescr", "rnsap.TrCH_SrcStatisticsDescr",
@@ -38229,11 +38229,11 @@ void proto_register_rnsap(void) {
         "rnsap.SAT_ID", HFILL }},
     { &hf_rnsap_nCC,
       { "nCC", "rnsap.nCC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.NCC", HFILL }},
     { &hf_rnsap_bCC,
       { "bCC", "rnsap.bCC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BCC", HFILL }},
     { &hf_rnsap_burstStart,
       { "burstStart", "rnsap.burstStart",
@@ -38277,15 +38277,15 @@ void proto_register_rnsap(void) {
         "rnsap.T_lAI", HFILL }},
     { &hf_rnsap_pLMN_Identity,
       { "pLMN-Identity", "rnsap.pLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.PLMN_Identity", HFILL }},
     { &hf_rnsap_lAC,
       { "lAC", "rnsap.lAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.LAC", HFILL }},
     { &hf_rnsap_cI,
       { "cI", "rnsap.cI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.CI", HFILL }},
     { &hf_rnsap_tUTRANGPSMeasurementAccuracyClass,
       { "tUTRANGPSMeasurementAccuracyClass", "rnsap.tUTRANGPSMeasurementAccuracyClass",
@@ -38369,7 +38369,7 @@ void proto_register_rnsap(void) {
         "rnsap.Transport_Block_Size_Index", HFILL }},
     { &hf_rnsap_hSPDSCH_Second_Code_Support,
       { "hSPDSCH-Second-Code-Support", "rnsap.hSPDSCH_Second_Code_Support",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.HSPDSCH_Second_Code_Support", HFILL }},
     { &hf_rnsap_hSPDSCH_First_Code_Index,
       { "hSPDSCH-First-Code-Index", "rnsap.hSPDSCH_First_Code_Index",
@@ -38441,7 +38441,7 @@ void proto_register_rnsap(void) {
         "rnsap.RepetitionNumber1", HFILL }},
     { &hf_rnsap_rAC,
       { "rAC", "rnsap.rAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.RAC", HFILL }},
     { &hf_rnsap_DCH_FDD_Information_item,
       { "DCH-FDD-InformationItem", "rnsap.DCH_FDD_InformationItem",
@@ -38517,11 +38517,11 @@ void proto_register_rnsap(void) {
         "rnsap.DCH_InformationResponseItem", HFILL }},
     { &hf_rnsap_bindingID,
       { "bindingID", "rnsap.bindingID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BindingID", HFILL }},
     { &hf_rnsap_transportLayerAddress,
       { "transportLayerAddress", "rnsap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.TransportLayerAddress", HFILL }},
     { &hf_rnsap_DCH_TDD_Information_item,
       { "DCH-TDD-InformationItem", "rnsap.DCH_TDD_InformationItem",
@@ -38669,7 +38669,7 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_0_63", HFILL }},
     { &hf_rnsap_gANSS_iod,
       { "gANSS-iod", "rnsap.gANSS_iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_udre,
       { "udre", "rnsap.udre",
@@ -38685,7 +38685,7 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_M127_127", HFILL }},
     { &hf_rnsap_dGANSS_Signal_ID,
       { "dGANSS-Signal-ID", "rnsap.dGANSS_Signal_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_pRCDeviation,
       { "pRCDeviation", "rnsap.pRCDeviation",
@@ -38713,7 +38713,7 @@ void proto_register_rnsap(void) {
         "rnsap.SAT_ID", HFILL }},
     { &hf_rnsap_iode_dgps,
       { "iode-dgps", "rnsap.iode_dgps",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_uDRE,
       { "uDRE", "rnsap.uDRE",
@@ -38845,7 +38845,7 @@ void proto_register_rnsap(void) {
         "rnsap.Inactivity_Threshold_for_UE_Grant_Monitoring", HFILL }},
     { &hf_rnsap_uE_DRX_Grant_Monitoring,
       { "uE-DRX-Grant-Monitoring", "rnsap.uE_DRX_Grant_Monitoring",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.UE_DRX_Grant_Monitoring", HFILL }},
     { &hf_rnsap_modify,
       { "modify", "rnsap.modify",
@@ -39001,7 +39001,7 @@ void proto_register_rnsap(void) {
         "rnsap.EDCH_MACdFlows_Information", HFILL }},
     { &hf_rnsap_hARQ_Process_Allocation_Scheduled_2ms_EDCH,
       { "hARQ-Process-Allocation-Scheduled-2ms-EDCH", "rnsap.hARQ_Process_Allocation_Scheduled_2ms_EDCH",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_rnsap_e_DCH_Maximum_Bitrate,
       { "e-DCH-Maximum-Bitrate", "rnsap.e_DCH_Maximum_Bitrate",
@@ -39029,7 +39029,7 @@ void proto_register_rnsap(void) {
         "rnsap.EDCH_MACdFlow_ID", HFILL }},
     { &hf_rnsap_hARQ_Process_Allocation_NonSched_2ms_EDCH,
       { "hARQ-Process-Allocation-NonSched-2ms-EDCH", "rnsap.hARQ_Process_Allocation_NonSched_2ms_EDCH",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_rnsap_eDCH_MACdFlow_Specific_Information,
       { "eDCH-MACdFlow-Specific-Information", "rnsap.eDCH_MACdFlow_Specific_Information",
@@ -39145,7 +39145,7 @@ void proto_register_rnsap(void) {
         "rnsap.E_DCH_HARQ_PO_FDD", HFILL }},
     { &hf_rnsap_eDCH_MACdFlow_Multiplexing_List,
       { "eDCH-MACdFlow-Multiplexing-List", "rnsap.eDCH_MACdFlow_Multiplexing_List",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.E_DCH_MACdFlow_Multiplexing_List", HFILL }},
     { &hf_rnsap_eDCH_Grant_Type_Information,
       { "eDCH-Grant-Type-Information", "rnsap.eDCH_Grant_Type_Information",
@@ -39189,7 +39189,7 @@ void proto_register_rnsap(void) {
         "rnsap.Max_Bits_MACe_PDU_non_scheduled", HFILL }},
     { &hf_rnsap_hARQ_Process_Allocation_NonSched_2ms,
       { "hARQ-Process-Allocation-NonSched-2ms", "rnsap.hARQ_Process_Allocation_NonSched_2ms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.HARQ_Process_Allocation_2ms_EDCH", HFILL }},
     { &hf_rnsap_e_DCH_serving_cell_outcome_choice,
       { "e-DCH-serving-cell-outcome-choice", "rnsap.e_DCH_serving_cell_outcome_choice",
@@ -39517,7 +39517,7 @@ void proto_register_rnsap(void) {
         "rnsap.E_HICH_TimeOffset", HFILL }},
     { &hf_rnsap_timeslotResource,
       { "timeslotResource", "rnsap.timeslotResource",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.E_DCH_TimeslotResource", HFILL }},
     { &hf_rnsap_powerResource,
       { "powerResource", "rnsap.powerResource",
@@ -39641,7 +39641,7 @@ void proto_register_rnsap(void) {
         "rnsap.SignatureSequenceGroupIndex", HFILL }},
     { &hf_rnsap_timeslotResource_LCR,
       { "timeslotResource-LCR", "rnsap.timeslotResource_LCR",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.E_DCH_TimeslotResource_LCR", HFILL }},
     { &hf_rnsap_subframenumber,
       { "subframenumber", "rnsap.subframenumber",
@@ -39801,23 +39801,23 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_Clock_Model_item", HFILL }},
     { &hf_rnsap_t_oc,
       { "t-oc", "rnsap.t_oc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rnsap_a_i2,
       { "a-i2", "rnsap.a_i2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rnsap_a_i1,
       { "a-i1", "rnsap.a_i1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_18", HFILL }},
     { &hf_rnsap_a_i0,
       { "a-i0", "rnsap.a_i0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_rnsap_t_gd,
       { "t-gd", "rnsap.t_gd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_model_id,
       { "model-id", "rnsap.model_id",
@@ -39833,7 +39833,7 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_RX_Pos", HFILL }},
     { &hf_rnsap_ionospheric_Model,
       { "ionospheric-Model", "rnsap.ionospheric_Model",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganssTod,
       { "ganssTod", "rnsap.ganssTod",
@@ -39861,7 +39861,7 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_Signal_ID", HFILL }},
     { &hf_rnsap_ganssDataBits,
       { "ganssDataBits", "rnsap.ganssDataBits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_1_1024", HFILL }},
     { &hf_rnsap_ganssTod_01,
       { "ganssTod", "rnsap.ganssTod",
@@ -39893,23 +39893,23 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_ID", HFILL }},
     { &hf_rnsap_ganss_Navigation_Model_And_Time_Recovery,
       { "ganss-Navigation-Model-And-Time-Recovery", "rnsap.ganss_Navigation_Model_And_Time_Recovery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Time_Model_GNSS_GNSS,
       { "ganss-Time-Model-GNSS-GNSS", "rnsap.ganss_Time_Model_GNSS_GNSS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_9", HFILL }},
     { &hf_rnsap_ganss_UTC_Model,
       { "ganss-UTC-Model", "rnsap.ganss_UTC_Model",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Almanac,
       { "ganss-Almanac", "rnsap.ganss_Almanac",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Real_Time_Integrity,
       { "ganss-Real-Time-Integrity", "rnsap.ganss_Real_Time_Integrity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Data_Bit_Assistance_Req,
       { "ganss-Data-Bit-Assistance-Req", "rnsap.ganss_Data_Bit_Assistance_Req",
@@ -39957,15 +39957,15 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_GenericDataInfoReqList", HFILL }},
     { &hf_rnsap_alpha_zero_ionos,
       { "alpha-zero-ionos", "rnsap.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rnsap_alpha_one_ionos,
       { "alpha-one-ionos", "rnsap.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rnsap_alpha_two_ionos,
       { "alpha-two-ionos", "rnsap.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rnsap_gANSS_IonosphereRegionalStormFlags,
       { "gANSS-IonosphereRegionalStormFlags", "rnsap.gANSS_IonosphereRegionalStormFlags",
@@ -39973,23 +39973,23 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_IonosphereRegionalStormFlags", HFILL }},
     { &hf_rnsap_storm_flag_one,
       { "storm-flag-one", "rnsap.storm_flag_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_storm_flag_two,
       { "storm-flag-two", "rnsap.storm_flag_two",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_storm_flag_three,
       { "storm-flag-three", "rnsap.storm_flag_three",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_storm_flag_four,
       { "storm-flag-four", "rnsap.storm_flag_four",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_storm_flag_five,
       { "storm-flag-five", "rnsap.storm_flag_five",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rnsap.BOOLEAN", HFILL }},
     { &hf_rnsap_ganss_Transmission_Time,
       { "ganss-Transmission-Time", "rnsap.ganss_Transmission_Time",
@@ -40009,67 +40009,67 @@ void proto_register_rnsap(void) {
         "rnsap.T_gANSS_keplerianParameters_01", HFILL }},
     { &hf_rnsap_toe_nav,
       { "toe-nav", "rnsap.toe_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rnsap_ganss_omega_nav,
       { "ganss-omega-nav", "rnsap.ganss_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_delta_n_nav,
       { "delta-n-nav", "rnsap.delta_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_m_zero_nav,
       { "m-zero-nav", "rnsap.m_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_omegadot_nav,
       { "omegadot-nav", "rnsap.omegadot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_ganss_e_nav,
       { "ganss-e-nav", "rnsap.ganss_e_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_idot_nav,
       { "idot-nav", "rnsap.idot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rnsap_a_sqrt_nav,
       { "a-sqrt-nav", "rnsap.a_sqrt_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_i_zero_nav,
       { "i-zero-nav", "rnsap.i_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_omega_zero_nav,
       { "omega-zero-nav", "rnsap.omega_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_c_rs_nav,
       { "c-rs-nav", "rnsap.c_rs_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_c_is_nav,
       { "c-is-nav", "rnsap.c_is_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_c_us_nav,
       { "c-us-nav", "rnsap.c_us_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_c_rc_nav,
       { "c-rc-nav", "rnsap.c_rc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_c_ic_nav,
       { "c-ic-nav", "rnsap.c_ic_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_c_uc_nav,
       { "c-uc-nav", "rnsap.c_uc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_GANSS_Real_Time_Integrity_item,
       { "GANSS-Real-Time-Integrity item", "rnsap.GANSS_Real_Time_Integrity_item",
@@ -40081,7 +40081,7 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_0_63", HFILL }},
     { &hf_rnsap_bad_ganss_signalId,
       { "bad-ganss-signalId", "rnsap.bad_ganss_signalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_latitudeSign,
       { "latitudeSign", "rnsap.latitudeSign",
@@ -40105,43 +40105,43 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_SatelliteInformationKP_item", HFILL }},
     { &hf_rnsap_ganss_e_alm,
       { "ganss-e-alm", "rnsap.ganss_e_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_ganss_delta_I_alm,
       { "ganss-delta-I-alm", "rnsap.ganss_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_ganss_omegadot_alm,
       { "ganss-omegadot-alm", "rnsap.ganss_omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_ganss_svhealth_alm,
       { "ganss-svhealth-alm", "rnsap.ganss_svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_rnsap_ganss_delta_a_sqrt_alm,
       { "ganss-delta-a-sqrt-alm", "rnsap.ganss_delta_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_17", HFILL }},
     { &hf_rnsap_ganss_omegazero_alm,
       { "ganss-omegazero-alm", "rnsap.ganss_omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_ganss_m_zero_alm,
       { "ganss-m-zero-alm", "rnsap.ganss_m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_ganss_omega_alm,
       { "ganss-omega-alm", "rnsap.ganss_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_ganss_af_zero_alm,
       { "ganss-af-zero-alm", "rnsap.ganss_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rnsap_ganss_af_one_alm,
       { "ganss-af-one-alm", "rnsap.ganss_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_GANSS_Sat_Info_Nav_item,
       { "GANSS-Sat-Info-Nav item", "rnsap.GANSS_Sat_Info_Nav_item",
@@ -40149,11 +40149,11 @@ void proto_register_rnsap(void) {
         "rnsap.GANSS_Sat_Info_Nav_item", HFILL }},
     { &hf_rnsap_svHealth,
       { "svHealth", "rnsap.svHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rnsap_iod,
       { "iod", "rnsap.iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_ganssClockModel,
       { "ganssClockModel", "rnsap.ganssClockModel",
@@ -40193,35 +40193,35 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_0_8191", HFILL }},
     { &hf_rnsap_a_one_utc,
       { "a-one-utc", "rnsap.a_one_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_a_zero_utc,
       { "a-zero-utc", "rnsap.a_zero_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_t_ot_utc,
       { "t-ot-utc", "rnsap.t_ot_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_w_n_t_utc,
       { "w-n-t-utc", "rnsap.w_n_t_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_delta_t_ls_utc,
       { "delta-t-ls-utc", "rnsap.delta_t_ls_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_w_n_lsf_utc,
       { "w-n-lsf-utc", "rnsap.w_n_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_dn_utc,
       { "dn-utc", "rnsap.dn_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_delta_t_lsf_utc,
       { "delta-t-lsf-utc", "rnsap.delta_t_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_altitudeAndDirection,
       { "altitudeAndDirection", "rnsap.altitudeAndDirection",
@@ -40281,11 +40281,11 @@ void proto_register_rnsap(void) {
         "rnsap.GERAN_SystemInfo_item", HFILL }},
     { &hf_rnsap_gERAN_SI_block,
       { "gERAN-SI-block", "rnsap.gERAN_SI_block",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.OCTET_STRING_SIZE_1_23", HFILL }},
     { &hf_rnsap_wna_alm,
       { "wna-alm", "rnsap.wna_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_satellite_Almanac_Information,
       { "satellite-Almanac-Information", "rnsap.satellite_Almanac_Information",
@@ -40301,51 +40301,51 @@ void proto_register_rnsap(void) {
         "rnsap.DATA_ID", HFILL }},
     { &hf_rnsap_gps_e_alm,
       { "gps-e-alm", "rnsap.gps_e_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_gps_toa_alm,
       { "gps-toa-alm", "rnsap.gps_toa_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_gps_delta_I_alm,
       { "gps-delta-I-alm", "rnsap.gps_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_omegadot_alm,
       { "omegadot-alm", "rnsap.omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_svhealth_alm,
       { "svhealth-alm", "rnsap.svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_gps_a_sqrt_alm,
       { "gps-a-sqrt-alm", "rnsap.gps_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_omegazero_alm,
       { "omegazero-alm", "rnsap.omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_m_zero_alm,
       { "m-zero-alm", "rnsap.m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_gps_omega_alm,
       { "gps-omega-alm", "rnsap.gps_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rnsap_gps_af_zero_alm,
       { "gps-af-zero-alm", "rnsap.gps_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_gps_af_one_alm,
       { "gps-af-one-alm", "rnsap.gps_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rnsap_sVGlobalHealth_alm,
       { "sVGlobalHealth-alm", "rnsap.sVGlobalHealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_364", HFILL }},
     { &hf_rnsap_Satellite_Almanac_Information_ExtItem_item,
       { "Satellite-Almanac-Information-ExtItem item", "rnsap.Satellite_Almanac_Information_ExtItem_item",
@@ -40361,35 +40361,35 @@ void proto_register_rnsap(void) {
         "rnsap.T_gPSInformationItem", HFILL }},
     { &hf_rnsap_alpha_zero_ionos_01,
       { "alpha-zero-ionos", "rnsap.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_alpha_one_ionos_01,
       { "alpha-one-ionos", "rnsap.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_alpha_two_ionos_01,
       { "alpha-two-ionos", "rnsap.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_alpha_three_ionos,
       { "alpha-three-ionos", "rnsap.alpha_three_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_beta_zero_ionos,
       { "beta-zero-ionos", "rnsap.beta_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_beta_one_ionos,
       { "beta-one-ionos", "rnsap.beta_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_beta_two_ionos,
       { "beta-two-ionos", "rnsap.beta_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_beta_three_ionos,
       { "beta-three-ionos", "rnsap.beta_three_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_GPS_NavigationModel_and_TimeRecovery_item,
       { "GPS-NavigationModel-and-TimeRecovery item", "rnsap.GPS_NavigationModel_and_TimeRecovery_item",
@@ -40401,87 +40401,87 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_0_1048575", HFILL }},
     { &hf_rnsap_tlm_message_nav,
       { "tlm-message-nav", "rnsap.tlm_message_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rnsap_tlm_revd_c_nav,
       { "tlm-revd-c-nav", "rnsap.tlm_revd_c_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rnsap_ho_word_nav,
       { "ho-word-nav", "rnsap.ho_word_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_rnsap_w_n_nav,
       { "w-n-nav", "rnsap.w_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_ca_or_p_on_l2_nav,
       { "ca-or-p-on-l2-nav", "rnsap.ca_or_p_on_l2_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rnsap_user_range_accuracy_index_nav,
       { "user-range-accuracy-index-nav", "rnsap.user_range_accuracy_index_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_4", HFILL }},
     { &hf_rnsap_sv_health_nav,
       { "sv-health-nav", "rnsap.sv_health_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_6", HFILL }},
     { &hf_rnsap_iodc_nav,
       { "iodc-nav", "rnsap.iodc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rnsap_l2_p_dataflag_nav,
       { "l2-p-dataflag-nav", "rnsap.l2_p_dataflag_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rnsap_sf1_reserved_nav,
       { "sf1-reserved-nav", "rnsap.sf1_reserved_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_87", HFILL }},
     { &hf_rnsap_t_gd_nav,
       { "t-gd-nav", "rnsap.t_gd_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_t_oc_nav,
       { "t-oc-nav", "rnsap.t_oc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_a_f_2_nav,
       { "a-f-2-nav", "rnsap.a_f_2_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_a_f_1_nav,
       { "a-f-1-nav", "rnsap.a_f_1_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_a_f_zero_nav,
       { "a-f-zero-nav", "rnsap.a_f_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_22", HFILL }},
     { &hf_rnsap_gps_e_nav,
       { "gps-e-nav", "rnsap.gps_e_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_t_oe_nav,
       { "t-oe-nav", "rnsap.t_oe_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rnsap_fit_interval_flag_nav,
       { "fit-interval-flag-nav", "rnsap.fit_interval_flag_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rnsap_aodo_nav,
       { "aodo-nav", "rnsap.aodo_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rnsap_gps_omega_nav,
       { "gps-omega-nav", "rnsap.gps_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rnsap_spare_zero_fill,
       { "spare-zero-fill", "rnsap.spare_zero_fill",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_rnsap_badSatellites,
       { "badSatellites", "rnsap.badSatellites",
@@ -40917,7 +40917,7 @@ void proto_register_rnsap(void) {
         "rnsap.IPSub", HFILL }},
     { &hf_rnsap_List_Of_PLMNs_item,
       { "PLMN-Identity", "rnsap.PLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.PLMN_Identity", HFILL }},
     { &hf_rnsap_uplinkLoadValue,
       { "uplinkLoadValue", "rnsap.uplinkLoadValue",
@@ -40953,11 +40953,11 @@ void proto_register_rnsap(void) {
         "rnsap.MACdPDU_Size_IndexItem_to_Modify", HFILL }},
     { &hf_rnsap_accessPointName,
       { "accessPointName", "rnsap.accessPointName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.AccessPointName", HFILL }},
     { &hf_rnsap_iPMulticastAddress,
       { "iPMulticastAddress", "rnsap.iPMulticastAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.IPMulticastAddress", HFILL }},
     { &hf_rnsap_MBMS_Bearer_Service_List_item,
       { "TMGI", "rnsap.TMGI",
@@ -41349,7 +41349,7 @@ void proto_register_rnsap(void) {
         "rnsap.InformationReportPeriodicity", HFILL }},
     { &hf_rnsap_imsi,
       { "imsi", "rnsap.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.IMSI", HFILL }},
     { &hf_rnsap_defaultPreferredFrequency,
       { "defaultPreferredFrequency", "rnsap.defaultPreferredFrequency",
@@ -41585,7 +41585,7 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_0_100", HFILL }},
     { &hf_rnsap_sAC,
       { "sAC", "rnsap.sAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.SAC", HFILL }},
     { &hf_rnsap_dl_TFCS,
       { "dl-TFCS", "rnsap.dl_TFCS",
@@ -41861,19 +41861,19 @@ void proto_register_rnsap(void) {
         "rnsap.EightPSK_UL_DPCH_TimeSlotFormatTDD_LCR", HFILL }},
     { &hf_rnsap_plmn_id,
       { "plmn-id", "rnsap.plmn_id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.PLMN_Identity", HFILL }},
     { &hf_rnsap_service_id,
       { "service-id", "rnsap.service_id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.Service_ID", HFILL }},
     { &hf_rnsap_dsField,
       { "dsField", "rnsap.dsField",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.DsField", HFILL }},
     { &hf_rnsap_genericTrafficCategory,
       { "genericTrafficCategory", "rnsap.genericTrafficCategory",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.GenericTrafficCategory", HFILL }},
     { &hf_rnsap_Transmission_Gap_Pattern_Sequence_Information_item,
       { "Transmission-Gap-Pattern-Sequence-Information item", "rnsap.Transmission_Gap_Pattern_Sequence_Information_item",
@@ -42165,11 +42165,11 @@ void proto_register_rnsap(void) {
         "rnsap.INTEGER_1_64_", HFILL }},
     { &hf_rnsap_imei,
       { "imei", "rnsap.imei",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.IMEI", HFILL }},
     { &hf_rnsap_imeisv,
       { "imeisv", "rnsap.imeisv",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.IMEISV", HFILL }},
     { &hf_rnsap_periodic_02,
       { "periodic", "rnsap.periodic",
@@ -42401,7 +42401,7 @@ void proto_register_rnsap(void) {
         "rnsap.UL_Timeslot_ISCP_Value", HFILL }},
     { &hf_rnsap_sync_UL_codes_bitmap,
       { "sync-UL-codes-bitmap", "rnsap.sync_UL_codes_bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rnsap.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rnsap_fPACH_info,
       { "fPACH-info", "rnsap.fPACH_info",
diff --git a/epan/dissectors/packet-roofnet.c b/epan/dissectors/packet-roofnet.c
index ee7742abda..06f328f8c6 100644
--- a/epan/dissectors/packet-roofnet.c
+++ b/epan/dissectors/packet-roofnet.c
@@ -291,7 +291,7 @@ void proto_register_roofnet(void)
 
     { &hf_roofnet_query_dst,
       { "Query Dst", "roofnet.querydst",
-	FT_IPv4, BASE_HEX, NULL, 0x0, "Roofnet Query Destination", HFILL }
+	FT_IPv4, BASE_NONE, NULL, 0x0, "Roofnet Query Destination", HFILL }
     },
 
     { &hf_roofnet_seq,
@@ -301,17 +301,17 @@ void proto_register_roofnet(void)
 
     { &hf_roofnet_links,
       { "Links", "roofnet.links",
-      FT_NONE, BASE_DEC, NULL, 0x0, "", HFILL }
+      FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_roofnet_link_src,
       { "Source IP", "roofnet.link.src",
-      FT_IPv4, BASE_HEX, NULL, 0x0, "Roofnet Message Source", HFILL }
+      FT_IPv4, BASE_NONE, NULL, 0x0, "Roofnet Message Source", HFILL }
     },
 
     { &hf_roofnet_link_forward,
       { "Forward", "roofnet.link.forward",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "Forward", HFILL }
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
     },
 
     { &hf_roofnet_link_rev,
@@ -331,7 +331,7 @@ void proto_register_roofnet(void)
 
     { &hf_roofnet_link_dst,
       { "Dst IP", "roofnet.link.dst",
-	FT_IPv4, BASE_HEX, NULL, 0x0, "Roofnet Message Destination", HFILL }
+	FT_IPv4, BASE_NONE, NULL, 0x0, "Roofnet Message Destination", HFILL }
     }
   };
 
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c
index 68ecfbae12..2267042c44 100644
--- a/epan/dissectors/packet-rpc.c
+++ b/epan/dissectors/packet-rpc.c
@@ -3562,160 +3562,160 @@ proto_register_rpc(void)
 	static hf_register_info hf[] = {
 		{ &hf_rpc_reqframe, {
 			"Request Frame", "rpc.reqframe", FT_FRAMENUM, BASE_NONE,
-			NULL, 0, "Request Frame", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_repframe, {
 			"Reply Frame", "rpc.repframe", FT_FRAMENUM, BASE_NONE,
-			NULL, 0, "Reply Frame", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_lastfrag, {
 			"Last Fragment", "rpc.lastfrag", FT_BOOLEAN, 32,
-			TFS(&tfs_yes_no), RPC_RM_LASTFRAG, "Last Fragment", HFILL }},
+			TFS(&tfs_yes_no), RPC_RM_LASTFRAG, NULL, HFILL }},
 		{ &hf_rpc_fraglen, {
 			"Fragment Length", "rpc.fraglen", FT_UINT32, BASE_DEC,
-			NULL, RPC_RM_FRAGLEN, "Fragment Length", HFILL }},
+			NULL, RPC_RM_FRAGLEN, NULL, HFILL }},
 		{ &hf_rpc_xid, {
 			"XID", "rpc.xid", FT_UINT32, BASE_HEX,
-			NULL, 0, "XID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_msgtype, {
 			"Message Type", "rpc.msgtyp", FT_UINT32, BASE_DEC,
-			VALS(rpc_msg_type), 0, "Message Type", HFILL }},
+			VALS(rpc_msg_type), 0, NULL, HFILL }},
 		{ &hf_rpc_state_reply, {
 			"Reply State", "rpc.replystat", FT_UINT32, BASE_DEC,
-			VALS(rpc_reply_state), 0, "Reply State", HFILL }},
+			VALS(rpc_reply_state), 0, NULL, HFILL }},
 		{ &hf_rpc_state_accept, {
 			"Accept State", "rpc.state_accept", FT_UINT32, BASE_DEC,
-			VALS(rpc_accept_state), 0, "Accept State", HFILL }},
+			VALS(rpc_accept_state), 0, NULL, HFILL }},
 		{ &hf_rpc_state_reject, {
 			"Reject State", "rpc.state_reject", FT_UINT32, BASE_DEC,
-			VALS(rpc_reject_state), 0, "Reject State", HFILL }},
+			VALS(rpc_reject_state), 0, NULL, HFILL }},
 		{ &hf_rpc_state_auth, {
 			"Auth State", "rpc.state_auth", FT_UINT32, BASE_DEC,
-			VALS(rpc_auth_state), 0, "Auth State", HFILL }},
+			VALS(rpc_auth_state), 0, NULL, HFILL }},
 		{ &hf_rpc_version, {
 			"RPC Version", "rpc.version", FT_UINT32, BASE_DEC,
-			NULL, 0, "RPC Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_version_min, {
 			"RPC Version (Minimum)", "rpc.version.min", FT_UINT32,
 			BASE_DEC, NULL, 0, "Program Version (Minimum)", HFILL }},
 		{ &hf_rpc_version_max, {
 			"RPC Version (Maximum)", "rpc.version.max", FT_UINT32,
-			BASE_DEC, NULL, 0, "RPC Version (Maximum)", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_program, {
 			"Program", "rpc.program", FT_UINT32, BASE_DEC,
-			NULL, 0, "Program", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_programversion, {
 			"Program Version", "rpc.programversion", FT_UINT32,
-			BASE_DEC, NULL, 0, "Program Version", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_programversion_min, {
 			"Program Version (Minimum)", "rpc.programversion.min", FT_UINT32,
-			BASE_DEC, NULL, 0, "Program Version (Minimum)", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_programversion_max, {
 			"Program Version (Maximum)", "rpc.programversion.max", FT_UINT32,
-			BASE_DEC, NULL, 0, "Program Version (Maximum)", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_procedure, {
 			"Procedure", "rpc.procedure", FT_UINT32, BASE_DEC,
-			NULL, 0, "Procedure", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_auth_flavor, {
 			"Flavor", "rpc.auth.flavor", FT_UINT32, BASE_DEC,
-			VALS(rpc_auth_flavor), 0, "Flavor", HFILL }},
+			VALS(rpc_auth_flavor), 0, NULL, HFILL }},
 		{ &hf_rpc_auth_length, {
 			"Length", "rpc.auth.length", FT_UINT32, BASE_DEC,
-			NULL, 0, "Length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_auth_stamp, {
 			"Stamp", "rpc.auth.stamp", FT_UINT32, BASE_HEX,
-			NULL, 0, "Stamp", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_auth_uid, {
 			"UID", "rpc.auth.uid", FT_UINT32, BASE_DEC,
-			NULL, 0, "UID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_auth_gid, {
 			"GID", "rpc.auth.gid", FT_UINT32, BASE_DEC,
-			NULL, 0, "GID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_v, {
 			"GSS Version", "rpc.authgss.version", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Version", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_proc, {
 			"GSS Procedure", "rpc.authgss.procedure", FT_UINT32,
-			BASE_DEC, VALS(rpc_authgss_proc), 0, "GSS Procedure", HFILL }},
+			BASE_DEC, VALS(rpc_authgss_proc), 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_seq, {
 			"GSS Sequence Number", "rpc.authgss.seqnum", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Sequence Number", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_svc, {
 			"GSS Service", "rpc.authgss.service", FT_UINT32,
-			BASE_DEC, VALS(rpc_authgss_svc), 0, "GSS Service", HFILL }},
+			BASE_DEC, VALS(rpc_authgss_svc), 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_ctx, {
 			"GSS Context", "rpc.authgss.context", FT_BYTES,
-			BASE_HEX, NULL, 0, "GSS Context", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_major, {
 			"GSS Major Status", "rpc.authgss.major", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Major Status", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_minor, {
 			"GSS Minor Status", "rpc.authgss.minor", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Minor Status", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_window, {
 			"GSS Sequence Window", "rpc.authgss.window", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Sequence Window", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_token_length, {
 			"GSS Token Length", "rpc.authgss.token_length", FT_UINT32,
-			BASE_DEC, NULL, 0, "GSS Token Length", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_data_length, {
 			"Length", "rpc.authgss.data.length", FT_UINT32,
-			BASE_DEC, NULL, 0, "Length", HFILL }},
+			BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_data, {
 			"GSS Data", "rpc.authgss.data", FT_BYTES,
-			BASE_HEX, NULL, 0, "GSS Data", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_checksum, {
 			"GSS Checksum", "rpc.authgss.checksum", FT_BYTES,
-			BASE_HEX, NULL, 0, "GSS Checksum", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgss_token, {
 			"GSS Token", "rpc.authgss.token", FT_BYTES,
-			BASE_HEX, NULL, 0, "GSS Token", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgssapi_v, {
 			"AUTH_GSSAPI Version", "rpc.authgssapi.version",
-			FT_UINT32, BASE_DEC, NULL, 0, "AUTH_GSSAPI Version",
+			FT_UINT32, BASE_DEC, NULL, 0, NULL,
 			HFILL }},
 		{ &hf_rpc_authgssapi_msg, {
 			"AUTH_GSSAPI Message", "rpc.authgssapi.message",
-			FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0, "AUTH_GSSAPI Message",
+			FT_BOOLEAN, BASE_NONE, TFS(&tfs_yes_no), 0x0, NULL,
 			HFILL }},
 		{ &hf_rpc_authgssapi_msgv, {
 			"Msg Version", "rpc.authgssapi.msgversion",
-			FT_UINT32, BASE_DEC, NULL, 0, "Msg Version",
+			FT_UINT32, BASE_DEC, NULL, 0, NULL,
 			HFILL }},
 		{ &hf_rpc_authgssapi_handle, {
 			"Client Handle", "rpc.authgssapi.handle",
-			FT_BYTES, BASE_HEX, NULL, 0, "Client Handle", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authgssapi_isn, {
 			"Signed ISN", "rpc.authgssapi.isn",
-			FT_BYTES, BASE_HEX, NULL, 0, "Signed ISN", HFILL }},
+			FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_namekind, {
 			"Namekind", "rpc.authdes.namekind", FT_UINT32, BASE_DEC,
-			VALS(rpc_authdes_namekind), 0, "Namekind", HFILL }},
+			VALS(rpc_authdes_namekind), 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_netname, {
 			"Netname", "rpc.authdes.netname", FT_STRING,
-			BASE_DEC, NULL, 0, "Netname", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_convkey, {
 			"Conversation Key (encrypted)", "rpc.authdes.convkey", FT_UINT32,
-			BASE_HEX, NULL, 0, "Conversation Key (encrypted)", HFILL }},
+			BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_window, {
 			"Window (encrypted)", "rpc.authdes.window", FT_UINT32,
 			BASE_HEX, NULL, 0, "Windows (encrypted)", HFILL }},
 		{ &hf_rpc_authdes_nickname, {
 			"Nickname", "rpc.authdes.nickname", FT_UINT32,
-			BASE_HEX, NULL, 0, "Nickname", HFILL }},
+			BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_timestamp, {
 			"Timestamp (encrypted)", "rpc.authdes.timestamp", FT_UINT32,
-			BASE_HEX, NULL, 0, "Timestamp (encrypted)", HFILL }},
+			BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_windowverf, {
 			"Window verifier (encrypted)", "rpc.authdes.windowverf", FT_UINT32,
-			BASE_HEX, NULL, 0, "Window verifier (encrypted)", HFILL }},
+			BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_authdes_timeverf, {
 			"Timestamp verifier (encrypted)", "rpc.authdes.timeverf", FT_UINT32,
-			BASE_HEX, NULL, 0, "Timestamp verifier (encrypted)", HFILL }},
+			BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_auth_machinename, {
 			"Machine Name", "rpc.auth.machinename", FT_STRING,
-			BASE_DEC, NULL, 0, "Machine Name", HFILL }},
+			BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_dup, {
 			"Duplicate Call/Reply", "rpc.dup", FT_NONE, BASE_NONE,
-			NULL, 0, "Duplicate Call/Reply", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rpc_call_dup, {
 			"Duplicate to the call in", "rpc.call.dup", FT_FRAMENUM, BASE_DEC,
 			NULL, 0, "This is a duplicate to the call in frame", HFILL }},
@@ -3724,7 +3724,7 @@ proto_register_rpc(void)
 			NULL, 0, "This is a duplicate to the reply in frame", HFILL }},
 		{ &hf_rpc_value_follows, {
 			"Value Follows", "rpc.value_follows", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "Value Follows", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_rpc_array_len, {
 			"num", "rpc.array.len", FT_UINT32, BASE_DEC,
 			NULL, 0, "Length of RPC array", HFILL }},
@@ -3755,11 +3755,11 @@ proto_register_rpc(void)
 
 		{ &hf_rpc_fragment,
 		{ "RPC Fragment", "rpc.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"RPC Fragment", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_rpc_fragments,
 		{ "RPC Fragments", "rpc.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-			"RPC Fragments", HFILL }},
+			NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_rpc,
diff --git a/epan/dissectors/packet-rpcap.c b/epan/dissectors/packet-rpcap.c
index 9dbcb37888..bd76fc89d5 100644
--- a/epan/dissectors/packet-rpcap.c
+++ b/epan/dissectors/packet-rpcap.c
@@ -1035,24 +1035,24 @@ proto_register_rpcap (void)
     /* Common header for all messages */
     { &hf_version,
       { "Version", "rpcap.version", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "Version", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_type,
       { "Message type", "rpcap.type", FT_UINT8, BASE_DEC,
-	VALS(message_type), 0x0, "Message type", HFILL } },
+	VALS(message_type), 0x0, NULL, HFILL } },
     { &hf_value,
       { "Message value", "rpcap.value", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Message value", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_plen,
       { "Payload length", "rpcap.len", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Payload length", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Error */
     { &hf_error,
-      { "Error", "rpcap.error", FT_STRING, BASE_DEC,
+      { "Error", "rpcap.error", FT_STRING, BASE_NONE,
 	NULL, 0x0, "Error text", HFILL } },
     { &hf_error_value,
       { "Error value", "rpcap.error_value", FT_UINT16, BASE_DEC,
-	VALS(error_codes), 0x0, "Error value", HFILL } },
+	VALS(error_codes), 0x0, NULL, HFILL } },
     
     /* Packet header */
     { &hf_packet,
@@ -1060,84 +1060,84 @@ proto_register_rpcap (void)
 	NULL, 0x0, "Packet data", HFILL } },
     { &hf_timestamp,
       { "Arrival time", "rpcap.time", FT_ABSOLUTE_TIME, BASE_NONE,
-	NULL, 0x0, "Arrival time", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_caplen,
       { "Capture length", "rpcap.cap_len", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Capture length", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_len,
       { "Frame length", "rpcap.len", FT_UINT32, BASE_DEC,
 	NULL, 0x0, "Frame length (off wire)", HFILL } },
     { &hf_npkt,
       { "Frame number", "rpcap.number", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Frame number", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Authentication request */
     { &hf_auth_request,
       { "Authentication", "rpcap.auth", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Authentication", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_auth_type,
       { "Authentication type", "rpcap.auth_type", FT_UINT16, BASE_DEC,
-	VALS(auth_type), 0x0, "Authentication type", HFILL } },
+	VALS(auth_type), 0x0, NULL, HFILL } },
     { &hf_auth_slen1,
       { "Authentication item length 1", "rpcap.auth_len1", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Authentication item length 1", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_auth_slen2,
       { "Authentication item length 2", "rpcap.auth_len2", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Authentication item length 2", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_auth_username,
-      { "Username", "rpcap.username", FT_STRING, BASE_DEC,
-	NULL, 0x0, "Username", HFILL } },
+      { "Username", "rpcap.username", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     { &hf_auth_password,
-      { "Password", "rpcap.password", FT_STRING, BASE_DEC,
-	NULL, 0x0, "Password", HFILL } },
+      { "Password", "rpcap.password", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     
     /* Open request */
     { &hf_open_request,
-      { "Open request", "rpcap.open_request", FT_STRING, BASE_DEC,
-	NULL, 0x0, "Open request", HFILL } },
+      { "Open request", "rpcap.open_request", FT_STRING, BASE_NONE,
+	NULL, 0x0, NULL, HFILL } },
     
     /* Open reply */
     { &hf_open_reply,
       { "Open reply", "rpcap.open_reply", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Open reply", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_linktype,
       { "Link type", "rpcap.linktype", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Link type", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_tzoff,
       { "Timezone offset", "rpcap.tzoff", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Timezone offset", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Start capture request */
     { &hf_startcap_request,
       { "Start capture request", "rpcap.startcap_request", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Start capture request", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_snaplen,
       { "Snap length", "rpcap.snaplen", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Snap length", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_read_timeout,
       { "Read timeout", "rpcap.read_timeout", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Read timeout", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_flags,
       { "Flags", "rpcap.flags", FT_UINT16, BASE_DEC,
 	NULL, 0x0, "Capture flags", HFILL } },
     { &hf_flags_promisc,
       { "Promiscuous mode", "rpcap.flags.promisc", FT_BOOLEAN, 16,
-	TFS(&tfs_enabled_disabled), FLAG_PROMISC, "Promiscuous mode", HFILL } },
+	TFS(&tfs_enabled_disabled), FLAG_PROMISC, NULL, HFILL } },
     { &hf_flags_dgram,
       { "Use Datagram", "rpcap.flags.dgram", FT_BOOLEAN, 16,
-	TFS(&tfs_yes_no), FLAG_DGRAM, "", HFILL } },
+	TFS(&tfs_yes_no), FLAG_DGRAM, NULL, HFILL } },
     { &hf_flags_serveropen,
       { "Server open", "rpcap.flags.serveropen", FT_BOOLEAN, 16,
-	TFS(&open_closed), FLAG_SERVEROPEN, "Server open", HFILL } },
+	TFS(&open_closed), FLAG_SERVEROPEN, NULL, HFILL } },
     { &hf_flags_inbound,
       { "Inbound", "rpcap.flags.inbound", FT_BOOLEAN, 16,
-	TFS(&tfs_yes_no), FLAG_INBOUND, "Inbound", HFILL } },
+	TFS(&tfs_yes_no), FLAG_INBOUND, NULL, HFILL } },
     { &hf_flags_outbound,
       { "Outbound", "rpcap.flags.outbound", FT_BOOLEAN, 16,
-	TFS(&tfs_yes_no), FLAG_OUTBOUND, "Outbound", HFILL } },
+	TFS(&tfs_yes_no), FLAG_OUTBOUND, NULL, HFILL } },
     { &hf_client_port,
       { "Client Port", "rpcap.client_port", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Client Port", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Start capture reply */
     { &hf_startcap_reply,
@@ -1145,38 +1145,38 @@ proto_register_rpcap (void)
 	NULL, 0x0, "Start Capture Reply", HFILL } },
     { &hf_bufsize,
       { "Buffer size", "rpcap.bufsize", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Buffer size", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_server_port,
       { "Server port", "rpcap.server_port", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Server port", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_dummy,
       { "Dummy", "rpcap.dummy", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Filter */
     { &hf_filter,
       { "Filter", "rpcap.filter", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Filter", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_filtertype,
       { "Filter type", "rpcap.filtertype", FT_UINT16, BASE_DEC,
 	NULL, 0x0, "Filter type (BPF)", HFILL } },
     { &hf_nitems,
       { "Number of items", "rpcap.nitems", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Number of items", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Filter BPF instruction */
     { &hf_filterbpf_insn,
       { "Filter BPF instruction", "rpcap.filterbpf_insn", FT_NONE, BASE_NONE,
-	NULL, 0x0, "", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_code,
       { "Op code", "rpcap.opcode", FT_UINT16, BASE_DEC,
 	NULL, 0x0, "Operation code", HFILL } },
     { &hf_jt,
       { "JT", "rpcap.jt", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "JT", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_jf,
       { "JF", "rpcap.jf", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "JF", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_instr_value,
       { "Instruction value", "rpcap.instr_value", FT_UINT32, BASE_DEC,
 	NULL, 0x0, "Instruction-Dependent value", HFILL } },
@@ -1190,10 +1190,10 @@ proto_register_rpcap (void)
 	NULL, 0x0, "Received by kernel", HFILL } },
     { &hf_ifdrop,
       { "Dropped by network interface", "rpcap.ifdrop", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Dropped by network interface", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_krnldrop,
       { "Dropped by kernel filter", "rpcap.krnldrop", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Dropped by kernel filter", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_srvcapt,
       { "Captured by rpcapd", "rpcap.srvcapt", FT_UINT32, BASE_DEC,
 	NULL, 0x0, "Captured by RPCAP daemon", HFILL } },
@@ -1201,77 +1201,77 @@ proto_register_rpcap (void)
     /* Find all devices reply */
     { &hf_findalldevs_reply,
       { "Find all devices", "rpcap.findalldevs_reply", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Find all devices", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_findalldevs_if,
       { "Interface", "rpcap.if", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Interface", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_namelen,
       { "Name length", "rpcap.namelen", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Name length", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_desclen,
       { "Description length", "rpcap.desclen", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Description length", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_flags,
       { "Interface flags", "rpcap.if.flags", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Interface flags", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_naddr,
       { "Number of addresses", "rpcap.naddr", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "Number of addresses", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_name,
-      { "Name", "rpcap.ifname", FT_STRING, BASE_DEC,
+      { "Name", "rpcap.ifname", FT_STRING, BASE_NONE,
 	NULL, 0x0, "Interface name", HFILL } },
     { &hf_if_desc,
-      { "Description", "rpcap.ifdesc", FT_STRING, BASE_DEC,
+      { "Description", "rpcap.ifdesc", FT_STRING, BASE_NONE,
 	NULL, 0x0, "Interface description", HFILL } },
 
     /* Find all devices / Interface addresses */
     { &hf_findalldevs_ifaddr,
       { "Interface address", "rpcap.ifaddr", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Interface address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_addr,
       { "Address", "rpcap.addr", FT_NONE, BASE_NONE,
 	NULL, 0x0, "Network address", HFILL } },
     { &hf_if_netmask,
       { "Netmask", "rpcap.netmask", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Netmask", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_broadaddr,
       { "Broadcast", "rpcap.broadaddr", FT_NONE, BASE_NONE,
-	NULL, 0x0, "", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_dstaddr,
       { "P2P destination address", "rpcap.dstaddr", FT_NONE, BASE_NONE,
-	NULL, 0x0, "P2P destination address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_af,
       { "Address family", "rpcap.if.af", FT_UINT16, BASE_HEX,
-	VALS(address_family), 0x0, "Address family", HFILL } },
+	VALS(address_family), 0x0, NULL, HFILL } },
     { &hf_if_port,
       { "Port", "rpcap.if.port", FT_UINT16, BASE_DEC,
 	NULL, 0x0, "Port number", HFILL } },
     { &hf_if_ip,
       { "IP address", "rpcap.if.ip", FT_IPv4, BASE_NONE,
-	NULL, 0x0, "IP address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_padding,
       { "Padding", "rpcap.if.padding", FT_BYTES, BASE_NONE,
-	NULL, 0x0, "Padding", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_if_unknown,
       { "Unknown address", "rpcap.if.unknown", FT_BYTES, BASE_NONE,
-	NULL, 0x0, "Unknown address", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
 
     /* Sampling request */
     { &hf_sampling_request,
       { "Sampling", "rpcap.sampling_request", FT_NONE, BASE_NONE,
-	NULL, 0x0, "Sampling", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_sampling_method,
       { "Method", "rpcap.sampling_method", FT_UINT8, BASE_DEC,
 	VALS(sampling_method), 0x0, "Sampling method", HFILL } },
     { &hf_sampling_dummy1,
       { "Dummy1", "rpcap.dummy", FT_UINT8, BASE_DEC,
-	NULL, 0x0, "Dummy1", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_sampling_dummy2,
       { "Dummy2", "rpcap.dummy", FT_UINT16, BASE_DEC,
-	NULL, 0x0, "Dummy2", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
     { &hf_sampling_value,
       { "Value", "rpcap.sampling_value", FT_UINT32, BASE_DEC,
-	NULL, 0x0, "", HFILL } },
+	NULL, 0x0, NULL, HFILL } },
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c
index 2953de59d7..9fcfaa75dc 100644
--- a/epan/dissectors/packet-rpl.c
+++ b/epan/dissectors/packet-rpl.c
@@ -341,8 +341,7 @@ proto_register_rpl(void)
 		{ &hf_rpl_memsize,
 			{ "Memory Size", "rpl.memsize", 
 				FT_UINT16, BASE_DEC, NULL, 0x0,
-				"RPL Memory Size - AX from INT 12h MINUS 32k"
-				" MINUS the Boot ROM Size", HFILL }},
+				"RPL Memory Size - AX from INT 12h MINUS 32k MINUS the Boot ROM Size", HFILL }},
 		{ &hf_rpl_bsmversion,
 			{ "BSM Version", "rpl.bsmversion", 
 				FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -353,7 +352,7 @@ proto_register_rpl(void)
 				"RPL Adapter ID", HFILL }},
 		{ &hf_rpl_shortname,
 			{ "Short Name", "rpl.shortname", 
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"RPL BSM Short Name", HFILL }},
 		{ &hf_rpl_laddress,
 			{ "Locate Address", "rpl.laddress", 
@@ -369,7 +368,7 @@ proto_register_rpl(void)
 				"RPL Sequence Number", HFILL }},
 		{ &hf_rpl_config,
 			{ "Configuration", "rpl.config", 
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				 "RPL Configuration", HFILL }},
 		{ &hf_rpl_flags,
 			{ "Flags", "rpl.flags", 
@@ -377,11 +376,11 @@ proto_register_rpl(void)
 				"RPL Bit Significant Option Flags", HFILL }},
 		{ &hf_rpl_data,
 			{ "Data", "rpl.data", 
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"RPL Binary File Data", HFILL }},
 		{ &hf_rpl_ec,
 			{ "EC", "rpl.ec",
-				FT_BYTES, BASE_HEX, NULL, 0x0,
+				FT_BYTES, BASE_NONE, NULL, 0x0,
 				"RPL EC", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-rquota.c b/epan/dissectors/packet-rquota.c
index a153ab33f9..4f4efbd0b7 100644
--- a/epan/dissectors/packet-rquota.c
+++ b/epan/dissectors/packet-rquota.c
@@ -168,13 +168,13 @@ proto_register_rquota(void)
 	static hf_register_info hf[] = {
 		{ &hf_rquota_procedure_v1, {
 			"V1 Procedure", "rquota.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(rquota1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(rquota1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_rquota_uid, {
 			"uid", "rquota.uid", FT_UINT32, BASE_DEC,
 			NULL, 0, "User ID", HFILL }},
 
 		{ &hf_rquota_pathp, {
-			"pathp", "rquota.pathp", FT_STRING, BASE_DEC,
+			"pathp", "rquota.pathp", FT_STRING, BASE_NONE,
 			NULL, 0, "Filesystem of interest", HFILL }},
 
 		{ &hf_rquota_status, {
@@ -191,7 +191,7 @@ proto_register_rquota(void)
 
 		{ &hf_rquota_active, {
 			"active", "rquota.active", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_active), 0, "Indicates whether quota is active", HFILL }},
+			TFS(&tfs_active), 0x0, "Indicates whether quota is active", HFILL }},
 
 		{ &hf_rquota_bhardlimit, {
 			"bhardlimit", "rquota.bhardlimit", FT_UINT32, BASE_DEC,
diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c
index 6de186daac..4aa927ec68 100644
--- a/epan/dissectors/packet-rrc.c
+++ b/epan/dissectors/packet-rrc.c
@@ -100017,7 +100017,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions", HFILL }},
     { &hf_rrc_activeSetUpdate_r3_add_ext,
       { "activeSetUpdate-r3-add-ext", "rrc.activeSetUpdate_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -100069,7 +100069,7 @@ void proto_register_rrc(void) {
         "rrc.ActiveSetUpdate_r6_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r6_add_ext,
       { "activeSetUpdate-r6-add-ext", "rrc.activeSetUpdate_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -100097,7 +100097,7 @@ void proto_register_rrc(void) {
         "rrc.ActiveSetUpdate_r7_IEs", HFILL }},
     { &hf_rrc_activeSetUpdate_r7_add_ext,
       { "activeSetUpdate-r7-add-ext", "rrc.activeSetUpdate_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -100181,15 +100181,15 @@ void proto_register_rrc(void) {
         "rrc.PLMN_Identity", HFILL }},
     { &hf_rrc_newH_RNTI,
       { "newH-RNTI", "rrc.newH_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.H_RNTI", HFILL }},
     { &hf_rrc_newPrimary_E_RNTI,
       { "newPrimary-E-RNTI", "rrc.newPrimary_E_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.E_RNTI", HFILL }},
     { &hf_rrc_newSecondary_E_RNTI,
       { "newSecondary-E-RNTI", "rrc.newSecondary_E_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.E_RNTI", HFILL }},
     { &hf_rrc_cn_InformationInfo_01,
       { "cn-InformationInfo", "rrc.cn_InformationInfo",
@@ -100249,7 +100249,7 @@ void proto_register_rrc(void) {
         "rrc.E_TFC_Boost_Info_r7", HFILL }},
     { &hf_rrc_e_DPDCH_PowerInterpolation,
       { "e-DPDCH-PowerInterpolation", "rrc.e_DPDCH_PowerInterpolation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.E_DPDCH_PowerInterpolation", HFILL }},
     { &hf_rrc_hs_DSCH_TBSizeTable,
       { "hs-DSCH-TBSizeTable", "rrc.hs_DSCH_TBSizeTable",
@@ -100273,7 +100273,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_01", HFILL }},
     { &hf_rrc_activeSetUpdateComplete_r3_add_ext,
       { "activeSetUpdateComplete-r3-add-ext", "rrc.activeSetUpdateComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_03,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -100289,7 +100289,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_02", HFILL }},
     { &hf_rrc_activeSetUpdateFailure_r3_add_ext,
       { "activeSetUpdateFailure-r3-add-ext", "rrc.activeSetUpdateFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_04,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -100317,7 +100317,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_03", HFILL }},
     { &hf_rrc_assistanceDataDelivery_r3_add_ext,
       { "assistanceDataDelivery-r3-add-ext", "rrc.assistanceDataDelivery_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_01,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -100389,7 +100389,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_04", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRAN_r3_add_ext,
       { "cellChangeOrderFromUTRAN-r3-add-ext", "rrc.cellChangeOrderFromUTRAN_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_01,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -100445,7 +100445,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_05", HFILL }},
     { &hf_rrc_cellChangeOrderFromUTRANFailure_r3_add_ext,
       { "cellChangeOrderFromUTRANFailure-r3-add-ext", "rrc.cellChangeOrderFromUTRANFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_07,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -100473,11 +100473,11 @@ void proto_register_rrc(void) {
         "rrc.STARTList", HFILL }},
     { &hf_rrc_am_RLC_ErrorIndicationRb2_3or4,
       { "am-RLC-ErrorIndicationRb2-3or4", "rrc.am_RLC_ErrorIndicationRb2_3or4",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_am_RLC_ErrorIndicationRb5orAbove,
       { "am-RLC-ErrorIndicationRb5orAbove", "rrc.am_RLC_ErrorIndicationRb5orAbove",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_cellUpdateCause,
       { "cellUpdateCause", "rrc.cellUpdateCause",
@@ -100501,7 +100501,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_06", HFILL }},
     { &hf_rrc_cellUpdate_r3_add_ext,
       { "cellUpdate-r3-add-ext", "rrc.cellUpdate_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_02,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -100601,7 +100601,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_07", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r3_add_ext,
       { "cellUpdateConfirm-r3-add-ext", "rrc.cellUpdateConfirm_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_02,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -100661,7 +100661,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r4_add_ext,
       { "cellUpdateConfirm-r4-add-ext", "rrc.cellUpdateConfirm_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions_01,
       { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
@@ -100693,7 +100693,7 @@ void proto_register_rrc(void) {
         "rrc.CellUpdateConfirm_r5_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r5_add_ext,
       { "cellUpdateConfirm-r5-add-ext", "rrc.cellUpdateConfirm_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_02,
       { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
@@ -100721,7 +100721,7 @@ void proto_register_rrc(void) {
         "rrc.CellUpdateConfirm_r6_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r6_add_ext,
       { "cellUpdateConfirm-r6-add-ext", "rrc.cellUpdateConfirm_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_02,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -100749,7 +100749,7 @@ void proto_register_rrc(void) {
         "rrc.CellUpdateConfirm_r7_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r7_add_ext,
       { "cellUpdateConfirm-r7-add-ext", "rrc.cellUpdateConfirm_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_01,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -100777,7 +100777,7 @@ void proto_register_rrc(void) {
         "rrc.CellUpdateConfirm_r8_IEs", HFILL }},
     { &hf_rrc_cellUpdateConfirm_r8_add_ext,
       { "cellUpdateConfirm-r8-add-ext", "rrc.cellUpdateConfirm_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_14,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -100801,7 +100801,7 @@ void proto_register_rrc(void) {
         "rrc.U_RNTI", HFILL }},
     { &hf_rrc_new_C_RNTI,
       { "new-C-RNTI", "rrc.new_C_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.C_RNTI", HFILL }},
     { &hf_rrc_rrc_StateIndicator,
       { "rrc-StateIndicator", "rrc.rrc_StateIndicator",
@@ -100813,15 +100813,15 @@ void proto_register_rrc(void) {
         "rrc.UTRAN_DRX_CycleLengthCoefficient", HFILL }},
     { &hf_rrc_rlc_Re_establishIndicatorRb2_3or4,
       { "rlc-Re-establishIndicatorRb2-3or4", "rrc.rlc_Re_establishIndicatorRb2_3or4",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rlc_Re_establishIndicatorRb5orAbove,
       { "rlc-Re-establishIndicatorRb5orAbove", "rrc.rlc_Re_establishIndicatorRb5orAbove",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ura_Identity,
       { "ura-Identity", "rrc.ura_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.URA_Identity", HFILL }},
     { &hf_rrc_rb_InformationReleaseList,
       { "rb-InformationReleaseList", "rrc.rb_InformationReleaseList",
@@ -100913,7 +100913,7 @@ void proto_register_rrc(void) {
         "rrc.DL_InformationPerRL_List", HFILL }},
     { &hf_rrc_new_DSCH_RNTI,
       { "new-DSCH-RNTI", "rrc.new_DSCH_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.DSCH_RNTI", HFILL }},
     { &hf_rrc_pdcp_ROHC_TargetMode,
       { "pdcp-ROHC-TargetMode", "rrc.pdcp_ROHC_TargetMode",
@@ -100965,7 +100965,7 @@ void proto_register_rrc(void) {
         "rrc.DL_InformationPerRL_List_r4", HFILL }},
     { &hf_rrc_new_H_RNTI,
       { "new-H-RNTI", "rrc.new_H_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.H_RNTI", HFILL }},
     { &hf_rrc_rb_InformationReconfigList_02,
       { "rb-InformationReconfigList", "rrc.rb_InformationReconfigList",
@@ -101097,7 +101097,7 @@ void proto_register_rrc(void) {
         "rrc.WaitTime", HFILL }},
     { &hf_rrc_supportForChangeOfUE_Capability,
       { "supportForChangeOfUE-Capability", "rrc.supportForChangeOfUE_Capability",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rb_InformationReconfigList_04,
       { "rb-InformationReconfigList", "rrc.rb_InformationReconfigList",
@@ -101161,7 +101161,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_08", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r3_add_ext,
       { "cellUpdateConfirm-CCCH-r3-add-ext", "rrc.cellUpdateConfirm_CCCH_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_03,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -101201,7 +101201,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r4_add_ext,
       { "cellUpdateConfirm-CCCH-r4-add-ext", "rrc.cellUpdateConfirm_CCCH_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_04,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -101229,7 +101229,7 @@ void proto_register_rrc(void) {
         "rrc.T_r5_01", HFILL }},
     { &hf_rrc_cellUpdateConfirm_CCCH_r5_add_ext,
       { "cellUpdateConfirm-CCCH-r5-add-ext", "rrc.cellUpdateConfirm_CCCH_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_05,
       { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
@@ -101309,7 +101309,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_09", HFILL }},
     { &hf_rrc_counterCheck_r3_add_ext,
       { "counterCheck-r3-add-ext", "rrc.counterCheck_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_21,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -101337,7 +101337,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_10", HFILL }},
     { &hf_rrc_counterCheckResponse_r3_add_ext,
       { "counterCheckResponse-r3-add-ext", "rrc.counterCheckResponse_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_22,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -101357,7 +101357,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_11", HFILL }},
     { &hf_rrc_downlinkDirectTransfer_r3_add_ext,
       { "downlinkDirectTransfer-r3-add-ext", "rrc.downlinkDirectTransfer_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_23,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -101377,7 +101377,7 @@ void proto_register_rrc(void) {
         "rrc.CN_DomainIdentity", HFILL }},
     { &hf_rrc_nas_Message,
       { "nas-Message", "rrc.nas_Message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_Message", HFILL }},
     { &hf_rrc_r3_08,
       { "r3", "rrc.r3",
@@ -101929,7 +101929,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_12", HFILL }},
     { &hf_rrc_handoverToUTRANComplete_r3_add_ext,
       { "handoverToUTRANComplete-r3-add-ext", "rrc.handoverToUTRANComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_30,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -101953,7 +101953,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_13", HFILL }},
     { &hf_rrc_initialDirectTransfer_r3_add_ext,
       { "initialDirectTransfer-r3-add-ext", "rrc.initialDirectTransfer_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_05,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -101985,7 +101985,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_31", HFILL }},
     { &hf_rrc_start_Value,
       { "start-Value", "rrc.start_Value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.START_Value", HFILL }},
     { &hf_rrc_plmn_Identity,
       { "plmn-Identity", "rrc.plmn_Identity",
@@ -102013,7 +102013,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_14", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r3_add_ext,
       { "handoverFromUTRANCommand-GSM-r3-add-ext", "rrc.handoverFromUTRANCommand_GSM_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_09,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -102045,7 +102045,7 @@ void proto_register_rrc(void) {
         "rrc.HandoverFromUTRANCommand_GSM_r6_IEs", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_GSM_r6_add_ext,
       { "handoverFromUTRANCommand-GSM-r6-add-ext", "rrc.handoverFromUTRANCommand_GSM_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_33,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -102161,7 +102161,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_15", HFILL }},
     { &hf_rrc_handoverFromUTRANCommand_CDMA2000_r3_add_ext,
       { "handoverFromUTRANCommand-CDMA2000-r3-add-ext", "rrc.handoverFromUTRANCommand_CDMA2000_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_35,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -102205,7 +102205,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_16", HFILL }},
     { &hf_rrc_handoverFromUTRANFailure_r3_add_ext,
       { "handoverFromUTRANFailure-r3-add-ext", "rrc.handoverFromUTRANFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_06,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -102249,7 +102249,7 @@ void proto_register_rrc(void) {
         "rrc.T_ue_CapabilityContainer", HFILL }},
     { &hf_rrc_present_02,
       { "present", "rrc.present",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_present", HFILL }},
     { &hf_rrc_v390NonCriticalExtensions,
       { "v390NonCriticalExtensions", "rrc.v390NonCriticalExtensions",
@@ -102281,7 +102281,7 @@ void proto_register_rrc(void) {
         "rrc.InterRATHandoverInfo_v3d0ext_IEs", HFILL }},
     { &hf_rrc_interRATHandoverInfo_r3_add_ext,
       { "interRATHandoverInfo-r3-add-ext", "rrc.interRATHandoverInfo_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_interRATHandoverInfo_r3_add_ext", HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions,
       { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
@@ -102365,7 +102365,7 @@ void proto_register_rrc(void) {
         "rrc.UE_RadioAccessCapability_v3a0ext", HFILL }},
     { &hf_rrc_uESpecificBehaviourInformation1interRAT,
       { "uESpecificBehaviourInformation1interRAT", "rrc.uESpecificBehaviourInformation1interRAT",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UESpecificBehaviourInformation1interRAT", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v3g0ext,
       { "ue-RadioAccessCapability-v3g0ext", "rrc.ue_RadioAccessCapability_v3g0ext",
@@ -102461,7 +102461,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_18", HFILL }},
     { &hf_rrc_measurementControl_r3_add_ext,
       { "measurementControl-r3-add-ext", "rrc.measurementControl_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_05,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -102509,7 +102509,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_03", HFILL }},
     { &hf_rrc_measurementControl_r4_add_ext,
       { "measurementControl-r4-add-ext", "rrc.measurementControl_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_09,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -102569,7 +102569,7 @@ void proto_register_rrc(void) {
         "rrc.MeasurementControl_r7_IEs", HFILL }},
     { &hf_rrc_measurementControl_r7_add_ext,
       { "measurementControl-r7-add-ext", "rrc.measurementControl_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_42,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -102649,7 +102649,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_19", HFILL }},
     { &hf_rrc_measurementControlFailure_r3_add_ext,
       { "measurementControlFailure-r3-add-ext", "rrc.measurementControlFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_10,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -102689,7 +102689,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_20", HFILL }},
     { &hf_rrc_measurementReport_r3_add_ext,
       { "measurementReport-r3-add-ext", "rrc.measurementReport_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_06,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -102785,7 +102785,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_21", HFILL }},
     { &hf_rrc_pagingType1_r3_add_ext,
       { "pagingType1-r3-add-ext", "rrc.pagingType1_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_12,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -102817,7 +102817,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_22", HFILL }},
     { &hf_rrc_pagingType2_r3_add_ext,
       { "pagingType2-r3-add-ext", "rrc.pagingType2_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_46,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -102845,7 +102845,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_23", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r3_add_ext,
       { "physicalChannelReconfiguration-r3-add-ext", "rrc.physicalChannelReconfiguration_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtenstions,
       { "v4b0NonCriticalExtenstions", "rrc.v4b0NonCriticalExtenstions",
@@ -102905,7 +102905,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_04", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r4_add_ext,
       { "physicalChannelReconfiguration-r4-add-ext", "rrc.physicalChannelReconfiguration_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtenstions_03,
       { "v590NonCriticalExtenstions", "rrc.v590NonCriticalExtenstions",
@@ -102937,7 +102937,7 @@ void proto_register_rrc(void) {
         "rrc.PhysicalChannelReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r5_add_ext,
       { "physicalChannelReconfiguration-r5-add-ext", "rrc.physicalChannelReconfiguration_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_14,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -102965,7 +102965,7 @@ void proto_register_rrc(void) {
         "rrc.PhysicalChannelReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r6_add_ext,
       { "physicalChannelReconfiguration-r6-add-ext", "rrc.physicalChannelReconfiguration_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_06,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -102997,7 +102997,7 @@ void proto_register_rrc(void) {
         "rrc.PhysicalChannelReconfiguration_r7_IEs", HFILL }},
     { &hf_rrc_physicalChannelReconfiguration_r7_add_ext,
       { "physicalChannelReconfiguration-r7-add-ext", "rrc.physicalChannelReconfiguration_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_04,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -103093,7 +103093,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_24", HFILL }},
     { &hf_rrc_physicalChannelReconfigurationComplete_r3_add_ext,
       { "physicalChannelReconfigurationComplete-r3-add-ext", "rrc.physicalChannelReconfigurationComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_08,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -103121,7 +103121,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_25", HFILL }},
     { &hf_rrc_physicalChannelReconfigurationFailure_r3_add_ext,
       { "physicalChannelReconfigurationFailure-r3-add-ext", "rrc.physicalChannelReconfigurationFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_53,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -103141,7 +103141,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_26", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r3_add_ext,
       { "physicalSharedChannelAllocation-r3-add-ext", "rrc.physicalSharedChannelAllocation_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_54,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -103153,7 +103153,7 @@ void proto_register_rrc(void) {
         "rrc.T_later_than_r3_11", HFILL }},
     { &hf_rrc_dsch_RNTI,
       { "dsch-RNTI", "rrc.dsch_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.DSCH_RNTI", HFILL }},
     { &hf_rrc_criticalExtensions_39,
       { "criticalExtensions", "rrc.criticalExtensions",
@@ -103173,7 +103173,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_05", HFILL }},
     { &hf_rrc_physicalSharedChannelAllocation_r4_add_ext,
       { "physicalSharedChannelAllocation-r4-add-ext", "rrc.physicalSharedChannelAllocation_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_15,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -103225,7 +103225,7 @@ void proto_register_rrc(void) {
         "rrc.TimeslotList", HFILL }},
     { &hf_rrc_requestPCCPCHRSCP,
       { "requestPCCPCHRSCP", "rrc.requestPCCPCHRSCP",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_TimingAdvance_02,
       { "ul-TimingAdvance", "rrc.ul_TimingAdvance",
@@ -103293,7 +103293,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_27", HFILL }},
     { &hf_rrc_puschCapacityRequest_r3_add_ext,
       { "puschCapacityRequest-r3-add-ext", "rrc.puschCapacityRequest_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_13,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -103333,7 +103333,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_28", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r3_add_ext,
       { "radioBearerReconfiguration-r3-add-ext", "rrc.radioBearerReconfiguration_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_07,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -103401,7 +103401,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_06", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r4_add_ext,
       { "radioBearerReconfiguration-r4-add-ext", "rrc.radioBearerReconfiguration_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_15,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -103437,7 +103437,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r5_add_ext,
       { "radioBearerReconfiguration-r5-add-ext", "rrc.radioBearerReconfiguration_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_08,
       { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
@@ -103469,7 +103469,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerReconfiguration_r6_add_ext,
       { "radioBearerReconfiguration-r6-add-ext", "rrc.radioBearerReconfiguration_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_07,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -103717,7 +103717,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_29", HFILL }},
     { &hf_rrc_radioBearerReconfigurationComplete_r3_add_ext,
       { "radioBearerReconfigurationComplete-r3-add-ext", "rrc.radioBearerReconfigurationComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_14,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -103745,7 +103745,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_30", HFILL }},
     { &hf_rrc_radioBearerReconfigurationFailure_r3_add_ext,
       { "radioBearerReconfigurationFailure-r3-add-ext", "rrc.radioBearerReconfigurationFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_64,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -103773,7 +103773,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_31", HFILL }},
     { &hf_rrc_radioBearerRelease_r3_add_ext,
       { "radioBearerRelease-r3-add-ext", "rrc.radioBearerRelease_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_08,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -103833,7 +103833,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_07", HFILL }},
     { &hf_rrc_radioBearerRelease_r4_add_ext,
       { "radioBearerRelease-r4-add-ext", "rrc.radioBearerRelease_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_17,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -103865,7 +103865,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerRelease_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r5_add_ext,
       { "radioBearerRelease-r5-add-ext", "rrc.radioBearerRelease_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_21,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -103893,7 +103893,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerRelease_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r6_add_ext,
       { "radioBearerRelease-r6-add-ext", "rrc.radioBearerRelease_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_08,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -103925,7 +103925,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerRelease_r7_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r7_add_ext,
       { "radioBearerRelease-r7-add-ext", "rrc.radioBearerRelease_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_06,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -103953,7 +103953,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerRelease_r8_IEs", HFILL }},
     { &hf_rrc_radioBearerRelease_r8_add_ext,
       { "radioBearerRelease-r8-add-ext", "rrc.radioBearerRelease_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_70,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -104029,7 +104029,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_32", HFILL }},
     { &hf_rrc_radioBearerReleaseComplete_r3_add_ext,
       { "radioBearerReleaseComplete-r3-add-ext", "rrc.radioBearerReleaseComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_19,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -104053,7 +104053,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_33", HFILL }},
     { &hf_rrc_radioBearerReleaseFailure_r3_add_ext,
       { "radioBearerReleaseFailure-r3-add-ext", "rrc.radioBearerReleaseFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_72,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -104081,7 +104081,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_34", HFILL }},
     { &hf_rrc_radioBearerSetup_r3_add_ext,
       { "radioBearerSetup-r3-add-ext", "rrc.radioBearerSetup_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_09,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -104141,7 +104141,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_08", HFILL }},
     { &hf_rrc_radioBearerSetup_r4_add_ext,
       { "radioBearerSetup-r4-add-ext", "rrc.radioBearerSetup_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_19,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -104173,7 +104173,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerSetup_r5_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r5_add_ext,
       { "radioBearerSetup-r5-add-ext", "rrc.radioBearerSetup_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v5d0NonCriticalExtenstions_11,
       { "v5d0NonCriticalExtenstions", "rrc.v5d0NonCriticalExtenstions",
@@ -104201,7 +104201,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerSetup_r6_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r6_add_ext,
       { "radioBearerSetup-r6-add-ext", "rrc.radioBearerSetup_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_09,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -104229,7 +104229,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerSetup_r7_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r7_add_ext,
       { "radioBearerSetup-r7-add-ext", "rrc.radioBearerSetup_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_07,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -104265,7 +104265,7 @@ void proto_register_rrc(void) {
         "rrc.RadioBearerSetup_r8_IEs", HFILL }},
     { &hf_rrc_radioBearerSetup_r8_add_ext,
       { "radioBearerSetup-r8-add-ext", "rrc.radioBearerSetup_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_78,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -104393,7 +104393,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_35", HFILL }},
     { &hf_rrc_radioBearerSetupComplete_r3_add_ext,
       { "radioBearerSetupComplete-r3-add-ext", "rrc.radioBearerSetupComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_20,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -104417,7 +104417,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_36", HFILL }},
     { &hf_rrc_radioBearerSetupFailure_r3_add_ext,
       { "radioBearerSetupFailure-r3-add-ext", "rrc.radioBearerSetupFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_80,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -104437,7 +104437,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_37", HFILL }},
     { &hf_rrc_rrcConnectionReject_r3_add_ext,
       { "rrcConnectionReject-r3-add-ext", "rrc.rrcConnectionReject_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_25,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104501,7 +104501,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_38", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r3_add_ext,
       { "rrcConnectionRelease-r3-add-ext", "rrc.rrcConnectionRelease_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_26,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104545,7 +104545,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_09", HFILL }},
     { &hf_rrc_rrcConnectionRelease_r4_add_ext,
       { "rrcConnectionRelease-r4-add-ext", "rrc.rrcConnectionRelease_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_27,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104597,7 +104597,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_39", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r3_add_ext,
       { "rrcConnectionRelease-CCCH-r3-add-ext", "rrc.rrcConnectionRelease_CCCH_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_28,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104633,7 +104633,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_10", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r4_add_ext,
       { "rrcConnectionRelease-CCCH-r4-add-ext", "rrc.rrcConnectionRelease_CCCH_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_29,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104669,7 +104669,7 @@ void proto_register_rrc(void) {
         "rrc.RRCConnectionRelease_CCCH_r5_IEs", HFILL }},
     { &hf_rrc_rrcConnectionRelease_CCCH_r5_add_ext,
       { "rrcConnectionRelease-CCCH-r5-add-ext", "rrc.rrcConnectionRelease_CCCH_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_30,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104701,7 +104701,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_40", HFILL }},
     { &hf_rrc_rrcConnectionReleaseComplete_r3_add_ext,
       { "rrcConnectionReleaseComplete-r3-add-ext", "rrc.rrcConnectionReleaseComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_87,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -104773,11 +104773,11 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_88", HFILL }},
     { &hf_rrc_uESpecificBehaviourInformation1idle,
       { "uESpecificBehaviourInformation1idle", "rrc.uESpecificBehaviourInformation1idle",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UESpecificBehaviourInformation1idle", HFILL }},
     { &hf_rrc_predefinedConfigStatusInfo,
       { "predefinedConfigStatusInfo", "rrc.predefinedConfigStatusInfo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ueCapabilityIndication,
       { "ueCapabilityIndication", "rrc.ueCapabilityIndication",
@@ -104829,7 +104829,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_41", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r3_add_ext,
       { "rrcConnectionSetup-r3-add-ext", "rrc.rrcConnectionSetup_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_11,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -104881,7 +104881,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_11", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r4_add_ext,
       { "rrcConnectionSetup-r4-add-ext", "rrc.rrcConnectionSetup_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_22,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -104909,7 +104909,7 @@ void proto_register_rrc(void) {
         "rrc.RRCConnectionSetup_r5_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r5_add_ext,
       { "rrcConnectionSetup-r5-add-ext", "rrc.rrcConnectionSetup_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_34,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -104933,7 +104933,7 @@ void proto_register_rrc(void) {
         "rrc.RRCConnectionSetup_r6_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r6_add_ext,
       { "rrcConnectionSetup-r6-add-ext", "rrc.rrcConnectionSetup_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_11,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -104961,7 +104961,7 @@ void proto_register_rrc(void) {
         "rrc.RRCConnectionSetup_r7_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r7_add_ext,
       { "rrcConnectionSetup-r7-add-ext", "rrc.rrcConnectionSetup_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_08,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -104989,7 +104989,7 @@ void proto_register_rrc(void) {
         "rrc.RRCConnectionSetup_r8_IEs", HFILL }},
     { &hf_rrc_rrcConnectionSetup_r8_add_ext,
       { "rrcConnectionSetup-r8-add-ext", "rrc.rrcConnectionSetup_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_94,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105001,7 +105001,7 @@ void proto_register_rrc(void) {
         "rrc.T_criticalExtensions_71", HFILL }},
     { &hf_rrc_new_c_RNTI,
       { "new-c-RNTI", "rrc.new_c_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.C_RNTI", HFILL }},
     { &hf_rrc_capabilityUpdateRequirement,
       { "capabilityUpdateRequirement", "rrc.capabilityUpdateRequirement",
@@ -105169,7 +105169,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_42", HFILL }},
     { &hf_rrc_rrcConnectionSetupComplete_r3_add_ext,
       { "rrcConnectionSetupComplete-r3-add-ext", "rrc.rrcConnectionSetupComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_rrcConnectionSetupComplete_r3_add_ext", HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions_01,
       { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
@@ -105265,7 +105265,7 @@ void proto_register_rrc(void) {
         "rrc.UE_RadioAccessCapability_v680ext", HFILL }},
     { &hf_rrc_ueCapabilityContainer,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer", HFILL }},
     { &hf_rrc_deferredMeasurementControlReading_04,
       { "deferredMeasurementControlReading", "rrc.deferredMeasurementControlReading",
@@ -105285,7 +105285,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_43", HFILL }},
     { &hf_rrc_rrc_FailureInfo_r3_add_ext,
       { "rrc-FailureInfo-r3-add-ext", "rrc.rrc_FailureInfo_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_97,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105309,7 +105309,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_44", HFILL }},
     { &hf_rrc_rrcStatus_r3_add_ext,
       { "rrcStatus-r3-add-ext", "rrc.rrcStatus_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_98,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105329,7 +105329,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_45", HFILL }},
     { &hf_rrc_securityModeCommand_r3_add_ext,
       { "securityModeCommand-r3-add-ext", "rrc.securityModeCommand_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_99,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105353,7 +105353,7 @@ void proto_register_rrc(void) {
         "rrc.SecurityModeCommand_r7_IEs", HFILL }},
     { &hf_rrc_securityModeCommand_r7_add_ext,
       { "securityModeCommand-r7-add-ext", "rrc.securityModeCommand_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_100,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105381,7 +105381,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_46", HFILL }},
     { &hf_rrc_securityModeComplete_r3_add_ext,
       { "securityModeComplete-r3-add-ext", "rrc.securityModeComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_101,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105393,7 +105393,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_47", HFILL }},
     { &hf_rrc_securityModeFailure_r3_add_ext,
       { "securityModeFailure-r3-add-ext", "rrc.securityModeFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_102,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105413,7 +105413,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_48", HFILL }},
     { &hf_rrc_signallingConnectionRelease_r3_add_ext,
       { "signallingConnectionRelease-r3-add-ext", "rrc.signallingConnectionRelease_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_103,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105433,7 +105433,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_49", HFILL }},
     { &hf_rrc_signallingConnectionReleaseIndication_r3_add_ext,
       { "signallingConnectionReleaseIndication-r3-add-ext", "rrc.signallingConnectionReleaseIndication_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_104,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105525,11 +105525,11 @@ void proto_register_rrc(void) {
         "rrc.SegCount", HFILL }},
     { &hf_rrc_sib_Data_fixed,
       { "sib-Data-fixed", "rrc.sib_Data_fixed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.SIB_Data_fixed", HFILL }},
     { &hf_rrc_sib_Data_variable,
       { "sib-Data-variable", "rrc.sib_Data_variable",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.SIB_Data_variable", HFILL }},
     { &hf_rrc_segmentIndex,
       { "segmentIndex", "rrc.segmentIndex",
@@ -105541,7 +105541,7 @@ void proto_register_rrc(void) {
         "rrc.CompleteSIBshort", HFILL }},
     { &hf_rrc_sib_Data_fixed_01,
       { "sib-Data-fixed", "rrc.sib_Data_fixed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_226", HFILL }},
     { &hf_rrc_laterNonCriticalExtensions_50,
       { "laterNonCriticalExtensions", "rrc.laterNonCriticalExtensions",
@@ -105549,7 +105549,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_50", HFILL }},
     { &hf_rrc_systemInformationChangeIndication_r3_add_ext,
       { "systemInformationChangeIndication-r3-add-ext", "rrc.systemInformationChangeIndication_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_105,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105577,7 +105577,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_51", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r3_add_ext,
       { "transportChannelReconfiguration-r3-add-ext", "rrc.transportChannelReconfiguration_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_13,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -105637,7 +105637,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_12", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r4_add_ext,
       { "transportChannelReconfiguration-r4-add-ext", "rrc.transportChannelReconfiguration_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_25,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -105669,7 +105669,7 @@ void proto_register_rrc(void) {
         "rrc.TransportChannelReconfiguration_r5_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r5_add_ext,
       { "transportChannelReconfiguration-r5-add-ext", "rrc.transportChannelReconfiguration_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_38,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -105697,7 +105697,7 @@ void proto_register_rrc(void) {
         "rrc.TransportChannelReconfiguration_r6_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r6_add_ext,
       { "transportChannelReconfiguration-r6-add-ext", "rrc.transportChannelReconfiguration_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_12,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -105729,7 +105729,7 @@ void proto_register_rrc(void) {
         "rrc.TransportChannelReconfiguration_r7_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r7_add_ext,
       { "transportChannelReconfiguration-r7-add-ext", "rrc.transportChannelReconfiguration_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v780NonCriticalExtensions_09,
       { "v780NonCriticalExtensions", "rrc.v780NonCriticalExtensions",
@@ -105757,7 +105757,7 @@ void proto_register_rrc(void) {
         "rrc.TransportChannelReconfiguration_r8_IEs", HFILL }},
     { &hf_rrc_transportChannelReconfiguration_r8_add_ext,
       { "transportChannelReconfiguration-r8-add-ext", "rrc.transportChannelReconfiguration_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_111,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105833,7 +105833,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_52", HFILL }},
     { &hf_rrc_transportChannelReconfigurationComplete_r3_add_ext,
       { "transportChannelReconfigurationComplete-r3-add-ext", "rrc.transportChannelReconfigurationComplete_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_29,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -105857,7 +105857,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_53", HFILL }},
     { &hf_rrc_transportChannelReconfigurationFailure_r3_add_ext,
       { "transportChannelReconfigurationFailure-r3-add-ext", "rrc.transportChannelReconfigurationFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_113,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105897,7 +105897,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_54", HFILL }},
     { &hf_rrc_transportFormatCombinationControl_r3_add_ext,
       { "transportFormatCombinationControl-r3-add-ext", "rrc.transportFormatCombinationControl_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_02,
       { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
@@ -105921,7 +105921,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_55", HFILL }},
     { &hf_rrc_transportFormatCombinationControlFailure_r3_add_ext,
       { "transportFormatCombinationControlFailure-r3-add-ext", "rrc.transportFormatCombinationControlFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_115,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -105941,7 +105941,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_56", HFILL }},
     { &hf_rrc_ueCapabilityEnquiry_r3_add_ext,
       { "ueCapabilityEnquiry-r3-add-ext", "rrc.ueCapabilityEnquiry_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_14,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -106013,7 +106013,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_57", HFILL }},
     { &hf_rrc_ueCapabilityInformation_r3_add_ext,
       { "ueCapabilityInformation-r3-add-ext", "rrc.ueCapabilityInformation_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityInformation_r3_add_ext", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_15,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -106069,7 +106069,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_118", HFILL }},
     { &hf_rrc_ueCapabilityContainer_01,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_01", HFILL }},
     { &hf_rrc_r3_26,
       { "r3", "rrc.r3",
@@ -106085,7 +106085,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_58", HFILL }},
     { &hf_rrc_ueCapabilityInformationConfirm_r3_add_ext,
       { "ueCapabilityInformationConfirm-r3-add-ext", "rrc.ueCapabilityInformationConfirm_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_31,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -106117,7 +106117,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_59", HFILL }},
     { &hf_rrc_uplinkDirectTransfer_r3_add_ext,
       { "uplinkDirectTransfer-r3-add-ext", "rrc.uplinkDirectTransfer_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_40,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106145,7 +106145,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_60", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r3_add_ext,
       { "uplinkPhysicalChannelControl-r3-add-ext", "rrc.uplinkPhysicalChannelControl_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v4b0NonCriticalExtensions_16,
       { "v4b0NonCriticalExtensions", "rrc.v4b0NonCriticalExtensions",
@@ -106181,7 +106181,7 @@ void proto_register_rrc(void) {
         "rrc.T_v4d0NonCriticalExtensions_13", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r4_add_ext,
       { "uplinkPhysicalChannelControl-r4-add-ext", "rrc.uplinkPhysicalChannelControl_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_41,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106209,7 +106209,7 @@ void proto_register_rrc(void) {
         "rrc.UplinkPhysicalChannelControl_r5_IEs", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r5_add_ext,
       { "uplinkPhysicalChannelControl-r5-add-ext", "rrc.uplinkPhysicalChannelControl_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_42,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106241,7 +106241,7 @@ void proto_register_rrc(void) {
         "rrc.UplinkPhysicalChannelControl_r7_IEs", HFILL }},
     { &hf_rrc_uplinkPhysicalChannelControl_r7_add_ext,
       { "uplinkPhysicalChannelControl-r7-add-ext", "rrc.uplinkPhysicalChannelControl_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_123,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -106373,7 +106373,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_61", HFILL }},
     { &hf_rrc_uraUpdate_r3_add_ext,
       { "uraUpdate-r3-add-ext", "rrc.uraUpdate_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtensions_32,
       { "v770NonCriticalExtensions", "rrc.v770NonCriticalExtensions",
@@ -106409,7 +106409,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_62", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r3_add_ext,
       { "uraUpdateConfirm-r3-add-ext", "rrc.uraUpdateConfirm_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_43,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106461,7 +106461,7 @@ void proto_register_rrc(void) {
         "rrc.URAUpdateConfirm_r7_IEs", HFILL }},
     { &hf_rrc_uraUpdateConfirm_r7_add_ext,
       { "uraUpdateConfirm-r7-add-ext", "rrc.uraUpdateConfirm_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_127,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -106485,7 +106485,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_63", HFILL }},
     { &hf_rrc_uraUpdateConfirm_CCCH_r3_add_ext,
       { "uraUpdateConfirm-CCCH-r3-add-ext", "rrc.uraUpdateConfirm_CCCH_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_45,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106529,7 +106529,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_64", HFILL }},
     { &hf_rrc_utranMobilityInformation_r3_add_ext,
       { "utranMobilityInformation-r3-add-ext", "rrc.utranMobilityInformation_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v690NonCriticalExtensions_46,
       { "v690NonCriticalExtensions", "rrc.v690NonCriticalExtensions",
@@ -106581,7 +106581,7 @@ void proto_register_rrc(void) {
         "rrc.UTRANMobilityInformation_r7_IEs", HFILL }},
     { &hf_rrc_utranMobilityInformation_r7_add_ext,
       { "utranMobilityInformation-r7-add-ext", "rrc.utranMobilityInformation_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_131,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -106617,7 +106617,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_65", HFILL }},
     { &hf_rrc_utranMobilityInformationConfirm_r3_add_ext,
       { "utranMobilityInformationConfirm-r3-add-ext", "rrc.utranMobilityInformationConfirm_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v770NonCriticalExtension_01,
       { "v770NonCriticalExtension", "rrc.v770NonCriticalExtension",
@@ -106641,7 +106641,7 @@ void proto_register_rrc(void) {
         "rrc.T_laterNonCriticalExtensions_66", HFILL }},
     { &hf_rrc_utranMobilityInformationFailure_r3_add_ext,
       { "utranMobilityInformationFailure-r3-add-ext", "rrc.utranMobilityInformationFailure_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_134,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -106737,7 +106737,7 @@ void proto_register_rrc(void) {
         "rrc.MBMS_MICHConfigurationInfo_r6", HFILL }},
     { &hf_rrc_cellGroupIdentity,
       { "cellGroupIdentity", "rrc.cellGroupIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.MBMS_CellGroupIdentity_r6", HFILL }},
     { &hf_rrc_mschDefaultConfigurationInfo,
       { "mschDefaultConfigurationInfo", "rrc.mschDefaultConfigurationInfo",
@@ -106765,7 +106765,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_138", HFILL }},
     { &hf_rrc_indicateChangeInSelectedServices,
       { "indicateChangeInSelectedServices", "rrc.indicateChangeInSelectedServices",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_mbmsMICHConfiguration,
       { "mbmsMICHConfiguration", "rrc.mbmsMICHConfiguration",
@@ -106909,7 +106909,7 @@ void proto_register_rrc(void) {
         "rrc.MBMS_UnmodifiedServiceList_v770ext", HFILL }},
     { &hf_rrc_cn_DomainSpecificNAS_Info,
       { "cn-DomainSpecificNAS-Info", "rrc.cn_DomainSpecificNAS_Info",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_SystemInformationGSM_MAP", HFILL }},
     { &hf_rrc_cn_DRX_CycleLengthCoeff,
       { "cn-DRX-CycleLengthCoeff", "rrc.cn_DRX_CycleLengthCoeff",
@@ -106929,11 +106929,11 @@ void proto_register_rrc(void) {
         "rrc.T_cn_Type", HFILL }},
     { &hf_rrc_gsm_MAP,
       { "gsm-MAP", "rrc.gsm_MAP",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_SystemInformationGSM_MAP", HFILL }},
     { &hf_rrc_ansi_41,
       { "ansi-41", "rrc.ansi_41",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_SystemInformationANSI_41", HFILL }},
     { &hf_rrc_CN_DomainSysInfoList_item,
       { "CN-DomainSysInfo", "rrc.CN_DomainSysInfo",
@@ -106941,7 +106941,7 @@ void proto_register_rrc(void) {
         "rrc.CN_DomainSysInfo", HFILL }},
     { &hf_rrc_cn_CommonGSM_MAP_NAS_SysInfo,
       { "cn-CommonGSM-MAP-NAS-SysInfo", "rrc.cn_CommonGSM_MAP_NAS_SysInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_SystemInformationGSM_MAP", HFILL }},
     { &hf_rrc_cn_DomainInformationList,
       { "cn-DomainInformationList", "rrc.cn_DomainInformationList",
@@ -106961,7 +106961,7 @@ void proto_register_rrc(void) {
         "rrc.T_localPTMSI", HFILL }},
     { &hf_rrc_routingparameter,
       { "routingparameter", "rrc.routingparameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.RoutingParameter", HFILL }},
     { &hf_rrc_tMSIofsamePLMN,
       { "tMSIofsamePLMN", "rrc.tMSIofsamePLMN",
@@ -106993,7 +106993,7 @@ void proto_register_rrc(void) {
         "rrc.T_spare1", HFILL }},
     { &hf_rrc_dummy_23,
       { "dummy", "rrc.dummy",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_IMEI_item,
       { "IMEI-Digit", "rrc.IMEI_Digit",
@@ -107021,7 +107021,7 @@ void proto_register_rrc(void) {
         "rrc.Gsm_map_IDNNS", HFILL }},
     { &hf_rrc_ansi_41_IDNNS,
       { "ansi-41-IDNNS", "rrc.ansi_41_IDNNS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.Ansi_41_IDNNS", HFILL }},
     { &hf_rrc_later,
       { "later", "rrc.later",
@@ -107029,11 +107029,11 @@ void proto_register_rrc(void) {
         "rrc.T_later", HFILL }},
     { &hf_rrc_futurecoding,
       { "futurecoding", "rrc.futurecoding",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_15", HFILL }},
     { &hf_rrc_lac,
       { "lac", "rrc.lac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_MCC_item,
       { "Digit", "rrc.Digit",
@@ -107045,7 +107045,7 @@ void proto_register_rrc(void) {
         "rrc.Digit", HFILL }},
     { &hf_rrc_mibPLMN_Identity,
       { "mibPLMN-Identity", "rrc.mibPLMN_Identity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_multiplePLMNs,
       { "multiplePLMNs", "rrc.multiplePLMNs",
@@ -107073,19 +107073,19 @@ void proto_register_rrc(void) {
         "rrc.T_ansi_41", HFILL }},
     { &hf_rrc_p_REV,
       { "p-REV", "rrc.p_REV",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.P_REV", HFILL }},
     { &hf_rrc_min_P_REV,
       { "min-P-REV", "rrc.min_P_REV",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.Min_P_REV", HFILL }},
     { &hf_rrc_sid,
       { "sid", "rrc.sid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.SID", HFILL }},
     { &hf_rrc_nid,
       { "nid", "rrc.nid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NID", HFILL }},
     { &hf_rrc_gsm_MAP_and_ANSI_41,
       { "gsm-MAP-and-ANSI-41", "rrc.gsm_MAP_and_ANSI_41",
@@ -107093,11 +107093,11 @@ void proto_register_rrc(void) {
         "rrc.T_gsm_MAP_and_ANSI_41", HFILL }},
     { &hf_rrc_gsm_MAP_RAB_Identity,
       { "gsm-MAP-RAB-Identity", "rrc.gsm_MAP_RAB_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_ansi_41_RAB_Identity,
       { "ansi-41-RAB-Identity", "rrc.ansi_41_RAB_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_lai,
       { "lai", "rrc.lai",
@@ -107105,7 +107105,7 @@ void proto_register_rrc(void) {
         "rrc.LAI", HFILL }},
     { &hf_rrc_rac,
       { "rac", "rrc.rac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.RoutingAreaCode", HFILL }},
     { &hf_rrc_AccessClassBarredList_item,
       { "AccessClassBarred", "rrc.AccessClassBarred",
@@ -107145,7 +107145,7 @@ void proto_register_rrc(void) {
         "rrc.NULL", HFILL }},
     { &hf_rrc_CellIdentity_PerRL_List_item,
       { "CellIdentity", "rrc.CellIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.CellIdentity", HFILL }},
     { &hf_rrc_mappingInfo,
       { "mappingInfo", "rrc.mappingInfo",
@@ -107341,7 +107341,7 @@ void proto_register_rrc(void) {
         "rrc.RAT_TDD_Info", HFILL }},
     { &hf_rrc_URA_IdentityList_item,
       { "URA-Identity", "rrc.URA_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.URA_Identity", HFILL }},
     { &hf_rrc_n_AP_RetransMax,
       { "n-AP-RetransMax", "rrc.n_AP_RetransMax",
@@ -107373,11 +107373,11 @@ void proto_register_rrc(void) {
         "rrc.T_CPCH", HFILL }},
     { &hf_rrc_ue_RadioCapabilityFDDUpdateRequirement,
       { "ue-RadioCapabilityFDDUpdateRequirement", "rrc.ue_RadioCapabilityFDDUpdateRequirement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement,
       { "ue-RadioCapabilityTDDUpdateRequirement", "rrc.ue_RadioCapabilityTDDUpdateRequirement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_systemSpecificCapUpdateReqList,
       { "systemSpecificCapUpdateReqList", "rrc.systemSpecificCapUpdateReqList",
@@ -107385,19 +107385,19 @@ void proto_register_rrc(void) {
         "rrc.SystemSpecificCapUpdateReqList", HFILL }},
     { &hf_rrc_ue_RadioCapabilityUpdateRequirement_TDD128,
       { "ue-RadioCapabilityUpdateRequirement-TDD128", "rrc.ue_RadioCapabilityUpdateRequirement_TDD128",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_RadioCapabilityFDDUpdateRequirement_FDD,
       { "ue-RadioCapabilityFDDUpdateRequirement-FDD", "rrc.ue_RadioCapabilityFDDUpdateRequirement_FDD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD384,
       { "ue-RadioCapabilityTDDUpdateRequirement-TDD384", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD384",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD128,
       { "ue-RadioCapabilityTDDUpdateRequirement-TDD128", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD128",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_systemSpecificCapUpdateReqList_01,
       { "systemSpecificCapUpdateReqList", "rrc.systemSpecificCapUpdateReqList",
@@ -107405,7 +107405,7 @@ void proto_register_rrc(void) {
         "rrc.SystemSpecificCapUpdateReqList_r5", HFILL }},
     { &hf_rrc_ue_RadioCapabilityTDDUpdateRequirement_TDD768,
       { "ue-RadioCapabilityTDDUpdateRequirement-TDD768", "rrc.ue_RadioCapabilityTDDUpdateRequirement_TDD768",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_startRestart,
       { "startRestart", "rrc.startRestart",
@@ -107437,27 +107437,27 @@ void proto_register_rrc(void) {
         "rrc.IMSI_GSM_MAP", HFILL }},
     { &hf_rrc_tmsi_GSM_MAP,
       { "tmsi-GSM-MAP", "rrc.tmsi_GSM_MAP",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_p_TMSI_GSM_MAP,
       { "p-TMSI-GSM-MAP", "rrc.p_TMSI_GSM_MAP",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.P_TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_imsi_DS_41,
       { "imsi-DS-41", "rrc.imsi_DS_41",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.IMSI_DS_41", HFILL }},
     { &hf_rrc_tmsi_DS_41,
       { "tmsi-DS-41", "rrc.tmsi_DS_41",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.TMSI_DS_41", HFILL }},
     { &hf_rrc_fdd_Measurements,
       { "fdd-Measurements", "rrc.fdd_Measurements",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_Measurements,
       { "tdd-Measurements", "rrc.tdd_Measurements",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_gsm_Measurements,
       { "gsm-Measurements", "rrc.gsm_Measurements",
@@ -107465,11 +107465,11 @@ void proto_register_rrc(void) {
         "rrc.GSM_Measurements", HFILL }},
     { &hf_rrc_multiCarrierMeasurements,
       { "multiCarrierMeasurements", "rrc.multiCarrierMeasurements",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd128_Measurements,
       { "tdd128-Measurements", "rrc.tdd128_Measurements",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_CompressedModeMeasCapabFDDList_item,
       { "CompressedModeMeasCapabFDD", "rrc.CompressedModeMeasCapabFDD",
@@ -107489,11 +107489,11 @@ void proto_register_rrc(void) {
         "rrc.RadioFrequencyBandFDD", HFILL }},
     { &hf_rrc_dl_MeasurementsFDD,
       { "dl-MeasurementsFDD", "rrc.dl_MeasurementsFDD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_MeasurementsFDD,
       { "ul-MeasurementsFDD", "rrc.ul_MeasurementsFDD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_radioFrequencyBandFDD2,
       { "radioFrequencyBandFDD2", "rrc.radioFrequencyBandFDD2",
@@ -107509,11 +107509,11 @@ void proto_register_rrc(void) {
         "rrc.RadioFrequencyBandTDD", HFILL }},
     { &hf_rrc_dl_MeasurementsTDD,
       { "dl-MeasurementsTDD", "rrc.dl_MeasurementsTDD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_MeasurementsTDD,
       { "ul-MeasurementsTDD", "rrc.ul_MeasurementsTDD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_CompressedModeMeasCapabGSMList_item,
       { "CompressedModeMeasCapabGSM", "rrc.CompressedModeMeasCapabGSM",
@@ -107525,19 +107525,19 @@ void proto_register_rrc(void) {
         "rrc.RadioFrequencyBandGSM", HFILL }},
     { &hf_rrc_dl_MeasurementsGSM,
       { "dl-MeasurementsGSM", "rrc.dl_MeasurementsGSM",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_MeasurementsGSM,
       { "ul-MeasurementsGSM", "rrc.ul_MeasurementsGSM",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dl_MeasurementsMC,
       { "dl-MeasurementsMC", "rrc.dl_MeasurementsMC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_MeasurementsMC,
       { "ul-MeasurementsMC", "rrc.ul_MeasurementsMC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_initialPriorityDelayList,
       { "initialPriorityDelayList", "rrc.initialPriorityDelayList",
@@ -107565,7 +107565,7 @@ void proto_register_rrc(void) {
         "rrc.MaxNoPhysChBitsReceived", HFILL }},
     { &hf_rrc_supportForSF_512,
       { "supportForSF-512", "rrc.supportForSF_512",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dummy2_04,
       { "dummy2", "rrc.dummy2",
@@ -107609,7 +107609,7 @@ void proto_register_rrc(void) {
         "rrc.MinimumSF_DL", HFILL }},
     { &hf_rrc_supportOfPDSCH,
       { "supportOfPDSCH", "rrc.supportOfPDSCH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_maxPhysChPerTS,
       { "maxPhysChPerTS", "rrc.maxPhysChPerTS",
@@ -107625,7 +107625,7 @@ void proto_register_rrc(void) {
         "rrc.MaxPhysChPerSubFrame_r4", HFILL }},
     { &hf_rrc_supportOf8PSK,
       { "supportOf8PSK", "rrc.supportOf8PSK",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_multiCarrier_physical_layer_category,
       { "multiCarrier-physical-layer-category", "rrc.multiCarrier_physical_layer_category",
@@ -107757,19 +107757,19 @@ void proto_register_rrc(void) {
         "rrc.U_RNTI_Group", HFILL }},
     { &hf_rrc_gsm900,
       { "gsm900", "rrc.gsm900",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dcs1800,
       { "dcs1800", "rrc.dcs1800",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_gsm1900,
       { "gsm1900", "rrc.gsm1900",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_esn_DS_41,
       { "esn-DS-41", "rrc.esn_DS_41",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ESN_DS_41", HFILL }},
     { &hf_rrc_InitialPriorityDelayList_item,
       { "NS-IP", "rrc.NS_IP",
@@ -107797,7 +107797,7 @@ void proto_register_rrc(void) {
         "rrc.IMSI_and_ESN_DS_41", HFILL }},
     { &hf_rrc_messageAuthenticationCode,
       { "messageAuthenticationCode", "rrc.messageAuthenticationCode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.MessageAuthenticationCode", HFILL }},
     { &hf_rrc_rrc_MessageSequenceNumber,
       { "rrc-MessageSequenceNumber", "rrc.rrc_MessageSequenceNumber",
@@ -107813,7 +107813,7 @@ void proto_register_rrc(void) {
         "rrc.T_startIntegrityProtection", HFILL }},
     { &hf_rrc_integrityProtInitNumber,
       { "integrityProtInitNumber", "rrc.integrityProtInitNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.IntegrityProtInitNumber", HFILL }},
     { &hf_rrc_modify,
       { "modify", "rrc.modify",
@@ -107873,15 +107873,15 @@ void proto_register_rrc(void) {
         "rrc.CompressedModeMeasCapability_LCR_r4", HFILL }},
     { &hf_rrc_supportOfGSM,
       { "supportOfGSM", "rrc.supportOfGSM",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportOfMulticarrier,
       { "supportOfMulticarrier", "rrc.supportOfMulticarrier",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportOfUTRAN_ToGERAN_NACC,
       { "supportOfUTRAN-ToGERAN-NACC", "rrc.supportOfUTRAN_ToGERAN_NACC",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportOfHandoverToGAN,
       { "supportOfHandoverToGAN", "rrc.supportOfHandoverToGAN",
@@ -107909,15 +107909,15 @@ void proto_register_rrc(void) {
         "rrc.GANSS_Signal_Id", HFILL }},
     { &hf_rrc_supportForUE_GANSS_TimingOfCellFrames,
       { "supportForUE-GANSS-TimingOfCellFrames", "rrc.supportForUE_GANSS_TimingOfCellFrames",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportForUE_GANSS_CarrierPhaseMeasurement,
       { "supportForUE-GANSS-CarrierPhaseMeasurement", "rrc.supportForUE_GANSS_CarrierPhaseMeasurement",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_p_TMSI,
       { "p-TMSI", "rrc.p_TMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.P_TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_rai,
       { "rai", "rrc.rai",
@@ -107965,7 +107965,7 @@ void proto_register_rrc(void) {
         "rrc.PagingRecord2_r5", HFILL }},
     { &hf_rrc_losslessSRNS_RelocationSupport,
       { "losslessSRNS-RelocationSupport", "rrc.losslessSRNS_RelocationSupport",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportForRfc2507,
       { "supportForRfc2507", "rrc.supportForRfc2507",
@@ -107997,7 +107997,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_65535", HFILL }},
     { &hf_rrc_supportForRfc3095ContextRelocation,
       { "supportForRfc3095ContextRelocation", "rrc.supportForRfc3095ContextRelocation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_maxHcContextSpace,
       { "maxHcContextSpace", "rrc.maxHcContextSpace",
@@ -108121,7 +108121,7 @@ void proto_register_rrc(void) {
         "rrc.HSDSCH_physical_layer_category", HFILL }},
     { &hf_rrc_dummy2_05,
       { "dummy2", "rrc.dummy2",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd384_hspdsch,
       { "tdd384-hspdsch", "rrc.tdd384_hspdsch",
@@ -108181,11 +108181,11 @@ void proto_register_rrc(void) {
         "rrc.IdentificationOfReceivedMessage", HFILL }},
     { &hf_rrc_t314_expired,
       { "t314-expired", "rrc.t314_expired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_t315_expired,
       { "t315-expired", "rrc.t315_expired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_interRATInfo,
       { "interRATInfo", "rrc.interRATInfo",
@@ -108261,7 +108261,7 @@ void proto_register_rrc(void) {
         "rrc.TotalRLC_AM_BufferSize_r5_ext", HFILL }},
     { &hf_rrc_supportOfTwoLogicalChannel,
       { "supportOfTwoLogicalChannel", "rrc.supportOfTwoLogicalChannel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_noRelease,
       { "noRelease", "rrc.noRelease",
@@ -108277,11 +108277,11 @@ void proto_register_rrc(void) {
         "rrc.RRC_MessageSequenceNumber", HFILL }},
     { &hf_rrc_cipheringAlgorithmCap,
       { "cipheringAlgorithmCap", "rrc.cipheringAlgorithmCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_cipheringAlgorithmCap", HFILL }},
     { &hf_rrc_integrityProtectionAlgorithmCap,
       { "integrityProtectionAlgorithmCap", "rrc.integrityProtectionAlgorithmCap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_integrityProtectionAlgorithmCap", HFILL }},
     { &hf_rrc_deltaACK,
       { "deltaACK", "rrc.deltaACK",
@@ -108317,7 +108317,7 @@ void proto_register_rrc(void) {
         "rrc.MaxNoSCCPCH_RL", HFILL }},
     { &hf_rrc_simultaneousSCCPCH_DPCH_DPDCH_Reception,
       { "simultaneousSCCPCH-DPCH-DPDCH-Reception", "rrc.simultaneousSCCPCH_DPCH_DPDCH_Reception",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_STARTList_item,
       { "STARTSingle", "rrc.STARTSingle",
@@ -108333,7 +108333,7 @@ void proto_register_rrc(void) {
         "rrc.SystemSpecificCapUpdateReq_r5", HFILL }},
     { &hf_rrc_tmsi,
       { "tmsi", "rrc.tmsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.TMSI_GSM_MAP", HFILL }},
     { &hf_rrc_dl_TransChCapability,
       { "dl-TransChCapability", "rrc.dl_TransChCapability",
@@ -108349,11 +108349,11 @@ void proto_register_rrc(void) {
         "rrc.MaxNoBits", HFILL }},
     { &hf_rrc_srnc_Identity,
       { "srnc-Identity", "rrc.srnc_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.SRNC_Identity", HFILL }},
     { &hf_rrc_s_RNTI,
       { "s-RNTI", "rrc.s_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.S_RNTI", HFILL }},
     { &hf_rrc_all,
       { "all", "rrc.all",
@@ -108361,131 +108361,131 @@ void proto_register_rrc(void) {
         "rrc.NULL", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b1,
       { "u-RNTI-BitMaskIndex-b1", "rrc.u_RNTI_BitMaskIndex_b1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_31", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b2,
       { "u-RNTI-BitMaskIndex-b2", "rrc.u_RNTI_BitMaskIndex_b2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_30", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b3,
       { "u-RNTI-BitMaskIndex-b3", "rrc.u_RNTI_BitMaskIndex_b3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_29", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b4,
       { "u-RNTI-BitMaskIndex-b4", "rrc.u_RNTI_BitMaskIndex_b4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_28", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b5,
       { "u-RNTI-BitMaskIndex-b5", "rrc.u_RNTI_BitMaskIndex_b5",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_27", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b6,
       { "u-RNTI-BitMaskIndex-b6", "rrc.u_RNTI_BitMaskIndex_b6",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_26", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b7,
       { "u-RNTI-BitMaskIndex-b7", "rrc.u_RNTI_BitMaskIndex_b7",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_25", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b8,
       { "u-RNTI-BitMaskIndex-b8", "rrc.u_RNTI_BitMaskIndex_b8",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b9,
       { "u-RNTI-BitMaskIndex-b9", "rrc.u_RNTI_BitMaskIndex_b9",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_23", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b10,
       { "u-RNTI-BitMaskIndex-b10", "rrc.u_RNTI_BitMaskIndex_b10",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_22", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b11,
       { "u-RNTI-BitMaskIndex-b11", "rrc.u_RNTI_BitMaskIndex_b11",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_21", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b12,
       { "u-RNTI-BitMaskIndex-b12", "rrc.u_RNTI_BitMaskIndex_b12",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_20", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b13,
       { "u-RNTI-BitMaskIndex-b13", "rrc.u_RNTI_BitMaskIndex_b13",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_19", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b14,
       { "u-RNTI-BitMaskIndex-b14", "rrc.u_RNTI_BitMaskIndex_b14",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_18", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b15,
       { "u-RNTI-BitMaskIndex-b15", "rrc.u_RNTI_BitMaskIndex_b15",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_17", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b16,
       { "u-RNTI-BitMaskIndex-b16", "rrc.u_RNTI_BitMaskIndex_b16",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b17,
       { "u-RNTI-BitMaskIndex-b17", "rrc.u_RNTI_BitMaskIndex_b17",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_15", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b18,
       { "u-RNTI-BitMaskIndex-b18", "rrc.u_RNTI_BitMaskIndex_b18",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b19,
       { "u-RNTI-BitMaskIndex-b19", "rrc.u_RNTI_BitMaskIndex_b19",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_13", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b20,
       { "u-RNTI-BitMaskIndex-b20", "rrc.u_RNTI_BitMaskIndex_b20",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b21,
       { "u-RNTI-BitMaskIndex-b21", "rrc.u_RNTI_BitMaskIndex_b21",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b22,
       { "u-RNTI-BitMaskIndex-b22", "rrc.u_RNTI_BitMaskIndex_b22",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b23,
       { "u-RNTI-BitMaskIndex-b23", "rrc.u_RNTI_BitMaskIndex_b23",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_9", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b24,
       { "u-RNTI-BitMaskIndex-b24", "rrc.u_RNTI_BitMaskIndex_b24",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b25,
       { "u-RNTI-BitMaskIndex-b25", "rrc.u_RNTI_BitMaskIndex_b25",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_7", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b26,
       { "u-RNTI-BitMaskIndex-b26", "rrc.u_RNTI_BitMaskIndex_b26",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_6", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b27,
       { "u-RNTI-BitMaskIndex-b27", "rrc.u_RNTI_BitMaskIndex_b27",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b28,
       { "u-RNTI-BitMaskIndex-b28", "rrc.u_RNTI_BitMaskIndex_b28",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b29,
       { "u-RNTI-BitMaskIndex-b29", "rrc.u_RNTI_BitMaskIndex_b29",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b30,
       { "u-RNTI-BitMaskIndex-b30", "rrc.u_RNTI_BitMaskIndex_b30",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_u_RNTI_BitMaskIndex_b31,
       { "u-RNTI-BitMaskIndex-b31", "rrc.u_RNTI_BitMaskIndex_b31",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rrc_s_RNTI_2,
       { "s-RNTI-2", "rrc.s_RNTI_2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.S_RNTI_2", HFILL }},
     { &hf_rrc_ue_RadioAccessCapability_v690ext,
       { "ue-RadioAccessCapability-v690ext", "rrc.ue_RadioAccessCapability_v690ext",
@@ -108785,7 +108785,7 @@ void proto_register_rrc(void) {
         "rrc.MeasurementCapabilityExt2", HFILL }},
     { &hf_rrc_rx_tx_TimeDifferenceType2Capable,
       { "rx-tx-TimeDifferenceType2Capable", "rrc.rx_tx_TimeDifferenceType2Capable",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_validity_CellPCH_UraPCH,
       { "validity-CellPCH-UraPCH", "rrc.validity_CellPCH_UraPCH",
@@ -108841,7 +108841,7 @@ void proto_register_rrc(void) {
         "rrc.MeasurementCapability_r4_ext", HFILL }},
     { &hf_rrc_totalAM_RLCMemoryExceeds10kB,
       { "totalAM-RLCMemoryExceeds10kB", "rrc.totalAM_RLCMemoryExceeds10kB",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rf_CapabilityComp,
       { "rf-CapabilityComp", "rrc.rf_CapabilityComp",
@@ -109001,7 +109001,7 @@ void proto_register_rrc(void) {
         "rrc.MinimumSF_UL", HFILL }},
     { &hf_rrc_supportOfPUSCH,
       { "supportOfPUSCH", "rrc.supportOfPUSCH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd384_edch,
       { "tdd384-edch", "rrc.tdd384_edch",
@@ -109085,11 +109085,11 @@ void proto_register_rrc(void) {
         "rrc.MaxNumberOfTFC_UL", HFILL }},
     { &hf_rrc_standaloneLocMethodsSupported,
       { "standaloneLocMethodsSupported", "rrc.standaloneLocMethodsSupported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_BasedOTDOA_Supported,
       { "ue-BasedOTDOA-Supported", "rrc.ue_BasedOTDOA_Supported",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_networkAssistedGPS_Supported,
       { "networkAssistedGPS-Supported", "rrc.networkAssistedGPS_Supported",
@@ -109097,19 +109097,19 @@ void proto_register_rrc(void) {
         "rrc.NetworkAssistedGPS_Supported", HFILL }},
     { &hf_rrc_supportForUE_GPS_TimingOfCellFrames,
       { "supportForUE-GPS-TimingOfCellFrames", "rrc.supportForUE_GPS_TimingOfCellFrames",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_supportForIPDL,
       { "supportForIPDL", "rrc.supportForIPDL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_start_CS,
       { "start-CS", "rrc.start_CS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.START_Value", HFILL }},
     { &hf_rrc_start_PS,
       { "start-PS", "rrc.start_PS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.START_Value", HFILL }},
     { &hf_rrc_drx_CycleLengthCoefficient,
       { "drx-CycleLengthCoefficient", "rrc.drx_CycleLengthCoefficient",
@@ -109141,7 +109141,7 @@ void proto_register_rrc(void) {
         "rrc.MAC_ehs_QueueId", HFILL }},
     { &hf_rrc_inSequenceDelivery,
       { "inSequenceDelivery", "rrc.inSequenceDelivery",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_receivingWindowSize,
       { "receivingWindowSize", "rrc.receivingWindowSize",
@@ -109249,7 +109249,7 @@ void proto_register_rrc(void) {
         "rrc.TimerEPC", HFILL }},
     { &hf_rrc_missingPDU_Indicator,
       { "missingPDU-Indicator", "rrc.missingPDU_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_timerStatusPeriodic,
       { "timerStatusPeriodic", "rrc.timerStatusPeriodic",
@@ -109257,7 +109257,7 @@ void proto_register_rrc(void) {
         "rrc.TimerStatusPeriodic", HFILL }},
     { &hf_rrc_segmentationIndication,
       { "segmentationIndication", "rrc.segmentationIndication",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dch,
       { "dch", "rrc.dch",
@@ -109397,11 +109397,11 @@ void proto_register_rrc(void) {
         "rrc.Poll_SDU", HFILL }},
     { &hf_rrc_lastTransmissionPDU_Poll,
       { "lastTransmissionPDU-Poll", "rrc.lastTransmissionPDU_Poll",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_lastRetransmissionPDU_Poll,
       { "lastRetransmissionPDU-Poll", "rrc.lastRetransmissionPDU_Poll",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_pollWindow,
       { "pollWindow", "rrc.pollWindow",
@@ -109493,15 +109493,15 @@ void proto_register_rrc(void) {
         "rrc.RAB_Identity", HFILL }},
     { &hf_rrc_nas_Synchronisation_Indicator,
       { "nas-Synchronisation-Indicator", "rrc.nas_Synchronisation_Indicator",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NAS_Synchronisation_Indicator", HFILL }},
     { &hf_rrc_mbms_SessionIdentity,
       { "mbms-SessionIdentity", "rrc.mbms_SessionIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.MBMS_SessionIdentity", HFILL }},
     { &hf_rrc_mbms_ServiceIdentity,
       { "mbms-ServiceIdentity", "rrc.mbms_ServiceIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_rrc_RAB_InformationList_item,
       { "RAB-Info", "rrc.RAB_Info",
@@ -109845,11 +109845,11 @@ void proto_register_rrc(void) {
         "rrc.UL_LogicalChannelMappings_r8", HFILL }},
     { &hf_rrc_dl_RFC3095_Context_Relocation,
       { "dl-RFC3095-Context-Relocation", "rrc.dl_RFC3095_Context_Relocation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_RFC3095_Context_Relocation,
       { "ul-RFC3095-Context-Relocation", "rrc.ul_RFC3095_Context_Relocation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_RB_PDCPContextRelocationList_item,
       { "RB-PDCPContextRelocation", "rrc.RB_PDCPContextRelocation",
@@ -109909,7 +109909,7 @@ void proto_register_rrc(void) {
         "rrc.DL_RLC_Mode_r5", HFILL }},
     { &hf_rrc_rlc_OneSidedReEst,
       { "rlc-OneSidedReEst", "rrc.rlc_OneSidedReEst",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dl_RLC_Mode_02,
       { "dl-RLC-Mode", "rrc.dl_RLC_Mode",
@@ -110101,7 +110101,7 @@ void proto_register_rrc(void) {
         "rrc.RLC_PDU_SizeList", HFILL }},
     { &hf_rrc_includeInSchedulingInfo,
       { "includeInSchedulingInfo", "rrc.includeInSchedulingInfo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_TrCH_Type_01,
       { "ul-TrCH-Type", "rrc.ul_TrCH_Type",
@@ -110133,7 +110133,7 @@ void proto_register_rrc(void) {
         "rrc.RLC_PDU_SizeConstraint", HFILL }},
     { &hf_rrc_rlc_LogicalChannelMappingIndicator,
       { "rlc-LogicalChannelMappingIndicator", "rrc.rlc_LogicalChannelMappingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_LogicalChannelMapping,
       { "ul-LogicalChannelMapping", "rrc.ul_LogicalChannelMapping",
@@ -110661,7 +110661,7 @@ void proto_register_rrc(void) {
         "rrc.E_DCH_MAC_d_FlowMaxRetrans", HFILL }},
     { &hf_rrc_mac_d_FlowMultiplexingList,
       { "mac-d-FlowMultiplexingList", "rrc.mac_d_FlowMultiplexingList",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.E_DCH_MAC_d_FlowMultiplexingList", HFILL }},
     { &hf_rrc_transmissionGrantType,
       { "transmissionGrantType", "rrc.transmissionGrantType",
@@ -110677,7 +110677,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_1_19982", HFILL }},
     { &hf_rrc_ms2_NonSchedTransmGrantHARQAlloc,
       { "ms2-NonSchedTransmGrantHARQAlloc", "rrc.ms2_NonSchedTransmGrantHARQAlloc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_scheduledTransmissionGrantInfo,
       { "scheduledTransmissionGrantInfo", "rrc.scheduledTransmissionGrantInfo",
@@ -110717,7 +110717,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd384_768", HFILL }},
     { &hf_rrc_timeslotResourceRelatedInfo,
       { "timeslotResourceRelatedInfo", "rrc.timeslotResourceRelatedInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_13", HFILL }},
     { &hf_rrc_powerResourceRelatedInfo,
       { "powerResourceRelatedInfo", "rrc.powerResourceRelatedInfo",
@@ -110741,7 +110741,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_1_8", HFILL }},
     { &hf_rrc_timeslotResourceRelatedInfo_01,
       { "timeslotResourceRelatedInfo", "rrc.timeslotResourceRelatedInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_sfnNum,
       { "sfnNum", "rrc.sfnNum",
@@ -111217,7 +111217,7 @@ void proto_register_rrc(void) {
         "rrc.TFCS_IdentityPlain", HFILL }},
     { &hf_rrc_sharedChannelIndicator,
       { "sharedChannelIndicator", "rrc.sharedChannelIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ctfc2bit,
       { "ctfc2bit", "rrc.ctfc2bit",
@@ -111557,11 +111557,11 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_15", HFILL }},
     { &hf_rrc_assignedSubChannelNumber,
       { "assignedSubChannelNumber", "rrc.assignedSubChannelNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_assignedSubChannelNumber", HFILL }},
     { &hf_rrc_channelisationCodeIndices,
       { "channelisationCodeIndices", "rrc.channelisationCodeIndices",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_channelisationCodeIndices", HFILL }},
     { &hf_rrc_subchannelSize,
       { "subchannelSize", "rrc.subchannelSize",
@@ -111585,7 +111585,7 @@ void proto_register_rrc(void) {
         "rrc.T_size4", HFILL }},
     { &hf_rrc_subchannels_01,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_01", HFILL }},
     { &hf_rrc_size8,
       { "size8", "rrc.size8",
@@ -111593,11 +111593,11 @@ void proto_register_rrc(void) {
         "rrc.T_size8", HFILL }},
     { &hf_rrc_subchannels_02,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_02", HFILL }},
     { &hf_rrc_channelisationCodeIndices_01,
       { "channelisationCodeIndices", "rrc.channelisationCodeIndices",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_channelisationCodeIndices_01", HFILL }},
     { &hf_rrc_subchannelSize_01,
       { "subchannelSize", "rrc.subchannelSize",
@@ -111617,7 +111617,7 @@ void proto_register_rrc(void) {
         "rrc.T_size4_01", HFILL }},
     { &hf_rrc_subchannels_04,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_04", HFILL }},
     { &hf_rrc_size8_01,
       { "size8", "rrc.size8",
@@ -111625,7 +111625,7 @@ void proto_register_rrc(void) {
         "rrc.T_size8_01", HFILL }},
     { &hf_rrc_subchannels_05,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_05", HFILL }},
     { &hf_rrc_size16,
       { "size16", "rrc.size16",
@@ -111633,11 +111633,11 @@ void proto_register_rrc(void) {
         "rrc.T_size16", HFILL }},
     { &hf_rrc_subchannels_06,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_06", HFILL }},
     { &hf_rrc_availableSYNC_UlCodesIndics,
       { "availableSYNC-UlCodesIndics", "rrc.availableSYNC_UlCodesIndics",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_availableSYNC_UlCodesIndics", HFILL }},
     { &hf_rrc_subchannelSize_02,
       { "subchannelSize", "rrc.subchannelSize",
@@ -111657,7 +111657,7 @@ void proto_register_rrc(void) {
         "rrc.T_size4_02", HFILL }},
     { &hf_rrc_subchannels_08,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_08", HFILL }},
     { &hf_rrc_size8_02,
       { "size8", "rrc.size8",
@@ -111665,7 +111665,7 @@ void proto_register_rrc(void) {
         "rrc.T_size8_02", HFILL }},
     { &hf_rrc_subchannels_09,
       { "subchannels", "rrc.subchannels",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_subchannels_09", HFILL }},
     { &hf_rrc_dynamicTFInformationCCCH,
       { "dynamicTFInformationCCCH", "rrc.dynamicTFInformationCCCH",
@@ -111685,7 +111685,7 @@ void proto_register_rrc(void) {
         "rrc.ChannelisationCode256", HFILL }},
     { &hf_rrc_sttd_Indicator,
       { "sttd-Indicator", "rrc.sttd_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_aich_TransmissionTiming,
       { "aich-TransmissionTiming", "rrc.aich_TransmissionTiming",
@@ -112053,7 +112053,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd128_11", HFILL }},
     { &hf_rrc_tstd_Indicator,
       { "tstd-Indicator", "rrc.tstd_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_modeSpecificInfo_25,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -112209,7 +112209,7 @@ void proto_register_rrc(void) {
         "rrc.PositionFixedOrFlexible", HFILL }},
     { &hf_rrc_tfci_Existence,
       { "tfci-Existence", "rrc.tfci_Existence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_22,
       { "tdd", "rrc.tdd",
@@ -112237,7 +112237,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd_22", HFILL }},
     { &hf_rrc_mac_d_HFN_initial_value,
       { "mac-d-HFN-initial-value", "rrc.mac_d_HFN_initial_value",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.MAC_d_HFN_initial_value", HFILL }},
     { &hf_rrc_cfnHandling_02,
       { "cfnHandling", "rrc.cfnHandling",
@@ -112605,7 +112605,7 @@ void proto_register_rrc(void) {
         "rrc.SCCPCH_InfoForFACH_r4", HFILL }},
     { &hf_rrc_cell_id,
       { "cell-id", "rrc.cell_id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.CellIdentity", HFILL }},
     { &hf_rrc_modeSpecificInfo_38,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -112617,7 +112617,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_72", HFILL }},
     { &hf_rrc_servingHSDSCH_RL_indicator,
       { "servingHSDSCH-RL-indicator", "rrc.servingHSDSCH_RL_indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dl_DPCH_InfoPerRL_02,
       { "dl-DPCH-InfoPerRL", "rrc.dl_DPCH_InfoPerRL",
@@ -112641,7 +112641,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_74", HFILL }},
     { &hf_rrc_servingEDCH_RL_indicator,
       { "servingEDCH-RL-indicator", "rrc.servingEDCH_RL_indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dl_dpchInfo,
       { "dl-dpchInfo", "rrc.dl_dpchInfo",
@@ -112829,7 +112829,7 @@ void proto_register_rrc(void) {
         "rrc.DL_TS_ChannelisationCode", HFILL }},
     { &hf_rrc_bitmap,
       { "bitmap", "rrc.bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_bitmap", HFILL }},
     { &hf_rrc_codesRepresentation_01,
       { "codesRepresentation", "rrc.codesRepresentation",
@@ -112849,7 +112849,7 @@ void proto_register_rrc(void) {
         "rrc.DL_TS_ChannelisationCode_VHCR", HFILL }},
     { &hf_rrc_bitmap_01,
       { "bitmap", "rrc.bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_bitmap_01", HFILL }},
     { &hf_rrc_parameters,
       { "parameters", "rrc.parameters",
@@ -113049,7 +113049,7 @@ void proto_register_rrc(void) {
         "rrc.UE_GrantMonitoring_InactivityThreshold", HFILL }},
     { &hf_rrc_ue_drx_GrantMonitoring,
       { "ue-drx-GrantMonitoring", "rrc.ue_drx_GrantMonitoring",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_maxTFCI_Field2Value,
       { "maxTFCI-Field2Value", "rrc.maxTFCI_Field2Value",
@@ -113221,7 +113221,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd384_13", HFILL }},
     { &hf_rrc_long_Term_Grant_Indicator,
       { "long-Term-Grant-Indicator", "rrc.long_Term_Grant_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_length_of_TTRI_field,
       { "length-of-TTRI-field", "rrc.length_of_TTRI_field",
@@ -113249,7 +113249,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd128_19", HFILL }},
     { &hf_rrc_rdi_Indicator,
       { "rdi-Indicator", "rrc.rdi_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tpc_StepSize,
       { "tpc-StepSize", "rrc.tpc_StepSize",
@@ -113401,7 +113401,7 @@ void proto_register_rrc(void) {
         "rrc.E_DPDCH_PeriodicyOfSchedInfo", HFILL }},
     { &hf_rrc_ms2_SchedTransmGrantHARQAlloc,
       { "ms2-SchedTransmGrantHARQAlloc", "rrc.ms2_SchedTransmGrantHARQAlloc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_servingGrant_02,
       { "servingGrant", "rrc.servingGrant",
@@ -113497,7 +113497,7 @@ void proto_register_rrc(void) {
         "rrc.E_PUCH_TS_Slots", HFILL }},
     { &hf_rrc_e_PUCH_CodeHopping,
       { "e-PUCH-CodeHopping", "rrc.e_PUCH_CodeHopping",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_e_PUCH_TPC_Step_Size,
       { "e-PUCH-TPC-Step-Size", "rrc.e_PUCH_TPC_Step_Size",
@@ -113525,7 +113525,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_M112_M50", HFILL }},
     { &hf_rrc_beaconPLEst_01,
       { "beaconPLEst", "rrc.beaconPLEst",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_e_PUCH_TS_ConfigurationList_01,
       { "e-PUCH-TS-ConfigurationList", "rrc.e_PUCH_TS_ConfigurationList",
@@ -113693,7 +113693,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_511", HFILL }},
     { &hf_rrc_ctch_Indicator,
       { "ctch-Indicator", "rrc.ctch_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_FACH_PCH_InformationList_item,
       { "FACH-PCH-Information", "rrc.FACH_PCH_Information",
@@ -113765,11 +113765,11 @@ void proto_register_rrc(void) {
         "rrc.SEQUENCE_SIZE_1_maxCommonHRNTI_OF_H_RNTI", HFILL }},
     { &hf_rrc_common_H_RNTI_information_item,
       { "H-RNTI", "rrc.H_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.H_RNTI", HFILL }},
     { &hf_rrc_bcchSpecific_H_RNTI,
       { "bcchSpecific-H-RNTI", "rrc.bcchSpecific_H_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.H_RNTI", HFILL }},
     { &hf_rrc_dlScramblingCode,
       { "dlScramblingCode", "rrc.dlScramblingCode",
@@ -113945,7 +113945,7 @@ void proto_register_rrc(void) {
         "rrc.PowerControlGAP", HFILL }},
     { &hf_rrc_pathlossCompensationSwitch,
       { "pathlossCompensationSwitch", "rrc.pathlossCompensationSwitch",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_hs_pdsch_CodeIndex,
       { "hs-pdsch-CodeIndex", "rrc.hs_pdsch_CodeIndex",
@@ -113977,7 +113977,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_1_90", HFILL }},
     { &hf_rrc_hs_scch_LessSecondCodeSupport,
       { "hs-scch-LessSecondCodeSupport", "rrc.hs_scch_LessSecondCodeSupport",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_midambleAllocationMode_05,
       { "midambleAllocationMode", "rrc.midambleAllocationMode",
@@ -114849,7 +114849,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_84", HFILL }},
     { &hf_rrc_availableSignatures,
       { "availableSignatures", "rrc.availableSignatures",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.AvailableSignatures", HFILL }},
     { &hf_rrc_availableSF,
       { "availableSF", "rrc.availableSF",
@@ -114861,7 +114861,7 @@ void proto_register_rrc(void) {
         "rrc.PreambleScramblingCodeWordNumber", HFILL }},
     { &hf_rrc_availableSubChannelNumbers,
       { "availableSubChannelNumbers", "rrc.availableSubChannelNumbers",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.AvailableSubChannelNumbers", HFILL }},
     { &hf_rrc_tdd_46,
       { "tdd", "rrc.tdd",
@@ -114881,7 +114881,7 @@ void proto_register_rrc(void) {
         "rrc.TDD768_PRACH_CCodeList", HFILL }},
     { &hf_rrc_e_RUCCH_Sync_UL_Codes_Bitmap,
       { "e-RUCCH-Sync-UL-Codes-Bitmap", "rrc.e_RUCCH_Sync_UL_Codes_Bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.Sync_UL_Codes_Bitmap", HFILL }},
     { &hf_rrc_sync_UL_Info,
       { "sync-UL-Info", "rrc.sync_UL_Info",
@@ -115005,7 +115005,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_86", HFILL }},
     { &hf_rrc_tx_DiversityIndicator,
       { "tx-DiversityIndicator", "rrc.tx_DiversityIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_47,
       { "tdd", "rrc.tdd",
@@ -115029,7 +115029,7 @@ void proto_register_rrc(void) {
         "rrc.TimeslotSync2", HFILL }},
     { &hf_rrc_sctd_Indicator,
       { "sctd-Indicator", "rrc.sctd_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_fdd_90,
       { "fdd", "rrc.fdd",
@@ -115465,7 +115465,7 @@ void proto_register_rrc(void) {
         "rrc.SCCPCH_InfoForFACH", HFILL }},
     { &hf_rrc_cell_Id,
       { "cell-Id", "rrc.cell_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.CellIdentity", HFILL }},
     { &hf_rrc_dl_dpchInfo_02,
       { "dl-dpchInfo", "rrc.dl_dpchInfo",
@@ -115645,7 +115645,7 @@ void proto_register_rrc(void) {
         "rrc.SF256_AndCodeNumber", HFILL }},
     { &hf_rrc_pilotSymbolExistence,
       { "pilotSymbolExistence", "rrc.pilotSymbolExistence",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_timingOffset,
       { "timingOffset", "rrc.timingOffset",
@@ -115881,7 +115881,7 @@ void proto_register_rrc(void) {
         "rrc.SSDT_UL", HFILL }},
     { &hf_rrc_sync_UL_CodesBitmap,
       { "sync-UL-CodesBitmap", "rrc.sync_UL_CodesBitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_sync_UL_CodesBitmap", HFILL }},
     { &hf_rrc_prxUpPCHdes,
       { "prxUpPCHdes", "rrc.prxUpPCHdes",
@@ -115901,7 +115901,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_3", HFILL }},
     { &hf_rrc_sync_UL_Codes_Bitmap,
       { "sync-UL-Codes-Bitmap", "rrc.sync_UL_Codes_Bitmap",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.Sync_UL_Codes_Bitmap", HFILL }},
     { &hf_rrc_max_SYNC_UL_Transmissions_01,
       { "max-SYNC-UL-Transmissions", "rrc.max_SYNC_UL_Transmissions",
@@ -116721,7 +116721,7 @@ void proto_register_rrc(void) {
         "rrc.T_newParameters_07", HFILL }},
     { &hf_rrc_dynamicSFusage,
       { "dynamicSFusage", "rrc.dynamicSFusage",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_moreTimeslots_04,
       { "moreTimeslots", "rrc.moreTimeslots",
@@ -116861,47 +116861,47 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_3", HFILL }},
     { &hf_rrc_e,
       { "e", "rrc.e",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_t_oa,
       { "t-oa", "rrc.t_oa",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_deltaI,
       { "deltaI", "rrc.deltaI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_omegaDot,
       { "omegaDot", "rrc.omegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_satHealth,
       { "satHealth", "rrc.satHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_a_Sqrt,
       { "a-Sqrt", "rrc.a_Sqrt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_omega0,
       { "omega0", "rrc.omega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_m0,
       { "m0", "rrc.m0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_omega,
       { "omega", "rrc.omega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_af0,
       { "af0", "rrc.af0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_af1,
       { "af1", "rrc.af1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_AlmanacSatInfoList_item,
       { "AlmanacSatInfo", "rrc.AlmanacSatInfo",
@@ -116993,7 +116993,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_108", HFILL }},
     { &hf_rrc_readSFN_Indicator,
       { "readSFN-Indicator", "rrc.readSFN_Indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_65,
       { "tdd", "rrc.tdd",
@@ -117101,7 +117101,7 @@ void proto_register_rrc(void) {
         "rrc.CellSelectReselectInfoSIB_11_12_HCS_ECN0", HFILL }},
     { &hf_rrc_cellIdentity,
       { "cellIdentity", "rrc.cellIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.CellIdentity", HFILL }},
     { &hf_rrc_dummy_40,
       { "dummy", "rrc.dummy",
@@ -117169,11 +117169,11 @@ void proto_register_rrc(void) {
         "rrc.SFN_SFN_OTD_Type", HFILL }},
     { &hf_rrc_cellIdentity_reportingIndicator,
       { "cellIdentity-reportingIndicator", "rrc.cellIdentity_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_cellSynchronisationInfoReportingIndicator,
       { "cellSynchronisationInfoReportingIndicator", "rrc.cellSynchronisationInfoReportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_modeSpecificInfo_77,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -117185,15 +117185,15 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_115", HFILL }},
     { &hf_rrc_cpich_Ec_N0_reportingIndicator,
       { "cpich-Ec-N0-reportingIndicator", "rrc.cpich_Ec_N0_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_cpich_RSCP_reportingIndicator,
       { "cpich-RSCP-reportingIndicator", "rrc.cpich_RSCP_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_pathloss_reportingIndicator,
       { "pathloss-reportingIndicator", "rrc.pathloss_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_73,
       { "tdd", "rrc.tdd",
@@ -117201,15 +117201,15 @@ void proto_register_rrc(void) {
         "rrc.T_tdd_66", HFILL }},
     { &hf_rrc_timeslotISCP_reportingIndicator,
       { "timeslotISCP-reportingIndicator", "rrc.timeslotISCP_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_proposedTGSN_ReportingRequired,
       { "proposedTGSN-ReportingRequired", "rrc.proposedTGSN_ReportingRequired",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_primaryCCPCH_RSCP_reportingIndicator,
       { "primaryCCPCH-RSCP-reportingIndicator", "rrc.primaryCCPCH_RSCP_reportingIndicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_q_Offset1S_N,
       { "q-Offset1S-N", "rrc.q_Offset1S_N",
@@ -117413,7 +117413,7 @@ void proto_register_rrc(void) {
         "rrc.GANSS_Signal_Id", HFILL }},
     { &hf_rrc_data_bits,
       { "data-bits", "rrc.data_bits",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1_1024", HFILL }},
     { &hf_rrc_DataBitAssistanceList_item,
       { "DataBitAssistanceSat", "rrc.DataBitAssistanceSat",
@@ -117457,7 +117457,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_63", HFILL }},
     { &hf_rrc_iode_dganss,
       { "iode-dganss", "rrc.iode_dganss",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_udre,
       { "udre", "rrc.udre",
@@ -117621,7 +117621,7 @@ void proto_register_rrc(void) {
         "rrc.ReplacementActivationThreshold", HFILL }},
     { &hf_rrc_useCIO,
       { "useCIO", "rrc.useCIO",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_thresholdUsedFrequency,
       { "thresholdUsedFrequency", "rrc.thresholdUsedFrequency",
@@ -117737,11 +117737,11 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_1_12", HFILL }},
     { &hf_rrc_inter_freq_FDD_meas_ind,
       { "inter-freq-FDD-meas-ind", "rrc.inter_freq_FDD_meas_ind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_inter_freq_TDD_meas_ind,
       { "inter-freq-TDD-meas-ind", "rrc.inter_freq_TDD_meas_ind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_inter_RAT_meas_ind,
       { "inter-RAT-meas-ind", "rrc.inter_RAT_meas_ind",
@@ -117753,7 +117753,7 @@ void proto_register_rrc(void) {
         "rrc.RAT_Type", HFILL }},
     { &hf_rrc_inter_freq_TDD128_meas_ind,
       { "inter-freq-TDD128-meas-ind", "rrc.inter_freq_TDD128_meas_ind",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_fdd_126,
       { "fdd", "rrc.fdd",
@@ -117785,11 +117785,11 @@ void proto_register_rrc(void) {
         "rrc.ReqDataBitAssistanceList", HFILL }},
     { &hf_rrc_currentDecipheringKey,
       { "currentDecipheringKey", "rrc.currentDecipheringKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_56", HFILL }},
     { &hf_rrc_nextDecipheringKey,
       { "nextDecipheringKey", "rrc.nextDecipheringKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_56", HFILL }},
     { &hf_rrc_ganssId,
       { "ganssId", "rrc.ganssId",
@@ -117857,7 +117857,7 @@ void proto_register_rrc(void) {
         "rrc.T_multipathIndicator", HFILL }},
     { &hf_rrc_carrierQualityIndication,
       { "carrierQualityIndication", "rrc.carrierQualityIndication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_ganssCodePhase,
       { "ganssCodePhase", "rrc.ganssCodePhase",
@@ -117909,27 +117909,27 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_127", HFILL }},
     { &hf_rrc_ganssRealTimeIntegrity,
       { "ganssRealTimeIntegrity", "rrc.ganssRealTimeIntegrity",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssDifferentialCorrection,
       { "ganssDifferentialCorrection", "rrc.ganssDifferentialCorrection",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.DGANSS_Sig_Id_Req", HFILL }},
     { &hf_rrc_ganssAlmanac,
       { "ganssAlmanac", "rrc.ganssAlmanac",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssNavigationModel,
       { "ganssNavigationModel", "rrc.ganssNavigationModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssTimeModelGNSS_GNSS,
       { "ganssTimeModelGNSS-GNSS", "rrc.ganssTimeModelGNSS_GNSS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_ganssReferenceMeasurementInfo,
       { "ganssReferenceMeasurementInfo", "rrc.ganssReferenceMeasurementInfo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssDataBits,
       { "ganssDataBits", "rrc.ganssDataBits",
@@ -117937,7 +117937,7 @@ void proto_register_rrc(void) {
         "rrc.GanssDataBits", HFILL }},
     { &hf_rrc_ganssUTCModel,
       { "ganssUTCModel", "rrc.ganssUTCModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssNavigationModelAdditionalData,
       { "ganssNavigationModelAdditionalData", "rrc.ganssNavigationModelAdditionalData",
@@ -117969,7 +117969,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_127", HFILL }},
     { &hf_rrc_codePhaseSearchWindow_01,
       { "codePhaseSearchWindow", "rrc.codePhaseSearchWindow",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_azimuthandElevation,
       { "azimuthandElevation", "rrc.azimuthandElevation",
@@ -117989,43 +117989,43 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_63", HFILL }},
     { &hf_rrc_ganss_alm_e,
       { "ganss-alm-e", "rrc.ganss_alm_e",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_ganss_delta_I_alm,
       { "ganss-delta-I-alm", "rrc.ganss_delta_I_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_ganss_omegadot_alm,
       { "ganss-omegadot-alm", "rrc.ganss_omegadot_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_ganss_svhealth_alm,
       { "ganss-svhealth-alm", "rrc.ganss_svhealth_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_rrc_ganss_delta_a_sqrt_alm,
       { "ganss-delta-a-sqrt-alm", "rrc.ganss_delta_a_sqrt_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_17", HFILL }},
     { &hf_rrc_ganss_omegazero_alm,
       { "ganss-omegazero-alm", "rrc.ganss_omegazero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_ganss_m_zero_alm,
       { "ganss-m-zero-alm", "rrc.ganss_m_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_ganss_omega_alm,
       { "ganss-omega-alm", "rrc.ganss_omega_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_ganss_af_zero_alm,
       { "ganss-af-zero-alm", "rrc.ganss_af_zero_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rrc_ganss_af_one_alm,
       { "ganss-af-one-alm", "rrc.ganss_af_one_alm",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_GANSS_SAT_Info_Almanac_KpList_item,
       { "GANSS-SAT-Info-Almanac-Kp", "rrc.GANSS_SAT_Info_Almanac_Kp",
@@ -118033,11 +118033,11 @@ void proto_register_rrc(void) {
         "rrc.GANSS_SAT_Info_Almanac_Kp", HFILL }},
     { &hf_rrc_svHealth,
       { "svHealth", "rrc.svHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_iod,
       { "iod", "rrc.iod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_ganssClockModel,
       { "ganssClockModel", "rrc.ganssClockModel",
@@ -118053,23 +118053,23 @@ void proto_register_rrc(void) {
         "rrc.Ganss_Sat_Info_Nav", HFILL }},
     { &hf_rrc_storm_flag_one,
       { "storm-flag-one", "rrc.storm_flag_one",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_storm_flag_two,
       { "storm-flag-two", "rrc.storm_flag_two",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_storm_flag_three,
       { "storm-flag-three", "rrc.storm_flag_three",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_storm_flag_four,
       { "storm-flag-four", "rrc.storm_flag_four",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_storm_flag_five,
       { "storm-flag-five", "rrc.storm_flag_five",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_satelliteID,
       { "satelliteID", "rrc.satelliteID",
@@ -118105,7 +118105,7 @@ void proto_register_rrc(void) {
         "rrc.GPS_MeasurementParam", HFILL }},
     { &hf_rrc_gsm_CarrierRSSI,
       { "gsm-CarrierRSSI", "rrc.gsm_CarrierRSSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GSM_CarrierRSSI", HFILL }},
     { &hf_rrc_dummy_43,
       { "dummy", "rrc.dummy",
@@ -118121,19 +118121,19 @@ void proto_register_rrc(void) {
         "rrc.GSM_MeasuredResults", HFILL }},
     { &hf_rrc_tlm_Message,
       { "tlm-Message", "rrc.tlm_Message",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rrc_tlm_Reserved,
       { "tlm-Reserved", "rrc.tlm_Reserved",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_alert,
       { "alert", "rrc.alert",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_antiSpoof,
       { "antiSpoof", "rrc.antiSpoof",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_GPS_TOW_AssistList_item,
       { "GPS-TOW-Assist", "rrc.GPS_TOW_Assist",
@@ -118525,11 +118525,11 @@ void proto_register_rrc(void) {
         "rrc.InterFreqEventList_r6", HFILL }},
     { &hf_rrc_utra_Carrier_RSSI,
       { "utra-Carrier-RSSI", "rrc.utra_Carrier_RSSI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_frequencyQualityEstimate,
       { "frequencyQualityEstimate", "rrc.frequencyQualityEstimate",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_nonFreqRelatedQuantities,
       { "nonFreqRelatedQuantities", "rrc.nonFreqRelatedQuantities",
@@ -118597,7 +118597,7 @@ void proto_register_rrc(void) {
         "rrc.BCCH_ARFCN", HFILL }},
     { &hf_rrc_ncMode,
       { "ncMode", "rrc.ncMode",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.NC_Mode", HFILL }},
     { &hf_rrc_is_2000,
       { "is-2000", "rrc.is_2000",
@@ -118745,7 +118745,7 @@ void proto_register_rrc(void) {
         "rrc.InterRATEventList", HFILL }},
     { &hf_rrc_utran_EstimatedQuality,
       { "utran-EstimatedQuality", "rrc.utran_EstimatedQuality",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ratSpecificInfo_01,
       { "ratSpecificInfo", "rrc.ratSpecificInfo",
@@ -118757,7 +118757,7 @@ void proto_register_rrc(void) {
         "rrc.T_gsm_08", HFILL }},
     { &hf_rrc_gsm_Carrier_RSSI,
       { "gsm-Carrier-RSSI", "rrc.gsm_Carrier_RSSI",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_removedIntraFreqCellList,
       { "removedIntraFreqCellList", "rrc.removedIntraFreqCellList",
@@ -119113,19 +119113,19 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_511", HFILL }},
     { &hf_rrc_ganss_omega_nav,
       { "ganss-omega-nav", "rrc.ganss_omega_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_delta_n_nav,
       { "delta-n-nav", "rrc.delta_n_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_m_zero_nav,
       { "m-zero-nav", "rrc.m_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_omegadot_nav,
       { "omegadot-nav", "rrc.omegadot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_gnass_e_lsb_nav,
       { "gnass-e-lsb-nav", "rrc.gnass_e_lsb_nav",
@@ -119133,7 +119133,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_33554431", HFILL }},
     { &hf_rrc_idot_nav,
       { "idot-nav", "rrc.idot_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rrc_a_sqrt_lsb_nav,
       { "a-sqrt-lsb-nav", "rrc.a_sqrt_lsb_nav",
@@ -119141,35 +119141,35 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_67108863", HFILL }},
     { &hf_rrc_i_zero_nav,
       { "i-zero-nav", "rrc.i_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_omega_zero_nav,
       { "omega-zero-nav", "rrc.omega_zero_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_c_rs_nav,
       { "c-rs-nav", "rrc.c_rs_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_c_is_nav,
       { "c-is-nav", "rrc.c_is_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_c_us_nav,
       { "c-us-nav", "rrc.c_us_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_c_rc_nav,
       { "c-rc-nav", "rrc.c_rc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_c_ic_nav,
       { "c-ic-nav", "rrc.c_ic_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_c_uc_nav,
       { "c-uc-nav", "rrc.c_uc_nav",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_intraFreqMeasuredResultsList,
       { "intraFreqMeasuredResultsList", "rrc.intraFreqMeasuredResultsList",
@@ -119705,23 +119705,23 @@ void proto_register_rrc(void) {
         "rrc.NavigationModelSatInfo", HFILL }},
     { &hf_rrc_codeOnL2,
       { "codeOnL2", "rrc.codeOnL2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_uraIndex,
       { "uraIndex", "rrc.uraIndex",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_4", HFILL }},
     { &hf_rrc_satHealth_01,
       { "satHealth", "rrc.satHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_6", HFILL }},
     { &hf_rrc_iodc,
       { "iodc", "rrc.iodc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_l2Pflag,
       { "l2Pflag", "rrc.l2Pflag",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rrc_sf1Revd,
       { "sf1Revd", "rrc.sf1Revd",
@@ -119729,95 +119729,95 @@ void proto_register_rrc(void) {
         "rrc.SubFrame1Reserved", HFILL }},
     { &hf_rrc_t_GD,
       { "t-GD", "rrc.t_GD",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_t_oc,
       { "t-oc", "rrc.t_oc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_af2,
       { "af2", "rrc.af2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_af1_01,
       { "af1", "rrc.af1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_af0_01,
       { "af0", "rrc.af0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_22", HFILL }},
     { &hf_rrc_c_rs,
       { "c-rs", "rrc.c_rs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_delta_n,
       { "delta-n", "rrc.delta_n",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_m0_01,
       { "m0", "rrc.m0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_c_uc,
       { "c-uc", "rrc.c_uc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_e_01,
       { "e", "rrc.e",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_c_us,
       { "c-us", "rrc.c_us",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_a_Sqrt_01,
       { "a-Sqrt", "rrc.a_Sqrt",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_t_oe,
       { "t-oe", "rrc.t_oe",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_fitInterval,
       { "fitInterval", "rrc.fitInterval",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rrc_aodo,
       { "aodo", "rrc.aodo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_c_ic,
       { "c-ic", "rrc.c_ic",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_omega0_01,
       { "omega0", "rrc.omega0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_c_is,
       { "c-is", "rrc.c_is",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_i0,
       { "i0", "rrc.i0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_c_rc,
       { "c-rc", "rrc.c_rc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_omega_01,
       { "omega", "rrc.omega",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_omegaDot_01,
       { "omegaDot", "rrc.omegaDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_iDot,
       { "iDot", "rrc.iDot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_14", HFILL }},
     { &hf_rrc_modeSpecificInfo_91,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -120233,7 +120233,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_1_512", HFILL }},
     { &hf_rrc_dl_TransChBLER,
       { "dl-TransChBLER", "rrc.dl_TransChBLER",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_bler_dl_TransChIdList,
       { "bler-dl-TransChIdList", "rrc.bler_dl_TransChIdList",
@@ -120389,7 +120389,7 @@ void proto_register_rrc(void) {
         "rrc.ReqDataBitAssistanceList_item", HFILL }},
     { &hf_rrc_ganssDataBitAssistance,
       { "ganssDataBitAssistance", "rrc.ganssDataBitAssistance",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_RL_AdditionInfoList_item,
       { "PrimaryCPICH-Info", "rrc.PrimaryCPICH_Info",
@@ -120421,19 +120421,19 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_511", HFILL }},
     { &hf_rrc_af2_01,
       { "af2", "rrc.af2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_af1_02,
       { "af1", "rrc.af1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_18", HFILL }},
     { &hf_rrc_af0_02,
       { "af0", "rrc.af0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_28", HFILL }},
     { &hf_rrc_tgd_01,
       { "tgd", "rrc.tgd",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_10", HFILL }},
     { &hf_rrc_model_id,
       { "model-id", "rrc.model_id",
@@ -120477,19 +120477,19 @@ void proto_register_rrc(void) {
         "rrc.SIR", HFILL }},
     { &hf_rrc_reserved1,
       { "reserved1", "rrc.reserved1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_23", HFILL }},
     { &hf_rrc_reserved2,
       { "reserved2", "rrc.reserved2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_reserved3,
       { "reserved3", "rrc.reserved3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_reserved4,
       { "reserved4", "rrc.reserved4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_t_ADV,
       { "t-ADV", "rrc.t_ADV",
@@ -120665,15 +120665,15 @@ void proto_register_rrc(void) {
         "rrc.TransChCriteriaList", HFILL }},
     { &hf_rrc_rlc_RB_BufferPayload,
       { "rlc-RB-BufferPayload", "rrc.rlc_RB_BufferPayload",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rlc_RB_BufferPayloadAverage,
       { "rlc-RB-BufferPayloadAverage", "rrc.rlc_RB_BufferPayloadAverage",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rlc_RB_BufferPayloadVariance,
       { "rlc-RB-BufferPayloadVariance", "rrc.rlc_RB_BufferPayloadVariance",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ul_transportChannelID,
       { "ul-transportChannelID", "rrc.ul_transportChannelID",
@@ -120853,7 +120853,7 @@ void proto_register_rrc(void) {
         "rrc.UE_InternalEventParamList", HFILL }},
     { &hf_rrc_ue_TransmittedPower,
       { "ue-TransmittedPower", "rrc.ue_TransmittedPower",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_modeSpecificInfo_97,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -120865,7 +120865,7 @@ void proto_register_rrc(void) {
         "rrc.T_fdd_132", HFILL }},
     { &hf_rrc_ue_RX_TX_TimeDifference,
       { "ue-RX-TX-TimeDifference", "rrc.ue_RX_TX_TimeDifference",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_tdd_92,
       { "tdd", "rrc.tdd",
@@ -120873,7 +120873,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd_84", HFILL }},
     { &hf_rrc_appliedTA_02,
       { "appliedTA", "rrc.appliedTA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_modeSpecificInfo_98,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -120901,7 +120901,7 @@ void proto_register_rrc(void) {
         "rrc.T_tdd128_42", HFILL }},
     { &hf_rrc_t_ADVinfo_02,
       { "t-ADVinfo", "rrc.t_ADVinfo",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ue_RX_TX_TimeDifferenceType1,
       { "ue-RX-TX-TimeDifferenceType1", "rrc.ue_RX_TX_TimeDifferenceType1",
@@ -120925,7 +120925,7 @@ void proto_register_rrc(void) {
         "rrc.NULL", HFILL }},
     { &hf_rrc_cipheringKeyFlag,
       { "cipheringKeyFlag", "rrc.cipheringKeyFlag",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1", HFILL }},
     { &hf_rrc_cipheringSerialNumber,
       { "cipheringSerialNumber", "rrc.cipheringSerialNumber",
@@ -120957,7 +120957,7 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_GANSS_AdditionalAssistanceDataRequest", HFILL }},
     { &hf_rrc_reportFirstFix,
       { "reportFirstFix", "rrc.reportFirstFix",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_measurementInterval,
       { "measurementInterval", "rrc.measurementInterval",
@@ -121009,15 +121009,15 @@ void proto_register_rrc(void) {
         "rrc.ALM_keplerianParameters", HFILL }},
     { &hf_rrc_ganssReferenceTime,
       { "ganssReferenceTime", "rrc.ganssReferenceTime",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssreferenceLocation,
       { "ganssreferenceLocation", "rrc.ganssreferenceLocation",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssIonosphericModel,
       { "ganssIonosphericModel", "rrc.ganssIonosphericModel",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ganssRequestedGenericAssistanceDataList,
       { "ganssRequestedGenericAssistanceDataList", "rrc.ganssRequestedGenericAssistanceDataList",
@@ -121065,15 +121065,15 @@ void proto_register_rrc(void) {
         "rrc.DataBitAssistanceList", HFILL }},
     { &hf_rrc_alpha_zero_ionos,
       { "alpha-zero-ionos", "rrc.alpha_zero_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_alpha_one_ionos,
       { "alpha-one-ionos", "rrc.alpha_one_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_alpha_two_ionos,
       { "alpha-two-ionos", "rrc.alpha_two_ionos",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_12", HFILL }},
     { &hf_rrc_gANSS_storm_flags,
       { "gANSS-storm-flags", "rrc.gANSS_storm_flags",
@@ -121129,7 +121129,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_63", HFILL }},
     { &hf_rrc_bad_ganss_signalId,
       { "bad-ganss-signalId", "rrc.bad_ganss_signalId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_satelliteInformationList,
       { "satelliteInformationList", "rrc.satelliteInformationList",
@@ -121213,35 +121213,35 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_GANSS_TimeModel", HFILL }},
     { &hf_rrc_a_one_utc,
       { "a-one-utc", "rrc.a_one_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_a_zero_utc,
       { "a-zero-utc", "rrc.a_zero_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_t_ot_utc,
       { "t-ot-utc", "rrc.t_ot_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_delta_t_ls_utc,
       { "delta-t-ls-utc", "rrc.delta_t_ls_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_w_n_t_utc,
       { "w-n-t-utc", "rrc.w_n_t_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_w_n_lsf_utc,
       { "w-n-lsf-utc", "rrc.w_n_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_dn_utc,
       { "dn-utc", "rrc.dn_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_delta_t_lsf_utc,
       { "delta-t-lsf-utc", "rrc.delta_t_lsf_utc",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_gps_ReferenceTime,
       { "gps-ReferenceTime", "rrc.gps_ReferenceTime",
@@ -121261,39 +121261,39 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_GPS_ReferenceTimeUncertainty", HFILL }},
     { &hf_rrc_almanacRequest,
       { "almanacRequest", "rrc.almanacRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_utcModelRequest,
       { "utcModelRequest", "rrc.utcModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_ionosphericModelRequest,
       { "ionosphericModelRequest", "rrc.ionosphericModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_navigationModelRequest,
       { "navigationModelRequest", "rrc.navigationModelRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_dgpsCorrectionsRequest,
       { "dgpsCorrectionsRequest", "rrc.dgpsCorrectionsRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_referenceLocationRequest,
       { "referenceLocationRequest", "rrc.referenceLocationRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_referenceTimeRequest,
       { "referenceTimeRequest", "rrc.referenceTimeRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_aquisitionAssistanceRequest,
       { "aquisitionAssistanceRequest", "rrc.aquisitionAssistanceRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_realTimeIntegrityRequest,
       { "realTimeIntegrityRequest", "rrc.realTimeIntegrityRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_navModelAddDataRequest,
       { "navModelAddDataRequest", "rrc.navModelAddDataRequest",
@@ -121301,7 +121301,7 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_GPS_NavModelAddDataReq", HFILL }},
     { &hf_rrc_wn_a,
       { "wn-a", "rrc.wn_a",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_almanacSatInfoList,
       { "almanacSatInfoList", "rrc.almanacSatInfoList",
@@ -121309,7 +121309,7 @@ void proto_register_rrc(void) {
         "rrc.AlmanacSatInfoList", HFILL }},
     { &hf_rrc_sv_GlobalHealth,
       { "sv-GlobalHealth", "rrc.sv_GlobalHealth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_364", HFILL }},
     { &hf_rrc_ue_positioning_GPS_ReferenceTime,
       { "ue-positioning-GPS-ReferenceTime", "rrc.ue_positioning_GPS_ReferenceTime",
@@ -121381,35 +121381,35 @@ void proto_register_rrc(void) {
         "rrc.DGPS_CorrectionSatInfoList", HFILL }},
     { &hf_rrc_alfa0,
       { "alfa0", "rrc.alfa0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_alfa1,
       { "alfa1", "rrc.alfa1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_alfa2,
       { "alfa2", "rrc.alfa2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_alfa3,
       { "alfa3", "rrc.alfa3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_beta0,
       { "beta0", "rrc.beta0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_beta1,
       { "beta1", "rrc.beta1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_beta2,
       { "beta2", "rrc.beta2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_beta3,
       { "beta3", "rrc.beta3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_referenceTime_01,
       { "referenceTime", "rrc.referenceTime",
@@ -121485,35 +121485,35 @@ void proto_register_rrc(void) {
         "rrc.GPS_TOW_AssistList", HFILL }},
     { &hf_rrc_a1,
       { "a1", "rrc.a1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_24", HFILL }},
     { &hf_rrc_a0,
       { "a0", "rrc.a0",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_t_ot,
       { "t-ot", "rrc.t_ot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_wn_t,
       { "wn-t", "rrc.wn_t",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_delta_t_LS,
       { "delta-t-LS", "rrc.delta_t_LS",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_wn_lsf,
       { "wn-lsf", "rrc.wn_lsf",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_dn,
       { "dn", "rrc.dn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_delta_t_LSF,
       { "delta-t-LSF", "rrc.delta_t_LSF",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_ip_Spacing,
       { "ip-Spacing", "rrc.ip_Spacing",
@@ -121561,7 +121561,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_4095", HFILL }},
     { &hf_rrc_ip_PCCPCG,
       { "ip-PCCPCG", "rrc.ip_PCCPCG",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.IP_PCCPCH_r4", HFILL }},
     { &hf_rrc_ip_Spacing_01,
       { "ip-Spacing", "rrc.ip_Spacing",
@@ -121913,15 +121913,15 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_OTDOA_NeighbourCellInfo_r7", HFILL }},
     { &hf_rrc_stdResolution,
       { "stdResolution", "rrc.stdResolution",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_2", HFILL }},
     { &hf_rrc_numberOfOTDOA_Measurements,
       { "numberOfOTDOA-Measurements", "rrc.numberOfOTDOA_Measurements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_3", HFILL }},
     { &hf_rrc_stdOfOTDOA_Measurements,
       { "stdOfOTDOA-Measurements", "rrc.stdOfOTDOA_Measurements",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_modeSpecificInfo_106,
       { "modeSpecificInfo", "rrc.modeSpecificInfo",
@@ -122057,7 +122057,7 @@ void proto_register_rrc(void) {
         "rrc.T_referenceTime_03", HFILL }},
     { &hf_rrc_positionData,
       { "positionData", "rrc.positionData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_velocityEstimate,
       { "velocityEstimate", "rrc.velocityEstimate",
@@ -122085,15 +122085,15 @@ void proto_register_rrc(void) {
         "rrc.UE_Positioning_ResponseTime", HFILL }},
     { &hf_rrc_horizontal_Accuracy,
       { "horizontal-Accuracy", "rrc.horizontal_Accuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UE_Positioning_Accuracy", HFILL }},
     { &hf_rrc_gps_TimingOfCellWanted,
       { "gps-TimingOfCellWanted", "rrc.gps_TimingOfCellWanted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_additionalAssistanceDataRequest,
       { "additionalAssistanceDataRequest", "rrc.additionalAssistanceDataRequest",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_environmentCharacterisation,
       { "environmentCharacterisation", "rrc.environmentCharacterisation",
@@ -122101,19 +122101,19 @@ void proto_register_rrc(void) {
         "rrc.EnvironmentCharacterisation", HFILL }},
     { &hf_rrc_vertical_Accuracy,
       { "vertical-Accuracy", "rrc.vertical_Accuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UE_Positioning_Accuracy", HFILL }},
     { &hf_rrc_horizontalAccuracy,
       { "horizontalAccuracy", "rrc.horizontalAccuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UE_Positioning_Accuracy", HFILL }},
     { &hf_rrc_verticalAccuracy,
       { "verticalAccuracy", "rrc.verticalAccuracy",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.UE_Positioning_Accuracy", HFILL }},
     { &hf_rrc_additionalAssistanceDataReq,
       { "additionalAssistanceDataReq", "rrc.additionalAssistanceDataReq",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_velocityRequested,
       { "velocityRequested", "rrc.velocityRequested",
@@ -122121,15 +122121,15 @@ void proto_register_rrc(void) {
         "rrc.T_velocityRequested", HFILL }},
     { &hf_rrc_gANSSPositioningMethods,
       { "gANSSPositioningMethods", "rrc.gANSSPositioningMethods",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_16", HFILL }},
     { &hf_rrc_gANSSTimingOfCellWanted,
       { "gANSSTimingOfCellWanted", "rrc.gANSSTimingOfCellWanted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_gANSSCarrierPhaseMeasurementRequested,
       { "gANSSCarrierPhaseMeasurementRequested", "rrc.gANSSCarrierPhaseMeasurementRequested",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_ue_GANSSTimingOfCellFrames,
       { "ue-GANSSTimingOfCellFrames", "rrc.ue_GANSSTimingOfCellFrames",
@@ -122237,11 +122237,11 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_255", HFILL }},
     { &hf_rrc_msg_Type,
       { "msg-Type", "rrc.msg_Type",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_payload_02,
       { "payload", "rrc.payload",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1_512", HFILL }},
     { &hf_rrc_CDMA2000_MessageList_item,
       { "CDMA2000-Message", "rrc.CDMA2000_Message",
@@ -122293,15 +122293,15 @@ void proto_register_rrc(void) {
         "rrc.FrequencyInfoFDD", HFILL }},
     { &hf_rrc_band_Class,
       { "band-Class", "rrc.band_Class",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_5", HFILL }},
     { &hf_rrc_cdma_Freq,
       { "cdma-Freq", "rrc.cdma_Freq",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_11", HFILL }},
     { &hf_rrc_GERAN_SystemInformation_item,
       { "GERAN-SystemInfoBlock", "rrc.GERAN_SystemInfoBlock",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GERAN_SystemInfoBlock", HFILL }},
     { &hf_rrc_gsmLowRangeUARFCN,
       { "gsmLowRangeUARFCN", "rrc.gsmLowRangeUARFCN",
@@ -122317,7 +122317,7 @@ void proto_register_rrc(void) {
         "rrc.GSM_BA_Range", HFILL }},
     { &hf_rrc_GSM_MessageList_item,
       { "GSM-MessageList item", "rrc.GSM_MessageList_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GSM_MessageList_item", HFILL }},
     { &hf_rrc_GSM_TargetCellInfoList_item,
       { "GSM-TargetCellInfo", "rrc.GSM_TargetCellInfo",
@@ -122337,7 +122337,7 @@ void proto_register_rrc(void) {
         "rrc.NULL", HFILL }},
     { &hf_rrc_GERANIu_MessageList_item,
       { "GERANIu-MessageList item", "rrc.GERANIu_MessageList_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1_32768", HFILL }},
     { &hf_rrc_gsm_12,
       { "gsm", "rrc.gsm",
@@ -122345,11 +122345,11 @@ void proto_register_rrc(void) {
         "rrc.T_gsm_11", HFILL }},
     { &hf_rrc_gsm_Classmark2,
       { "gsm-Classmark2", "rrc.gsm_Classmark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GSM_Classmark2", HFILL }},
     { &hf_rrc_gsm_Classmark3,
       { "gsm-Classmark3", "rrc.gsm_Classmark3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GSM_Classmark3", HFILL }},
     { &hf_rrc_cdma2000_01,
       { "cdma2000", "rrc.cdma2000",
@@ -122361,7 +122361,7 @@ void proto_register_rrc(void) {
         "rrc.InterRAT_UE_RadioAccessCapability", HFILL }},
     { &hf_rrc_geranIu_RadioAccessCapability,
       { "geranIu-RadioAccessCapability", "rrc.geranIu_RadioAccessCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GERANIu_RadioAccessCapability", HFILL }},
     { &hf_rrc_supportOfInter_RAT_PS_Handover,
       { "supportOfInter-RAT-PS-Handover", "rrc.supportOfInter_RAT_PS_Handover",
@@ -122369,7 +122369,7 @@ void proto_register_rrc(void) {
         "rrc.T_supportOfInter_RAT_PS_Handover", HFILL }},
     { &hf_rrc_gsm_MS_RadioAccessCapability,
       { "gsm-MS-RadioAccessCapability", "rrc.gsm_MS_RadioAccessCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GSM_MS_RadioAccessCapability", HFILL }},
     { &hf_rrc_gsm_13,
       { "gsm", "rrc.gsm",
@@ -122377,7 +122377,7 @@ void proto_register_rrc(void) {
         "rrc.T_gsm_12", HFILL }},
     { &hf_rrc_gsmSecurityCapability,
       { "gsmSecurityCapability", "rrc.gsmSecurityCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.GsmSecurityCapability", HFILL }},
     { &hf_rrc_InterRAT_UE_SecurityCapList_item,
       { "InterRAT-UE-SecurityCapability", "rrc.InterRAT_UE_SecurityCapability",
@@ -122753,7 +122753,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_147", HFILL }},
     { &hf_rrc_sib4indicator,
       { "sib4indicator", "rrc.sib4indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_cellSelectReselectInfo,
       { "cellSelectReselectInfo", "rrc.cellSelectReselectInfo",
@@ -122949,7 +122949,7 @@ void proto_register_rrc(void) {
         "rrc.CellSelectReselectInfoPCHFACH_v5b0ext", HFILL }},
     { &hf_rrc_sib6indicator,
       { "sib6indicator", "rrc.sib6indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_pich_PowerOffset,
       { "pich-PowerOffset", "rrc.pich_PowerOffset",
@@ -123313,7 +123313,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_155", HFILL }},
     { &hf_rrc_sib12indicator,
       { "sib12indicator", "rrc.sib12indicator",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_fach_MeasurementOccasionInfo,
       { "fach-MeasurementOccasionInfo", "rrc.fach_MeasurementOccasionInfo",
@@ -123501,7 +123501,7 @@ void proto_register_rrc(void) {
         "rrc.CapabilityUpdateRequirement_r4_ext", HFILL }},
     { &hf_rrc_ansi_41_RAND_Information,
       { "ansi-41-RAND-Information", "rrc.ansi_41_RAND_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ANSI_41_RAND_Information", HFILL }},
     { &hf_rrc_nonCriticalExtensions_160,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -123509,7 +123509,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_160", HFILL }},
     { &hf_rrc_ansi_41_UserZoneID_Information,
       { "ansi-41-UserZoneID-Information", "rrc.ansi_41_UserZoneID_Information",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ANSI_41_UserZoneID_Information", HFILL }},
     { &hf_rrc_nonCriticalExtensions_161,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -123517,7 +123517,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_161", HFILL }},
     { &hf_rrc_ansi_41_PrivateNeighbourListInfo,
       { "ansi-41-PrivateNeighbourListInfo", "rrc.ansi_41_PrivateNeighbourListInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ANSI_41_PrivateNeighbourListInfo", HFILL }},
     { &hf_rrc_nonCriticalExtensions_162,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -123525,7 +123525,7 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_162", HFILL }},
     { &hf_rrc_ansi_41_GlobalServiceRedirectInfo,
       { "ansi-41-GlobalServiceRedirectInfo", "rrc.ansi_41_GlobalServiceRedirectInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ANSI_41_GlobalServiceRedirectInfo", HFILL }},
     { &hf_rrc_nonCriticalExtensions_163,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -123609,11 +123609,11 @@ void proto_register_rrc(void) {
         "rrc.T_nonCriticalExtensions_170", HFILL }},
     { &hf_rrc_satMask,
       { "satMask", "rrc.satMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_1_32", HFILL }},
     { &hf_rrc_lsbTOW,
       { "lsbTOW", "rrc.lsbTOW",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_8", HFILL }},
     { &hf_rrc_nonCriticalExtensions_171,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -123885,15 +123885,15 @@ void proto_register_rrc(void) {
         "rrc.MBMS_CommonRBInformation_r6", HFILL }},
     { &hf_rrc_countingForUraPCH,
       { "countingForUraPCH", "rrc.countingForUraPCH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_countingForCellPCH,
       { "countingForCellPCH", "rrc.countingForCellPCH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_countingForCellFACH,
       { "countingForCellFACH", "rrc.countingForCellFACH",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_sccpchIdentity,
       { "sccpchIdentity", "rrc.sccpchIdentity",
@@ -124193,7 +124193,7 @@ void proto_register_rrc(void) {
         "rrc.T_dummy_14", HFILL }},
     { &hf_rrc_continueMCCHReading,
       { "continueMCCHReading", "rrc.continueMCCHReading",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_MBMS_ModifedServiceList_r6_item,
       { "MBMS-ModifedService-r6", "rrc.MBMS_ModifedService_r6",
@@ -124333,7 +124333,7 @@ void proto_register_rrc(void) {
         "rrc.MBMS_PTM_RBInformation_C", HFILL }},
     { &hf_rrc_layer1_CombiningStatus,
       { "layer1-CombiningStatus", "rrc.layer1_CombiningStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_MBMS_PTM_RBInformation_NList_item,
       { "MBMS-PTM-RBInformation-N", "rrc.MBMS_PTM_RBInformation_N",
@@ -124381,7 +124381,7 @@ void proto_register_rrc(void) {
         "rrc.MBMS_ServiceAccessInfo_r6", HFILL }},
     { &hf_rrc_serviceIdentity,
       { "serviceIdentity", "rrc.serviceIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.OCTET_STRING_SIZE_3", HFILL }},
     { &hf_rrc_plmn_Identity_01,
       { "plmn-Identity", "rrc.plmn_Identity",
@@ -124473,7 +124473,7 @@ void proto_register_rrc(void) {
         "rrc.MBMS_TrCHInformation_Curr", HFILL }},
     { &hf_rrc_transpCh_CombiningStatus,
       { "transpCh-CombiningStatus", "rrc.transpCh_CombiningStatus",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_rbInformation_02,
       { "rbInformation", "rrc.rbInformation",
@@ -124593,7 +124593,7 @@ void proto_register_rrc(void) {
         "rrc.RRC_FailureInfo", HFILL }},
     { &hf_rrc_dL_DCCHmessage,
       { "dL-DCCHmessage", "rrc.dL_DCCHmessage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_dL_DCCHmessage", HFILL }},
     { &hf_rrc_r3_31,
       { "r3", "rrc.r3",
@@ -124629,7 +124629,7 @@ void proto_register_rrc(void) {
         "rrc.T_criticalExtensions_95", HFILL }},
     { &hf_rrc_interRATHandoverInfo_01,
       { "interRATHandoverInfo", "rrc.interRATHandoverInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.OCTET_STRING_SIZE_0_255", HFILL }},
     { &hf_rrc_r5_14,
       { "r5", "rrc.r5",
@@ -124709,7 +124709,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_v3d0ext_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r3_add_ext,
       { "sRNC-RelocationInfo-r3-add-ext", "rrc.sRNC_RelocationInfo_r3_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_sRNC_RelocationInfo_r3_add_ext", HFILL }},
     { &hf_rrc_v3g0NonCriticalExtensions_02,
       { "v3g0NonCriticalExtensions", "rrc.v3g0NonCriticalExtensions",
@@ -124809,7 +124809,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_v4d0ext_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r4_add_ext,
       { "sRNC-RelocationInfo-r4-add-ext", "rrc.sRNC_RelocationInfo_r4_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v590NonCriticalExtensions_32,
       { "v590NonCriticalExtensions", "rrc.v590NonCriticalExtensions",
@@ -124857,7 +124857,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_r5_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r5_add_ext,
       { "sRNC-RelocationInfo-r5-add-ext", "rrc.sRNC_RelocationInfo_r5_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v5a0NonCriticalExtensions_02,
       { "v5a0NonCriticalExtensions", "rrc.v5a0NonCriticalExtensions",
@@ -124901,7 +124901,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_r6_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r6_add_ext,
       { "sRNC-RelocationInfo-r6-add-ext", "rrc.sRNC_RelocationInfo_r6_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v6b0NonCriticalExtensions_25,
       { "v6b0NonCriticalExtensions", "rrc.v6b0NonCriticalExtensions",
@@ -124937,7 +124937,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_r7_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r7_add_ext,
       { "sRNC-RelocationInfo-r7-add-ext", "rrc.sRNC_RelocationInfo_r7_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_v820NonCriticalExtensions_04,
       { "v820NonCriticalExtensions", "rrc.v820NonCriticalExtensions",
@@ -124961,7 +124961,7 @@ void proto_register_rrc(void) {
         "rrc.SRNC_RelocationInfo_r8_IEs", HFILL }},
     { &hf_rrc_sRNC_RelocationInfo_r8_add_ext,
       { "sRNC-RelocationInfo-r8-add-ext", "rrc.sRNC_RelocationInfo_r8_add_ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING", HFILL }},
     { &hf_rrc_nonCriticalExtensions_190,
       { "nonCriticalExtensions", "rrc.nonCriticalExtensions",
@@ -125005,11 +125005,11 @@ void proto_register_rrc(void) {
         "rrc.SRB_SpecificIntegrityProtInfoList", HFILL }},
     { &hf_rrc_implementationSpecificParams,
       { "implementationSpecificParams", "rrc.implementationSpecificParams",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.ImplementationSpecificParams", HFILL }},
     { &hf_rrc_c_RNTI,
       { "c-RNTI", "rrc.c_RNTI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.C_RNTI", HFILL }},
     { &hf_rrc_ue_Positioning_LastKnownPos,
       { "ue-Positioning-LastKnownPos", "rrc.ue_Positioning_LastKnownPos",
@@ -125057,7 +125057,7 @@ void proto_register_rrc(void) {
         "rrc.CipheringInfoPerRB_List_v3a0ext", HFILL }},
     { &hf_rrc_startValueForCiphering_v3a0ext,
       { "startValueForCiphering-v3a0ext", "rrc.startValueForCiphering_v3a0ext",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.START_Value", HFILL }},
     { &hf_rrc_startValueForCiphering_v3b0ext,
       { "startValueForCiphering-v3b0ext", "rrc.startValueForCiphering_v3b0ext",
@@ -125089,7 +125089,7 @@ void proto_register_rrc(void) {
         "rrc.StoredCompressedModeInfo", HFILL }},
     { &hf_rrc_dl_UM_SN,
       { "dl-UM-SN", "rrc.dl_UM_SN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_7", HFILL }},
     { &hf_rrc_CipheringStatusList_item,
       { "CipheringStatusCNdomain", "rrc.CipheringStatusCNdomain",
@@ -125201,15 +125201,15 @@ void proto_register_rrc(void) {
         "rrc.DL_AddReconfTransChInfoList_r5", HFILL }},
     { &hf_rrc_ueCapabilityContainer_02,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_02", HFILL }},
     { &hf_rrc_ueCapabilityContainer_RSC,
       { "ueCapabilityContainer-RSC", "rrc.ueCapabilityContainer_RSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_RSC", HFILL }},
     { &hf_rrc_ueCapabilityContainer_UCI,
       { "ueCapabilityContainer-UCI", "rrc.ueCapabilityContainer_UCI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_UCI", HFILL }},
     { &hf_rrc_intraFreqReportingCriteria_06,
       { "intraFreqReportingCriteria", "rrc.intraFreqReportingCriteria",
@@ -125221,15 +125221,15 @@ void proto_register_rrc(void) {
         "rrc.UE_RadioAccessCapability_r6", HFILL }},
     { &hf_rrc_ueCapabilityContainer_03,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_03", HFILL }},
     { &hf_rrc_ueCapabilityContainer_RSC_01,
       { "ueCapabilityContainer-RSC", "rrc.ueCapabilityContainer_RSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_RSC_01", HFILL }},
     { &hf_rrc_ueCapabilityContainer_UCI_01,
       { "ueCapabilityContainer-UCI", "rrc.ueCapabilityContainer_UCI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_UCI_01", HFILL }},
     { &hf_rrc_ongoingMeasRepList_03,
       { "ongoingMeasRepList", "rrc.ongoingMeasRepList",
@@ -125249,19 +125249,19 @@ void proto_register_rrc(void) {
         "rrc.UL_AddReconfTransChInfoList_r6", HFILL }},
     { &hf_rrc_measurementReport_01,
       { "measurementReport", "rrc.measurementReport",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_measurementReport", HFILL }},
     { &hf_rrc_ueCapabilityContainer_04,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_04", HFILL }},
     { &hf_rrc_ueCapabilityContainer_RSC_02,
       { "ueCapabilityContainer-RSC", "rrc.ueCapabilityContainer_RSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_RSC_02", HFILL }},
     { &hf_rrc_ueCapabilityContainer_UCI_02,
       { "ueCapabilityContainer-UCI", "rrc.ueCapabilityContainer_UCI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_UCI_02", HFILL }},
     { &hf_rrc_srns_t_305,
       { "srns-t-305", "rrc.srns_t_305",
@@ -125289,7 +125289,7 @@ void proto_register_rrc(void) {
         "rrc.DL_AddReconfTransChInfoList_r7", HFILL }},
     { &hf_rrc_measurementReport_02,
       { "measurementReport", "rrc.measurementReport",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_measurementReport_01", HFILL }},
     { &hf_rrc_thresholdSFN_GPS_TOW_us,
       { "thresholdSFN-GPS-TOW-us", "rrc.thresholdSFN_GPS_TOW_us",
@@ -125297,15 +125297,15 @@ void proto_register_rrc(void) {
         "rrc.ThresholdSFN_GPS_TOW_us", HFILL }},
     { &hf_rrc_ueCapabilityContainer_05,
       { "ueCapabilityContainer", "rrc.ueCapabilityContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_05", HFILL }},
     { &hf_rrc_ueCapabilityContainer_RSC_03,
       { "ueCapabilityContainer-RSC", "rrc.ueCapabilityContainer_RSC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_RSC_03", HFILL }},
     { &hf_rrc_ueCapabilityContainer_UCI_03,
       { "ueCapabilityContainer-UCI", "rrc.ueCapabilityContainer_UCI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_ueCapabilityContainer_UCI_03", HFILL }},
     { &hf_rrc_srb_InformationList_04,
       { "srb-InformationList", "rrc.srb_InformationList",
@@ -125317,7 +125317,7 @@ void proto_register_rrc(void) {
         "rrc.RAB_InformationSetupList_r8", HFILL }},
     { &hf_rrc_measurementReport_03,
       { "measurementReport", "rrc.measurementReport",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.T_measurementReport_02", HFILL }},
     { &hf_rrc_rab_InformationList_07,
       { "rab-InformationList", "rrc.rab_InformationList",
@@ -125325,11 +125325,11 @@ void proto_register_rrc(void) {
         "rrc.RAB_InformationSetupList_v820ext", HFILL }},
     { &hf_rrc_dl_HFN,
       { "dl-HFN", "rrc.dl_HFN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_20_25", HFILL }},
     { &hf_rrc_ul_HFN,
       { "ul-HFN", "rrc.ul_HFN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_20_25", HFILL }},
     { &hf_rrc_CipheringInfoPerRB_List_item,
       { "CipheringInfoPerRB", "rrc.CipheringInfoPerRB",
@@ -125349,7 +125349,7 @@ void proto_register_rrc(void) {
         "rrc.CN_DomainInformation_v390ext", HFILL }},
     { &hf_rrc_tdd384_Measurements,
       { "tdd384-Measurements", "rrc.tdd384_Measurements",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_COUNT_C_List_item,
       { "COUNT-CSingle", "rrc.COUNT_CSingle",
@@ -125357,7 +125357,7 @@ void proto_register_rrc(void) {
         "rrc.COUNT_CSingle", HFILL }},
     { &hf_rrc_count_C,
       { "count-C", "rrc.count_C",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_32", HFILL }},
     { &hf_rrc_dummy3_05,
       { "dummy3", "rrc.dummy3",
@@ -125389,7 +125389,7 @@ void proto_register_rrc(void) {
         "rrc.T_dl_mode", HFILL }},
     { &hf_rrc_dl_ref_ir,
       { "dl-ref-ir", "rrc.dl_ref_ir",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.OCTET_STRING_SIZE_1_3000", HFILL }},
     { &hf_rrc_dl_ref_time,
       { "dl-ref-time", "rrc.dl_ref_time",
@@ -125409,7 +125409,7 @@ void proto_register_rrc(void) {
         "rrc.INTEGER_0_4294967295", HFILL }},
     { &hf_rrc_dl_dyn_changed,
       { "dl-dyn-changed", "rrc.dl_dyn_changed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "rrc.BOOLEAN", HFILL }},
     { &hf_rrc_interRAT_UE_RadioAccessCapability,
       { "interRAT-UE-RadioAccessCapability", "rrc.interRAT_UE_RadioAccessCapability",
@@ -125593,11 +125593,11 @@ void proto_register_rrc(void) {
         "rrc.TotalRLC_AM_BufferSize_r5", HFILL }},
     { &hf_rrc_ul_RRC_HFN,
       { "ul-RRC-HFN", "rrc.ul_RRC_HFN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_28", HFILL }},
     { &hf_rrc_dl_RRC_HFN,
       { "dl-RRC-HFN", "rrc.dl_RRC_HFN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.BIT_STRING_SIZE_28", HFILL }},
     { &hf_rrc_ul_RRC_SequenceNumber,
       { "ul-RRC-SequenceNumber", "rrc.ul_RRC_SequenceNumber",
@@ -125665,7 +125665,7 @@ void proto_register_rrc(void) {
         "rrc.T_ul_mode", HFILL }},
     { &hf_rrc_ul_ref_ir,
       { "ul-ref-ir", "rrc.ul_ref_ir",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrc.OCTET_STRING_SIZE_1_3000", HFILL }},
     { &hf_rrc_ul_ref_time,
       { "ul-ref-time", "rrc.ul_ref_time",
@@ -125690,879 +125690,879 @@ void proto_register_rrc(void) {
     { &hf_rrc_T_cipheringAlgorithmCap_spare15,
       { "spare15", "rrc.spare15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare14,
       { "spare14", "rrc.spare14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare13,
       { "spare13", "rrc.spare13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare12,
       { "spare12", "rrc.spare12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare11,
       { "spare11", "rrc.spare11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare10,
       { "spare10", "rrc.spare10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare9,
       { "spare9", "rrc.spare9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare8,
       { "spare8", "rrc.spare8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare7,
       { "spare7", "rrc.spare7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare6,
       { "spare6", "rrc.spare6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare5,
       { "spare5", "rrc.spare5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare4,
       { "spare4", "rrc.spare4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_spare3,
       { "spare3", "rrc.spare3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea2,
       { "uea2", "rrc.uea2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea1,
       { "uea1", "rrc.uea1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_cipheringAlgorithmCap_uea0,
       { "uea0", "rrc.uea0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare15,
       { "spare15", "rrc.spare15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare14,
       { "spare14", "rrc.spare14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare13,
       { "spare13", "rrc.spare13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare12,
       { "spare12", "rrc.spare12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare11,
       { "spare11", "rrc.spare11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare10,
       { "spare10", "rrc.spare10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare9,
       { "spare9", "rrc.spare9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare8,
       { "spare8", "rrc.spare8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare7,
       { "spare7", "rrc.spare7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare6,
       { "spare6", "rrc.spare6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare5,
       { "spare5", "rrc.spare5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare4,
       { "spare4", "rrc.spare4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare3,
       { "spare3", "rrc.spare3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_uia2,
       { "uia2", "rrc.uia2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_uia1,
       { "uia1", "rrc.uia1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_integrityProtectionAlgorithmCap_spare0,
       { "spare0", "rrc.spare0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b3,
       { "b3", "rrc.b3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b2,
       { "b2", "rrc.b2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b1,
       { "b1", "rrc.b1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_assignedSubChannelNumber_b0,
       { "b0", "rrc.b0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex7,
       { "chCodeIndex7", "rrc.chCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex6,
       { "chCodeIndex6", "rrc.chCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex5,
       { "chCodeIndex5", "rrc.chCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex4,
       { "chCodeIndex4", "rrc.chCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex3,
       { "chCodeIndex3", "rrc.chCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex2,
       { "chCodeIndex2", "rrc.chCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex1,
       { "chCodeIndex1", "rrc.chCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_chCodeIndex0,
       { "chCodeIndex0", "rrc.chCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_01_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh7,
       { "subCh7", "rrc.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh6,
       { "subCh6", "rrc.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh5,
       { "subCh5", "rrc.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh4,
       { "subCh4", "rrc.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_02_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex15,
       { "chCodeIndex15", "rrc.chCodeIndex15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex14,
       { "chCodeIndex14", "rrc.chCodeIndex14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex13,
       { "chCodeIndex13", "rrc.chCodeIndex13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex12,
       { "chCodeIndex12", "rrc.chCodeIndex12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex11,
       { "chCodeIndex11", "rrc.chCodeIndex11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex10,
       { "chCodeIndex10", "rrc.chCodeIndex10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex9,
       { "chCodeIndex9", "rrc.chCodeIndex9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex8,
       { "chCodeIndex8", "rrc.chCodeIndex8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex7,
       { "chCodeIndex7", "rrc.chCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex6,
       { "chCodeIndex6", "rrc.chCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex5,
       { "chCodeIndex5", "rrc.chCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex4,
       { "chCodeIndex4", "rrc.chCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex3,
       { "chCodeIndex3", "rrc.chCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex2,
       { "chCodeIndex2", "rrc.chCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex1,
       { "chCodeIndex1", "rrc.chCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_channelisationCodeIndices_01_chCodeIndex0,
       { "chCodeIndex0", "rrc.chCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_04_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh7,
       { "subCh7", "rrc.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh6,
       { "subCh6", "rrc.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh5,
       { "subCh5", "rrc.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh4,
       { "subCh4", "rrc.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_05_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh15,
       { "subCh15", "rrc.subCh15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh14,
       { "subCh14", "rrc.subCh14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh13,
       { "subCh13", "rrc.subCh13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh12,
       { "subCh12", "rrc.subCh12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh11,
       { "subCh11", "rrc.subCh11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh10,
       { "subCh10", "rrc.subCh10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh9,
       { "subCh9", "rrc.subCh9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh8,
       { "subCh8", "rrc.subCh8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh7,
       { "subCh7", "rrc.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh6,
       { "subCh6", "rrc.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh5,
       { "subCh5", "rrc.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh4,
       { "subCh4", "rrc.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_06_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex7,
       { "sulCodeIndex7", "rrc.sulCodeIndex7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex6,
       { "sulCodeIndex6", "rrc.sulCodeIndex6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex5,
       { "sulCodeIndex5", "rrc.sulCodeIndex5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex4,
       { "sulCodeIndex4", "rrc.sulCodeIndex4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex3,
       { "sulCodeIndex3", "rrc.sulCodeIndex3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex2,
       { "sulCodeIndex2", "rrc.sulCodeIndex2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex1,
       { "sulCodeIndex1", "rrc.sulCodeIndex1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_availableSYNC_UlCodesIndics_sulCodeIndex0,
       { "sulCodeIndex0", "rrc.sulCodeIndex0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_08_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh7,
       { "subCh7", "rrc.subCh7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh6,
       { "subCh6", "rrc.subCh6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh5,
       { "subCh5", "rrc.subCh5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh4,
       { "subCh4", "rrc.subCh4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_subchannels_09_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature15,
       { "signature15", "rrc.signature15",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature14,
       { "signature14", "rrc.signature14",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature13,
       { "signature13", "rrc.signature13",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature12,
       { "signature12", "rrc.signature12",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature11,
       { "signature11", "rrc.signature11",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature10,
       { "signature10", "rrc.signature10",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature9,
       { "signature9", "rrc.signature9",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature8,
       { "signature8", "rrc.signature8",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature7,
       { "signature7", "rrc.signature7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature6,
       { "signature6", "rrc.signature6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature5,
       { "signature5", "rrc.signature5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature4,
       { "signature4", "rrc.signature4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature3,
       { "signature3", "rrc.signature3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature2,
       { "signature2", "rrc.signature2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature1,
       { "signature1", "rrc.signature1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSignatures_signature0,
       { "signature0", "rrc.signature0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh11,
       { "subCh11", "rrc.subCh11",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh10,
       { "subCh10", "rrc.subCh10",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh9,
       { "subCh9", "rrc.subCh9",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh8,
       { "subCh8", "rrc.subCh8",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh7,
       { "subCh7", "rrc.subCh7",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh6,
       { "subCh6", "rrc.subCh6",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh5,
       { "subCh5", "rrc.subCh5",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh4,
       { "subCh4", "rrc.subCh4",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh3,
       { "subCh3", "rrc.subCh3",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh2,
       { "subCh2", "rrc.subCh2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh1,
       { "subCh1", "rrc.subCh1",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_AvailableSubChannelNumbers_subCh0,
       { "subCh0", "rrc.subCh0",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode16_SF16,
       { "chCode16-SF16", "rrc.chCode16-SF16",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode15_SF16,
       { "chCode15-SF16", "rrc.chCode15-SF16",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode14_SF16,
       { "chCode14-SF16", "rrc.chCode14-SF16",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode13_SF16,
       { "chCode13-SF16", "rrc.chCode13-SF16",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode12_SF16,
       { "chCode12-SF16", "rrc.chCode12-SF16",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode11_SF16,
       { "chCode11-SF16", "rrc.chCode11-SF16",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode10_SF16,
       { "chCode10-SF16", "rrc.chCode10-SF16",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode9_SF16,
       { "chCode9-SF16", "rrc.chCode9-SF16",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode8_SF16,
       { "chCode8-SF16", "rrc.chCode8-SF16",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode7_SF16,
       { "chCode7-SF16", "rrc.chCode7-SF16",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode6_SF16,
       { "chCode6-SF16", "rrc.chCode6-SF16",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode5_SF16,
       { "chCode5-SF16", "rrc.chCode5-SF16",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode4_SF16,
       { "chCode4-SF16", "rrc.chCode4-SF16",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode3_SF16,
       { "chCode3-SF16", "rrc.chCode3-SF16",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode2_SF16,
       { "chCode2-SF16", "rrc.chCode2-SF16",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_chCode1_SF16,
       { "chCode1-SF16", "rrc.chCode1-SF16",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode32_SF32,
       { "chCode32-SF32", "rrc.chCode32-SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode31_SF32,
       { "chCode31-SF32", "rrc.chCode31-SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode30_SF32,
       { "chCode30-SF32", "rrc.chCode30-SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode29_SF32,
       { "chCode29-SF32", "rrc.chCode29-SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode28_SF32,
       { "chCode28-SF32", "rrc.chCode28-SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode27_SF32,
       { "chCode27-SF32", "rrc.chCode27-SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode26_SF32,
       { "chCode26-SF32", "rrc.chCode26-SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode25_SF32,
       { "chCode25-SF32", "rrc.chCode25-SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode24_SF32,
       { "chCode24-SF32", "rrc.chCode24-SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode23_SF32,
       { "chCode23-SF32", "rrc.chCode23-SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode22_SF32,
       { "chCode22-SF32", "rrc.chCode22-SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode21_SF32,
       { "chCode21-SF32", "rrc.chCode21-SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode20_SF32,
       { "chCode20-SF32", "rrc.chCode20-SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode19_SF32,
       { "chCode19-SF32", "rrc.chCode19-SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode18_SF32,
       { "chCode18-SF32", "rrc.chCode18-SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode17_SF32,
       { "chCode17-SF32", "rrc.chCode17-SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode16_SF32,
       { "chCode16-SF32", "rrc.chCode16-SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode15_SF32,
       { "chCode15-SF32", "rrc.chCode15-SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode14_SF32,
       { "chCode14-SF32", "rrc.chCode14-SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode13_SF32,
       { "chCode13-SF32", "rrc.chCode13-SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode12_SF32,
       { "chCode12-SF32", "rrc.chCode12-SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode11_SF32,
       { "chCode11-SF32", "rrc.chCode11-SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode10_SF32,
       { "chCode10-SF32", "rrc.chCode10-SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode9_SF32,
       { "chCode9-SF32", "rrc.chCode9-SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode8_SF32,
       { "chCode8-SF32", "rrc.chCode8-SF32",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode7_SF32,
       { "chCode7-SF32", "rrc.chCode7-SF32",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode6_SF32,
       { "chCode6-SF32", "rrc.chCode6-SF32",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode5_SF32,
       { "chCode5-SF32", "rrc.chCode5-SF32",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode4_SF32,
       { "chCode4-SF32", "rrc.chCode4-SF32",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode3_SF32,
       { "chCode3-SF32", "rrc.chCode3-SF32",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode2_SF32,
       { "chCode2-SF32", "rrc.chCode2-SF32",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_bitmap_01_chCode1_SF32,
       { "chCode1-SF32", "rrc.chCode1-SF32",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code7,
       { "code7", "rrc.code7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code6,
       { "code6", "rrc.code6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code5,
       { "code5", "rrc.code5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code4,
       { "code4", "rrc.code4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code3,
       { "code3", "rrc.code3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code2,
       { "code2", "rrc.code2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code1,
       { "code1", "rrc.code1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_T_sync_UL_CodesBitmap_code0,
       { "code0", "rrc.code0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code7,
       { "code7", "rrc.code7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code6,
       { "code6", "rrc.code6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code5,
       { "code5", "rrc.code5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code4,
       { "code4", "rrc.code4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code3,
       { "code3", "rrc.code3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code2,
       { "code2", "rrc.code2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code1,
       { "code1", "rrc.code1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_Sync_UL_Codes_Bitmap_code0,
       { "code0", "rrc.code0",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_7,
       { "a5-7", "rrc.a5-7",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_6,
       { "a5-6", "rrc.a5-6",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_5,
       { "a5-5", "rrc.a5-5",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_4,
       { "a5-4", "rrc.a5-4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_3,
       { "a5-3", "rrc.a5-3",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_2,
       { "a5-2", "rrc.a5-2",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrc_GsmSecurityCapability_a5_1,
       { "a5-1", "rrc.a5-1",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-rrc-hfarr.c ---*/
 #line 128 "packet-rrc-template.c"
diff --git a/epan/dissectors/packet-rrlp.c b/epan/dissectors/packet-rrlp.c
index a3f7673351..02182b4694 100644
--- a/epan/dissectors/packet-rrlp.c
+++ b/epan/dissectors/packet-rrlp.c
@@ -4791,7 +4791,7 @@ void proto_register_rrlp(void) {
         "rrlp.TimeSlotScheme", HFILL }},
     { &hf_rrlp_btsPosition,
       { "btsPosition", "rrlp.btsPosition",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.BTSPosition", HFILL }},
     { &hf_rrlp_msrAssistList,
       { "msrAssistList", "rrlp.msrAssistList",
@@ -5007,7 +5007,7 @@ void proto_register_rrlp(void) {
         "rrlp.FixType", HFILL }},
     { &hf_rrlp_posEstimate,
       { "posEstimate", "rrlp.posEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.Ext_GeographicalInformation", HFILL }},
     { &hf_rrlp_gpsMsrSetList,
       { "gpsMsrSetList", "rrlp.gpsMsrSetList",
@@ -5067,11 +5067,11 @@ void proto_register_rrlp(void) {
         "rrlp.AdditionalAssistanceData", HFILL }},
     { &hf_rrlp_gpsAssistanceData,
       { "gpsAssistanceData", "rrlp.gpsAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GPSAssistanceData", HFILL }},
     { &hf_rrlp_ganssAssistanceData,
       { "ganssAssistanceData", "rrlp.ganssAssistanceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GANSSAssistanceData", HFILL }},
     { &hf_rrlp_controlHeader,
       { "controlHeader", "rrlp.controlHeader",
@@ -5167,7 +5167,7 @@ void proto_register_rrlp(void) {
         "rrlp.BitNumber", HFILL }},
     { &hf_rrlp_threeDLocation,
       { "threeDLocation", "rrlp.threeDLocation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.Ext_GeographicalInformation", HFILL }},
     { &hf_rrlp_gpsTOW_02,
       { "gpsTOW", "rrlp.gpsTOW",
@@ -5675,7 +5675,7 @@ void proto_register_rrlp(void) {
         "rrlp.NULL", HFILL }},
     { &hf_rrlp_ganssPositionMethod,
       { "ganssPositionMethod", "rrlp.ganssPositionMethod",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.GANSSPositioningMethod", HFILL }},
     { &hf_rrlp_ganss_AssistData,
       { "ganss-AssistData", "rrlp.ganss_AssistData",
@@ -6095,7 +6095,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_0_255", HFILL }},
     { &hf_rrlp_svIDMask,
       { "svIDMask", "rrlp.svIDMask",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.SVIDMASK", HFILL }},
     { &hf_rrlp_toa,
       { "toa", "rrlp.toa",
@@ -6191,7 +6191,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_M128_127", HFILL }},
     { &hf_rrlp_velEstimate,
       { "velEstimate", "rrlp.velEstimate",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.VelocityEstimate", HFILL }},
     { &hf_rrlp_ganssLocationInfo,
       { "ganssLocationInfo", "rrlp.ganssLocationInfo",
@@ -6219,7 +6219,7 @@ void proto_register_rrlp(void) {
         "rrlp.INTEGER_0_3", HFILL }},
     { &hf_rrlp_posData,
       { "posData", "rrlp.posData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rrlp.PositionData", HFILL }},
     { &hf_rrlp_stationaryIndication,
       { "stationaryIndication", "rrlp.stationaryIndication",
@@ -6292,23 +6292,23 @@ void proto_register_rrlp(void) {
     { &hf_rrlp_GANSSPositioningMethod_gps,
       { "gps", "rrlp.gps",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_GANSSPositioningMethod_galileo,
       { "galileo", "rrlp.galileo",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_e_otd,
       { "e-otd", "rrlp.e-otd",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_gps,
       { "gps", "rrlp.gps",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_rrlp_PositionData_galileo,
       { "galileo", "rrlp.galileo",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-rrlp-hfarr.c ---*/
 #line 80 "packet-rrlp-template.c"
diff --git a/epan/dissectors/packet-rsl.c b/epan/dissectors/packet-rsl.c
index c57030ebc4..30ef499106 100644
--- a/epan/dissectors/packet-rsl.c
+++ b/epan/dissectors/packet-rsl.c
@@ -3546,342 +3546,342 @@ void proto_register_rsl(void)
 		{ &hf_rsl_msg_dsc,
 			{ "Message discriminator",           "rsl.msg_dsc",
 			FT_UINT8, BASE_DEC, VALS(rsl_msg_disc_vals), 0xfe,
-			"Message discriminator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_T_bit,
 			{ "T bit",           "rsl.T_bit",
 			FT_BOOLEAN, 8, TFS(&rsl_t_bit_vals), 0x01,
-			"T bit", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_msg_type,
 			{ "Message type",           "rsl.msg_type",
 			FT_UINT8, BASE_HEX_DEC, VALS(rsl_msg_type_vals), 0x7f,
-			"Message type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ie_id,
 			{ "Element identifier",           "rsl.ie_id",
 			FT_UINT8, BASE_HEX_DEC, VALS(rsl_ie_type_vals), 0x0,
-			"Element identifier", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ie_length,
 			{ "Length",           "rsl.ie_length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_no_Cbits,
 			{ "C-bits",           "rsl.ch_no_Cbits",
 			FT_UINT8, BASE_DEC, VALS(rsl_ch_no_Cbits_vals), 0xf8,
-			"C-bits", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_no_TN,
 			{ "Time slot number (TN)",  "rsl.ch_no_TN",
 			FT_UINT8, BASE_DEC, NULL, 0x07,
-			"Time slot number (TN)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rtd,
 			{ "Round Trip Delay (RTD)",  "rsl.rtd",
 			FT_UINT8, BASE_DEC, NULL, 0xfe,
-			"Round Trip Delay (RTD)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_delay_ind,
 			{ "Delay IND",  "rsl.delay_ind",
 			FT_UINT8, BASE_DEC, rsl_delay_ind_vals, 0x01,
-			"Delay IND", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_tfo,
 			{ "TFO",           "rsl.tfo",
 			FT_BOOLEAN, 8, TFS(&rsl_tfo_vals), 0x01,
-			"TFO", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_req_ref_ra,
 			{ "Random Access Information (RA)", "rsl.req_ref_ra",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Random Access Information (RA)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_req_ref_T1prim,
 			{ "T1'",           "rsl.req_ref_T1prim",
 			FT_UINT8, BASE_DEC, NULL, 0xf8,
-			"T1'", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_req_ref_T3,
 			{ "T3",           "rsl.req_ref_T3",
 			FT_UINT16, BASE_DEC, NULL, 0x07e0,
-			"T3", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_req_ref_T2,
 			{ "T2",           "rsl.req_ref_T2",
 			FT_UINT8, BASE_DEC, NULL, 0x1f,
-			"T2", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_timing_adv,
 			{ "Timing Advance",           "rsl.timing_adv",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Timing Advance", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ho_ref,
 			{ "Hand-over reference",           "rsl.ho_ref",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Hand-over reference", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ms_power_lev,
 			{ "MS power level",           "rsl.ms_power_lev",
 			FT_UINT8, BASE_DEC, NULL, 0xf8,
-			"MS power level", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ms_fpc,
 			{ "FPC/EPC",           "rsl.ms_fpc",
 			FT_BOOLEAN, 8, TFS(&rsl_ms_fpc_epc_mode_vals), 0x04,
-			"FPC/EPC", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_act_timing_adv,
 			{ "Actual Timing Advance",           "rsl.act_timing_adv",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Actual Timing Advance", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_power_lev,
 			{ "Power level",           "rsl.power_lev",
 			FT_UINT8, BASE_DEC, NULL, 0x1f,
-			"Power level", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_rsl_dtxd,
 			{ "DTXd",           "rsl.dtxd",
 			FT_BOOLEAN, 8, TFS(&rsl_dtxd_vals), 0x40,
-			"DTXd", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rxlev_full_up,
 			{ "RXLEV.FULL.up",           "rsl.rxlev_full_up",
 			FT_UINT8, BASE_DEC, NULL, 0x3f,
-			"RXLEV.FULL.up", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rxlev_sub_up,
 			{ "RXLEV.SUB.up",           "rsl.rxlev_sub_up",
 			FT_UINT8, BASE_DEC, NULL, 0x3f,
-			"RXLEV.SUB.up", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rxqual_full_up,
 			{ "RXQUAL.FULL.up",           "rsl.rxqual_full_up",
 			FT_UINT8, BASE_DEC, NULL, 0x38,
-			"RXQUAL.FULL.up", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rxqual_sub_up,
 			{ "RXQUAL.SUB.up",           "rsl.rxqual_sub_up",
 			FT_UINT8, BASE_DEC, NULL, 0x07,
-			"RXQUAL.SUB.up", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_acc_delay,
 			{ "Access Delay",           "rsl.acc_del",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Access Delay", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rach_slot_cnt,
 			{ "RACH Slot Count",           "rsl.rach_slot_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"RACH Slot Count", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rach_busy_cnt,
 			{ "RACH Busy Count",           "rsl.rach_busy_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"RACH Busy Count", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rach_acc_cnt,
 			{ "RACH Access Count",           "rsl.rach_acc_cnt",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"RACH Access Count", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_phy_ctx,
 			{ "Physical Context",           "rsl.phy_ctx",
 			FT_BYTES, BASE_NONE, NULL, 0x0,
-			"Physical Context", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_na,
 			{ "Not applicable (NA)",           "rsl.na",
 			FT_BOOLEAN, 8, TFS(&rsl_na_vals), 0x20,
-			"Not applicable (NA)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_type,
 			{ "channel type",           "rsl.ch_type",
 			FT_UINT8, BASE_DEC, VALS(rsl_ch_type_vals), 0xc0,
-			"channel type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_prio,
 			{ "Priority",           "rsl.prio",
 			FT_UINT8, BASE_DEC, VALS(rsl_prio_vals), 0x18,
-			"Priority", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_sapi,
 			{ "SAPI",           "rsl.sapi",
 			FT_UINT8, BASE_DEC, NULL, 0x07,
-			"SAPI", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rbit,
 			{ "R",           "rsl.rbit",
 			FT_BOOLEAN, 8, TFS(&rsl_rbit_vals), 0x80,
-			"R", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_a3a2,
 			{ "A3A2",           "rsl.a3a2",
 			FT_UINT8, BASE_DEC, VALS(rsl_a3a2_vals), 0x06,
-			"A3A2", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_a1_0,
 			{ "A1",           "rsl.a1_0",
 			FT_BOOLEAN, 8, TFS(&rsl_a1_0_vals), 0x01,
-			"A1", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_a1_1,
 			{ "A1",           "rsl.a1_1",
 			FT_BOOLEAN, 8, TFS(&rsl_a1_1_vals), 0x01,
-			"A1", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_a1_2,
 			{ "A1",           "rsl.a2_0",
 			FT_BOOLEAN, 8, TFS(&rsl_a1_2_vals), 0x01,
-			"A1", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_epc_mode,
 			{ "EPC mode", "rsl.epc_mode",
 			FT_BOOLEAN, 8, TFS(&rsl_epc_mode_vals), 0x20,
-			"EPC mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_bs_fpc_epc_mode,
 			{ "FPC-EPC mode", "rsl.fpc_epc_mode",
 			FT_BOOLEAN, 8, TFS(&rsl_fpc_epc_mode_vals), 0x10,
-			"FPC-EPC mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_bs_power,
 			{ "Power Level",           "rsl.bs_power",
 			FT_UINT8, BASE_DEC, VALS(rsl_rlm_bs_power_vals), 0x0f,
-			"Power Level", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_cm_dtxd,
 			{ "DTXd", "rsl.cm_dtxd",
 			FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x02,
-			"DTXd", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_cm_dtxu,
 			{ "DTXu", "rsl.cm_dtxu",
 			FT_BOOLEAN, 8, TFS(&rsl_dtx_vals), 0x01,
-			"DTXu", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_speech_or_data,
 			{ "Speech or data indicator",           "rsl.speech_or_data",
 			FT_UINT8, BASE_DEC, VALS(rsl_speech_or_data_vals), 0x0,
-			"Speech or data indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_rate_and_type,
 			{ "Channel rate and type",           "rsl.speech_or_data",
 			FT_UINT8, BASE_DEC, VALS(rsl_ch_rate_and_type_vals), 0x0,
-			"Channel rate and type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_speech_coding_alg,
 			{ "Speech coding algorithm",           "rsl.speech_coding_alg",
 			FT_UINT8, BASE_DEC, VALS(rsl_speech_coding_alg_vals), 0x0,
-			"Speech coding algorithm", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_t_nt_bit,
 			{ "Transparent indication", "rsl.t_nt_bit",
 			FT_BOOLEAN, 8, TFS(&t_nt_bit_vals), 0x40,
-			"Transparent indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ra_if_data_rte,
 			{ "Radio interface data rate",           "rsl.ra_if_data_rte",
 			FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
-			"Radio interface data rate", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_data_rte,
 			{ "Data rate",           "rsl.data_rte",
 			FT_UINT8, BASE_DEC, VALS(rsl_ra_if_data_rte_vals), 0x3f,
-			"Data rate", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_alg_id,
 			{ "Algorithm Identifier",           "rsl.alg_id",
 			FT_UINT8, BASE_DEC, VALS(rsl_algorithm_id_vals), 0x0,
-			"Algorithm Identifier", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_key,
 			{ "KEY",           "rsl.key",
 			FT_BYTES, BASE_NONE, NULL, 0x0,
-			"KEY", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_cause,
 			{ "Cause",           "rsl.cause",
 			FT_UINT8, BASE_DEC, VALS(rsl_rlm_cause_vals), 0x7f,
-			"Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_rel_mode,
 			{ "Release Mode",           "rsl.rel_mode",
 			FT_UINT8, BASE_DEC, VALS(rel_mode_vals), 0x01,
-			"Release Mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_interf_band,
 			{ "Interf Band",           "rsl.interf_band",
 			FT_UINT8, BASE_DEC, NULL, 0xe0,
-			"Interf Band", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_meas_res_no,
 			{ "Measurement result number",           "rsl.meas_res_no",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Measurement result number", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_extension_bit,
 			{ "Extension", "rsl.extension_bit",
 			FT_BOOLEAN, 8, TFS(&rsl_extension_bit_value), 0x80,
-			"Extension", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rsl_class,
 			{ "Class",           "rsl.class",
 			FT_UINT8, BASE_DEC, VALS(rsl_class_vals), 0x70,
-			"Class", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_paging_grp,
 			{ "Paging Group",           "rsl.paging_grp",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Paging Group", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_paging_load,
 			{ "Paging Buffer Space",           "rsl.paging_load",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Paging Buffer Space", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_sys_info_type,
 			{ "System Info Type",           "rsl.sys_info_type",
 			FT_UINT8, BASE_DEC, VALS(rsl_sys_info_type_vals), 0x0,
-			"System Info Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_timing_offset,
 			{ "Timing Offset",           "rsl.timing_offset",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Timing Offset", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_needed,
 			{ "Channel Needed",           "rsl.ch_needed",
 			FT_UINT8, BASE_DEC, VALS(rsl_ch_needed_vals), 0x03,
-			"Channel Needed", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_cbch_load_type,
 			{ "CBCH Load Type", "rsl.cbch_load_type",
 			FT_BOOLEAN, 8, TFS(&rsl_cbch_load_type_vals), 0x80,
-			"CBCH Load Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_msg_slt_cnt,
 			{ "Message Slot Count", "rsl.sg_slt_cnt",
 			FT_UINT8, BASE_DEC, NULL, 0x0f,
-			"Message Slot Count", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_ch_ind,
 			{ "Channel Ind",           "rsl.ch_ind",
 			FT_UINT8, BASE_DEC, VALS(rsl_ch_ind_vals), 0x0f,
-			"Channel Ind", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_command,
 			{ "Command",           "rsl.cmd",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Command", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rsl_emlpp_prio,
 			{ "eMLPP Priority",           "rsl.emlpp_prio",
 			FT_UINT8, BASE_DEC, VALS(rsl_emlpp_prio_vals), 0x03,
-			"eMLPP Priority", HFILL }
+			NULL, HFILL }
 		},
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-rstat.c b/epan/dissectors/packet-rstat.c
index 7df2a77576..caa37cfb15 100644
--- a/epan/dissectors/packet-rstat.c
+++ b/epan/dissectors/packet-rstat.c
@@ -118,16 +118,16 @@ proto_register_rstat(void)
 	static hf_register_info hf[] = {
 		{ &hf_rstat_procedure_v1, {
 			"V1 Procedure", "rstat.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(rstat1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(rstat1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_rstat_procedure_v2, {
 			"V2 Procedure", "rstat.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(rstat2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(rstat2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_rstat_procedure_v3, {
 			"V3 Procedure", "rstat.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(rstat3_proc_vals), 0, "V3 Procedure", HFILL }},
+			VALS(rstat3_proc_vals), 0, NULL, HFILL }},
 		{ &hf_rstat_procedure_v4, {
 			"V4 Procedure", "rstat.procedure_v4", FT_UINT32, BASE_DEC,
-			VALS(rstat4_proc_vals), 0, "V4 Procedure", HFILL }}
+			VALS(rstat4_proc_vals), 0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-rsync.c b/epan/dissectors/packet-rsync.c
index 70760dfeb4..4a4a7c8f13 100644
--- a/epan/dissectors/packet-rsync.c
+++ b/epan/dissectors/packet-rsync.c
@@ -283,35 +283,35 @@ proto_register_rsync(void)
     static hf_register_info hf[] = {
 	{&hf_rsync_hdr_magic,
 	 {"Magic Header", "rsync.hdr_magic",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_hdr_version,
 	 {"Header Version", "rsync.hdr_version",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_query_string,
 	 {"Client Query String", "rsync.query",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_response_string,
 	 {"Server Response String", "rsync.response",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_motd_string,
 	 {"Server MOTD String", "rsync.motd",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_rsyncdok_string,
 	 {"RSYNCD Response String", "rsync.response",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_command_string,
 	 {"Command String", "rsync.command",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_rsync_data,
 	 {"rsync data", "rsync.data",
-	  FT_BYTES, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 
     };
diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c
index d41b578024..f5dddd0f20 100644
--- a/epan/dissectors/packet-rtcp.c
+++ b/epan/dissectors/packet-rtcp.c
@@ -2794,7 +2794,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_version_vals),
 				0xC0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2806,7 +2806,7 @@ proto_register_rtcp(void)
 				8,
 				NULL,
 				0x20,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2818,7 +2818,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x1F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2830,7 +2830,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x1F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2842,7 +2842,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS( rtcp_packet_type_vals ),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2866,7 +2866,7 @@ proto_register_rtcp(void)
 				BASE_HEX_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2878,7 +2878,7 @@ proto_register_rtcp(void)
 				BASE_DEC_HEX,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2890,7 +2890,7 @@ proto_register_rtcp(void)
 				BASE_DEC_HEX,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2902,7 +2902,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2914,7 +2914,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2926,7 +2926,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2938,7 +2938,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2950,7 +2950,7 @@ proto_register_rtcp(void)
 				BASE_HEX_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2962,7 +2962,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2974,7 +2974,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2986,7 +2986,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -2998,7 +2998,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3010,7 +3010,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3022,7 +3022,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3034,7 +3034,7 @@ proto_register_rtcp(void)
 				BASE_DEC_HEX,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3046,7 +3046,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3058,7 +3058,7 @@ proto_register_rtcp(void)
 				BASE_HEX_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3070,7 +3070,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS( rtcp_sdes_type_vals ),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3082,7 +3082,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3094,7 +3094,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3106,7 +3106,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3118,7 +3118,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3130,7 +3130,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3142,7 +3142,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3154,7 +3154,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3166,7 +3166,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3178,7 +3178,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_floor_cnt_type_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3190,7 +3190,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3202,7 +3202,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3214,7 +3214,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_qsresp_priority_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3226,7 +3226,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3238,7 +3238,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3250,7 +3250,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3262,7 +3262,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3274,7 +3274,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3286,7 +3286,7 @@ proto_register_rtcp(void)
 				BASE_HEX,
 				NULL,
 				0x8000,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3298,7 +3298,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_reason_code1_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3310,7 +3310,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3322,7 +3322,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_reason_code2_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3346,7 +3346,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_floor_cnt_type_vals),
 				0xf8,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3358,7 +3358,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_reason_code_ack_vals),
 				0x07ff,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3370,7 +3370,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_qsresp_priority_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3382,7 +3382,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3394,7 +3394,7 @@ proto_register_rtcp(void)
 				16,
 				NULL,
 				0x8000,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3406,7 +3406,7 @@ proto_register_rtcp(void)
 				16,
 				NULL,
 				0x4000,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3418,7 +3418,7 @@ proto_register_rtcp(void)
 				16,
 				NULL,
 				0x2000,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3430,7 +3430,7 @@ proto_register_rtcp(void)
 				16,
 				NULL,
 				0x1000,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3442,7 +3442,7 @@ proto_register_rtcp(void)
 				16,
 				NULL,
 				0x0800,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3454,7 +3454,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_app_poc1_conn_sess_type_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3466,7 +3466,7 @@ proto_register_rtcp(void)
 				8,
 				NULL,
 				0x80,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3478,7 +3478,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3490,7 +3490,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3502,7 +3502,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3514,7 +3514,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3526,7 +3526,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3538,7 +3538,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3550,7 +3550,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3562,7 +3562,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3574,7 +3574,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3586,7 +3586,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"Profile-specific extension", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3718,7 +3718,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3730,7 +3730,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3742,7 +3742,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3754,7 +3754,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3766,7 +3766,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3778,7 +3778,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3814,7 +3814,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3826,7 +3826,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3886,7 +3886,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_xr_plc_algo_vals),
 				0xC0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3898,7 +3898,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_xr_jb_adaptive_vals),
 				0x30,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3910,7 +3910,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3922,7 +3922,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3934,7 +3934,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3946,7 +3946,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3958,7 +3958,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
                                 NULL,
 				0x0F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3970,7 +3970,7 @@ proto_register_rtcp(void)
 				8,
 				NULL,
 				0x80,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3982,7 +3982,7 @@ proto_register_rtcp(void)
 				8,
 				NULL,
 				0x40,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -3994,7 +3994,7 @@ proto_register_rtcp(void)
 				8,
 				NULL,
 				0x20,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4006,7 +4006,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_xr_ip_ttl_vals),
 				0x18,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4018,7 +4018,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4030,7 +4030,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4042,7 +4042,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4054,7 +4054,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4066,7 +4066,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4078,7 +4078,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4090,7 +4090,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4102,7 +4102,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4114,7 +4114,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4126,7 +4126,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4138,7 +4138,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4150,7 +4150,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4162,7 +4162,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4174,7 +4174,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4186,7 +4186,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"RTCP frame length check", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4210,7 +4210,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_rtpfb_fmt_vals),
 				0x1f,
-				"RTCP Feedback message type (FMT)", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4222,7 +4222,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				VALS(rtcp_psfb_fmt_vals),
 				0x1f,
-				"RTCP Feedback message type (FMT)", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4234,7 +4234,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"RTCP Transport Feedback NACK", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4246,7 +4246,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"RTCP Transport Feedback NACK BLP", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4258,7 +4258,7 @@ proto_register_rtcp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"Feedback Control Information (FCI)", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -4283,7 +4283,7 @@ proto_register_rtcp(void)
 				BASE_DEC_HEX,
 				NULL,
 				0x7fffffff,
-				"SRTCP Index", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4320,7 +4320,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4332,7 +4332,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4344,7 +4344,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4356,7 +4356,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4368,7 +4368,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4380,7 +4380,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4392,7 +4392,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4401,10 +4401,10 @@ proto_register_rtcp(void)
 				"Spare/reserved bits",
 				"rtcp.xr.btxnq.spare",
 				FT_STRING,
-				BASE_DEC,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4416,7 +4416,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4428,7 +4428,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4440,7 +4440,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -4452,7 +4452,7 @@ proto_register_rtcp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 	};
diff --git a/epan/dissectors/packet-rtmpt.c b/epan/dissectors/packet-rtmpt.c
index 6c4122b770..6c1b394de0 100644
--- a/epan/dissectors/packet-rtmpt.c
+++ b/epan/dissectors/packet-rtmpt.c
@@ -468,7 +468,7 @@ proto_register_rtmpt(void)
       { "Caller source", "rtmpt.header.caller", FT_UINT32, BASE_DEC, NULL, 0x0, "RTMPT Header caller source", HFILL }},
 
    { &hf_rtmpt_handshake_data,
-      { "Handshake data", "rtmpt.header.handshake", FT_BYTES, BASE_HEX, NULL, 0x0, "RTMPT Header handshake data", HFILL }},
+      { "Handshake data", "rtmpt.header.handshake", FT_BYTES, BASE_NONE, NULL, 0x0, "RTMPT Header handshake data", HFILL }},
 
    { &hf_rtmpt_amf_type,
       { "AMF type", "rtmpt.amf.type", FT_UINT8, BASE_DEC, VALS(rtmpt_type_vals), 0x0, "RTMPT AMF type", HFILL }},
@@ -480,7 +480,7 @@ proto_register_rtmpt(void)
       { "AMF boolean", "rtmpt.amf.boolean", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "RTMPT AMF boolean", HFILL }},
 
    { &hf_rtmpt_amf_string,
-      { "AMF string", "rtmpt.amf.string", FT_STRINGZ, BASE_DEC, NULL, 0x0, "RTMPT AMF string", HFILL }}
+      { "AMF string", "rtmpt.amf.string", FT_STRINGZ, BASE_NONE, NULL, 0x0, "RTMPT AMF string", HFILL }}
 
 
   };
diff --git a/epan/dissectors/packet-rtnet.c b/epan/dissectors/packet-rtnet.c
index 49f2bc5929..b28f0809fa 100644
--- a/epan/dissectors/packet-rtnet.c
+++ b/epan/dissectors/packet-rtnet.c
@@ -1216,13 +1216,13 @@ proto_register_rtcfg(void) {
     { &hf_rtcfg_client_ip_address,
       { "Client IP Address",
         "rtcfg.client_ip_address",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "RTcfg Client IP Address", HFILL }},
 
     { &hf_rtcfg_server_ip_address,
       { "Server IP Address",
         "rtcfg.server_ip_address",
-        FT_IPv4, BASE_DEC, NULL, 0x0,
+        FT_IPv4, BASE_NONE, NULL, 0x0,
         "RTcfg Server IP Address", HFILL }},
 
     { &hf_rtcfg_burst_rate,
@@ -1240,7 +1240,7 @@ proto_register_rtcfg(void) {
     { &hf_rtcfg_config_data,
       { "Config Data",
         "rtcfg.config_data",
-        FT_BYTES, BASE_DEC, NULL, 0x00,
+        FT_BYTES, BASE_NONE, NULL, 0x00,
         "RTcfg Config Data", HFILL }},
 
     { &hf_rtcfg_padding,
@@ -1265,13 +1265,13 @@ proto_register_rtcfg(void) {
       { "Client Ready",
         "rtcfg.client_flags.ready",
         FT_UINT8, BASE_DEC, NULL, 0x02,
-        "Client Ready", HFILL }},
+        NULL, HFILL }},
 
     { &hf_rtcfg_client_flags_res,
       { "Reserved",
         "rtcfg.client_flags.res",
         FT_UINT8, BASE_HEX, NULL, 0xfc,
-        "Reserved", HFILL }},
+        NULL, HFILL }},
 
     { &hf_rtcfg_server_flags,
       { "Flags",
@@ -1283,19 +1283,19 @@ proto_register_rtcfg(void) {
       { "Reserved",
         "rtcfg.server_flags.res0",
         FT_UINT8, BASE_HEX, NULL, 0x01,
-        "Reserved", HFILL }},
+        NULL, HFILL }},
 
     { &hf_rtcfg_server_flags_ready,
       { "Server Ready",
         "rtcfg.server_flags.ready",
         FT_UINT8, BASE_DEC, NULL, 0x02,
-        "Server Ready", HFILL }},
+        NULL, HFILL }},
 
     { &hf_rtcfg_server_flags_res2,
       { "Reserved",
         "rtcfg.server_flags.res2",
         FT_UINT8, BASE_HEX, NULL, 0xfc,
-        "Reserved", HFILL }},
+        NULL, HFILL }},
 
     { &hf_rtcfg_active_stations,
       { "Active Stations",
diff --git a/epan/dissectors/packet-rtp-events.c b/epan/dissectors/packet-rtp-events.c
index d2ee744220..c57e4015b0 100644
--- a/epan/dissectors/packet-rtp-events.c
+++ b/epan/dissectors/packet-rtp-events.c
@@ -168,7 +168,7 @@ proto_register_rtp_events(void)
 				BASE_DEC,
 				VALS(rtp_event_type_values),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -180,7 +180,7 @@ proto_register_rtp_events(void)
 				8,
 				NULL,
 				0x80,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -192,7 +192,7 @@ proto_register_rtp_events(void)
 				8,
 				NULL,
 				0x40,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -204,7 +204,7 @@ proto_register_rtp_events(void)
 				BASE_DEC,
 				NULL,
 				0x3F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -217,7 +217,7 @@ proto_register_rtp_events(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c
index 6ee4895982..eb5c448975 100644
--- a/epan/dissectors/packet-rtp.c
+++ b/epan/dissectors/packet-rtp.c
@@ -1593,7 +1593,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				VALS(rtp_version_vals),
 				0xC0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1605,7 +1605,7 @@ proto_register_rtp(void)
 				8,
 				NULL,
 				0x20,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1617,7 +1617,7 @@ proto_register_rtp(void)
 				8,
 				NULL,
 				0x10,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1629,7 +1629,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1641,7 +1641,7 @@ proto_register_rtp(void)
 				8,
 				NULL,
 				0x80,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1653,7 +1653,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x7F,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1665,7 +1665,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1677,7 +1677,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1689,7 +1689,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1701,7 +1701,7 @@ proto_register_rtp(void)
 				BASE_HEX_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1713,7 +1713,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1725,7 +1725,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1737,7 +1737,7 @@ proto_register_rtp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1749,7 +1749,7 @@ proto_register_rtp(void)
 				BASE_HEX_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1761,7 +1761,7 @@ proto_register_rtp(void)
 				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1773,7 +1773,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1782,10 +1782,10 @@ proto_register_rtp(void)
 				"Payload",
 				"rtp.payload",
 				FT_BYTES,
-				BASE_HEX,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1794,10 +1794,10 @@ proto_register_rtp(void)
 				"Padding data",
 				"rtp.padding.data",
 				FT_BYTES,
-				BASE_HEX,
+				BASE_NONE,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1809,7 +1809,7 @@ proto_register_rtp(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1888,12 +1888,12 @@ proto_register_rtp(void)
 		/* reassembly stuff */
 		{&hf_rtp_fragments,
 		 {"RTP Fragments", "rtp.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-		  "RTP Fragments", HFILL }
+		  NULL, HFILL }
 		},
 
 		{&hf_rtp_fragment,
 		 {"RTP Fragment data", "rtp.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-		  "RTP Fragment data", HFILL }
+		  NULL, HFILL }
 		},
 
 		{&hf_rtp_fragment_overlap,
@@ -1933,7 +1933,7 @@ proto_register_rtp(void)
 		{&hf_srtp_encrypted_payload,
 		 {"SRTP Encrypted Payload", "srtp.enc_payload",
 		  FT_BYTES, BASE_NONE, NULL, 0x0,
-		  "SRTP Encrypted Payload", HFILL }
+		  NULL, HFILL }
 		},
 		{&hf_srtp_mki,
 		 {"SRTP MKI", "srtp.mki",
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c
index 3e1636c1c4..c009fe0d69 100644
--- a/epan/dissectors/packet-rtps.c
+++ b/epan/dissectors/packet-rtps.c
@@ -6047,7 +6047,7 @@ void proto_register_rtps(void) {
         "guidPrefix",
         "rtps.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
         "GuidPrefix of the RTPS packet",
@@ -6141,11 +6141,10 @@ void proto_register_rtps(void) {
         "guidPrefix",
         "rtps.sm.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
-        "a generic guidPrefix that is transmitted inside the submessage "
-        "(this is NOT the guidPrefix described in the packet header",
+        "a generic guidPrefix that is transmitted inside the submessage (this is NOT the guidPrefix described in the packet header",
         HFILL }
     },
 
@@ -6377,8 +6376,7 @@ void proto_register_rtps(void) {
         BASE_DEC, 
         NULL,
         0,
-        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH "
-        "parameter", 
+        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH parameter", 
         HFILL }
     },
 
@@ -6399,7 +6397,7 @@ void proto_register_rtps(void) {
         "userData", 
         "rtps.param.userData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_USER_DATA parameter", 
@@ -6411,7 +6409,7 @@ void proto_register_rtps(void) {
         "groupData", 
         "rtps.param.groupData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_GROUP_DATA parameter", 
@@ -6423,7 +6421,7 @@ void proto_register_rtps(void) {
         "topicData", 
         "rtps.param.topicData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_TOPIC_DATA parameter", 
@@ -6469,7 +6467,7 @@ void proto_register_rtps(void) {
         "serializedData", 
         "rtps.issueData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data transferred in a ISSUE submessage", 
diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c
index bdd77917d7..e3529e0f84 100644
--- a/epan/dissectors/packet-rtps2.c
+++ b/epan/dissectors/packet-rtps2.c
@@ -8747,7 +8747,7 @@ void proto_register_rtps2(void) {
         "guidPrefix",
         "rtps2.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
         "GuidPrefix of the RTPS packet",
@@ -8832,11 +8832,10 @@ void proto_register_rtps2(void) {
         "guidPrefix",
         "rtps2.sm.guidPrefix",
         FT_BYTES,
-        BASE_HEX,
+        BASE_NONE,
         NULL,
         0,
-        "a generic guidPrefix that is transmitted inside the submessage "
-        "(this is NOT the guidPrefix described in the packet header",
+        "a generic guidPrefix that is transmitted inside the submessage (this is NOT the guidPrefix described in the packet header",
         HFILL }
     },
 
@@ -9033,8 +9032,7 @@ void proto_register_rtps2(void) {
         BASE_HEX, 
         NULL,
         0,
-        "State information of the data object to which the message apply"
-        " (i.e. lifecycle)", 
+        "State information of the data object to which the message apply (i.e. lifecycle)", 
         HFILL }
     },
 
@@ -9104,8 +9102,7 @@ void proto_register_rtps2(void) {
         BASE_DEC, 
         NULL,
         0,
-        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH "
-        "parameter", 
+        "Decimal value representing the value of a PID_OWNERSHIP_STRENGTH parameter", 
         HFILL }
     },
 
@@ -9126,7 +9123,7 @@ void proto_register_rtps2(void) {
         "userData", 
         "rtps2.param.userData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_USER_DATA parameter", 
@@ -9138,7 +9135,7 @@ void proto_register_rtps2(void) {
         "groupData", 
         "rtps2.param.groupData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_GROUP_DATA parameter", 
@@ -9150,7 +9147,7 @@ void proto_register_rtps2(void) {
         "topicData", 
         "rtps2.param.topicData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data sent in a PID_TOPIC_DATA parameter", 
@@ -9195,7 +9192,7 @@ void proto_register_rtps2(void) {
         "serializedData", 
         "rtps2.serializedData",
         FT_BYTES, 
-        BASE_HEX, 
+        BASE_NONE, 
         NULL, 
         0,
         "The user data transferred in a ISSUE submessage", 
diff --git a/epan/dissectors/packet-rtse.c b/epan/dissectors/packet-rtse.c
index b2778ae29f..13d1d07b03 100644
--- a/epan/dissectors/packet-rtse.c
+++ b/epan/dissectors/packet-rtse.c
@@ -834,18 +834,18 @@ void proto_register_rtse(void) {
 	NULL, 0x00, "Message fragment", HFILL } },
     { &hf_rtse_fragment_overlap,
       { "RTSE fragment overlap", "rtse.fragment.overlap", FT_BOOLEAN,
-	BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
+	BASE_NONE, NULL, 0x0, "Message fragment overlap", HFILL } },
     { &hf_rtse_fragment_overlap_conflicts,
       { "RTSE fragment overlapping with conflicting data",
 	"rtse.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
-	0x00, "Message fragment overlapping with conflicting data", HFILL } },
+	0x0, "Message fragment overlapping with conflicting data", HFILL } },
     { &hf_rtse_fragment_multiple_tails,
       { "RTSE has multiple tail fragments",
 	"rtse.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x00, "Message has multiple tail fragments", HFILL } },
+	NULL, 0x0, "Message has multiple tail fragments", HFILL } },
     { &hf_rtse_fragment_too_long_fragment,
       { "RTSE fragment too long", "rtse.fragment.too_long_fragment",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Message fragment too long",
 	HFILL } },
     { &hf_rtse_fragment_error,
       { "RTSE defragmentation error", "rtse.fragment.error", FT_FRAMENUM,
@@ -875,7 +875,7 @@ void proto_register_rtse(void) {
         "rtse.RTTPapdu", HFILL }},
     { &hf_rtse_rttr_apdu,
       { "rttr-apdu", "rtse.rttr_apdu",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rtse.RTTRapdu", HFILL }},
     { &hf_rtse_rtab_apdu,
       { "rtab-apdu", "rtse.rtab_apdu",
@@ -919,7 +919,7 @@ void proto_register_rtse(void) {
         "rtse.AbortReason", HFILL }},
     { &hf_rtse_reflectedParameter,
       { "reflectedParameter", "rtse.reflectedParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rtse.BIT_STRING", HFILL }},
     { &hf_rtse_userdataAB,
       { "userdataAB", "rtse.userdataAB",
@@ -951,7 +951,7 @@ void proto_register_rtse(void) {
         "rtse.T_t61String", HFILL }},
     { &hf_rtse_octetString,
       { "octetString", "rtse.octetString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "rtse.T_octetString", HFILL }},
 
 /*--- End of included file: packet-rtse-hfarr.c ---*/
diff --git a/epan/dissectors/packet-rtsp.c b/epan/dissectors/packet-rtsp.c
index ad7ec57989..e3a345ad26 100644
--- a/epan/dissectors/packet-rtsp.c
+++ b/epan/dissectors/packet-rtsp.c
@@ -1213,37 +1213,37 @@ proto_register_rtsp(void)
 	static hf_register_info hf[] = {
 		{ &hf_rtsp_request,
 			{ "Request", "rtsp.request", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_response,
 			{ "Response", "rtsp.response", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_method,
 			{ "Method", "rtsp.method", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_content_type,
 			{ "Content-type", "rtsp.content-type", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_content_length,
 			{ "Content-length", "rtsp.content-length", FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_url,
 			{ "URL", "rtsp.url", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_status,
 			{ "Status", "rtsp.status", FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_session,
 			{ "Session", "rtsp.session", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_transport,
 			{ "Transport", "rtsp.transport", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_rdtfeaturelevel,
 			{ "RDTFeatureLevel", "rtsp.rdt-feature-level", FT_UINT32, BASE_DEC, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 		{ &hf_rtsp_X_Vig_Msisdn,
 			{ "X-Vig-Msisdn", "X_Vig_Msisdn", FT_STRING, BASE_NONE, NULL, 0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 
 	};
diff --git a/epan/dissectors/packet-rudp.c b/epan/dissectors/packet-rudp.c
index f6bfe18663..1f31b1f5e9 100644
--- a/epan/dissectors/packet-rudp.c
+++ b/epan/dissectors/packet-rudp.c
@@ -151,17 +151,17 @@ proto_register_rudp(void)
 		{ &hf_rudp_flags,
 			{ "RUDP Header flags",           "rudp.flags",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rudp_flags_syn,
 			{ "Syn",           "rudp.flags.syn",
 			FT_BOOLEAN, 8, NULL, 0x80,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rudp_flags_ack,
 			{ "Ack",           "rudp.flags.ack",
 			FT_BOOLEAN, 8, NULL, 0x40,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rudp_flags_eak,
 			{ "Eak",           "rudp.flags.eak",
@@ -191,12 +191,12 @@ proto_register_rudp(void)
 		{ &hf_rudp_flags_0,
 			{ "0",           "rudp.flags.0",
 			FT_BOOLEAN, 8, NULL, 0x01,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rudp_hlen,
 			{ "Header Length",           "rudp.hlen",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_rudp_seq,
 			{ "Seq",           "rudp.seq",
@@ -211,7 +211,7 @@ proto_register_rudp(void)
 		{ &hf_rudp_cksum,
 			{ "Checksum",           "rudp.cksum",
 			FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-rwall.c b/epan/dissectors/packet-rwall.c
index a8a4bf42b5..6780271148 100644
--- a/epan/dissectors/packet-rwall.c
+++ b/epan/dissectors/packet-rwall.c
@@ -61,10 +61,10 @@ proto_register_rwall(void)
 	static hf_register_info hf[] = {
 		{ &hf_rwall_procedure_v1, {
 			"V1 Procedure", "rwall.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(rwall1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(rwall1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_rwall_message, {
-			"Message", "rwall.message", FT_STRING, BASE_DEC,
-			NULL, 0, "Message", HFILL }}
+			"Message", "rwall.message", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-rx.c b/epan/dissectors/packet-rx.c
index b92e71e3d1..7034d36c9a 100644
--- a/epan/dissectors/packet-rx.c
+++ b/epan/dissectors/packet-rx.c
@@ -600,70 +600,70 @@ proto_register_rx(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_rx_epoch, {
-			"Epoch", "rx.epoch", FT_ABSOLUTE_TIME, BASE_DEC,
-			NULL, 0, "Epoch", HFILL }},
+			"Epoch", "rx.epoch", FT_ABSOLUTE_TIME, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_cid, {
 			"CID", "rx.cid", FT_UINT32, BASE_DEC,
-			NULL, 0, "CID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_callnumber, {
 			"Call Number", "rx.callnumber", FT_UINT32, BASE_DEC,
-			NULL, 0, "Call Number", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_seq, {
 			"Sequence Number", "rx.seq", FT_UINT32, BASE_DEC,
-			NULL, 0, "Sequence Number", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_serial, {
 			"Serial", "rx.serial", FT_UINT32, BASE_DEC,
-			NULL, 0, "Serial", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_type, {
 			"Type", "rx.type", FT_UINT8, BASE_DEC,
-			VALS(rx_types), 0, "Type", HFILL }},
+			VALS(rx_types), 0, NULL, HFILL }},
 
 		{ &hf_rx_flags, {
 			"Flags", "rx.flags", FT_UINT8, BASE_HEX,
-			NULL, 0, "Flags", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_flags_clientinit, {
 			"Client Initiated", "rx.flags.client_init", FT_BOOLEAN, 8,
-			NULL, RX_CLIENT_INITIATED, "Client Initiated", HFILL }},
+			NULL, RX_CLIENT_INITIATED, NULL, HFILL }},
 
 		{ &hf_rx_flags_request_ack, {
 			"Request Ack", "rx.flags.request_ack", FT_BOOLEAN, 8,
-			NULL, RX_REQUEST_ACK, "Request Ack", HFILL }},
+			NULL, RX_REQUEST_ACK, NULL, HFILL }},
 
 		{ &hf_rx_flags_last_packet, {
 			"Last Packet", "rx.flags.last_packet", FT_BOOLEAN, 8,
-			NULL, RX_LAST_PACKET, "Last Packet", HFILL }},
+			NULL, RX_LAST_PACKET, NULL, HFILL }},
 
 		{ &hf_rx_flags_more_packets, {
 			"More Packets", "rx.flags.more_packets", FT_BOOLEAN, 8,
-			NULL, RX_MORE_PACKETS, "More Packets", HFILL }},
+			NULL, RX_MORE_PACKETS, NULL, HFILL }},
 
 		{ &hf_rx_flags_free_packet, {
 			"Free Packet", "rx.flags.free_packet", FT_BOOLEAN, 8,
-			NULL, RX_FREE_PACKET, "Free Packet", HFILL }},
+			NULL, RX_FREE_PACKET, NULL, HFILL }},
 
 		/* XXX - what about RX_SLOW_START_OR_JUMBO? */
 
 		{ &hf_rx_userstatus, {
 			"User Status", "rx.userstatus", FT_UINT32, BASE_DEC,
-			NULL, 0, "User Status", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_securityindex, {
 			"Security Index", "rx.securityindex", FT_UINT32, BASE_DEC,
-			NULL, 0, "Security Index", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_spare, {
 			"Spare/Checksum", "rx.spare", FT_UINT16, BASE_DEC,
-			NULL, 0, "Spare/Checksum", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_serviceid, {
 			"Service ID", "rx.serviceid", FT_UINT16, BASE_DEC,
-			NULL, 0, "Service ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_bufferspace, {
 			"Bufferspace", "rx.bufferspace", FT_UINT16, BASE_DEC,
@@ -671,11 +671,11 @@ proto_register_rx(void)
 
 		{ &hf_rx_maxskew, {
 			"Max Skew", "rx.maxskew", FT_UINT16, BASE_DEC,
-			NULL, 0, "Max Skew", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_first_packet, {
 			"First Packet", "rx.first", FT_UINT32, BASE_DEC,
-			NULL, 0, "First Packet", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_prev_packet, {
 			"Prev Packet", "rx.prev", FT_UINT32, BASE_DEC,
@@ -695,11 +695,11 @@ proto_register_rx(void)
 
 		{ &hf_rx_ack, {
 			"ACK Packet", "rx.ack", FT_NONE, BASE_NONE,
-			NULL, 0, "ACK Packet", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_challenge, {
 			"CHALLENGE Packet", "rx.challenge", FT_NONE, BASE_NONE,
-			NULL, 0, "CHALLENGE Packet", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_version, {
 			"Version", "rx.version", FT_UINT32, BASE_DEC,
@@ -707,7 +707,7 @@ proto_register_rx(void)
 
 		{ &hf_rx_nonce, {
 			"Nonce", "rx.nonce", FT_UINT32, BASE_HEX,
-			NULL, 0, "Nonce", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_inc_nonce, {
 			"Inc Nonce", "rx.inc_nonce", FT_UINT32, BASE_HEX,
@@ -715,19 +715,19 @@ proto_register_rx(void)
 
 		{ &hf_rx_min_level, {
 			"Min Level", "rx.min_level", FT_UINT32, BASE_DEC,
-			NULL, 0, "Min Level", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_level, {
 			"Level", "rx.level", FT_UINT32, BASE_DEC,
-			NULL, 0, "Level", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_response, {
 			"RESPONSE Packet", "rx.response", FT_NONE, BASE_NONE,
-			NULL, 0, "RESPONSE Packet", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_abort, {
 			"ABORT Packet", "rx.abort", FT_NONE, BASE_NONE,
-			NULL, 0, "ABORT Packet", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_encrypted, {
 			"Encrypted", "rx.encrypted", FT_NONE, BASE_NONE,
@@ -735,35 +735,35 @@ proto_register_rx(void)
 
 		{ &hf_rx_kvno, {
 			"kvno", "rx.kvno", FT_UINT32, BASE_DEC,
-			NULL, 0, "kvno", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_ticket_len, {
 			"Ticket len", "rx.ticket_len", FT_UINT32, BASE_DEC,
 			NULL, 0, "Ticket Length", HFILL }},
 
 		{ &hf_rx_ticket, {
-			"ticket", "rx.ticket", FT_BYTES, BASE_HEX,
+			"ticket", "rx.ticket", FT_BYTES, BASE_NONE,
 			NULL, 0, "Ticket", HFILL }},
 
 		{ &hf_rx_ifmtu, {
 			"Interface MTU", "rx.if_mtu", FT_UINT32, BASE_DEC,
-			NULL, 0, "Interface MTU", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_maxmtu, {
 			"Max MTU", "rx.max_mtu", FT_UINT32, BASE_DEC,
-			NULL, 0, "Max MTU", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_rwind, {
 			"rwind", "rx.rwind", FT_UINT32, BASE_DEC,
-			NULL, 0, "rwind", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_maxpackets, {
 			"Max Packets", "rx.max_packets", FT_UINT32, BASE_DEC,
-			NULL, 0, "Max Packets", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_rx_abortcode, {
 			"Abort Code", "rx.abort_code", FT_UINT32, BASE_DEC,
-			NULL, 0, "Abort Code", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 	};
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c
index 6913979598..a316b7f2cb 100644
--- a/epan/dissectors/packet-s1ap.c
+++ b/epan/dissectors/packet-s1ap.c
@@ -7074,11 +7074,11 @@ void proto_register_s1ap(void) {
   static hf_register_info hf[] = {
     { &hf_s1ap_transportLayerAddressIPv4,
       { "transportLayerAddress(IPv4)", "s1ap.transportLayerAddressIPv4",
-        FT_IPv4, BASE_DEC, NULL, 0,
+        FT_IPv4, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_s1ap_transportLayerAddressIPv6,
       { "transportLayerAddress(IPv6)", "s1ap.transportLayerAddressIPv6",
-        FT_IPv4, BASE_HEX, NULL, 0,
+        FT_IPv4, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
 
@@ -7098,7 +7098,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cause", HFILL }},
     { &hf_s1ap_Cdma2000PDU_PDU,
       { "Cdma2000PDU", "s1ap.Cdma2000PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000PDU", HFILL }},
     { &hf_s1ap_Cdma2000RATType_PDU,
       { "Cdma2000RATType", "s1ap.Cdma2000RATType",
@@ -7106,7 +7106,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cdma2000RATType", HFILL }},
     { &hf_s1ap_Cdma2000SectorID_PDU,
       { "Cdma2000SectorID", "s1ap.Cdma2000SectorID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000SectorID", HFILL }},
     { &hf_s1ap_Cdma2000HOStatus_PDU,
       { "Cdma2000HOStatus", "s1ap.Cdma2000HOStatus",
@@ -7122,7 +7122,7 @@ void proto_register_s1ap(void) {
         "s1ap.Cdma2000OneXSRVCCInfo", HFILL }},
     { &hf_s1ap_Cdma2000OneXRAND_PDU,
       { "Cdma2000OneXRAND", "s1ap.Cdma2000OneXRAND",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXRAND", HFILL }},
     { &hf_s1ap_CNDomain_PDU,
       { "CNDomain", "s1ap.CNDomain",
@@ -7134,7 +7134,7 @@ void proto_register_s1ap(void) {
         "s1ap.CSFallbackIndicator", HFILL }},
     { &hf_s1ap_CSG_Id_PDU,
       { "CSG-Id", "s1ap.CSG_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CSG_Id", HFILL }},
     { &hf_s1ap_CSG_IdList_PDU,
       { "CSG-IdList", "s1ap.CSG_IdList",
@@ -7146,7 +7146,7 @@ void proto_register_s1ap(void) {
         "s1ap.CriticalityDiagnostics", HFILL }},
     { &hf_s1ap_DataCodingScheme_PDU,
       { "DataCodingScheme", "s1ap.DataCodingScheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.DataCodingScheme", HFILL }},
     { &hf_s1ap_Direct_Forwarding_Path_Availability_PDU,
       { "Direct-Forwarding-Path-Availability", "s1ap.Direct_Forwarding_Path_Availability",
@@ -7198,7 +7198,7 @@ void proto_register_s1ap(void) {
         "s1ap.HandoverType", HFILL }},
     { &hf_s1ap_MessageIdentifier_PDU,
       { "MessageIdentifier", "s1ap.MessageIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MessageIdentifier", HFILL }},
     { &hf_s1ap_MMEname_PDU,
       { "MMEname", "s1ap.MMEname",
@@ -7210,23 +7210,23 @@ void proto_register_s1ap(void) {
         "s1ap.MME_UE_S1AP_ID", HFILL }},
     { &hf_s1ap_MSClassmark2_PDU,
       { "MSClassmark2", "s1ap.MSClassmark2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MSClassmark2", HFILL }},
     { &hf_s1ap_MSClassmark3_PDU,
       { "MSClassmark3", "s1ap.MSClassmark3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MSClassmark3", HFILL }},
     { &hf_s1ap_NAS_PDU_PDU,
       { "NAS-PDU", "s1ap.NAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NAS_PDU", HFILL }},
     { &hf_s1ap_NASSecurityParametersfromE_UTRAN_PDU,
       { "NASSecurityParametersfromE-UTRAN", "s1ap.NASSecurityParametersfromE_UTRAN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NASSecurityParametersfromE_UTRAN", HFILL }},
     { &hf_s1ap_NASSecurityParameterstoE_UTRAN_PDU,
       { "NASSecurityParameterstoE-UTRAN", "s1ap.NASSecurityParameterstoE_UTRAN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NASSecurityParameterstoE_UTRAN", HFILL }},
     { &hf_s1ap_NumberofBroadcastRequest_PDU,
       { "NumberofBroadcastRequest", "s1ap.NumberofBroadcastRequest",
@@ -7258,7 +7258,7 @@ void proto_register_s1ap(void) {
         "s1ap.RRC_Establishment_Cause", HFILL }},
     { &hf_s1ap_SecurityKey_PDU,
       { "SecurityKey", "s1ap.SecurityKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SecurityKey", HFILL }},
     { &hf_s1ap_SecurityContext_PDU,
       { "SecurityContext", "s1ap.SecurityContext",
@@ -7266,7 +7266,7 @@ void proto_register_s1ap(void) {
         "s1ap.SecurityContext", HFILL }},
     { &hf_s1ap_SerialNumber_PDU,
       { "SerialNumber", "s1ap.SerialNumber",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SerialNumber", HFILL }},
     { &hf_s1ap_SONConfigurationTransfer_PDU,
       { "SONConfigurationTransfer", "s1ap.SONConfigurationTransfer",
@@ -7274,7 +7274,7 @@ void proto_register_s1ap(void) {
         "s1ap.SONConfigurationTransfer", HFILL }},
     { &hf_s1ap_Source_ToTarget_TransparentContainer_PDU,
       { "Source-ToTarget-TransparentContainer", "s1ap.Source_ToTarget_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Source_ToTarget_TransparentContainer", HFILL }},
     { &hf_s1ap_SRVCCOperationPossible_PDU,
       { "SRVCCOperationPossible", "s1ap.SRVCCOperationPossible",
@@ -7314,7 +7314,7 @@ void proto_register_s1ap(void) {
         "s1ap.TargetID", HFILL }},
     { &hf_s1ap_Target_ToSource_TransparentContainer_PDU,
       { "Target-ToSource-TransparentContainer", "s1ap.Target_ToSource_TransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Target_ToSource_TransparentContainer", HFILL }},
     { &hf_s1ap_TimeToWait_PDU,
       { "TimeToWait", "s1ap.TimeToWait",
@@ -7322,7 +7322,7 @@ void proto_register_s1ap(void) {
         "s1ap.TimeToWait", HFILL }},
     { &hf_s1ap_TransportLayerAddress_PDU,
       { "TransportLayerAddress", "s1ap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_TraceActivation_PDU,
       { "TraceActivation", "s1ap.TraceActivation",
@@ -7342,7 +7342,7 @@ void proto_register_s1ap(void) {
         "s1ap.UE_associatedLogicalS1_ConnectionItem", HFILL }},
     { &hf_s1ap_UEIdentityIndexValue_PDU,
       { "UEIdentityIndexValue", "s1ap.UEIdentityIndexValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.UEIdentityIndexValue", HFILL }},
     { &hf_s1ap_UEPagingID_PDU,
       { "UEPagingID", "s1ap.UEPagingID",
@@ -7350,7 +7350,7 @@ void proto_register_s1ap(void) {
         "s1ap.UEPagingID", HFILL }},
     { &hf_s1ap_UERadioCapability_PDU,
       { "UERadioCapability", "s1ap.UERadioCapability",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.UERadioCapability", HFILL }},
     { &hf_s1ap_UESecurityCapabilities_PDU,
       { "UESecurityCapabilities", "s1ap.UESecurityCapabilities",
@@ -7362,15 +7362,15 @@ void proto_register_s1ap(void) {
         "s1ap.WarningAreaList", HFILL }},
     { &hf_s1ap_WarningType_PDU,
       { "WarningType", "s1ap.WarningType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningType", HFILL }},
     { &hf_s1ap_WarningSecurityInfo_PDU,
       { "WarningSecurityInfo", "s1ap.WarningSecurityInfo",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningSecurityInfo", HFILL }},
     { &hf_s1ap_WarningMessageContents_PDU,
       { "WarningMessageContents", "s1ap.WarningMessageContents",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.WarningMessageContents", HFILL }},
     { &hf_s1ap_HandoverRequired_PDU,
       { "HandoverRequired", "s1ap.HandoverRequired",
@@ -7850,11 +7850,11 @@ void proto_register_s1ap(void) {
         "s1ap.COUNTvalue", HFILL }},
     { &hf_s1ap_receiveStatusofULPDCPSDUs,
       { "receiveStatusofULPDCPSDUs", "s1ap.receiveStatusofULPDCPSDUs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.ReceiveStatusofULPDCPSDUs", HFILL }},
     { &hf_s1ap_BPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_cellID_Broadcast,
       { "cellID-Broadcast", "s1ap.cellID_Broadcast",
@@ -7898,15 +7898,15 @@ void proto_register_s1ap(void) {
         "s1ap.EUTRAN_CGI", HFILL }},
     { &hf_s1ap_cdma2000OneXMEID,
       { "cdma2000OneXMEID", "s1ap.cdma2000OneXMEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXMEID", HFILL }},
     { &hf_s1ap_cdma2000OneXMSI,
       { "cdma2000OneXMSI", "s1ap.cdma2000OneXMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXMSI", HFILL }},
     { &hf_s1ap_cdma2000OneXPilot,
       { "cdma2000OneXPilot", "s1ap.cdma2000OneXPilot",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.Cdma2000OneXPilot", HFILL }},
     { &hf_s1ap_cell_Size,
       { "cell-Size", "s1ap.cell_Size",
@@ -7914,19 +7914,19 @@ void proto_register_s1ap(void) {
         "s1ap.Cell_Size", HFILL }},
     { &hf_s1ap_pLMNidentity,
       { "pLMNidentity", "s1ap.pLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_lAC,
       { "lAC", "s1ap.lAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LAC", HFILL }},
     { &hf_s1ap_cI,
       { "cI", "s1ap.cI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CI", HFILL }},
     { &hf_s1ap_rAC,
       { "rAC", "s1ap.rAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.RAC", HFILL }},
     { &hf_s1ap_CSG_IdList_item,
       { "CSG-IdList-Item", "s1ap.CSG_IdList_Item",
@@ -7934,7 +7934,7 @@ void proto_register_s1ap(void) {
         "s1ap.CSG_IdList_Item", HFILL }},
     { &hf_s1ap_cSG_Id,
       { "cSG-Id", "s1ap.cSG_Id",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CSG_Id", HFILL }},
     { &hf_s1ap_pDCP_SN,
       { "pDCP-SN", "s1ap.pDCP_SN",
@@ -7982,7 +7982,7 @@ void proto_register_s1ap(void) {
         "s1ap.EUTRAN_CGI", HFILL }},
     { &hf_s1ap_EmergencyAreaIDList_item,
       { "EmergencyAreaID", "s1ap.EmergencyAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EmergencyAreaID", HFILL }},
     { &hf_s1ap_EmergencyAreaID_Broadcast_item,
       { "EmergencyAreaID-Broadcast-Item", "s1ap.EmergencyAreaID_Broadcast_Item",
@@ -7990,7 +7990,7 @@ void proto_register_s1ap(void) {
         "s1ap.EmergencyAreaID_Broadcast_Item", HFILL }},
     { &hf_s1ap_emergencyAreaID,
       { "emergencyAreaID", "s1ap.emergencyAreaID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EmergencyAreaID", HFILL }},
     { &hf_s1ap_completedCellinEAI,
       { "completedCellinEAI", "s1ap.completedCellinEAI",
@@ -8002,11 +8002,11 @@ void proto_register_s1ap(void) {
         "s1ap.CompletedCellinEAI_Item", HFILL }},
     { &hf_s1ap_macroENB_ID,
       { "macroENB-ID", "s1ap.macroENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_s1ap_homeENB_ID,
       { "homeENB-ID", "s1ap.homeENB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_s1ap_lAI,
       { "lAI", "s1ap.lAI",
@@ -8022,11 +8022,11 @@ void proto_register_s1ap(void) {
         "s1ap.Bearers_SubjectToStatusTransferList", HFILL }},
     { &hf_s1ap_ENBX2TLAs_item,
       { "TransportLayerAddress", "s1ap.TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_EPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_dL_Forwarding,
       { "dL-Forwarding", "s1ap.dL_Forwarding",
@@ -8054,7 +8054,7 @@ void proto_register_s1ap(void) {
         "s1ap.GBR_QosInformation", HFILL }},
     { &hf_s1ap_cell_ID,
       { "cell-ID", "s1ap.cell_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.CellIdentity", HFILL }},
     { &hf_s1ap_ForbiddenTAs_item,
       { "ForbiddenTAs-Item", "s1ap.ForbiddenTAs_Item",
@@ -8062,7 +8062,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenTAs_Item", HFILL }},
     { &hf_s1ap_pLMN_Identity,
       { "pLMN-Identity", "s1ap.pLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_forbiddenTACs,
       { "forbiddenTACs", "s1ap.forbiddenTACs",
@@ -8070,7 +8070,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenTACs", HFILL }},
     { &hf_s1ap_ForbiddenTACs_item,
       { "TAC", "s1ap.TAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TAC", HFILL }},
     { &hf_s1ap_ForbiddenLAs_item,
       { "ForbiddenLAs-Item", "s1ap.ForbiddenLAs_Item",
@@ -8082,7 +8082,7 @@ void proto_register_s1ap(void) {
         "s1ap.ForbiddenLACs", HFILL }},
     { &hf_s1ap_ForbiddenLACs_item,
       { "LAC", "s1ap.LAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LAC", HFILL }},
     { &hf_s1ap_e_RAB_MaximumBitrateDL,
       { "e-RAB-MaximumBitrateDL", "s1ap.e_RAB_MaximumBitrateDL",
@@ -8102,15 +8102,15 @@ void proto_register_s1ap(void) {
         "s1ap.BitRate", HFILL }},
     { &hf_s1ap_mME_Group_ID,
       { "mME-Group-ID", "s1ap.mME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Group_ID", HFILL }},
     { &hf_s1ap_mME_Code,
       { "mME-Code", "s1ap.mME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_servingPLMN,
       { "servingPLMN", "s1ap.servingPLMN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_equivalentPLMNs,
       { "equivalentPLMNs", "s1ap.equivalentPLMNs",
@@ -8134,7 +8134,7 @@ void proto_register_s1ap(void) {
         "s1ap.LastVisitedEUTRANCellInformation", HFILL }},
     { &hf_s1ap_uTRAN_Cell,
       { "uTRAN-Cell", "s1ap.uTRAN_Cell",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.LastVisitedUTRANCellInformation", HFILL }},
     { &hf_s1ap_gERAN_Cell,
       { "gERAN-Cell", "s1ap.gERAN_Cell",
@@ -8170,7 +8170,7 @@ void proto_register_s1ap(void) {
         "s1ap.ReportArea", HFILL }},
     { &hf_s1ap_rIMInformation,
       { "rIMInformation", "s1ap.rIMInformation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.RIMInformation", HFILL }},
     { &hf_s1ap_rIMRoutingAddress,
       { "rIMRoutingAddress", "s1ap.rIMRoutingAddress",
@@ -8186,7 +8186,7 @@ void proto_register_s1ap(void) {
         "s1ap.INTEGER_0_7", HFILL }},
     { &hf_s1ap_nextHopParameter,
       { "nextHopParameter", "s1ap.nextHopParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.SecurityKey", HFILL }},
     { &hf_s1ap_sONInformationRequest,
       { "sONInformationRequest", "s1ap.sONInformationRequest",
@@ -8238,15 +8238,15 @@ void proto_register_s1ap(void) {
         "s1ap.ServedMMECs", HFILL }},
     { &hf_s1ap_ServedGroupIDs_item,
       { "MME-Group-ID", "s1ap.MME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Group_ID", HFILL }},
     { &hf_s1ap_ServedMMECs_item,
       { "MME-Code", "s1ap.MME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_ServedPLMNs_item,
       { "PLMNidentity", "s1ap.PLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.PLMNidentity", HFILL }},
     { &hf_s1ap_SupportedTAs_item,
       { "SupportedTAs-Item", "s1ap.SupportedTAs_Item",
@@ -8254,7 +8254,7 @@ void proto_register_s1ap(void) {
         "s1ap.SupportedTAs_Item", HFILL }},
     { &hf_s1ap_tAC,
       { "tAC", "s1ap.tAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TAC", HFILL }},
     { &hf_s1ap_broadcastPLMNs,
       { "broadcastPLMNs", "s1ap.broadcastPLMNs",
@@ -8262,11 +8262,11 @@ void proto_register_s1ap(void) {
         "s1ap.BPLMNs", HFILL }},
     { &hf_s1ap_mMEC,
       { "mMEC", "s1ap.mMEC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.MME_Code", HFILL }},
     { &hf_s1ap_m_TMSI,
       { "m-TMSI", "s1ap.m_TMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.M_TMSI", HFILL }},
     { &hf_s1ap_TAIListforWarning_item,
       { "TAI", "s1ap.TAI",
@@ -8306,11 +8306,11 @@ void proto_register_s1ap(void) {
         "s1ap.ExtendedRNC_ID", HFILL }},
     { &hf_s1ap_e_UTRAN_Trace_ID,
       { "e-UTRAN-Trace-ID", "s1ap.e_UTRAN_Trace_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.E_UTRAN_Trace_ID", HFILL }},
     { &hf_s1ap_interfacesToTrace,
       { "interfacesToTrace", "s1ap.interfacesToTrace",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.InterfacesToTrace", HFILL }},
     { &hf_s1ap_traceDepth,
       { "traceDepth", "s1ap.traceDepth",
@@ -8318,7 +8318,7 @@ void proto_register_s1ap(void) {
         "s1ap.TraceDepth", HFILL }},
     { &hf_s1ap_traceCollectionEntityIPAddress,
       { "traceCollectionEntityIPAddress", "s1ap.traceCollectionEntityIPAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_uEaggregateMaximumBitRateDL,
       { "uEaggregateMaximumBitRateDL", "s1ap.uEaggregateMaximumBitRateDL",
@@ -8346,15 +8346,15 @@ void proto_register_s1ap(void) {
         "s1ap.S_TMSI", HFILL }},
     { &hf_s1ap_iMSI,
       { "iMSI", "s1ap.iMSI",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.IMSI", HFILL }},
     { &hf_s1ap_encryptionAlgorithms,
       { "encryptionAlgorithms", "s1ap.encryptionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.EncryptionAlgorithms", HFILL }},
     { &hf_s1ap_integrityProtectionAlgorithms,
       { "integrityProtectionAlgorithms", "s1ap.integrityProtectionAlgorithms",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.IntegrityProtectionAlgorithms", HFILL }},
     { &hf_s1ap_cellIDList,
       { "cellIDList", "s1ap.cellIDList",
@@ -8378,27 +8378,27 @@ void proto_register_s1ap(void) {
         "s1ap.ProtocolIE_Container", HFILL }},
     { &hf_s1ap_dL_transportLayerAddress,
       { "dL-transportLayerAddress", "s1ap.dL_transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_dL_gTP_TEID,
       { "dL-gTP-TEID", "s1ap.dL_gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_uL_TransportLayerAddress,
       { "uL-TransportLayerAddress", "s1ap.uL_TransportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_uL_GTP_TEID,
       { "uL-GTP-TEID", "s1ap.uL_GTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_transportLayerAddress,
       { "transportLayerAddress", "s1ap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.TransportLayerAddress", HFILL }},
     { &hf_s1ap_gTP_TEID,
       { "gTP-TEID", "s1ap.gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.GTP_TEID", HFILL }},
     { &hf_s1ap_e_RABlevelQosParameters,
       { "e-RABlevelQosParameters", "s1ap.e_RABlevelQosParameters",
@@ -8414,7 +8414,7 @@ void proto_register_s1ap(void) {
         "s1ap.E_RABLevelQoSParameters", HFILL }},
     { &hf_s1ap_nAS_PDU,
       { "nAS-PDU", "s1ap.nAS_PDU",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s1ap.NAS_PDU", HFILL }},
     { &hf_s1ap_E_RABSetupListBearerSURes_item,
       { "ProtocolIE-SingleContainer", "s1ap.ProtocolIE_SingleContainer",
diff --git a/epan/dissectors/packet-s4406.c b/epan/dissectors/packet-s4406.c
index e961a177a7..9d2608e9e5 100644
--- a/epan/dissectors/packet-s4406.c
+++ b/epan/dissectors/packet-s4406.c
@@ -986,7 +986,7 @@ void proto_register_s4406(void) {
         "s4406.OriginatorPlad", HFILL }},
     { &hf_s4406_Acp127NotificationType_PDU,
       { "Acp127NotificationType", "s4406.Acp127NotificationType",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "s4406.Acp127NotificationType", HFILL }},
     { &hf_s4406_SecurityInformationLabels_PDU,
       { "SecurityInformationLabels", "s4406.SecurityInformationLabels",
@@ -1135,15 +1135,15 @@ void proto_register_s4406(void) {
     { &hf_s4406_Acp127NotificationType_negative,
       { "negative", "s4406.negative",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_s4406_Acp127NotificationType_positive,
       { "positive", "s4406.positive",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_s4406_Acp127NotificationType_transfer,
       { "transfer", "s4406.transfer",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-s4406-hfarr.c ---*/
 #line 95 "packet-s4406-template.c"
diff --git a/epan/dissectors/packet-s5066.c b/epan/dissectors/packet-s5066.c
index d502defb48..8eb82236ee 100644
--- a/epan/dissectors/packet-s5066.c
+++ b/epan/dissectors/packet-s5066.c
@@ -429,166 +429,166 @@ proto_register_s5066(void)
 {
 	static hf_register_info hf[] = {
 		{ &hf_s5066_sync_word,
-			{ "Sync preamble", "s5066.sync", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Sync preamble", "s5066.sync", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_version,
-			{ "S5066 version", "s5066.version", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "S5066 version", "s5066.version", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_size,
-			{ "S_Primitive size", "s5066.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "S_Primitive size", "s5066.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_type,
-			{ "PDU Type", "s5066.type", FT_UINT8, BASE_DEC, VALS(s5066_pdu_type), 0x0, "", HFILL }
+			{ "PDU Type", "s5066.type", FT_UINT8, BASE_DEC, VALS(s5066_pdu_type), 0x0, NULL, HFILL }
 		},
 		/* STANAG 5066 Address */
 		{ &hf_s5066_ad_size,
-			{ "Address size (1/2 Bytes)", "s5066.address.size", FT_UINT8, BASE_HEX, NULL, 0xE0, "", HFILL }
+			{ "Address size (1/2 Bytes)", "s5066.address.size", FT_UINT8, BASE_HEX, NULL, 0xE0, NULL, HFILL }
 		},
 		{ &hf_s5066_ad_group,
-			{ "Group address", "s5066.address.group", FT_UINT8, BASE_HEX, NULL, 0x10, "", HFILL }
+			{ "Group address", "s5066.address.group", FT_UINT8, BASE_HEX, NULL, 0x10, NULL, HFILL }
 		},
 		{ &hf_s5066_ad_address,
-			{ "Address", "s5066.address.address", FT_IPv4, BASE_NONE, NULL, 0, "", HFILL }
+			{ "Address", "s5066.address.address", FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL }
 		},
 		/* Service type */
 		{ &hf_s5066_st_txmode,
-			{ "Transmission mode", "s5066.st.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, "", HFILL }
+			{ "Transmission mode", "s5066.st.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_st_delivery_confirmation,
-			{ "Delivery confirmation", "s5066.st.confirm", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_confirmation),  0x0C, "", HFILL }
+			{ "Delivery confirmation", "s5066.st.confirm", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_confirmation),  0x0C, NULL, HFILL }
 		},
 		{ &hf_s5066_st_delivery_order,
-			{ "Delivery order", "s5066.st.order", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_order), 0x02, "", HFILL }
+			{ "Delivery order", "s5066.st.order", FT_UINT8, BASE_HEX, VALS(s5066_st_delivery_order), 0x02, NULL, HFILL }
 		},
 		{ &hf_s5066_st_extended,
-			{ "Extended field", "s5066.st.extended", FT_UINT8, BASE_HEX, VALS(s5066_st_extended), 0x01, "", HFILL }
+			{ "Extended field", "s5066.st.extended", FT_UINT8, BASE_HEX, VALS(s5066_st_extended), 0x01, NULL, HFILL }
 		},
 		{ &hf_s5066_st_retries,
-			{ "Minimum number of retransmissions", "s5066.st.retries", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "Minimum number of retransmissions", "s5066.st.retries", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		/* PDU Type 01: S_BIND_REQUEST */
 		{ &hf_s5066_01_sapid,
-			{ "Sap ID", "s5066.01.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "Sap ID", "s5066.01.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_01_rank,
-			{ "Rank", "s5066.01.rank", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Rank", "s5066.01.rank", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_01_unused,
-			{ "(Unused)", "s5066.01.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, "", HFILL }
+			{ "(Unused)", "s5066.01.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
 		},
 		/* PDU Type 02: S_UNBIND_REQUEST */
 		/*     --- no subfields ---     */
 		/* PDU Type 03: S_BIND_ACCEPTED */
 		{ &hf_s5066_03_sapid,
-			{ "Sap ID", "s5066.03.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "Sap ID", "s5066.03.sapid", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_03_unused,
-			{ "(Unused)", "s5066.03.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, "", HFILL }
+			{ "(Unused)", "s5066.03.unused", FT_UINT8, BASE_HEX, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_03_mtu,
-			{ "MTU", "s5066.03.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "MTU", "s5066.03.mtu", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* PDU Type 04: S_BIND_REJECTED */
 		{ &hf_s5066_04_reason,
-			{ "Reason", "s5066.04.reason", FT_UINT8, BASE_DEC, VALS(s5066_04_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.04.reason", FT_UINT8, BASE_DEC, VALS(s5066_04_reason), 0x0, NULL, HFILL }
 		},
 		/* PDU Type 05: S_UNBIND_INDICATION */
 		{ &hf_s5066_05_reason,
-			{ "Reason", "s5066.05.reason", FT_UINT8, BASE_DEC, VALS(s5066_05_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.05.reason", FT_UINT8, BASE_DEC, VALS(s5066_05_reason), 0x0, NULL, HFILL }
 		},
 		/* Type  6: S_HARD_LINK_ESTABLISH */
 		{ &hf_s5066_06_link_type,
-			{ "Hardlink type", "s5066.06.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.06.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_06_link_priority,
-			{ "Priority", "s5066.06.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.06.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_06_sapid,
-			{ "Remote Sap ID", "s5066.06.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.06.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type  7: S_HARD_LINK_TERMINATE */
 		/* --- Only remote node address --- */
 		/* Type  8: S_HARD_LINK_ESTABLISHED */
 		{ &hf_s5066_08_remote_status,
-			{ "Remote node status", "s5066.08.status", FT_UINT8, BASE_DEC, VALS(s5066_08_remote_status), 0x0, "", HFILL }
+			{ "Remote node status", "s5066.08.status", FT_UINT8, BASE_DEC, VALS(s5066_08_remote_status), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_08_link_type,
-			{ "Hardlink type", "s5066.08.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.08.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_08_link_priority,
-			{ "Priority", "s5066.08.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.08.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_08_sapid,
-			{ "Remote Sap ID", "s5066.08.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.08.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type  9: S_HARD_LINK_REJECTED */
 		{ &hf_s5066_09_reason,
-			{ "Reason", "s5066.09.reason", FT_UINT8, BASE_DEC, VALS(s5066_09_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.09.reason", FT_UINT8, BASE_DEC, VALS(s5066_09_reason), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_09_link_type,
-			{ "Hardlink type", "s5066.09.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.09.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_09_link_priority,
-			{ "Priority", "s5066.09.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.09.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_09_sapid,
-			{ "Remote Sap ID", "s5066.09.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.09.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type 10: S_HARD_LINK_TERMINATED */
 		{ &hf_s5066_10_reason,
-			{ "Reason", "s5066.10.reason", FT_UINT8, BASE_DEC, VALS(s5066_10_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.10.reason", FT_UINT8, BASE_DEC, VALS(s5066_10_reason), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_10_link_type,
-			{ "Hardlink type", "s5066.10.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.10.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_10_link_priority,
-			{ "Priority", "s5066.10.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.10.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_10_sapid,
-			{ "Remote Sap ID", "s5066.10.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.10.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type 11: S_HARD_LINK_INDICATION */
 		{ &hf_s5066_11_remote_status,
-			{ "Remote node status", "s5066.11.status", FT_UINT8, BASE_DEC, VALS(s5066_11_remote_status), 0x0, "", HFILL }
+			{ "Remote node status", "s5066.11.status", FT_UINT8, BASE_DEC, VALS(s5066_11_remote_status), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_11_link_type,
-			{ "Hardlink type", "s5066.11.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.11.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_11_link_priority,
-			{ "Priority", "s5066.11.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.11.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_11_sapid,
-			{ "Remote Sap ID", "s5066.11.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.11.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type 12: S_HARD_LINK_ACCEPT */
 		{ &hf_s5066_12_link_type,
-			{ "Hardlink type", "s5066.12.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.12.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_12_link_priority,
-			{ "Priority", "s5066.12.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.12.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_12_sapid,
-			{ "Remote Sap ID", "s5066.12.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.12.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type 13: S_HARD_LINK_REJECT */
 		{ &hf_s5066_13_reason,
-			{ "Reason", "s5066.13.reason", FT_UINT8, BASE_DEC, VALS(s5066_13_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.13.reason", FT_UINT8, BASE_DEC, VALS(s5066_13_reason), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_13_link_type,
-			{ "Hardlink type", "s5066.13.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, "", HFILL }
+			{ "Hardlink type", "s5066.13.type", FT_UINT8, BASE_DEC, VALS(s5066_hard_link_type), 0xC0, NULL, HFILL }
 		},
 		{ &hf_s5066_13_link_priority,
-			{ "Priority", "s5066.13.priority", FT_UINT8, BASE_DEC, NULL, 0x30, "", HFILL }
+			{ "Priority", "s5066.13.priority", FT_UINT8, BASE_DEC, NULL, 0x30, NULL, HFILL }
 		},
 		{ &hf_s5066_13_sapid,
-			{ "Remote Sap ID", "s5066.13.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Remote Sap ID", "s5066.13.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		/* Type 14: S_SUBNET_AVAILABILITY */
 		{ &hf_s5066_14_status,
-			{ "Status", "s5066.14.status", FT_UINT8, BASE_DEC, VALS(s5066_14_status), 0x0, "", HFILL }
+			{ "Status", "s5066.14.status", FT_UINT8, BASE_DEC, VALS(s5066_14_status), 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_14_reason,
-			{ "Reason", "s5066.14.reason", FT_UINT8, BASE_DEC, VALS(s5066_14_reason), 0x0, "", HFILL }
+			{ "Reason", "s5066.14.reason", FT_UINT8, BASE_DEC, VALS(s5066_14_reason), 0x0, NULL, HFILL }
 		},
 		/* Type 15: S_DATAFLOW_ON */
 		/*   --- no subfields ---   */
@@ -598,163 +598,163 @@ proto_register_s5066(void)
 		/*   --- no subfields ---   */
 		/* Type 18: S_MANAGEMENT_MESSAGE_REQUEST */
 		{ &hf_s5066_18_type,
-			{ "Message Type", "s5066.18.type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Message Type", "s5066.18.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_18_body,
-			{ "Message Body", "s5066.18.body", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Message Body", "s5066.18.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 19: S_MANAGEMENT_MESSAGE_INDICATION */
 		{ &hf_s5066_19_type,
-			{ "Message Type", "s5066.19.type", FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Message Type", "s5066.19.type", FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_19_body,
-			{ "Message Body", "s5066.19.body", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Message Body", "s5066.19.body", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 20: S_UNIDATA_REQUEST */
 		{ &hf_s5066_20_priority,
-			{ "Priority", "s5066.20.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "Priority", "s5066.20.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_20_sapid,
-			{ "Destination Sap ID", "s5066.20.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.20.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_20_ttl,
-			{ "Time-To-Live (x2 seconds)", "s5066.20.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, "", HFILL }
+			{ "Time-To-Live (x2 seconds)", "s5066.20.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
 		},
 		{ &hf_s5066_20_size,
-			{ "U_PDU Size", "s5066.20.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.20.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 21: S_UNIDATA_INDICATION */
 		{ &hf_s5066_21_priority,
-			{ "Priority", "s5066.21.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "Priority", "s5066.21.priority", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_dest_sapid,
-			{ "Destination Sap ID", "s5066.21.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.21.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_21_tx_mode,
-			{ "Transmission Mode", "s5066.21.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, "", HFILL }
+			{ "Transmission Mode", "s5066.21.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_src_sapid,
-			{ "Source Sap ID", "s5066.21.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Source Sap ID", "s5066.21.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_21_size,
-			{ "U_PDU Size", "s5066.21.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.21.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_err_blocks,
-			{ "Number of errored blocks", "s5066.21.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Number of errored blocks", "s5066.21.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_err_ptr,
-			{ "Pointer to error block", "s5066.21.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Pointer to error block", "s5066.21.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_err_size,
-			{ "Size of error block", "s5066.21.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Size of error block", "s5066.21.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_nrx_blocks,
-			{ "Number of non-received blocks", "s5066.21.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Number of non-received blocks", "s5066.21.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_nrx_ptr,
-			{ "Pointer to non-received block", "s5066.21.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Pointer to non-received block", "s5066.21.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_21_nrx_size,
-			{ "Size of non-received block", "s5066.21.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Size of non-received block", "s5066.21.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 22: S_UNIDATA_REQUEST_CONFIRM */
 		{ &hf_s5066_22_unused,
-			{ "(Unused)", "s5066.22.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "(Unused)", "s5066.22.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_22_sapid,
-			{ "Destination Sap ID", "s5066.22.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.22.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_22_size,
-			{ "U_PDU Size", "s5066.22.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.22.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_22_data,
-			{ "(Part of) Confirmed data", "s5066.22.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "(Part of) Confirmed data", "s5066.22.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 23: S_UNIDATA_REQUEST_REJECTED */
 		{ &hf_s5066_23_reason,
-			{ "Reason", "s5066.23.reason", FT_UINT8, BASE_DEC, VALS(s5066_23_reason), 0xF0, "", HFILL }
+			{ "Reason", "s5066.23.reason", FT_UINT8, BASE_DEC, VALS(s5066_23_reason), 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_23_sapid,
-			{ "Destination Sap ID", "s5066.23.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.23.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_23_size,
-			{ "U_PDU Size", "s5066.23.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.23.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_23_data,
-			{ "(Part of) Rejected data", "s5066.23.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "(Part of) Rejected data", "s5066.23.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 24: S_EXPEDITED_UNIDATA_REQUEST */
 		{ &hf_s5066_24_unused,
-			{ "(Unused)", "s5066.24.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "(Unused)", "s5066.24.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_24_sapid,
-			{ "Destination Sap ID", "s5066.24.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.24.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_24_ttl,
-			{ "Time-To-Live (x2 seconds)", "s5066.24.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, "", HFILL }
+			{ "Time-To-Live (x2 seconds)", "s5066.24.ttl", FT_UINT24, BASE_DEC, NULL, 0x0FFFFF, NULL, HFILL }
 		},
 		{ &hf_s5066_24_size,
-			{ "U_PDU Size", "s5066.24.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.24.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 25: S_EXPEDITED_UNIDATA_INDICATION */
 		{ &hf_s5066_25_unused,
-			{ "(Unused)", "s5066.25.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "(Unused)", "s5066.25.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_dest_sapid,
-			{ "Destination Sap ID", "s5066.25.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.25.dest_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_25_tx_mode,
-			{ "Transmission Mode", "s5066.25.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, "", HFILL }
+			{ "Transmission Mode", "s5066.25.txmode", FT_UINT8, BASE_HEX, VALS(s5066_st_txmode), 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_src_sapid,
-			{ "Source Sap ID", "s5066.25.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Source Sap ID", "s5066.25.src_sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_25_size,
-			{ "U_PDU Size", "s5066.25.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.25.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_err_blocks,
-			{ "Number of errored blocks", "s5066.25.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Number of errored blocks", "s5066.25.err_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_err_ptr,
-			{ "Pointer to error block", "s5066.25.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Pointer to error block", "s5066.25.err_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_err_size,
-			{ "Size of error block", "s5066.25.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Size of error block", "s5066.25.err_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_nrx_blocks,
-			{ "Number of non-received blocks", "s5066.25.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Number of non-received blocks", "s5066.25.nrx_blocks", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_nrx_ptr,
-			{ "Pointer to non-received block", "s5066.25.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "Pointer to non-received block", "s5066.25.nrx_ptr", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_25_nrx_size,
-			{ "Size of non-received block", "s5066.25.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Size of non-received block", "s5066.25.nrx_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 26: S_EXPEDITED_UNIDATA_REQUEST_CONFIRM */
 		{ &hf_s5066_26_unused,
-			{ "(Unused)", "s5066.26.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, "", HFILL }
+			{ "(Unused)", "s5066.26.unused", FT_UINT8, BASE_DEC, NULL, 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_26_sapid,
-			{ "Destination Sap ID", "s5066.26.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.26.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_26_size,
-			{ "U_PDU Size", "s5066.26.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.26.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_26_data,
-			{ "(Part of) Confirmed data", "s5066.26.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "(Part of) Confirmed data", "s5066.26.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		/* Type 27: S_EXPEDITED_UNIDATA_REQUEST_REJECTED */
 		{ &hf_s5066_27_reason,
-			{ "Reason", "s5066.27.reason", FT_UINT8, BASE_DEC, VALS(s5066_27_reason), 0xF0, "", HFILL }
+			{ "Reason", "s5066.27.reason", FT_UINT8, BASE_DEC, VALS(s5066_27_reason), 0xF0, NULL, HFILL }
 		},
 		{ &hf_s5066_27_sapid,
-			{ "Destination Sap ID", "s5066.27.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, "", HFILL }
+			{ "Destination Sap ID", "s5066.27.sapid", FT_UINT8, BASE_DEC, NULL, 0x0F, NULL, HFILL }
 		},
 		{ &hf_s5066_27_size,
-			{ "U_PDU Size", "s5066.27.size", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "U_PDU Size", "s5066.27.size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_s5066_27_data,
-			{ "(Part of) Rejected data", "s5066.27.data", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "(Part of) Rejected data", "s5066.27.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 
 	};
diff --git a/epan/dissectors/packet-sabp.c b/epan/dissectors/packet-sabp.c
index a219f95db6..ab3c935051 100644
--- a/epan/dissectors/packet-sabp.c
+++ b/epan/dissectors/packet-sabp.c
@@ -1672,14 +1672,14 @@ void proto_register_sabp(void) {
     { &hf_sabp_no_of_pages,
       { "Number-of-Pages", "sabp.no_of_pages",
         FT_UINT8, BASE_DEC, NULL, 0,
-        "Number-of-Pages", HFILL }},
+        NULL, HFILL }},
 
 
 /*--- Included file: packet-sabp-hfarr.c ---*/
 #line 1 "packet-sabp-hfarr.c"
     { &hf_sabp_Broadcast_Message_Content_PDU,
       { "Broadcast-Message-Content", "sabp.Broadcast_Message_Content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Broadcast_Message_Content", HFILL }},
     { &hf_sabp_Category_PDU,
       { "Category", "sabp.Category",
@@ -1699,7 +1699,7 @@ void proto_register_sabp(void) {
         "sabp.MessageStructure", HFILL }},
     { &hf_sabp_Data_Coding_Scheme_PDU,
       { "Data-Coding-Scheme", "sabp.Data_Coding_Scheme",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Data_Coding_Scheme", HFILL }},
     { &hf_sabp_Failure_List_PDU,
       { "Failure-List", "sabp.Failure_List",
@@ -1707,11 +1707,11 @@ void proto_register_sabp(void) {
         "sabp.Failure_List", HFILL }},
     { &hf_sabp_Message_Identifier_PDU,
       { "Message-Identifier", "sabp.Message_Identifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Message_Identifier", HFILL }},
     { &hf_sabp_New_Serial_Number_PDU,
       { "New-Serial-Number", "sabp.New_Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.New_Serial_Number", HFILL }},
     { &hf_sabp_Number_of_Broadcasts_Completed_List_PDU,
       { "Number-of-Broadcasts-Completed-List", "sabp.Number_of_Broadcasts_Completed_List",
@@ -1723,7 +1723,7 @@ void proto_register_sabp(void) {
         "sabp.Number_of_Broadcasts_Requested", HFILL }},
     { &hf_sabp_Old_Serial_Number_PDU,
       { "Old-Serial-Number", "sabp.Old_Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Old_Serial_Number", HFILL }},
     { &hf_sabp_Radio_Resource_Loading_List_PDU,
       { "Radio-Resource-Loading-List", "sabp.Radio_Resource_Loading_List",
@@ -1739,7 +1739,7 @@ void proto_register_sabp(void) {
         "sabp.Repetition_Period", HFILL }},
     { &hf_sabp_Serial_Number_PDU,
       { "Serial-Number", "sabp.Serial_Number",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.Serial_Number", HFILL }},
     { &hf_sabp_Service_Areas_List_PDU,
       { "Service-Areas-List", "sabp.Service_Areas_List",
@@ -1931,15 +1931,15 @@ void proto_register_sabp(void) {
         "sabp.Available_Bandwidth", HFILL }},
     { &hf_sabp_pLMNidentity,
       { "pLMNidentity", "sabp.pLMNidentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.PLMNidentity", HFILL }},
     { &hf_sabp_lac,
       { "lac", "sabp.lac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_sabp_sac,
       { "sac", "sabp.sac",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "sabp.OCTET_STRING_SIZE_2", HFILL }},
     { &hf_sabp_Service_Areas_List_item,
       { "Service-Area-Identifier", "sabp.Service_Area_Identifier",
diff --git a/epan/dissectors/packet-sadmind.c b/epan/dissectors/packet-sadmind.c
index 6240477f90..7e4cfe89cb 100644
--- a/epan/dissectors/packet-sadmind.c
+++ b/epan/dissectors/packet-sadmind.c
@@ -81,13 +81,13 @@ proto_register_sadmind(void)
 	static hf_register_info hf[] = {
 		{ &hf_sadmind_procedure_v1, {
 			"V1 Procedure", "sadmind.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(sadmind1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(sadmind1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_sadmind_procedure_v2, {
 			"V2 Procedure", "sadmind.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(sadmind2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(sadmind2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_sadmind_procedure_v3, {
 			"V3 Procedure", "sadmind.procedure_v3", FT_UINT32, BASE_DEC,
-			VALS(sadmind3_proc_vals), 0, "V3 Procedure", HFILL }}
+			VALS(sadmind3_proc_vals), 0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-sap.c b/epan/dissectors/packet-sap.c
index 149bbf233b..c9865bcc26 100644
--- a/epan/dissectors/packet-sap.c
+++ b/epan/dissectors/packet-sap.c
@@ -300,7 +300,7 @@ void proto_register_sap(void)
     { &hf_sap_flags_r,
       { "Reserved",               "sap.flags.r",
 	FT_BOOLEAN, 8, TFS(&flags_set_truth), MCAST_SAP_BIT_R,
-      	"Reserved", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_sap_flags_t,
       { "Message Type",           "sap.flags.t",
diff --git a/epan/dissectors/packet-sbus.c b/epan/dissectors/packet-sbus.c
index 3b3c5b7d41..7125ed6b46 100644
--- a/epan/dissectors/packet-sbus.c
+++ b/epan/dissectors/packet-sbus.c
@@ -1584,7 +1584,7 @@ proto_register_sbus(void)
               { &hf_sbus_web_size,
                      { "Web server packet size",      "sbus.web.size",
                      FT_UINT8, BASE_HEX, NULL, 0,           
-                     "Web server packet size", HFILL }
+                     NULL, HFILL }
               },
                      
               { &hf_sbus_web_aid,
diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c
index d0a4511e1a..aae08d96cb 100644
--- a/epan/dissectors/packet-sccp.c
+++ b/epan/dissectors/packet-sccp.c
@@ -2830,335 +2830,335 @@ proto_register_sccp(void)
     { &hf_sccp_message_type,
       { "Message Type", "sccp.message_type",
 	FT_UINT8, BASE_HEX, VALS(sccp_message_type_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_variable_pointer1,
       { "Pointer to first Mandatory Variable parameter", "sccp.variable_pointer1",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_variable_pointer2,
       { "Pointer to second Mandatory Variable parameter", "sccp.variable_pointer2",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_variable_pointer3,
       { "Pointer to third Mandatory Variable parameter", "sccp.variable_pointer3",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_optional_pointer,
       { "Pointer to Optional parameter", "sccp.optional_pointer",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_ssn,
       { "Called or Calling SubSystem Number", "sccp.ssn",
 	FT_UINT8, BASE_DEC, VALS(sccp_ssn_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_gt_digits,
       { "Called or Calling GT Digits",
 	"sccp.digits",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_national_indicator,
       { "National Indicator", "sccp.called.ni",
 	FT_UINT8, BASE_HEX, VALS(sccp_national_indicator_values), ANSI_NATIONAL_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_routing_indicator,
       { "Routing Indicator", "sccp.called.ri",
 	FT_UINT8, BASE_HEX, VALS(sccp_routing_indicator_values), ROUTING_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_itu_global_title_indicator,
       { "Global Title Indicator", "sccp.called.gti",
 	FT_UINT8, BASE_HEX, VALS(sccp_itu_global_title_indicator_values), GTI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_ansi_global_title_indicator,
       { "Global Title Indicator", "sccp.called.gti",
 	FT_UINT8, BASE_HEX, VALS(sccp_ansi_global_title_indicator_values), GTI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_itu_ssn_indicator,
       { "SubSystem Number Indicator", "sccp.called.ssni",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_ssni_values), ITU_SSN_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_itu_point_code_indicator,
       { "Point Code Indicator", "sccp.called.pci",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_pci_values), ITU_PC_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_ansi_ssn_indicator,
       { "SubSystem Number Indicator", "sccp.called.ssni",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_ssni_values), ANSI_SSN_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_ansi_point_code_indicator,
       { "Point Code Indicator", "sccp.called.pci",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_pci_values), ANSI_PC_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_ssn,
       { "SubSystem Number", "sccp.called.ssn",
 	FT_UINT8, BASE_DEC, VALS(sccp_ssn_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_itu_pc,
       { "PC", "sccp.called.pc",
 	FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_ansi_pc,
       { "PC", "sccp.called.ansi_pc",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_chinese_pc,
       { "PC", "sccp.called.chinese_pc",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_japan_pc,
       { "PC", "sccp.called.pc",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_called_pc_network,
       { "PC Network",
 	"sccp.called.network",
 	FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_pc_cluster,
       { "PC Cluster",
 	"sccp.called.cluster",
 	FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_pc_member,
       { "PC Member",
 	"sccp.called.member",
 	FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_nai,
       { "Nature of Address Indicator",
 	"sccp.called.nai",
 	FT_UINT8, BASE_HEX, VALS(sccp_nai_values), GT_NAI_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_oe,
       { "Odd/Even Indicator",
 	"sccp.called.oe",
 	FT_UINT8, BASE_HEX, VALS(sccp_oe_values), GT_OE_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_tt,
       { "Translation Type",
 	"sccp.called.tt",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_np,
       { "Numbering Plan",
 	"sccp.called.np",
 	FT_UINT8, BASE_HEX, VALS(sccp_np_values), GT_NP_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_es,
       { "Encoding Scheme",
 	"sccp.called.es",
 	FT_UINT8, BASE_HEX, VALS(sccp_es_values), GT_ES_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_called_gt_digits,
       { "GT Digits",
 	"sccp.called.digits",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_national_indicator,
       { "National Indicator", "sccp.calling.ni",
 	FT_UINT8, BASE_HEX, VALS(sccp_national_indicator_values), ANSI_NATIONAL_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_routing_indicator,
       { "Routing Indicator", "sccp.calling.ri",
 	FT_UINT8, BASE_HEX, VALS(sccp_routing_indicator_values), ROUTING_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_itu_global_title_indicator,
       { "Global Title Indicator", "sccp.calling.gti",
 	FT_UINT8, BASE_HEX, VALS(sccp_itu_global_title_indicator_values), GTI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_ansi_global_title_indicator,
       { "Global Title Indicator", "sccp.calling.gti",
 	FT_UINT8, BASE_HEX, VALS(sccp_ansi_global_title_indicator_values), GTI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_itu_ssn_indicator,
       { "SubSystem Number Indicator", "sccp.calling.ssni",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_ssni_values), ITU_SSN_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_itu_point_code_indicator,
       { "Point Code Indicator", "sccp.calling.pci",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_pci_values), ITU_PC_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_ansi_ssn_indicator,
       { "SubSystem Number Indicator", "sccp.calling.ssni",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_ssni_values), ANSI_SSN_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_ansi_point_code_indicator,
       { "Point Code Indicator", "sccp.calling.pci",
 	FT_UINT8, BASE_HEX, VALS(sccp_ai_pci_values), ANSI_PC_INDICATOR_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_ssn,
       { "SubSystem Number", "sccp.calling.ssn",
 	FT_UINT8, BASE_DEC, VALS(sccp_ssn_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_itu_pc,
       { "PC", "sccp.calling.pc",
 	FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_ansi_pc,
       { "PC", "sccp.calling.ansi_pc",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_chinese_pc,
       { "PC", "sccp.calling.chinese_pc",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_japan_pc,
       { "PC", "sccp.calling.pc",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_calling_pc_network,
       { "PC Network",
 	"sccp.calling.network",
 	FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_pc_cluster,
       { "PC Cluster",
 	"sccp.calling.cluster",
 	FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_pc_member,
       { "PC Member",
 	"sccp.calling.member",
 	FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_nai,
       { "Nature of Address Indicator",
 	"sccp.calling.nai",
 	FT_UINT8, BASE_HEX, VALS(sccp_nai_values), GT_NAI_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_oe,
       { "Odd/Even Indicator",
 	"sccp.calling.oe",
 	FT_UINT8, BASE_HEX, VALS(sccp_oe_values), GT_OE_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_tt,
       { "Translation Type",
 	"sccp.calling.tt",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_np,
       { "Numbering Plan",
 	"sccp.calling.np",
 	FT_UINT8, BASE_HEX, VALS(sccp_np_values), GT_NP_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_es,
       { "Encoding Scheme",
 	"sccp.calling.es",
 	FT_UINT8, BASE_HEX, VALS(sccp_es_values), GT_ES_MASK,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_calling_gt_digits,
       { "GT Digits",
 	"sccp.calling.digits",
 	FT_STRING, BASE_NONE, NULL, 0x0,
-	"", HFILL }},
+	NULL, HFILL }},
     { &hf_sccp_dlr,
       { "Destination Local Reference", "sccp.dlr",
 	FT_UINT24, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_slr,
       { "Source Local Reference", "sccp.slr",
 	FT_UINT24, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_lr,
     { "Local Reference", "sccp.lr",
       FT_UINT24, BASE_HEX, NULL, 0x0,
-      "", HFILL}},
+      NULL, HFILL}},
     { &hf_sccp_class,
       { "Class", "sccp.class",
 	FT_UINT8, BASE_HEX, NULL, CLASS_CLASS_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_handling,
       { "Message handling", "sccp.handling",
 	FT_UINT8, BASE_HEX, VALS(sccp_class_handling_values), CLASS_SPARE_HANDLING_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_more,
       { "More data", "sccp.more",
 	FT_UINT8, BASE_HEX, VALS(sccp_segmenting_reassembling_values), SEGMENTING_REASSEMBLING_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_rsn,
       { "Receive Sequence Number", "sccp.rsn",
 	FT_UINT8, BASE_HEX, NULL, RSN_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_sequencing_segmenting_ssn,
       { "Sequencing Segmenting: Send Sequence Number", "sccp.sequencing_segmenting.ssn",
 	FT_UINT8, BASE_HEX, NULL, SEND_SEQUENCE_NUMBER_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_sequencing_segmenting_rsn,
       { "Sequencing Segmenting: Receive Sequence Number", "sccp.sequencing_segmenting.rsn",
 	FT_UINT8, BASE_HEX, NULL, RECEIVE_SEQUENCE_NUMBER_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_sequencing_segmenting_more,
       { "Sequencing Segmenting: More", "sccp.sequencing_segmenting.more",
 	FT_UINT8, BASE_HEX, VALS(sccp_segmenting_reassembling_values), SEQUENCING_SEGMENTING_MORE_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_credit,
       { "Credit", "sccp.credit",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_release_cause,
       { "Release Cause", "sccp.release_cause",
 	FT_UINT8, BASE_HEX, VALS(sccp_release_cause_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_return_cause,
       { "Return Cause", "sccp.return_cause",
 	FT_UINT8, BASE_HEX, VALS(sccp_return_cause_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_reset_cause,
       { "Reset Cause", "sccp.reset_cause",
 	FT_UINT8, BASE_HEX, VALS(sccp_reset_cause_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_error_cause,
       { "Error Cause", "sccp.error_cause",
 	FT_UINT8, BASE_HEX, VALS(sccp_error_cause_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_refusal_cause,
       { "Refusal Cause", "sccp.refusal_cause",
 	FT_UINT8, BASE_HEX, VALS(sccp_refusal_cause_values), 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_segmentation_first,
       { "Segmentation: First", "sccp.segmentation.first",
 	FT_UINT8, BASE_HEX, VALS(sccp_segmentation_first_segment_values), SEGMENTATION_FIRST_SEGMENT_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_segmentation_class,
       { "Segmentation: Class", "sccp.segmentation.class",
 	FT_UINT8, BASE_HEX, VALS(sccp_segmentation_class_values), SEGMENTATION_CLASS_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_segmentation_remaining,
       { "Segmentation: Remaining", "sccp.segmentation.remaining",
 	FT_UINT8, BASE_HEX, NULL, SEGMENTATION_REMAINING_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_segmentation_slr,
       { "Segmentation: Source Local Reference", "sccp.segmentation.slr",
 	FT_UINT24, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_hop_counter,
       { "Hop Counter", "sccp.hops",
 	FT_UINT8, BASE_HEX, NULL, 0x0,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_importance,
       { "Importance", "sccp.importance",
 	FT_UINT8, BASE_HEX, NULL, IMPORTANCE_IMPORTANCE_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     /* ISNI is ANSI only */
     { &hf_sccp_ansi_isni_mi,
       { "ISNI Mark for Identification Indicator", "sccp.isni.mi",
 	FT_UINT8, BASE_HEX, VALS(sccp_isni_mark_for_id_values), ANSI_ISNI_MI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_ansi_isni_iri,
       { "ISNI Routing Indicator", "sccp.isni.iri",
 	FT_UINT8, BASE_HEX, VALS(sccp_isni_iri_values), ANSI_ISNI_IRI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_ansi_isni_ti,
       { "ISNI Type Indicator", "sccp.isni.ti",
 	FT_UINT8, BASE_HEX, VALS(sccp_isni_ti_values), ANSI_ISNI_TI_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_ansi_isni_netspec,
       { "ISNI Network Specific (Type 1)", "sccp.isni.netspec",
 	FT_UINT8, BASE_HEX, NULL, ANSI_ISNI_NETSPEC_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     { &hf_sccp_ansi_isni_counter,
       { "ISNI Counter", "sccp.isni.counter",
 	FT_UINT8, BASE_DEC, NULL, ANSI_ISNI_COUNTER_MASK,
-	"", HFILL}},
+	NULL, HFILL}},
     {&hf_sccp_xudt_msg_fragments,
 	{"Message fragments", "sccp.msg.fragments",
 	FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL }
@@ -3169,19 +3169,19 @@ proto_register_sccp(void)
     },
     {&hf_sccp_xudt_msg_fragment_overlap,
 	{"Message fragment overlap", "sccp.msg.fragment.overlap",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     {&hf_sccp_xudt_msg_fragment_overlap_conflicts,
 	{"Message fragment overlapping with conflicting data", "sccp.msg.fragment.overlap.conflicts",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     {&hf_sccp_xudt_msg_fragment_multiple_tails,
 	{"Message has multiple tail fragments", "sccp.msg.fragment.multiple_tails",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     {&hf_sccp_xudt_msg_fragment_too_long_fragment,
 	{"Message fragment too long", "sccp.msg.fragment.too_long_fragment",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     {&hf_sccp_xudt_msg_fragment_error,
 	{"Message defragmentation error", "sccp.msg.fragment.error",
@@ -3193,10 +3193,10 @@ proto_register_sccp(void)
     },
     { &hf_sccp_assoc_id,
       { "Association ID", "sccp.assoc.id",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_sccp_assoc_msg,
 	{"Message in frame", "sccp.assoc.msg",
-	FT_FRAMENUM, BASE_NONE, NULL, 0x00, "", HFILL }
+	FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }
     },
 
   };
diff --git a/epan/dissectors/packet-sccpmg.c b/epan/dissectors/packet-sccpmg.c
index ae4de287c9..9cbcafc48c 100644
--- a/epan/dissectors/packet-sccpmg.c
+++ b/epan/dissectors/packet-sccpmg.c
@@ -304,47 +304,47 @@ proto_register_sccpmg(void)
 	  { &hf_sccpmg_message_type,
 	    { "Message Type", "sccpmg.message_type",
 	      FT_UINT8, BASE_HEX, VALS(sccpmg_message_type_values), 0x0,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_ssn,
 	    { "Affected SubSystem Number", "sccpmg.ssn",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_itu_pc,
 	    { "Affected Point Code", "sccpmg.pc",
 	      FT_UINT16, BASE_DEC, NULL, ITU_PC_MASK,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_japan_pc,
 	    { "Affected Point Code", "sccpmg.pc",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_ansi_pc,
 	    { "Affected Point Code", "sccpmg.ansi_pc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_chinese_pc,
 	    { "Affected Point Code", "sccpmg.chinese_pc",
 	      FT_STRING, BASE_NONE, NULL, 0x0,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_pc_network,
 	    { "Affected PC Network", "sccpmg.network",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_NETWORK_MASK,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_pc_cluster,
 	    { "Affected PC Cluster", "sccpmg.cluster",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_CLUSTER_MASK,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_affected_pc_member,
 	    { "Affected PC Member", "sccpmg.member",
 	      FT_UINT24, BASE_DEC, NULL, ANSI_MEMBER_MASK,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_smi,
 	    { "Subsystem Multiplicity Indicator", "sccpmg.smi",
 	      FT_UINT8, BASE_DEC, NULL, SCCPMG_SMI_MASK,
-	      "", HFILL}},
+	      NULL, HFILL}},
 	  { &hf_sccpmg_congestion_level,
 	    { "SCCP Congestion Level (ITU)", "sccpmg.congestion",
 	      FT_UINT8, BASE_DEC, NULL, ITU_SCCPMG_CONGESTION_MASK,
-	      "", HFILL}}
+	      NULL, HFILL}}
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-scriptingservice.c b/epan/dissectors/packet-scriptingservice.c
index c8c68f55e4..7d4d8be3cd 100644
--- a/epan/dissectors/packet-scriptingservice.c
+++ b/epan/dissectors/packet-scriptingservice.c
@@ -144,11 +144,11 @@ proto_register_ssprotocol(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_message_type,      { "Type",       "ssprotocol.message_type",   FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, "", HFILL } },
-    { &hf_message_flags,     { "Flags",      "ssprotocol.message_flags",  FT_UINT8,  BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_length,    { "Length",     "ssprotocol.message_length", FT_UINT16, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_status,    { "Status",     "ssprotocol.message_status", FT_UINT32, BASE_DEC, NULL,                      0x0, "", HFILL } },
-    { &hf_message_data,      { "Data",       "ssprotocol.message_data",   FT_BYTES,  BASE_HEX, NULL,                      0x0, "", HFILL } }
+    { &hf_message_type,      { "Type",       "ssprotocol.message_type",   FT_UINT8,  BASE_DEC, VALS(message_type_values), 0x0, NULL, HFILL } },
+    { &hf_message_flags,     { "Flags",      "ssprotocol.message_flags",  FT_UINT8,  BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_length,    { "Length",     "ssprotocol.message_length", FT_UINT16, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_status,    { "Status",     "ssprotocol.message_status", FT_UINT32, BASE_DEC, NULL,                      0x0, NULL, HFILL } },
+    { &hf_message_data,      { "Data",       "ssprotocol.message_data",   FT_BYTES,  BASE_NONE, NULL,                      0x0, NULL, HFILL } }
   };
 
   /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-scsi-mmc.c b/epan/dissectors/packet-scsi-mmc.c
index f9765fb5fb..4bd0184da5 100644
--- a/epan/dissectors/packet-scsi-mmc.c
+++ b/epan/dissectors/packet-scsi-mmc.c
@@ -1375,364 +1375,364 @@ proto_register_scsi_mmc(void)
 	static hf_register_info hf[] = {
         { &hf_scsi_mmc_opcode,
           {"MMC Opcode", "scsi.mmc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_mmc_vals), 0x0, "", HFILL}},
+           VALS (scsi_mmc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_type,
           {"Type", "scsi.mmc.setstreaming.type", FT_UINT8, BASE_DEC,
-           VALS(scsi_setstreaming_type_val), 0, "", HFILL}},
+           VALS(scsi_setstreaming_type_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_param_len,
           {"Parameter Length", "scsi.mmc.setstreaming.param_len", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_wrc,
           {"WRC", "scsi.mmc.setstreaming.wrc", FT_UINT8, BASE_HEX,
-           NULL, 0x18, "", HFILL}},
+           NULL, 0x18, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_rdd,
           {"RDD", "scsi.mmc.setstreaming.rdd", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_exact,
           {"Exact", "scsi.mmc.setstreaming.exact", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_ra,
           {"RA", "scsi.mmc.setstreaming.ra", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_start_lba,
           {"Start LBA", "scsi.mmc.setstreaming.start_lbs", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_end_lba,
           {"End LBA", "scsi.mmc.setstreaming.end_lba", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_read_size,
           {"Read Size", "scsi.mmc.setstreaming.read_size", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_read_time,
           {"Read Time", "scsi.mmc.setstreaming.read_time", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_write_size,
           {"Write Size", "scsi.mmc.setstreaming.write_size", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setstreaming_write_time,
           {"Write Time", "scsi.mmc.setstreaming.write_time", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_setcdspeed_rc,
           {"Rotational Control", "scsi.mmc.setcdspeed.rc", FT_UINT8, BASE_HEX,
-           VALS(scsi_setcdspeed_rc_val), 0x03, "", HFILL}},
+           VALS(scsi_setcdspeed_rc_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_block,
           {"BLOCK", "scsi.mmc.rbc.block", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_lob_blocks,
           {"Buffer Len (blocks)", "scsi.mmc.rbc.lob_blocks", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_alob_blocks,
           {"Available Buffer Len (blocks)", "scsi.mmc.rbc.alob_blocks", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_lob_bytes,
           {"Buffer Len (bytes)", "scsi.mmc.rbc.lob_bytes", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rbc_alob_bytes,
           {"Available Buffer Len (bytes)", "scsi.mmc.rbc.alob_bytes", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_rti_address_type,
           {"Address Type", "scsi.mmc.rti.address_type", FT_UINT8, BASE_HEX,
-           VALS(scsi_rti_address_type_val), 0x03, "", HFILL}},
+           VALS(scsi_rti_address_type_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_rti_damage,
           {"Damage", "scsi.mmc.rti.damage", FT_BOOLEAN, 8,
-           NULL, 0x20, "", HFILL}},
+           NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_rti_copy,
           {"Copy", "scsi.mmc.rti.copy", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_rti_track_mode,
           {"Track Mode", "scsi.mmc.rti.track_mode", FT_UINT8, BASE_HEX,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_rti_rt,
           {"RT", "scsi.mmc.rti.rt", FT_BOOLEAN, 8,
-           NULL, 0x80, "", HFILL}},
+           NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_rti_blank,
           {"Blank", "scsi.mmc.rti.blank", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_rti_packet,
           {"Packet/Inc", "scsi.mmc.rti.packet", FT_BOOLEAN, 8,
-           NULL, 0x20, "", HFILL}},
+           NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_rti_fp,
           {"FP", "scsi.mmc.rti.fp", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_rti_data_mode,
           {"Data Mode", "scsi.mmc.rti.data_mode", FT_UINT8, BASE_HEX,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_rti_lra_v,
           {"LRA_V", "scsi.mmc.rti.lra_v", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_rti_nwa_v,
           {"NWA_V", "scsi.mmc.rti.nwa_v", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_type_code,
           {"Type Code", "scsi.mmc.report_key.type_code", FT_UINT8, BASE_HEX,
-           VALS(scsi_report_key_type_code_val), 0xc0, "", HFILL}},
+           VALS(scsi_report_key_type_code_val), 0xc0, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_vendor_resets,
           {"Vendor Resets", "scsi.mmc.report_key.vendor_resets", FT_UINT8, BASE_HEX,
-           NULL, 0x38, "", HFILL}},
+           NULL, 0x38, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_user_changes,
           {"User Changes", "scsi.mmc.report_key.user_changes", FT_UINT8, BASE_HEX,
-           NULL, 0x07, "", HFILL}},
+           NULL, 0x07, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_region_mask,
           {"Region Mask", "scsi.mmc.report_key.region_mask", FT_UINT8, BASE_HEX,
-           NULL, 0xff, "", HFILL}},
+           NULL, 0xff, NULL, HFILL}},
         { &hf_scsi_mmc_report_key_rpc_scheme,
           {"RPC Scheme", "scsi.mmc.report_key.rpc_scheme", FT_UINT8, BASE_HEX,
-           VALS(scsi_report_key_rpc_scheme_val), 0, "", HFILL}},
+           VALS(scsi_report_key_rpc_scheme_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_key_class,
           {"Key Class", "scsi.mmc.key_class", FT_UINT8, BASE_HEX,
-           VALS (scsi_key_class_val), 0x00, "", HFILL}},
+           VALS (scsi_key_class_val), 0x00, NULL, HFILL}},
         { &hf_scsi_mmc_key_format,
           {"Key Format", "scsi.mmc.key_format", FT_UINT8, BASE_HEX,
-           VALS (scsi_key_format_val), 0x3f, "", HFILL}},
+           VALS (scsi_key_format_val), 0x3f, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_erasable,
           {"Erasable", "scsi.mmc.disc_info.erasable", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_state_of_last_session,
           {"State Of Last Session", "scsi.mmc.disc_info.state_of_last_session", FT_UINT8, BASE_HEX,
-           VALS(scsi_disc_info_sols_val), 0x0c, "", HFILL}},
+           VALS(scsi_disc_info_sols_val), 0x0c, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disk_status,
           {"Disk Status", "scsi.mmc.disc_info.disk_status", FT_UINT8, BASE_HEX,
-           VALS(scsi_disc_info_disc_status_val), 0x03, "", HFILL}},
+           VALS(scsi_disc_info_disc_status_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_number_of_sessions,
           {"Number Of Sessions", "scsi.mmc.disc_info.number_of_sessions", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_first_track_in_last_session,
           {"First Track In Last Session", "scsi.mmc.disc_info.first_track_in_last_session", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_track_in_last_session,
           {"Last Track In Last Session", "scsi.mmc.disc_info.last_track_in_last_session", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_did_v,
           {"DID_V", "scsi.mmc.disc_info.did_v", FT_BOOLEAN, 8,
-           NULL, 0x80, "", HFILL}},
+           NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dbc_v,
           {"DBC_V", "scsi.mmc.disc_info.dbc_v", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_uru,
           {"URU", "scsi.mmc.disc_info.uru", FT_BOOLEAN, 8,
-           NULL, 0x20, "", HFILL}},
+           NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dac_v,
           {"DAC_V", "scsi.mmc.disc_info.dac_v", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_dbit,
           {"Dbit", "scsi.mmc.disc_info.dbit", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_bgfs,
           {"BG Format Status", "scsi.mmc.disc_info.bgfs", FT_UINT8, BASE_HEX,
-           VALS(scsi_disc_info_bgfs_val), 0x03, "", HFILL}},
+           VALS(scsi_disc_info_bgfs_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_type,
           {"Disc Type", "scsi.mmc.disc_info.disc_type", FT_UINT8, BASE_HEX,
-           VALS(scsi_disc_info_disc_type_val), 0, "", HFILL}},
+           VALS(scsi_disc_info_disc_type_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_identification,
           {"Disc Identification", "scsi.mmc.disc_info.disc_identification", FT_UINT32, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_session_lead_in_start_address,
           {"Last Session Lead-In Start Address", "scsi.mmc.disc_info.last_session_lead_in_start_address", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_last_possible_lead_out_start_address,
           {"Last Possible Lead-Out Start Address", "scsi.mmc.disc_info.last_possible_lead_out_start_address", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_disc_info_disc_bar_code,
           {"Disc Bar Code", "scsi.mmc.disc_info.disc_bar_code", FT_UINT64, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_time,
           {"Time", "scsi.mmc.readtoc.time", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_format,
           {"Format", "scsi.mmc.readtoc.format", FT_UINT8, BASE_HEX,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_first_session,
           {"First Session", "scsi.mmc.readtoc.first_session", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_last_track,
           {"Last Track", "scsi.mmc.readtoc.last_track", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_readtoc_last_session,
           {"Last Session", "scsi.mmc.readtoc.last_session", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_q_subchannel_adr,
           {"Q Subchannel ADR", "scsi.mmc.q.subchannel.adr", FT_UINT8, BASE_HEX,
-           VALS(scsi_q_subchannel_adr_val), 0xf0, "", HFILL}},
+           VALS(scsi_q_subchannel_adr_val), 0xf0, NULL, HFILL}},
         { &hf_scsi_mmc_q_subchannel_control,
           {"Q Subchannel Control", "scsi.mmc.q.subchannel.control", FT_UINT8, BASE_HEX,
-           VALS(scsi_q_subchannel_control_val), 0x0f, "", HFILL}},
+           VALS(scsi_q_subchannel_control_val), 0x0f, NULL, HFILL}},
         { &hf_scsi_mmc_agid,
           {"AGID", "scsi.mmc.agid", FT_UINT8, BASE_HEX,
-           NULL, 0xc0, "", HFILL}},
+           NULL, 0xc0, NULL, HFILL}},
         { &hf_scsi_mmc_track,
           {"Track", "scsi.mmc.track", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_size,
           {"Track Size", "scsi.mmc.track_size", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_start_address,
           {"Track Start Address", "scsi.mmc.track_start_address", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_track_start_time,
           {"Track Start Time", "scsi.mmc.track_start_time", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_lba,
           {"Logical Block Address", "scsi.mmc.lba", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_session,
           {"Session", "scsi.mmc.session", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_data_length,
           {"Data Length", "scsi.mmc.data_length", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_rt,
           {"RT", "scsi.mmc.getconf.rt", FT_UINT8, BASE_HEX,
-           VALS(scsi_getconf_rt_val), 0x03, "", HFILL}},
+           VALS(scsi_getconf_rt_val), 0x03, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_current_profile,
           {"Current Profile", "scsi.mmc.getconf.current_profile", FT_UINT16, BASE_HEX,
-           VALS(scsi_getconf_current_profile_val), 0, "", HFILL}},
+           VALS(scsi_getconf_current_profile_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_getconf_starting_feature,
           {"Starting Feature", "scsi.mmc.getconf.starting_feature", FT_UINT16, BASE_HEX,
-           VALS(scsi_feature_val), 0, "", HFILL}},
+           VALS(scsi_feature_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature,
           {"Feature", "scsi.mmc.feature", FT_UINT16, BASE_HEX,
-           VALS(scsi_feature_val), 0, "", HFILL}},
+           VALS(scsi_feature_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_version,
           {"Version", "scsi.mmc.feature.version", FT_UINT8, BASE_DEC,
-           NULL, 0x3c, "", HFILL}},
+           NULL, 0x3c, NULL, HFILL}},
         { &hf_scsi_mmc_feature_persistent,
           {"Persistent", "scsi.mmc.feature.persistent", FT_UINT8, BASE_HEX,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_current,
           {"Current", "scsi.mmc.feature.current", FT_UINT8, BASE_HEX,
-           NULL, 001, "", HFILL}},
+           NULL, 001, NULL, HFILL}},
         { &hf_scsi_mmc_feature_additional_length,
           {"Additional Length", "scsi.mmc.feature.additional_length", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_lun_sn,
           {"LUN Serial Number", "scsi.mmc.feature.lun_sn", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_dap,
           {"DAP", "scsi.mmc.feature.cdread.dap", FT_BOOLEAN, 8,
-           NULL, 0x80, "", HFILL}},
+           NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_c2flag,
           {"C2 Flag", "scsi.mmc.feature.cdread.c2flag", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_cdread_cdtext,
           {"CD-Text", "scsi.mmc.feature.cdread.cdtext", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_write,
           {"Write", "scsi.mmc.feature.dvdrw.write", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_quickstart,
           {"Quick Start", "scsi.mmc.feature.dvdrw.quickstart", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdrw_closeonly,
           {"Close Only", "scsi.mmc.feature.dvdrw.closeonly", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_write,
           {"Write", "scsi.mmc.feature.dvdr.write", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_buf,
           {"BUF", "scsi.mmc.feature.tao.buf", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwraw,
           {"R-W Raw", "scsi.mmc.feature.tao.rwraw", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwpack,
           {"R-W Pack", "scsi.mmc.feature.tao.rwpack", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_testwrite,
           {"Test Write", "scsi.mmc.feature.tao.testwrite", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_cdrw,
           {"CD-RW", "scsi.mmc.feature.tao.cdrw", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_tao_rwsubcode,
           {"R-W Subcode", "scsi.mmc.feature.tao.rwsubcode", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dts,
           {"Data Type Supported", "scsi.mmc.feature.dts", FT_UINT16, BASE_HEX,
-           NULL, 0xffff, "", HFILL}},
+           NULL, 0xffff, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_buf,
           {"BUF", "scsi.mmc.feature.sao.buf", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_sao,
           {"SAO", "scsi.mmc.feature.sao.sao", FT_BOOLEAN, 8,
-           NULL, 0x20, "", HFILL}},
+           NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_rawms,
           {"Raw MS", "scsi.mmc.feature.sao.rawms", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_raw,
           {"Raw", "scsi.mmc.feature.sao.raw", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_testwrite,
           {"Test Write", "scsi.mmc.feature.sao.testwrite", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_cdrw,
           {"CD-RW", "scsi.mmc.feature.sao.cdrw", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_rw,
           {"R-W", "scsi.mmc.feature.sao.rw", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_sao_mcsl,
           {"Maximum Cue Sheet Length", "scsi.mmc.feature.sao.mcsl", FT_UINT24, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_buf,
           {"BUF", "scsi.mmc.feature.dvdr.buf", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_testwrite,
           {"Test Write", "scsi.mmc.feature.dvdr.testwrite", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_mmc_feature_dvdr_dvdrw,
           {"DVD-RW", "scsi.mmc.feature.dvdr.dvdrw", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_feature_profile,
           {"Profile", "scsi.mmc.feature.profile", FT_UINT16, BASE_HEX,
-           VALS(scsi_getconf_current_profile_val), 0, "", HFILL}},
+           VALS(scsi_getconf_current_profile_val), 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_profile_current,
           {"Current", "scsi.mmc.feature.profile.current", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_buf,
           {"BUF", "scsi.mmc.feature.isw.buf", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_num_linksize,
           {"Number of Link Sizes", "scsi.mmc.feature.isw.num_linksize", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_feature_isw_linksize,
           {"Link Size", "scsi.mmc.feature.isw.linksize", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_read_compatibility_lba,
           {"Read Compatibility LBA", "scsi.mmc.read_compatibility_lba", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_reservation_size,
           {"Reservation Size", "scsi.mmc.reservation_size", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_last_recorded_address,
           {"Last Recorded Address", "scsi.mmc.last_recorded_address", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_first_track,
           {"First Track", "scsi.mmc.first_track", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_fixed_packet_size,
           {"Fixed Packet Size", "scsi.mmc.fixed_packet_size", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_closetrack_immed,
           {"IMMED", "scsi.mmc.closetrack.immed", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_closetrack_func,
           {"Close Function", "scsi.mmc.closetrack.func", FT_UINT8, BASE_HEX,
-           VALS(scsi_closetrack_func_val), 0x07, "", HFILL}},
+           VALS(scsi_closetrack_func_val), 0x07, NULL, HFILL}},
         { &hf_scsi_mmc_synccache_immed,
           {"IMMED", "scsi.mmc.synccache.immed", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_mmc_synccache_reladr,
           {"RelAdr", "scsi.mmc.synccache.reladr", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_mmc_num_blocks,
           {"Number of Blocks", "scsi.mmc.num_blocks", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_mmc_next_writable_address,
           {"Next Writable Address", "scsi.mmc.next_writable_address", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_mmc_free_blocks,
           {"Free Blocks", "scsi.mmc.free_blocks", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-scsi-osd.c b/epan/dissectors/packet-scsi-osd.c
index 411bb5ee3e..53ba32df3c 100644
--- a/epan/dissectors/packet-scsi-osd.c
+++ b/epan/dissectors/packet-scsi-osd.c
@@ -2951,212 +2951,212 @@ proto_register_scsi_osd(void)
 	static hf_register_info hf[] = {
         { &hf_scsi_osd_opcode,
           {"OSD Opcode", "scsi.osd.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_osd_vals), 0x0, "", HFILL}},
+           VALS (scsi_osd_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_osd_add_cdblen,
           {"Additional CDB Length", "scsi.osd.addcdblen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_svcaction,
           {"Service Action", "scsi.osd.svcaction", FT_UINT16, BASE_HEX,
-           VALS(scsi_osd_svcaction_vals), 0x0, "", HFILL}},
+           VALS(scsi_osd_svcaction_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_osd_option,
           {"Options Byte", "scsi.osd.option", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_option_dpo,
           {"DPO", "scsi.osd.option.dpo", FT_BOOLEAN, 8,
-           TFS(&option_dpo_tfs), 0x10, "", HFILL}},
+           TFS(&option_dpo_tfs), 0x10, NULL, HFILL}},
         { &hf_scsi_osd_option_fua,
           {"FUA", "scsi.osd.option.fua", FT_BOOLEAN, 8,
-           TFS(&option_fua_tfs), 0x08, "", HFILL}},
+           TFS(&option_fua_tfs), 0x08, NULL, HFILL}},
         { &hf_scsi_osd_getsetattrib,
           {"GET/SET CDBFMT", "scsi.osd.getset", FT_UINT8, BASE_HEX,
-           VALS(scsi_osd_getsetattrib_vals), 0x30, "", HFILL}},
+           VALS(scsi_osd_getsetattrib_vals), 0x30, NULL, HFILL}},
         { &hf_scsi_osd_timestamps_control,
           {"Timestamps Control", "scsi.osd.timestamps_control", FT_UINT8, BASE_HEX,
-           VALS(scsi_osd_timestamps_control_vals), 0x0, "", HFILL}},
+           VALS(scsi_osd_timestamps_control_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_osd_formatted_capacity,
           {"Formatted Capacity", "scsi.osd.formatted_capacity", FT_UINT64, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_page,
           {"Get Attributes Page", "scsi.osd.get_attributes_page", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_list_length,
           {"Get Attributes List Length", "scsi.osd.get_attributes_list_length", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_list_offset,
           {"Get Attributes List Offset", "scsi.osd.get_attributes_list_offset", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_list_length,
           {"Set Attributes List Length", "scsi.osd.set_attributes_list_length", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_list_offset,
           {"Set Attributes List Offset", "scsi.osd.set_attributes_list_offset", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_get_attributes_allocation_length,
           {"Get Attributes Allocation Length", "scsi.osd.get_attributes_allocation_length", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_retrieved_attributes_offset,
           {"Retrieved Attributes Offset", "scsi.osd.retrieved_attributes_offset", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_page,
           {"Set Attributes Page", "scsi.osd.set_attributes_page", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attribute_length,
           {"Set Attribute Length", "scsi.osd.set_attribute_length", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attribute_number,
           {"Set Attribute Number", "scsi.osd.set_attribute_number", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_set_attributes_offset,
           {"Set Attributes Offset", "scsi.osd.set_attributes_offset", FT_UINT32, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_osd_capability_format,
           {"Capability Format", "scsi.osd.capability_format", FT_UINT8, BASE_HEX,
-           VALS(scsi_osd_capability_format_vals), 0x0f, "", HFILL}},
+           VALS(scsi_osd_capability_format_vals), 0x0f, NULL, HFILL}},
         { &hf_scsi_osd_key_version,
           {"Key Version", "scsi.osd.key_version", FT_UINT8, BASE_HEX,
-           NULL, 0xf0, "", HFILL}},
+           NULL, 0xf0, NULL, HFILL}},
         { &hf_scsi_osd_icva,
           {"Integrity Check Value Algorithm", "scsi.osd.icva", FT_UINT8, BASE_HEX,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_osd_security_method,
           {"Security Method", "scsi.osd.security_method", FT_UINT8, BASE_HEX,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
         { &hf_scsi_osd_capability_expiration_time,
-          {"Capability Expiration Time", "scsi.osd.capability_expiration_time", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Capability Expiration Time", "scsi.osd.capability_expiration_time", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_audit,
-          {"Audit", "scsi.osd.audit", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Audit", "scsi.osd.audit", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_capability_discriminator,
-          {"Capability Discriminator", "scsi.osd.capability_descriminator", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Capability Discriminator", "scsi.osd.capability_descriminator", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_object_created_time,
-          {"Object Created Time", "scsi.osd.object_created_time", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Object Created Time", "scsi.osd.object_created_time", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_object_type,
           {"Object Type", "scsi.osd.object_type", FT_UINT8, BASE_HEX,
-           VALS(scsi_osd_object_type_vals), 0, "", HFILL}},
+           VALS(scsi_osd_object_type_vals), 0, NULL, HFILL}},
         { &hf_scsi_osd_permissions,
           {"Permissions", "scsi.osd.permissions", FT_UINT16, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_permissions_read,
           {"READ", "scsi.osd.permissions.read", FT_BOOLEAN, 16,
-           TFS(&permissions_read_tfs), 0x8000, "", HFILL}},
+           TFS(&permissions_read_tfs), 0x8000, NULL, HFILL}},
         { &hf_scsi_osd_permissions_write,
           {"WRITE", "scsi.osd.permissions.write", FT_BOOLEAN, 16,
-           TFS(&permissions_write_tfs), 0x4000, "", HFILL}},
+           TFS(&permissions_write_tfs), 0x4000, NULL, HFILL}},
         { &hf_scsi_osd_permissions_get_attr,
           {"GET_ATTR", "scsi.osd.permissions.get_attr", FT_BOOLEAN, 16,
-           TFS(&permissions_get_attr_tfs), 0x2000, "", HFILL}},
+           TFS(&permissions_get_attr_tfs), 0x2000, NULL, HFILL}},
         { &hf_scsi_osd_permissions_set_attr,
           {"SET_ATTR", "scsi.osd.permissions.set_attr", FT_BOOLEAN, 16,
-           TFS(&permissions_set_attr_tfs), 0x1000, "", HFILL}},
+           TFS(&permissions_set_attr_tfs), 0x1000, NULL, HFILL}},
         { &hf_scsi_osd_permissions_create,
           {"CREATE", "scsi.osd.permissions.create", FT_BOOLEAN, 16,
-           TFS(&permissions_create_tfs), 0x0800, "", HFILL}},
+           TFS(&permissions_create_tfs), 0x0800, NULL, HFILL}},
         { &hf_scsi_osd_permissions_remove,
           {"REMOVE", "scsi.osd.permissions.remove", FT_BOOLEAN, 16,
-           TFS(&permissions_remove_tfs), 0x0400, "", HFILL}},
+           TFS(&permissions_remove_tfs), 0x0400, NULL, HFILL}},
         { &hf_scsi_osd_permissions_obj_mgmt,
           {"OBJ_MGMT", "scsi.osd.permissions.obj_mgmt", FT_BOOLEAN, 16,
-           TFS(&permissions_obj_mgmt_tfs), 0x0200, "", HFILL}},
+           TFS(&permissions_obj_mgmt_tfs), 0x0200, NULL, HFILL}},
         { &hf_scsi_osd_permissions_append,
           {"APPEND", "scsi.osd.permissions.append", FT_BOOLEAN, 16,
-           TFS(&permissions_append_tfs), 0x0100, "", HFILL}},
+           TFS(&permissions_append_tfs), 0x0100, NULL, HFILL}},
         { &hf_scsi_osd_permissions_dev_mgmt,
           {"DEV_MGMT", "scsi.osd.permissions.dev_mgmt", FT_BOOLEAN, 16,
-           TFS(&permissions_dev_mgmt_tfs), 0x0080, "", HFILL}},
+           TFS(&permissions_dev_mgmt_tfs), 0x0080, NULL, HFILL}},
         { &hf_scsi_osd_permissions_global,
           {"GLOBAL", "scsi.osd.permissions.global", FT_BOOLEAN, 16,
-           TFS(&permissions_global_tfs), 0x0040, "", HFILL}},
+           TFS(&permissions_global_tfs), 0x0040, NULL, HFILL}},
         { &hf_scsi_osd_permissions_pol_sec,
           {"POL/SEC", "scsi.osd.permissions.pol_sec", FT_BOOLEAN, 16,
-           TFS(&permissions_pol_sec_tfs), 0x0020, "", HFILL}},
+           TFS(&permissions_pol_sec_tfs), 0x0020, NULL, HFILL}},
 
         { &hf_scsi_osd_object_descriptor_type,
           {"Object Descriptor Type", "scsi.osd.object_descriptor_type", FT_UINT8, BASE_HEX,
-           VALS(scsi_osd_object_descriptor_type_vals), 0xf0, "", HFILL}},
+           VALS(scsi_osd_object_descriptor_type_vals), 0xf0, NULL, HFILL}},
         { &hf_scsi_osd_object_descriptor,
-          {"Object Descriptor", "scsi.osd.object_descriptor", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Object Descriptor", "scsi.osd.object_descriptor", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_ricv,
-          {"Request Integrity Check value", "scsi.osd.ricv", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Request Integrity Check value", "scsi.osd.ricv", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_request_nonce,
-          {"Request Nonce", "scsi.osd.request_nonce", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Request Nonce", "scsi.osd.request_nonce", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_diicvo,
           {"Data-In Integrity Check Value Offset", "scsi.osd.diicvo", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_doicvo,
           {"Data-Out Integrity Check Value Offset", "scsi.osd.doicvo", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_requested_partition_id,
           {"Requested Partition Id", "scsi.osd.requested_partition_id", FT_UINT64, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_sortorder,
           {"Sort Order", "scsi.osd.sort_order", FT_UINT8, BASE_DEC,
-           VALS(scsi_osd_sort_order_vals), 0x0f, "", HFILL}},
+           VALS(scsi_osd_sort_order_vals), 0x0f, NULL, HFILL}},
         { &hf_scsi_osd_partition_id,
           {"Partition Id", "scsi.osd.partition_id", FT_UINT64, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_list_identifier,
           {"List Identifier", "scsi.osd.list_identifier", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_allocation_length,
           {"Allocation Length", "scsi.osd.allocation_length", FT_UINT64, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_length,
           {"Length", "scsi.osd.length", FT_UINT64, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_starting_byte_address,
           {"Starting Byte Address", "scsi.osd.starting_byte_address", FT_UINT64, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_initial_object_id,
-          {"Initial Object Id", "scsi.osd.initial_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Initial Object Id", "scsi.osd.initial_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_additional_length,
           {"Additional Length", "scsi.osd.additional_length", FT_UINT64, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_continuation_object_id,
-          {"Continuation Object Id", "scsi.osd.continuation_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Continuation Object Id", "scsi.osd.continuation_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_user_object_id,
-          {"User Object Id", "scsi.osd.user_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"User Object Id", "scsi.osd.user_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_list_flags_lstchg,
           {"LSTCHG", "scsi.osd.list.lstchg", FT_BOOLEAN, 8,
-           TFS(&list_lstchg_tfs), 0x02, "", HFILL}},
+           TFS(&list_lstchg_tfs), 0x02, NULL, HFILL}},
         { &hf_scsi_osd_list_flags_root,
           {"ROOT", "scsi.osd.list.root", FT_BOOLEAN, 8,
-           TFS(&list_root_tfs), 0x01, "", HFILL}},
+           TFS(&list_root_tfs), 0x01, NULL, HFILL}},
         { &hf_scsi_osd_requested_user_object_id,
-          {"Requested User Object Id", "scsi.osd.requested_user_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Requested User Object Id", "scsi.osd.requested_user_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_number_of_user_objects,
           {"Number Of User Objects", "scsi.osd.number_of_user_objects", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_key_to_set,
           {"Key to Set", "scsi.osd.key_to_set", FT_UINT8, BASE_DEC,
-           VALS(key_to_set_vals), 0x03, "", HFILL}},
+           VALS(key_to_set_vals), 0x03, NULL, HFILL}},
 	{ &hf_scsi_osd_set_key_version,
           {"Key Version", "scsi.osd.set_key_version", FT_UINT8, BASE_DEC,
-           NULL, 0x0f, "", HFILL}},
+           NULL, 0x0f, NULL, HFILL}},
 	{ &hf_scsi_osd_key_identifier,
-          {"Key Identifier", "scsi.osd.key_identifier", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Key Identifier", "scsi.osd.key_identifier", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_seed,
-          {"Seed", "scsi.osd.seed", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Seed", "scsi.osd.seed", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_collection_fcr,
           {"FCR", "scsi.osd.collection.fcr", FT_BOOLEAN, 8,
-           TFS(&collection_fcr_tfs), 0x01, "", HFILL}},
+           TFS(&collection_fcr_tfs), 0x01, NULL, HFILL}},
         { &hf_scsi_osd_collection_object_id,
-          {"Collection Object Id", "scsi.osd.collection_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Collection Object Id", "scsi.osd.collection_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_requested_collection_object_id,
-          {"Requested Collection Object Id", "scsi.osd.requested_collection_object_id", FT_BYTES, BASE_HEX,
-           NULL, 0, "", HFILL}},
+          {"Requested Collection Object Id", "scsi.osd.requested_collection_object_id", FT_BYTES, BASE_NONE,
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_osd_partition_created_in,
           { "Created In", "scsi.osd.partition.created_in", FT_FRAMENUM, BASE_NONE,
           NULL, 0x0, "The frame this partition was created", HFILL }},
@@ -3167,37 +3167,37 @@ proto_register_scsi_osd(void)
 
 	{ &hf_scsi_osd_flush_scope,
           {"Flush Scope", "scsi.osd.flush.scope", FT_UINT8, BASE_DEC,
-           VALS(flush_scope_vals), 0x03, "", HFILL}},
+           VALS(flush_scope_vals), 0x03, NULL, HFILL}},
 
 	{ &hf_scsi_osd_flush_collection_scope,
           {"Flush Collection Scope", "scsi.osd.flush_collection.scope", FT_UINT8, BASE_DEC,
-           VALS(flush_collection_scope_vals), 0x03, "", HFILL}},
+           VALS(flush_collection_scope_vals), 0x03, NULL, HFILL}},
 
 	{ &hf_scsi_osd_flush_partition_scope,
           {"Flush Partition Scope", "scsi.osd.flush_partition.scope", FT_UINT8, BASE_DEC,
-           VALS(flush_partition_scope_vals), 0x03, "", HFILL}},
+           VALS(flush_partition_scope_vals), 0x03, NULL, HFILL}},
 
 	{ &hf_scsi_osd_flush_osd_scope,
           {"Flush OSD Scope", "scsi.osd.flush_osd.scope", FT_UINT8, BASE_DEC,
-           VALS(flush_osd_scope_vals), 0x03, "", HFILL}},
+           VALS(flush_osd_scope_vals), 0x03, NULL, HFILL}},
 	{ &hf_scsi_osd_attributes_list_type,
           {"Attributes List Type", "scsi.osd.attributes_list.type", FT_UINT8, BASE_HEX,
-           VALS(attributes_list_type_vals), 0x0f, "", HFILL}},
+           VALS(attributes_list_type_vals), 0x0f, NULL, HFILL}},
 	{ &hf_scsi_osd_attributes_list_length,
           {"Attributes List Length", "scsi.osd.attributes_list.length", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_attributes_page,
 	  {"Attributes Page", "scsi.osd.attributes.page", FT_UINT32, BASE_HEX,
-	  VALS(attributes_page_vals), 0, "", HFILL}},
+	  VALS(attributes_page_vals), 0, NULL, HFILL}},
 	{ &hf_scsi_osd_attribute_number,
 	  {"Attribute Number", "scsi.osd.attribute.number", FT_UINT32, BASE_HEX,
-	  NULL, 0, "", HFILL}},
+	  NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_attribute_length,
 	  {"Attribute Length", "scsi.osd.attribute.length", FT_UINT16, BASE_DEC,
-	  NULL, 0, "", HFILL}},
+	  NULL, 0, NULL, HFILL}},
 	{ &hf_scsi_osd_user_object_logical_length,
 	 {"User Object Logical Length", "scsi.osd.user_object.logical_length", FT_UINT64, BASE_DEC,
-	  NULL, 0, "", HFILL}},
+	  NULL, 0, NULL, HFILL}},
 	};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-scsi-sbc.c b/epan/dissectors/packet-scsi-sbc.c
index fbb107b687..f3ed3f404a 100644
--- a/epan/dissectors/packet-scsi-sbc.c
+++ b/epan/dissectors/packet-scsi-sbc.c
@@ -1734,127 +1734,127 @@ proto_register_scsi_sbc(void)
 	static hf_register_info hf[] = {
         { &hf_scsi_sbc_opcode,
           {"SBC Opcode", "scsi.sbc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_sbc_vals), 0x0, "", HFILL}},
+           VALS (scsi_sbc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_formatunit_flags,
           {"Flags", "scsi.sbc.formatunit.flags", FT_UINT8, BASE_HEX, NULL, 0xF8,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_sbc_defect_list_format,
           {"Defect List Format", "scsi.sbc.defect_list_format", FT_UINT8, BASE_DEC,
-           NULL, 0x7, "", HFILL}},
+           NULL, 0x7, NULL, HFILL}},
         { &hf_scsi_sbc_formatunit_vendor,
           {"Vendor Unique", "scsi.sbc.formatunit.vendor", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_sbc_formatunit_interleave,
           {"Interleave", "scsi.sbc.formatunit.interleave", FT_UINT16, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_rdwr6_lba,
           {"Logical Block Address (LBA)", "scsi.sbc.rdwr6.lba", FT_UINT24, BASE_DEC,
-           NULL, 0x0FFFFF, "", HFILL}},
+           NULL, 0x0FFFFF, NULL, HFILL}},
         { &hf_scsi_sbc_rdwr6_xferlen,
           {"Transfer Length", "scsi.sbc.rdwr6.xferlen", FT_UINT24, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_sbc_rdwr10_lba,
           {"Logical Block Address (LBA)", "scsi.sbc.rdwr10.lba", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_rdwr10_xferlen,
           {"Transfer Length", "scsi.sbc.rdwr10.xferlen", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_sbc_rdwr12_xferlen,
           {"Transfer Length", "scsi.sbc.rdwr12.xferlen", FT_UINT32, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_sbc_rdwr16_lba,
-          {"Logical Block Address (LBA)", "scsi.sbc.rdwr16.lba", FT_BYTES, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+          {"Logical Block Address (LBA)", "scsi.sbc.rdwr16.lba", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_ssu_immed,
           {"Immediate", "scsi.sbc.ssu.immediate", FT_BOOLEAN, 8, NULL,
-           0x01, "", HFILL}},
+           0x01, NULL, HFILL}},
         { &hf_scsi_sbc_ssu_pwr_cond,
           {"Power Conditions", "scsi.sbc.ssu.pwr", FT_UINT8, BASE_HEX,
-           VALS (scsi_ssu_pwrcnd_val), 0xF0, "", HFILL}},
+           VALS (scsi_ssu_pwrcnd_val), 0xF0, NULL, HFILL}},
         { &hf_scsi_sbc_ssu_loej,
-          {"LOEJ", "scsi.sbc.ssu.loej", FT_BOOLEAN, 8, NULL, 0x2, "",
+          {"LOEJ", "scsi.sbc.ssu.loej", FT_BOOLEAN, 8, NULL, 0x2, NULL,
            HFILL}},
         { &hf_scsi_sbc_ssu_start,
           {"Start", "scsi.sbc.ssu.start", FT_BOOLEAN, 8, NULL, 0x1,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_sbc_bytchk,
           {"BYTCHK", "scsi.sbc.bytchk", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_sbc_verify_reladdr,
           {"RELADDR", "scsi.sbc.verify.reladdr", FT_BOOLEAN, 8, NULL,
-           0x1, "", HFILL}},
+           0x1, NULL, HFILL}},
         { &hf_scsi_sbc_verify_lba,
-          {"LBA", "scsi.sbc.verify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"LBA", "scsi.sbc.verify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_verify_lba64,
-          {"LBA", "scsi.sbc.verify.lba64", FT_UINT64, BASE_DEC, NULL, 0x0, "",
+          {"LBA", "scsi.sbc.verify.lba64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_verify_vlen,
           {"Verification Length", "scsi.sbc.verify.vlen", FT_UINT16,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_verify_vlen32,
           {"Verification Length", "scsi.sbc.verify.vlen32", FT_UINT32,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_wrverify_lba,
-          {"LBA", "scsi.sbc.wrverify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, "",
+          {"LBA", "scsi.sbc.wrverify.lba", FT_UINT32, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_wrverify_xferlen,
           {"Transfer Length", "scsi.sbc.wrverify.xferlen", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_wrverify_lba64,
           {"LBA", "scsi.sbc.wrverify.lba64", FT_UINT64, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_sbc_wrverify_xferlen32,
           {"Transfer Length", "scsi.sbc.wrverify.xferlen32", FT_UINT32,
-           BASE_DEC, NULL, 0x0, "", HFILL}},
+           BASE_DEC, NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_readcapacity_flags,
           {"Flags", "scsi.sbc.readcapacity.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_sbc_readcapacity_lba,
           {"Logical Block Address", "scsi.sbc.readcapacity.lba", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_readdefdata_flags,
-          {"Flags", "scsi.sbc.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.readdefdata.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_reassignblks_flags,
-          {"Flags", "scsi.sbc.reassignblks.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.reassignblks.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_read_flags,
-          {"Flags", "scsi.sbc.read.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.read.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_alloclen32,
           {"Allocation Length", "scsi.sbc.alloclen32", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_alloclen16,
           {"Allocation Length", "scsi.sbc.alloclen16", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sbc_fuflags_fmtpinfo,
           {"FMTPINFO", "scsi.sbc.format_unit.fmtpinfo", FT_BOOLEAN, 8,
-           NULL, 0x80, "", HFILL}},
+           NULL, 0x80, NULL, HFILL}},
         { &hf_scsi_sbc_fuflags_rto_req,
           {"RTO_REQ", "scsi.sbc.format_unit.rto_req", FT_BOOLEAN, 8,
-           NULL, 0x40, "", HFILL}},
+           NULL, 0x40, NULL, HFILL}},
         { &hf_scsi_sbc_fuflags_longlist,
           {"LONGLIST", "scsi.sbc.format_unit.longlist", FT_BOOLEAN, 8,
-           NULL, 0x20, "", HFILL}},
+           NULL, 0x20, NULL, HFILL}},
         { &hf_scsi_sbc_fuflags_fmtdata,
           {"FMTDATA", "scsi.sbc.format_unit.fmtdata", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_sbc_fuflags_cmplist,
           {"CMPLIST", "scsi.sbc.format_unit.cmplist", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_sbc_prefetch_flags,
-          {"Flags", "scsi.sbc.prefetch.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.prefetch.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_prefetch_immed,
           {"Immediate", "scsi.sbc.prefetch.immediate", FT_BOOLEAN, 8, NULL,
-           0x2, "", HFILL}},
+           0x2, NULL, HFILL}},
         { &hf_scsi_sbc_group,
           {"Group", "scsi.sbc.group", FT_UINT8, BASE_HEX, NULL,
-           0x1f, "", HFILL}},
+           0x1f, NULL, HFILL}},
         { &hf_scsi_sbc_rdprotect,
           {"RDPROTECT", "scsi.sbc.rdprotect", FT_UINT8, BASE_HEX,
-           NULL, 0xe0, "", HFILL}},
+           NULL, 0xe0, NULL, HFILL}},
         { &hf_scsi_sbc_dpo,
           {"DPO", "scsi.sbc.dpo", FT_BOOLEAN, 8,
            TFS(&dpo_tfs), 0x10, "DisablePageOut: Whether the device should cache the data or not", HFILL}},
@@ -1869,84 +1869,84 @@ proto_register_scsi_sbc(void)
            TFS(&pmi_tfs), 0x01, "Partial Medium Indicator", HFILL}},
         { &hf_scsi_sbc_pmi_flags,
           {"PMI Flags", "scsi.sbc.pmi_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_blocksize,
           {"Block size in bytes", "scsi.sbc.blocksize", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_returned_lba,
           {"Returned LBA", "scsi.sbc.returned_lba", FT_UINT32, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_req_plist,
           {"REQ_PLIST", "scsi.sbc.req_plist", FT_BOOLEAN, 8,
-           NULL, 0x10, "", HFILL}},
+           NULL, 0x10, NULL, HFILL}},
         { &hf_scsi_sbc_req_glist,
           {"REQ_GLIST", "scsi.sbc.req_glist", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_sbc_corrct,
           {"CORRCT", "scsi.sbc.corrct", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_sbc_corrct_flags,
           {"Flags", "scsi.sbc.corrct_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_reassignblocks_longlba,
           {"LongLBA", "scsi.sbc.reassignblocks.longlba", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_sbc_reassignblocks_longlist,
           {"LongList", "scsi.sbc.reassignblocks.longlist", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_sbc_ssu_immed_flags,
           {"Immed flags", "scsi.sbc.ssu.immed_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_ssu_pwr_flags,
           {"Pwr flags", "scsi.sbc.ssu.pwr_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_synccache_flags,
-          {"Flags", "scsi.sbc.synccache.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.synccache.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_synccache_immed,
           {"Immediate", "scsi.sbc.synccache.immediate", FT_BOOLEAN, 8, NULL,
-           0x02, "", HFILL}},
+           0x02, NULL, HFILL}},
         { &hf_scsi_sbc_synccache_sync_nv,
           {"SYNC_NV", "scsi.sbc.synccache.sync_nv", FT_BOOLEAN, 8, NULL,
-           0x04, "", HFILL}},
+           0x04, NULL, HFILL}},
         { &hf_scsi_sbc_vrprotect,
           {"VRPROTECT", "scsi.sbc.vrprotect", FT_UINT8, BASE_HEX,
-           NULL, 0xe0, "", HFILL}},
+           NULL, 0xe0, NULL, HFILL}},
         { &hf_scsi_sbc_verify_flags,
           {"Flags", "scsi.sbc.verify_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_wrprotect,
           {"WRPROTECT", "scsi.sbc.wrprotect", FT_UINT8, BASE_HEX,
-           NULL, 0xe0, "", HFILL}},
+           NULL, 0xe0, NULL, HFILL}},
         { &hf_scsi_sbc_wrverify_flags,
           {"Flags", "scsi.sbc.wrverify_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_writesame_flags,
           {"Flags", "scsi.sbc.writesame_flags", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_sbc_pbdata,
           {"PBDATA", "scsi.sbc.pbdata", FT_BOOLEAN, 8, NULL,
-           0x04, "", HFILL}},
+           0x04, NULL, HFILL}},
         { &hf_scsi_sbc_lbdata,
           {"LBDATA", "scsi.sbc.lbdata", FT_BOOLEAN, 8, NULL,
-           0x02, "", HFILL}},
+           0x02, NULL, HFILL}},
         { &hf_scsi_sbc_xdread_flags,
-          {"Flags", "scsi.sbc.xdread.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.xdread.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_xorpinfo,
           {"XORPINFO", "scsi.sbc.xorpinfo", FT_BOOLEAN, 8, NULL,
-           0x01, "", HFILL}},
+           0x01, NULL, HFILL}},
         { &hf_scsi_sbc_disable_write,
           {"DISABLE_WRITE", "scsi.sbc.disable_write", FT_BOOLEAN, 8, NULL,
-           0x04, "", HFILL}},
+           0x04, NULL, HFILL}},
         { &hf_scsi_sbc_xdwrite_flags,
-          {"Flags", "scsi.sbc.xdwrite.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.xdwrite.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_xdwriteread_flags,
-          {"Flags", "scsi.sbc.xdwriteread.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.xdwriteread.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_sbc_xpwrite_flags,
-          {"Flags", "scsi.sbc.xpwrite.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.sbc.xpwrite.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
 	};
 
diff --git a/epan/dissectors/packet-scsi-smc.c b/epan/dissectors/packet-scsi-smc.c
index ebd828ffd8..94ec457668 100644
--- a/epan/dissectors/packet-scsi-smc.c
+++ b/epan/dissectors/packet-scsi-smc.c
@@ -914,55 +914,55 @@ proto_register_scsi_smc(void)
 	static hf_register_info hf[] = {
         { &hf_scsi_smc_opcode,
           {"SMC Opcode", "scsi.smc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_smc_vals), 0x0, "", HFILL}},
+           VALS (scsi_smc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_smc_mta,
           {"Medium Transport Address", "scsi.smc.mta", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_sa,
           {"Source Address", "scsi.smc.sa", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_da,
           {"Destination Address", "scsi.smc.da", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_fda,
           {"First Destination Address", "scsi.smc.fda", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_sda,
           {"Second Destination Address", "scsi.smc.sda", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
 	{ &hf_scsi_smc_medium_flags,
           {"Flags", "scsi.smc.medium_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
 	{ &hf_scsi_smc_inv1,
           {"INV1", "scsi.smc.inv1", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
 	{ &hf_scsi_smc_inv2,
           {"INV2", "scsi.smc.inv2", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
 	{ &hf_scsi_smc_range_flags,
           {"Flags", "scsi.smc.range_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
 	{ &hf_scsi_smc_fast,
           {"FAST", "scsi.smc.fast", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
 	{ &hf_scsi_smc_range,
           {"RANGE", "scsi.smc.range", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_smc_sea,
           {"Starting Element Address", "scsi.smc.sea", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_num_elements,
           {"Number of Elements", "scsi.smc.num_elements", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
 	{ &hf_scsi_smc_invert,
           {"INVERT", "scsi.smc.invert", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_smc_ea,
           {"Element Address", "scsi.smc.ea", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_smc_action_code,
           {"Action Code", "scsi.smc.action_code", FT_UINT8, BASE_HEX,
-           VALS(action_code_vals), 0x1f, "", HFILL}},
+           VALS(action_code_vals), 0x1f, NULL, HFILL}},
 	};
 
 
diff --git a/epan/dissectors/packet-scsi-ssc.c b/epan/dissectors/packet-scsi-ssc.c
index 298672d0ea..a095962e1e 100644
--- a/epan/dissectors/packet-scsi-ssc.c
+++ b/epan/dissectors/packet-scsi-ssc.c
@@ -1360,128 +1360,128 @@ proto_register_scsi_ssc(void)
 	static hf_register_info hf[] = {
         { &hf_scsi_ssc_opcode,
           {"SSC Opcode", "scsi.ssc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_ssc_vals), 0x0, "", HFILL}},
+           VALS (scsi_ssc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_rdwr6_xferlen,
           {"Transfer Length", "scsi.ssc.rdwr6.xferlen", FT_UINT24, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_ver16_verlen,
           {"Verification Length", "scsi.ssc.verify16.verify_len", FT_UINT24, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_locate10_loid,
           {"Logical Object Identifier", "scsi.ssc.locate10.loid", FT_UINT32, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_locate16_loid,
           {"Logical Identifier", "scsi.ssc.locate16.loid", FT_UINT64, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_space6_count,
           {"Count", "scsi.ssc.space6.count", FT_INT24, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_space6_code,
           {"Code", "scsi.ssc.space6.code", FT_UINT8, BASE_HEX,
           VALS(space6_code_vals), 0x0f,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_space16_count,
           {"Count", "scsi.ssc.space16.count", FT_UINT64, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_ssc_rdwr10_xferlen,
           {"Transfer Length", "scsi.ssc.rdwr10.xferlen", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_ssc_erase_flags,
           {"Flags", "scsi.ssc.erase_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_fcs,
           {"FCS", "scsi.ssc.fcs", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_ssc_lcs,
           {"LCS", "scsi.ssc.lcs", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_ssc_erase_immed,
           {"IMMED", "scsi.ssc.erase_immed", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_long,
           {"LONG", "scsi.ssc.long", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_partition,
           {"Partition", "scsi.ssc.partition", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_lbi,
           {"Logical Block Identifier", "scsi.ssc.lbi", FT_UINT64, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_verify,
           {"VERIFY", "scsi.ssc.verify", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_immed,
           {"IMMED", "scsi.ssc.immed", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_formatmedium_flags,
           {"Flags", "scsi.ssc.formatmedium_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_format,
           {"Format", "scsi.ssc.format", FT_UINT8, BASE_HEX,
-           VALS(format_vals), 0x0f, "", HFILL}},
+           VALS(format_vals), 0x0f, NULL, HFILL}},
         { &hf_scsi_ssc_loadunload_immed_flags,
           {"Immed", "scsi.ssc.loadunload_immed_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_loadunload_flags,
           {"Flags", "scsi.ssc.loadunload_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_hold,
           {"HOLD", "scsi.ssc.hold", FT_BOOLEAN, 8,
-           NULL, 0x08, "", HFILL}},
+           NULL, 0x08, NULL, HFILL}},
         { &hf_scsi_ssc_eot,
           {"EOT", "scsi.ssc.eot", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_ssc_reten,
           {"RETEN", "scsi.ssc.reten", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_load,
           {"LOAD", "scsi.ssc.load", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_locate_flags,
           {"Flags", "scsi.ssc.locate_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_bt,
           {"BT", "scsi.ssc.bt", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_ssc_cp,
           {"CP", "scsi.ssc.cp", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_dest_type,
           {"Dest Type", "scsi.ssc.dest_type", FT_UINT8, BASE_HEX,
-           VALS(dest_type_vals), 0x18, "", HFILL}},
+           VALS(dest_type_vals), 0x18, NULL, HFILL}},
         { &hf_scsi_ssc_bam_flags,
           {"Flags", "scsi.ssc.bam_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_bam,
           {"BAM", "scsi.ssc.bam", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_read6_flags,
           {"Flags", "scsi.ssc.read6_flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ssc_sili,
           {"SILI", "scsi.ssc.sili", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_fixed,
           {"FIXED", "scsi.ssc.fixed", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_bytord,
           {"BYTORD", "scsi.ssc.bytord", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_ssc_bytcmp,
           {"BYTCMP", "scsi.ssc.bytcmp", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_verify16_immed,
           {"IMMED", "scsi.ssc.verify16_immed", FT_BOOLEAN, 8,
-           NULL, 0x04, "", HFILL}},
+           NULL, 0x04, NULL, HFILL}},
         { &hf_scsi_ssc_medium_type,
           {"Medium Type", "scsi.ssc.medium_type", FT_BOOLEAN, 8,
-           NULL, 0x02, "", HFILL}},
+           NULL, 0x02, NULL, HFILL}},
         { &hf_scsi_ssc_media,
           {"Media", "scsi.ssc.media", FT_BOOLEAN, 8,
-           NULL, 0x01, "", HFILL}},
+           NULL, 0x01, NULL, HFILL}},
         { &hf_scsi_ssc_capacity_prop_value,
           {"Capacity Proportion Value", "scsi.ssc.cpv", FT_UINT16, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
 	};
 
 
diff --git a/epan/dissectors/packet-scsi.c b/epan/dissectors/packet-scsi.c
index ba961bff8b..7be14ad47f 100644
--- a/epan/dissectors/packet-scsi.c
+++ b/epan/dissectors/packet-scsi.c
@@ -4995,184 +4995,184 @@ proto_register_scsi (void)
         volume set addressing hosts*/
         { &hf_scsi_lun,
           {"LUN", "scsi.lun", FT_UINT16, BASE_HEX,
-           NULL, 0x0, "LUN", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_status,
           { "Status", "scsi.status", FT_UINT8, BASE_HEX,
            VALS(scsi_status_val), 0, "SCSI command status value", HFILL }},
         { &hf_scsi_spcopcode,
           {"SPC-2 Opcode", "scsi.spc.opcode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc_vals), 0x0, "", HFILL}},
+           VALS (scsi_spc_vals), 0x0, NULL, HFILL}},
         { &hf_scsi_control,
-          {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Control", "scsi.cdb.control", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_inquiry_flags,
-          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.inquiry.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_inquiry_evpd_page,
           {"EVPD Page Code", "scsi.inquiry.evpd.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_evpd_pagecode_val), 0x0, "", HFILL}},
+           VALS (scsi_evpd_pagecode_val), 0x0, NULL, HFILL}},
         { &hf_scsi_inquiry_cmdt_page,
           {"CMDT Page Code", "scsi.inquiry.cmdt.pagecode", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen,
           {"Allocation Length", "scsi.cdb.alloclen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_paramlen,
           {"Parameter Length", "scsi.cdb.paramlen", FT_UINT8, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_log_pc,
           {"Page Control", "scsi.log.pc", FT_UINT8, BASE_DEC,
-           VALS (scsi_log_pc_val), 0xC0, "", HFILL}},
+           VALS (scsi_log_pc_val), 0xC0, NULL, HFILL}},
         { &hf_scsi_log_pagecode,
           {"Page Code", "scsi.log.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_log_page_val), 0x3F, "", HFILL}},
+           VALS (scsi_log_page_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_paramlen16,
           {"Parameter Length", "scsi.cdb.paramlen16", FT_UINT16, BASE_DEC, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_modesel_flags,
           {"Mode Sense/Select Flags", "scsi.cdb.mode.flags", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen16,
           {"Allocation Length", "scsi.cdb.alloclen16", FT_UINT16, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_modesns_pc,
           {"Page Control", "scsi.mode.pc", FT_UINT8, BASE_DEC,
-           VALS (scsi_modesns_pc_val), 0xC0, "", HFILL}},
+           VALS (scsi_modesns_pc_val), 0xC0, NULL, HFILL}},
         { &hf_scsi_spcpagecode,
           {"SPC-2 Page Code", "scsi.mode.spc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_spc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_spc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_sbcpagecode,
           {"SBC-2 Page Code", "scsi.mode.sbc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_sbc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_sbc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_sscpagecode,
           {"SSC-2 Page Code", "scsi.mode.ssc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_ssc2_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_ssc2_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_mmcpagecode,
           {"MMC-5 Page Code", "scsi.mode.mmc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_mmc5_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_mmc5_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_smcpagecode,
           {"SMC-2 Page Code", "scsi.mode.smc.pagecode", FT_UINT8, BASE_HEX,
-           VALS (scsi_smc_modepage_val), 0x3F, "", HFILL}},
+           VALS (scsi_smc_modepage_val), 0x3F, NULL, HFILL}},
         { &hf_scsi_modesns_flags,
-          {"Flags", "scsi.mode.flags", FT_UINT8, BASE_HEX, NULL, 0x0, "",
+          {"Flags", "scsi.mode.flags", FT_UINT8, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_persresvin_svcaction,
           {"Service Action", "scsi.persresvin.svcaction", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresvin_svcaction_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresvin_svcaction_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_persresvout_svcaction,
           {"Service Action", "scsi.persresvout.svcaction", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresvout_svcaction_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresvout_svcaction_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_persresv_scope,
           {"Reservation Scope", "scsi.persresv.scope", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresv_scope_val), 0xF0, "", HFILL}},
+           VALS (scsi_persresv_scope_val), 0xF0, NULL, HFILL}},
         { &hf_scsi_persresv_type,
           {"Reservation Type", "scsi.persresv.type", FT_UINT8, BASE_HEX,
-           VALS (scsi_persresv_type_val), 0x0F, "", HFILL}},
+           VALS (scsi_persresv_type_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_release_flags,
           {"Release Flags", "scsi.release.flags", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_release_thirdpartyid,
-          {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+          {"Third-Party ID", "scsi.release.thirdpartyid", FT_BYTES, BASE_NONE,
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_alloclen32,
           {"Allocation Length", "scsi.cdb.alloclen32", FT_UINT32, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_inq_add_len,
           {"Additional Length", "scsi.inquiry.add_len", FT_UINT8, BASE_DEC,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_qualifier,
           {"Qualifier", "scsi.inquiry.qualifier", FT_UINT8, BASE_HEX,
-           VALS (scsi_qualifier_val), 0xE0, "", HFILL}},
+           VALS (scsi_qualifier_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_inq_peripheral,
           {"Peripheral", "scsi.inquiry.peripheral", FT_UINT8, BASE_HEX,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_vendor_id,
           {"Vendor Id", "scsi.inquiry.vendor_id", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_product_id,
           {"Product Id", "scsi.inquiry.product_id", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_product_rev,
           {"Product Revision Level", "scsi.inquiry.product_rev", FT_STRING, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_vendor_specific,
           {"Vendor Specific", "scsi.inquiry.vendor_specific", FT_BYTES, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_reserved,
           {"Reserved", "scsi.inquiry.reserved", FT_BYTES, BASE_NONE,
-           NULL, 0, "", HFILL}},
+           NULL, 0, NULL, HFILL}},
         { &hf_scsi_inq_version_desc,
           {"Version Description", "scsi.inquiry.version_desc", FT_UINT16, BASE_HEX,
-           VALS(scsi_verdesc_val), 0, "", HFILL}},
+           VALS(scsi_verdesc_val), 0, NULL, HFILL}},
         { &hf_scsi_inq_devtype,
           {"Device Type", "scsi.inquiry.devtype", FT_UINT8, BASE_HEX,
-           VALS (scsi_devtype_val), SCSI_DEV_BITS, "", HFILL}},
+           VALS (scsi_devtype_val), SCSI_DEV_BITS, NULL, HFILL}},
         { &hf_scsi_inq_rmb,
           {"Removable", "scsi.inquiry.removable", FT_BOOLEAN, 8,
-           TFS (&scsi_removable_val), 0x80, "", HFILL}},
+           TFS (&scsi_removable_val), 0x80, NULL, HFILL}},
         { & hf_scsi_inq_version,
           {"Version", "scsi.inquiry.version", FT_UINT8, BASE_HEX,
-           VALS (scsi_inquiry_vers_val), 0x0, "", HFILL}},
+           VALS (scsi_inquiry_vers_val), 0x0, NULL, HFILL}},
         { &hf_scsi_inq_reladrflags,
           {"Flags", "scsi.inquiry.reladrflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_reladr,
           {"RelAdr", "scsi.inquiry.reladr", FT_BOOLEAN, 8, TFS(&reladr_tfs), SCSI_INQ_RELADRFLAGS_RELADR,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sync,
           {"Sync", "scsi.inquiry.sync", FT_BOOLEAN, 8, TFS(&sync_tfs), SCSI_INQ_RELADRFLAGS_SYNC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_linked,
           {"Linked", "scsi.inquiry.linked", FT_BOOLEAN, 8, TFS(&linked_tfs), SCSI_INQ_RELADRFLAGS_LINKED,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_cmdque,
           {"CmdQue", "scsi.inquiry.cmdque", FT_BOOLEAN, 8, TFS(&cmdque_tfs), SCSI_INQ_RELADRFLAGS_CMDQUE,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_bqueflags,
           {"Flags", "scsi.inquiry.bqueflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_bque,
           {"BQue", "scsi.inquiry.bque", FT_BOOLEAN, 8, TFS(&bque_tfs), SCSI_INQ_BQUEFLAGS_BQUE,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_encserv,
           {"EncServ", "scsi.inquiry.encserv", FT_BOOLEAN, 8, TFS(&encserv_tfs), SCSI_INQ_BQUEFLAGS_ENCSERV,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_multip,
           {"MultiP", "scsi.inquiry.multip", FT_BOOLEAN, 8, TFS(&multip_tfs), SCSI_INQ_BQUEFLAGS_MULTIP,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_mchngr,
           {"MChngr", "scsi.inquiry.mchngr", FT_BOOLEAN, 8, TFS(&mchngr_tfs), SCSI_INQ_BQUEFLAGS_MCHNGR,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sccsflags,
           {"Flags", "scsi.inquiry.sccsflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_sccs,
           {"SCCS", "scsi.inquiry.sccs", FT_BOOLEAN, 8, TFS(&sccs_tfs), SCSI_INQ_SCCSFLAGS_SCCS,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_acc,
           {"ACC", "scsi.inquiry.acc", FT_BOOLEAN, 8, TFS(&acc_tfs), SCSI_INQ_SCCSFLAGS_ACC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_tpc,
           {"3PC", "scsi.inquiry.tpc", FT_BOOLEAN, 8, TFS(&tpc_tfs), SCSI_INQ_SCCSFLAGS_TPC,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_protect,
           {"Protect", "scsi.inquiry.protect", FT_BOOLEAN, 8, TFS(&protect_tfs), SCSI_INQ_SCCSFLAGS_PROTECT,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_tpgs,
           {"TPGS", "scsi.inquiry.tpgs", FT_UINT8, BASE_DEC, VALS(inq_tpgs_vals), 0x30,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_acaflags,
           {"Flags", "scsi.inquiry.acaflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_rmbflags,
           {"Flags", "scsi.inquiry.rmbflags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_normaca,
           {"NormACA", "scsi.inquiry.normaca", FT_BOOLEAN, 8, TFS(&normaca_tfs), SCSI_INQ_ACAFLAGS_NORMACA,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_hisup,
           {"HiSup", "scsi.inquiry.hisup", FT_BOOLEAN, 8, TFS(&hisup_tfs), SCSI_INQ_ACAFLAGS_HISUP,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_inq_aerc,
           {"AERC", "scsi.inquiry.aerc", FT_BOOLEAN, 8, TFS(&aerc_tfs), SCSI_INQ_ACAFLAGS_AERC,
            "AERC is obsolete from SPC-3 and forward", HFILL}},
@@ -5181,103 +5181,103 @@ proto_register_scsi (void)
            "TRMTSK is obsolete from SPC-2 and forward", HFILL}},
         { &hf_scsi_inq_rdf,
           {"Response Data Format", "scsi.inquiry.rdf", FT_UINT8, BASE_DEC, VALS(inq_rdf_vals), 0x0f,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_rluns_lun,
-          {"LUN", "scsi.reportluns.lun", FT_UINT8, BASE_DEC, NULL, 0x0, "",
+          {"LUN", "scsi.reportluns.lun", FT_UINT8, BASE_DEC, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_rluns_multilun,
-          {"Multi-level LUN", "scsi.reportluns.mlun", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Multi-level LUN", "scsi.reportluns.mlun", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_modesns_errrep,
           {"MRIE", "scsi.mode.mrie", FT_UINT8, BASE_HEX,
-           VALS (scsi_modesns_mrie_val), 0x0F, "", HFILL}},
+           VALS (scsi_modesns_mrie_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_modesns_tst,
           {"Task Set Type", "scsi.mode.tst", FT_UINT8, BASE_DEC,
-           VALS (scsi_modesns_tst_val), 0xE0, "", HFILL}},
+           VALS (scsi_modesns_tst_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_modesns_qmod,
           {"Queue Algorithm Modifier", "scsi.mode.qmod", FT_UINT8, BASE_HEX,
-           VALS (scsi_modesns_qmod_val), 0xF0, "", HFILL}},
+           VALS (scsi_modesns_qmod_val), 0xF0, NULL, HFILL}},
         { &hf_scsi_modesns_qerr,
           {"Queue Error Management", "scsi.mode.qerr", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_qerr_val), 0x2, "", HFILL}},
+           TFS (&scsi_modesns_qerr_val), 0x2, NULL, HFILL}},
         { &hf_scsi_modesns_tas,
           {"Task Aborted Status", "scsi.mode.tac", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_tas_val), 0x80, "", HFILL}},
+           TFS (&scsi_modesns_tas_val), 0x80, NULL, HFILL}},
         { &hf_scsi_modesns_rac,
           {"Report a Check", "ssci.mode.rac", FT_BOOLEAN, 8,
-           TFS (&scsi_modesns_rac_val), 0x40, "", HFILL}},
+           TFS (&scsi_modesns_rac_val), 0x40, NULL, HFILL}},
         { &hf_scsi_protocol,
           {"Protocol", "scsi.proto", FT_UINT8, BASE_DEC, VALS (scsi_proto_val),
-           0x0F, "", HFILL}},
+           0x0F, NULL, HFILL}},
         { &hf_scsi_sns_errtype,
           {"SNS Error Type", "scsi.sns.errtype", FT_UINT8, BASE_HEX,
-           VALS (scsi_sns_errtype_val), 0x7F, "", HFILL}},
+           VALS (scsi_sns_errtype_val), 0x7F, NULL, HFILL}},
         { &hf_scsi_snskey,
           {"Sense Key", "scsi.sns.key", FT_UINT8, BASE_HEX,
-           VALS (scsi_sensekey_val), 0x0F, "", HFILL}},
+           VALS (scsi_sensekey_val), 0x0F, NULL, HFILL}},
         { &hf_scsi_snsinfo,
-          {"Sense Info", "scsi.sns.info", FT_UINT32, BASE_HEX, NULL, 0x0, "",
+          {"Sense Info", "scsi.sns.info", FT_UINT32, BASE_HEX, NULL, 0x0, NULL,
            HFILL}},
         { &hf_scsi_addlsnslen,
           {"Additional Sense Length", "scsi.sns.addlen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_asc,
           {"Additional Sense Code", "scsi.sns.asc", FT_UINT8, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_ascq,
           {"Additional Sense Code Qualifier", "scsi.sns.ascq", FT_UINT8,
-           BASE_HEX, NULL, 0x0, "", HFILL}},
+           BASE_HEX, NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_ascascq,
           {"Additional Sense Code+Qualifier", "scsi.sns.ascascq", FT_UINT16,
-           BASE_HEX, VALS (scsi_asc_val), 0x0, "", HFILL}},
+           BASE_HEX, VALS (scsi_asc_val), 0x0, NULL, HFILL}},
         { &hf_scsi_fru,
           {"Field Replaceable Unit Code", "scsi.sns.fru", FT_UINT8, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_sksv,
-          {"SKSV", "scsi.sns.sksv", FT_BOOLEAN, 8, NULL, 0x80, "",
+          {"SKSV", "scsi.sns.sksv", FT_BOOLEAN, 8, NULL, 0x80, NULL,
            HFILL}},
         { &hf_scsi_persresv_key,
-          {"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Reservation Key", "scsi.spc.resv.key", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_persresv_scopeaddr,
-          {"Scope Address", "scsi.spc.resv.scopeaddr", FT_BYTES, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+          {"Scope Address", "scsi.spc.resv.scopeaddr", FT_BYTES, BASE_NONE, NULL,
+           0x0, NULL, HFILL}},
         { &hf_scsi_add_cdblen,
           {"Additional CDB Length", "scsi.spc.addcdblen", FT_UINT8, BASE_DEC,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_svcaction,
           {"Service Action", "scsi.spc.svcaction", FT_UINT16, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_wb_mode,
           {"Mode", "scsi.spc.wb.mode", FT_UINT8, BASE_HEX,
-           VALS (scsi_wb_mode_val), 0xF, "", HFILL}},
+           VALS (scsi_wb_mode_val), 0xF, NULL, HFILL}},
         { &hf_scsi_wb_bufferid,
           {"Buffer ID", "scsi.spc.sb.bufid", FT_UINT8, BASE_DEC, NULL, 0x0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_wb_bufoffset,
           {"Buffer Offset", "scsi.spc.wb.bufoff", FT_UINT24, BASE_HEX, NULL,
-           0x0, "", HFILL}},
+           0x0, NULL, HFILL}},
         { &hf_scsi_paramlen24,
           {"Parameter List Length", "scsi.cdb.paramlen24", FT_UINT24, BASE_HEX,
-           NULL, 0x0, "", HFILL}},
+           NULL, 0x0, NULL, HFILL}},
         { &hf_scsi_senddiag_st_code,
           {"Self-Test Code", "scsi.spc.senddiag.code", FT_UINT8, BASE_HEX,
-           VALS (scsi_senddiag_st_code_val), 0xE0, "", HFILL}},
+           VALS (scsi_senddiag_st_code_val), 0xE0, NULL, HFILL}},
         { &hf_scsi_select_report,
           {"Select Report", "scsi.spc.select_report", FT_UINT8, BASE_HEX,
-           VALS (scsi_select_report_val), 0x00, "", HFILL}},
+           VALS (scsi_select_report_val), 0x00, NULL, HFILL}},
         { &hf_scsi_senddiag_pf,
           {"PF", "scsi.spc.senddiag.pf", FT_BOOLEAN, 8,
-           TFS (&scsi_senddiag_pf_val), 0x10, "", HFILL}},
+           TFS (&scsi_senddiag_pf_val), 0x10, NULL, HFILL}},
         { &hf_scsi_senddiag_st,
           {"Self Test", "scsi.spc.senddiag.st", FT_BOOLEAN, 8, NULL,
-           0x4, "", HFILL}},
+           0x4, NULL, HFILL}},
         { &hf_scsi_senddiag_devoff,
           {"Device Offline", "scsi.spc.senddiag.devoff", FT_BOOLEAN, 8,
-           NULL, 0x2, "", HFILL}},
+           NULL, 0x2, NULL, HFILL}},
         { &hf_scsi_senddiag_unitoff,
           {"Unit Offline", "scsi.spc.senddiag.unitoff", FT_BOOLEAN, 8,
-           NULL, 0x1, "", HFILL}},
+           NULL, 0x1, NULL, HFILL}},
         { &hf_scsi_request_frame,
           { "Request in", "scsi.request_frame", FT_FRAMENUM, BASE_NONE, NULL, 0,
            "The request to this transaction is in this frame", HFILL }},
@@ -5289,7 +5289,7 @@ proto_register_scsi (void)
            "The response to this transaction is in this frame", HFILL }},
         { &hf_scsi_fragments,
           { "SCSI Fragments", "scsi.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-           "SCSI Fragments", HFILL }},
+           NULL, HFILL }},
         { &hf_scsi_fragment_overlap,
           { "Fragment overlap",	"scsi.fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
            "Fragment overlaps with other fragments", HFILL }},
@@ -5307,211 +5307,211 @@ proto_register_scsi (void)
            "Defragmentation error due to illegal fragments", HFILL }},
         { &hf_scsi_fragment,
           { "SCSI DATA Fragment", "scsi.fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-           "SCSI DATA Fragment", HFILL }},
+           NULL, HFILL }},
         { &hf_scsi_reassembled_in,
           { "Reassembled SCSI DATA in frame", "scsi.reassembled_in", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
            "This SCSI DATA packet is reassembled in this frame", HFILL }},
         { &hf_scsi_log_ppc_flags,
           {"PPC Flags", "scsi.log.ppc.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ppc,
           {"PPC", "scsi.log.ppc", FT_BOOLEAN, 8,
-          TFS (&scsi_log_ppc_tfs), 0x02, "", HFILL}},
+          TFS (&scsi_log_ppc_tfs), 0x02, NULL, HFILL}},
         { &hf_scsi_log_pcr,
           {"PCR", "scsi.log.pcr", FT_BOOLEAN, 8,
-          TFS (&scsi_log_pcr_tfs), 0x02, "", HFILL}},
+          TFS (&scsi_log_pcr_tfs), 0x02, NULL, HFILL}},
         { &hf_scsi_log_sp,
           {"SP", "scsi.log.sp", FT_BOOLEAN, 8,
-          TFS (&scsi_log_sp_tfs), 0x01, "", HFILL}},
+          TFS (&scsi_log_sp_tfs), 0x01, NULL, HFILL}},
         { &hf_scsi_log_pc_flags,
           {"PC Flags", "scsi.log.pc.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_page_length,
           {"Page Length", "scsi.log.page_length", FT_UINT16, BASE_DEC, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_parameter_code,
           {"Parameter Code", "scsi.log.parameter_code", FT_UINT16, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_flags,
           {"Param Flags", "scsi.log.param.flags", FT_UINT8, BASE_HEX, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_len,
           {"Parameter Len", "scsi.log.param_len", FT_UINT8, BASE_DEC, NULL, 0,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_param_data,
-          {"Parameter Data", "scsi.log.param_data", FT_BYTES, BASE_HEX, NULL, 0,
-           "", HFILL}},
+          {"Parameter Data", "scsi.log.param_data", FT_BYTES, BASE_NONE, NULL, 0,
+           NULL, HFILL}},
         { &hf_scsi_log_pf_du,
           {"DU", "scsi.log.pf.du", FT_BOOLEAN, 8, NULL, 0x80,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_ds,
           {"DS", "scsi.log.pf.ds", FT_BOOLEAN, 8, NULL, 0x40,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_tsd,
           {"TSD", "scsi.log.pf.tsd", FT_BOOLEAN, 8, NULL, 0x20,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_etc,
           {"ETC", "scsi.log.pf.etc", FT_BOOLEAN, 8, NULL, 0x10,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_tmc,
           {"TMC", "scsi.log.pf.tmc", FT_UINT8, BASE_HEX, VALS(log_flags_tmc_vals), 0x0c,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_lbin,
           {"LBIN", "scsi.log.pf.lbin", FT_BOOLEAN, 8, NULL, 0x02,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_pf_lp,
           {"LP", "scsi.log.pf.lp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rw,
           {"Read Warning", "scsi.log.ta.rw", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ww,
           {"write warning", "scsi.log.ta.ww", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_he,
           {"hard error", "scsi.log.ta.he", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_media,
           {"media", "scsi.log.ta.media", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rf,
           {"read failure", "scsi.log.ta.rf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wf,
           {"write failure", "scsi.log.ta.wf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ml,
           {"media life", "scsi.log.ta.ml", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ndg,
           {"not data grade", "scsi.log.ta.ndg", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wp,
           {"write protect", "scsi.log.ta.wp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nr,
           {"no removal", "scsi.log.ta.nr", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cm,
           {"cleaning media", "scsi.log.ta.cm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_uf,
           {"unsupported format", "scsi.log.ta.uf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rmcf,
           {"removable mechanical cartridge failure", "scsi.log.ta.rmcf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_umcf,
           {"unrecoverable mechanical cartridge failure", "scsi.log.ta.umcf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_mcicf,
           {"memory chip in cartridge failure", "scsi.log.ta.mcicf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_fe,
           {"forced eject", "scsi.log.ta.fe", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rof,
           {"read only format", "scsi.log.ta.rof", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tdcol,
           {"tape directory corrupted on load", "scsi.log.ta.tdcol", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nml,
           {"nearing media life", "scsi.log.ta.nml", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cn,
           {"clean now", "scsi.log.ta.cn", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cp,
           {"clean periodic", "scsi.log.ta.cp", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ecm,
           {"expired cleaning media", "scsi.log.ta.ecm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_ict,
           {"invalid cleaning tape", "scsi.log.ta.ict", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_rr,
           {"retention requested", "scsi.log.ta.rr", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dpie,
           {"dual port interface error", "scsi.log.ta.dpie", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_cff,
           {"cooling fan failure", "scsi.log.ta.cff", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_psf,
           {"power supply failure", "scsi.log.ta.psf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_pc,
           {"power consumption", "scsi.log.ta.pc", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dm,
           {"drive maintenance", "scsi.log.ta.dm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_hwa,
           {"hardware a", "scsi.log.ta.hwa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_hwb,
           {"hardware b", "scsi.log.ta.hwb", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_if,
           {"interface", "scsi.log.ta.if", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_em,
           {"eject media", "scsi.log.ta.em", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dwf,
           {"download failed", "scsi.log.ta.dwf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drhu,
           {"drive humidity", "scsi.log.ta.drhu", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drtm,
           {"drive temperature", "scsi.log.ta.drtm", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_drvo,
           {"drive voltage", "scsi.log.ta.drvo", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_pefa,
           {"periodic failure", "scsi.log.ta.pefa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_dire,
           {"diagnostics required", "scsi.log.ta.dire", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_lost,
           {"lost statistics", "scsi.log.ta.lost", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tduau,
           {"tape directory invalid at unload", "scsi.log.ta.tduau", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tsawf,
           {"tape system area write failure", "scsi.log.ta.tsawf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_tsarf,
           {"tape system area read failure", "scsi.log.ta.tsarf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_nsod,
           {"no start of data", "scsi.log.ta.nsod", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_lofa,
           {"loading failure", "scsi.log.ta.lofa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_uuf,
           {"unrecoverable unload failure", "scsi.log.ta.uuf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_aif,
           {"automatic interface failure", "scsi.log.ta.aif", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_fwf,
           {"firmware failure", "scsi.log.ta.fwf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wmicf,
           {"worm medium integrity check failed", "scsi.log.ta.wmicf", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
         { &hf_scsi_log_ta_wmoa,
           {"worm medium overwrite attempted", "scsi.log.ta.wmoa", FT_BOOLEAN, 8, NULL, 0x01,
-           "", HFILL}},
+           NULL, HFILL}},
     };
 
     /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c
index d7f51830d0..6084a0901c 100644
--- a/epan/dissectors/packet-sctp.c
+++ b/epan/dissectors/packet-sctp.c
@@ -3893,140 +3893,140 @@ proto_register_sctp(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_source_port,                              { "Source port",                                    "sctp.srcport",                                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_destination_port,                         { "Destination port",                               "sctp.dstport",                                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_port,                                     { "Port",                                           "sctp.port",                                            FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_verification_tag,                         { "Verification tag",                               "sctp.verification_tag",                                FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_checksum,                                 { "Checksum",                                       "sctp.checksum",                                        FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_checksum_bad,                             { "Bad checksum",                                   "sctp.checksum_bad",                                    FT_BOOLEAN, BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_chunk_type,                               { "Chunk type",                                     "sctp.chunk_type",                                      FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                "", HFILL } },
-    { &hf_chunk_flags,                              { "Chunk flags",                                    "sctp.chunk_flags",                                     FT_UINT8,   BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_chunk_bit_1,                              { "Bit",                                            "sctp.chunk_bit_1",                                     FT_BOOLEAN, 8,         TFS(&sctp_chunk_bit_1_value),                   SCTP_CHUNK_BIT_1,                   "", HFILL } },
-    { &hf_chunk_bit_2,                              { "Bit",                                            "sctp.chunk_bit_2",                                     FT_BOOLEAN, 8,         TFS(&sctp_chunk_bit_2_value),                   SCTP_CHUNK_BIT_2,                   "", HFILL } },
-    { &hf_chunk_length,                             { "Chunk length",                                   "sctp.chunk_length",                                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_chunk_padding,                            { "Chunk padding",                                  "sctp.chunk_padding",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_chunk_value,                              { "Chunk value",                                    "sctp.chunk_value",                                     FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cookie,                                   { "Cookie",                                         "sctp.cookie",                                          FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initiate_tag,                             { "Initiate tag",                                   "sctp.initiate_tag",                                    FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_init_chunk_initiate_tag,                  { "Initiate tag",                                   "sctp.init_initiate_tag",                               FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_init_chunk_adv_rec_window_credit,         { "Advertised receiver window credit (a_rwnd)",     "sctp.init_credit",                                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_init_chunk_number_of_outbound_streams,    { "Number of outbound streams",                     "sctp.init_nr_out_streams",                             FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_init_chunk_number_of_inbound_streams,     { "Number of inbound streams",                      "sctp.init_nr_in_streams",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_init_chunk_initial_tsn,                   { "Initial TSN",                                    "sctp.init_initial_tsn",                                FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initack_chunk_initiate_tag,               { "Initiate tag",                                   "sctp.initack_initiate_tag",                            FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initack_chunk_adv_rec_window_credit,      { "Advertised receiver window credit (a_rwnd)",     "sctp.initack_credit",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initack_chunk_number_of_outbound_streams, { "Number of outbound streams",                     "sctp.initack_nr_out_streams",                          FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initack_chunk_number_of_inbound_streams,  { "Number of inbound streams",                      "sctp.initack_nr_in_streams",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_initack_chunk_initial_tsn,                { "Initial TSN",                                    "sctp.initack_initial_tsn",                             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cumulative_tsn_ack,                       { "Cumulative TSN Ack",                             "sctp.cumulative_tsn_ack",                              FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_data_chunk_tsn,                           { "TSN",                                            "sctp.data_tsn",                                        FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_data_chunk_stream_id,                     { "Stream Identifier",                              "sctp.data_sid",                                        FT_UINT16,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_data_chunk_stream_seq_number,             { "Stream sequence number",                         "sctp.data_ssn",                                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_data_chunk_payload_proto_id,              { "Payload protocol identifier",                    "sctp.data_payload_proto_id",                           FT_UINT32,  BASE_DEC,  VALS(sctp_payload_proto_id_values),             0x0,                                "", HFILL } },
-    { &hf_data_chunk_e_bit,                         { "E-Bit",                                          "sctp.data_e_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_e_bit_value),              SCTP_DATA_CHUNK_E_BIT,              "", HFILL } },
-    { &hf_data_chunk_b_bit,                         { "B-Bit",                                          "sctp.data_b_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_b_bit_value),              SCTP_DATA_CHUNK_B_BIT,              "", HFILL } },
-    { &hf_data_chunk_u_bit,                         { "U-Bit",                                          "sctp.data_u_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_u_bit_value),              SCTP_DATA_CHUNK_U_BIT,              "", HFILL } },
-    { &hf_data_chunk_i_bit,                         { "I-Bit",                                          "sctp.data_i_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_i_bit_value),              SCTP_DATA_CHUNK_I_BIT,              "", HFILL } },
-    { &hf_sack_chunk_ns,                            { "Nounce sum",                                     "sctp.sack_nounce_sum",                                 FT_UINT8,   BASE_DEC,  NULL,                                           SCTP_SACK_CHUNK_NS_BIT,             "", HFILL } },
-    { &hf_sack_chunk_cumulative_tsn_ack,            { "Cumulative TSN ACK",                             "sctp.sack_cumulative_tsn_ack",                         FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_adv_rec_window_credit,         { "Advertised receiver window credit (a_rwnd)",     "sctp.sack_a_rwnd",                                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_number_of_gap_blocks,          { "Number of gap acknowledgement blocks",           "sctp.sack_number_of_gap_blocks",                       FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_number_of_dup_tsns,            { "Number of duplicated TSNs",                      "sctp.sack_number_of_duplicated_tsns",                  FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_gap_block_start,               { "Start",                                          "sctp.sack_gap_block_start",                            FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_gap_block_start_tsn,           { "Start TSN",                                      "sctp.sack_gap_block_start_tsn",                        FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_gap_block_end,                 { "End",                                            "sctp.sack_gap_block_end",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_gap_block_end_tsn,             { "End TSN",                                        "sctp.sack_gap_block_end_tsn",                          FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_number_tsns_gap_acked,         { "Number of TSNs in gap acknowledgement blocks",   "sctp.sack_number_of_tsns_gap_acked",                   FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sack_chunk_duplicate_tsn,                 { "Duplicate TSN",                                  "sctp.sack_duplicate_tsn",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_ns,                         { "Nounce sum",                                     "sctp.nr_sack_nounce_sum",                              FT_UINT8,   BASE_DEC,  NULL,                                           SCTP_NR_SACK_CHUNK_NS_BIT,             "", HFILL } },
-    { &hf_nr_sack_chunk_cumulative_tsn_ack,         { "Cumulative TSN ACK",                             "sctp.nr_sack_cumulative_tsn_ack",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_adv_rec_window_credit,      { "Advertised receiver window credit (a_rwnd)",     "sctp.nr_sack_a_rwnd",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_number_of_gap_blocks,       { "Number of gap acknowledgement blocks",           "sctp.nr_sack_number_of_gap_blocks",                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_number_of_nr_gap_blocks,    { "Number of nr-gap acknowledgement blocks",        "sctp.nr_sack_number_of_nr_gap_blocks",                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_number_of_dup_tsns,         { "Number of duplicated TSNs",                      "sctp.nr_sack_number_of_duplicated_tsns",               FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_reserved,                   { "Reserved",                                       "sctp.nr_sack_reserved",                                FT_UINT16,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_gap_block_start,            { "Start",                                          "sctp.nr_sack_gap_block_start",                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_gap_block_start_tsn,        { "Start TSN",                                      "sctp.nr_sack_gap_block_start_tsn",                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_gap_block_end,              { "End",                                            "sctp.nr_sack_gap_block_end",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_gap_block_end_tsn,          { "End TSN",                                        "sctp.nr_sack_gap_block_end_tsn",                       FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_number_tsns_gap_acked,      { "Number of TSNs in gap acknowledgement blocks",   "sctp.nr_sack_number_of_tsns_gap_acked",                FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_nr_gap_block_start,         { "Start",                                          "sctp.nr_sack_nr_gap_block_start",                      FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_nr_gap_block_start_tsn,     { "Start TSN",                                      "sctp.nr_sack_nr_gap_block_start_tsn",                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_nr_gap_block_end,           { "End",                                            "sctp.nr_sack_nr_gap_block_end",                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_nr_gap_block_end_tsn,       { "End TSN",                                        "sctp.nr_sack_nr_gap_block_end_tsn",                    FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_number_tsns_nr_gap_acked,   { "Number of TSNs in nr-gap acknowledgement blocks","sctp.nr_sack_number_of_tsns_nr_gap_acked",             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_nr_sack_chunk_duplicate_tsn,              { "Duplicate TSN",                                  "sctp.nr_sack_duplicate_tsn",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_shutdown_chunk_cumulative_tsn_ack,        { "Cumulative TSN Ack",                             "sctp.shutdown_cumulative_tsn_ack",                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_ecne_chunk_lowest_tsn,                    { "Lowest TSN",                                     "sctp.ecne_lowest_tsn",                                 FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cwr_chunk_lowest_tsn,                     { "Lowest TSN",                                     "sctp.cwr_lowest_tsn",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_shutdown_complete_chunk_t_bit,            { "T-Bit",                                          "sctp.shutdown_complete_t_bit",                         FT_BOOLEAN, 8,         TFS(&sctp_shutdown_complete_chunk_t_bit_value), SCTP_SHUTDOWN_COMPLETE_CHUNK_T_BIT, "", HFILL } },
-    { &hf_abort_chunk_t_bit,                        { "T-Bit",                                          "sctp.abort_t_bit",                                     FT_BOOLEAN, 8,         TFS(&sctp_shutdown_complete_chunk_t_bit_value), SCTP_ABORT_CHUNK_T_BIT,             "", HFILL } },
-    { &hf_forward_tsn_chunk_tsn,                    { "New cumulative TSN",                             "sctp.forward_tsn_tsn",                                 FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_forward_tsn_chunk_sid,                    { "Stream identifier",                              "sctp.forward_tsn_sid",                                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_forward_tsn_chunk_ssn,                    { "Stream sequence number",                         "sctp.forward_tsn_ssn",                                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_parameter_type,                           { "Parameter type",                                 "sctp.parameter_type",                                  FT_UINT16,  BASE_HEX,  VALS(parameter_identifier_values),              0x0,                                "", HFILL } },
-    { &hf_parameter_length,                         { "Parameter length",                               "sctp.parameter_length",                                FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_parameter_value,                          { "Parameter value",                                "sctp.parameter_value",                                 FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_parameter_padding,                        { "Parameter padding",                              "sctp.parameter_padding",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_parameter_bit_1,                          { "Bit",                                            "sctp.parameter_bit_1",                                 FT_BOOLEAN, 16,        TFS(&sctp_parameter_bit_1_value),               SCTP_PARAMETER_BIT_1,               "", HFILL } },
-    { &hf_parameter_bit_2,                          { "Bit",                                            "sctp.parameter_bit_2",                                 FT_BOOLEAN, 16,        TFS(&sctp_parameter_bit_2_value),               SCTP_PARAMETER_BIT_2,               "", HFILL } },
-    { &hf_ipv4_address,                             { "IP Version 4 address",                           "sctp.parameter_ipv4_address",                          FT_IPv4,    BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_ipv6_address,                             { "IP Version 6 address",                           "sctp.parameter_ipv6_address",                          FT_IPv6,    BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_heartbeat_info,                           { "Heartbeat information",                          "sctp.parameter_heartbeat_information",                 FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_state_cookie,                             { "State cookie",                                   "sctp.parameter_state_cookie",                          FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cookie_preservative_increment,            { "Suggested Cookie life-span increment (msec)",    "sctp.parameter_cookie_preservative_incr",              FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_hostname,                                 { "Hostname",                                       "sctp.parameter_hostname",                              FT_STRING,  BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_supported_address_type,                   { "Supported address type",                         "sctp.parameter_supported_addres_type",                 FT_UINT16,  BASE_DEC,  VALS(address_types_values),                     0x0,                                "", HFILL } },
-    { &hf_stream_reset_req_seq_nr,                  { "Stream reset request sequence number",           "sctp.parameter_stream_reset_request_sequence_number",  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_stream_reset_rsp_seq_nr,                  { "Stream reset response sequence number",          "sctp.parameter_stream_reset_response_sequence_number", FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_senders_last_assigned_tsn,                { "Senders last assigned TSN",                      "sctp.parameter_senders_last_assigned_tsn",             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_senders_next_tsn,                         { "Senders next TSN",                               "sctp.parameter_senders_next_tsn",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_receivers_next_tsn,                       { "Receivers next TSN",                             "sctp.parameter_receivers_next_tsn",                    FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_stream_reset_rsp_result,                  { "Result",                                         "sctp.parameter_stream_reset_response_result",          FT_UINT32,  BASE_DEC,  VALS(stream_reset_result_values),               0x0,                                "", HFILL } },
-    { &hf_stream_reset_sid,                         { "Stream Identifier",                              "sctp.parameter_stream_reset_sid",                      FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_asconf_serial,                            { "Serial number",                                  "sctp.asconf_serial_number",                            FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_asconf_ack_serial,                        { "Serial number",                                  "sctp.asconf_ack_serial_number",                        FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_correlation_id,                           { "Correlation_id",                                 "sctp.correlation_id",                                  FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_adap_indication,                          { "Indication",                                     "sctp.adapation_layer_indication",                      FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_random_number,                            { "Random number",                                  "sctp.random_number",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_chunks_to_auth,                           { "Chunk type",                                     "sctp.chunk_type_to_auth",                              FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                "", HFILL } },
-    { &hf_hmac_id,                                  { "HMAC identifier",                                "sctp.hmac_id",                                         FT_UINT16,  BASE_DEC,  VALS(hmac_id_values),                           0x0,                                "", HFILL } },
-    { &hf_hmac,                                     { "HMAC",                                           "sctp.hmac",                                            FT_BYTES,   BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_shared_key_id,                            { "Shared key identifier",                          "sctp.shared_key_id",                                   FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_supported_chunk_type,                     { "Supported chunk type",                           "sctp.supported_chunk_type",                            FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                "", HFILL } },
-    { &hf_cause_code,                               { "Cause code",                                     "sctp.cause_code",                                      FT_UINT16,  BASE_HEX,  VALS(cause_code_values),                        0x0,                                "", HFILL } },
-    { &hf_cause_length,                             { "Cause length",                                   "sctp.cause_length",                                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_info,                               { "Cause information",                              "sctp.cause_information",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_padding,                            { "Cause padding",                                  "sctp.cause_padding",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_stream_identifier,                  { "Stream identifier",                              "sctp.cause_stream_identifier",                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_reserved,                           { "Reserved",                                       "sctp.cause_reserved",                                  FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_number_of_missing_parameters,       { "Number of missing parameters",                   "sctp.cause_nr_of_missing_parameters",                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_missing_parameter_type,             { "Missing parameter type",                         "sctp.cause_missing_parameter_type",                    FT_UINT16,  BASE_HEX,  VALS(parameter_identifier_values),              0x0,                                "", HFILL } },
-    { &hf_cause_measure_of_staleness,               { "Measure of staleness in usec",                   "sctp.cause_measure_of_staleness",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_cause_tsn,                                { "TSN",                                            "sctp.cause_tsn",                                       FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_pktdrop_chunk_m_bit,                      { "M-Bit",                                          "sctp.pckdrop_m_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_m_bit_value),                SCTP_PKTDROP_CHUNK_M_BIT,           "", HFILL } },
-    { &hf_pktdrop_chunk_b_bit,                      { "B-Bit",                                          "sctp.pckdrop_b_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_b_bit_value),                SCTP_PKTDROP_CHUNK_B_BIT,           "", HFILL } },
-    { &hf_pktdrop_chunk_t_bit,                      { "T-Bit",                                          "sctp.pckdrop_t_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_t_bit_value),                SCTP_PKTDROP_CHUNK_T_BIT,           "", HFILL } },
-    { &hf_pktdrop_chunk_bandwidth,                  { "Bandwidth",                                      "sctp.pktdrop_bandwidth",                               FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_pktdrop_chunk_queuesize,                  { "Queuesize",                                      "sctp.pktdrop_queuesize",                               FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_pktdrop_chunk_truncated_length,           { "Truncated length",                               "sctp.pktdrop_truncated_length",                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_pktdrop_chunk_reserved,                   { "Reserved",                                       "sctp.pktdrop_reserved",                                FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                "", HFILL } },
-    { &hf_pktdrop_chunk_data_field,                 { "Data field",                                     "sctp.pktdrop_datafield",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-
-    { &hf_sctp_fragment,                            { "SCTP Fragment",                                  "sctp.fragment",                                        FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_fragments,                           { "Reassembled SCTP Fragments",                     "sctp.fragments",                                       FT_NONE,    BASE_NONE, NULL,                                           0x0,                                "", HFILL } },
-    { &hf_sctp_reassembled_in,                      { "Reassembled Message in frame",                   "sctp.reassembled_in",                                  FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_duplicate,                           { "Fragment already seen in frame",                 "sctp.duplicate",                                       FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-
-    { &hf_sctp_rtt,                                 { "The RTT to ACK the chunk was",                   "sctp.rtt",                                             FT_RELATIVE_TIME, BASE_DEC, NULL,                                      0x0,                                "", HFILL } },
-    { &hf_sctp_rto,                                 { "Retransmitted after",                            "sctp.retransmission_time",                             FT_RELATIVE_TIME, BASE_DEC, NULL,                                      0x0,                                "", HFILL } },
-    { &hf_sctp_retransmission,                      { "This TSN is a retransmission of one in frame",   "sctp.retransmission",                                  FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_retransmitted,                       { "This TSN is retransmitted in frame",             "sctp.retransmitted",                                   FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_retransmitted_count,                 { "TSN was retransmitted this many times",          "sctp.retransmitted_count",                             FT_UINT32, BASE_DEC, NULL,                                             0x0,                                "", HFILL } },
-    { &hf_sctp_acked,                               { "This chunk is acked in frame",                   "sctp.acked",                                           FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_ack_tsn,                             { "Acknowledges TSN",                               "sctp.ack",                                             FT_UINT32, BASE_DEC, NULL,                                             0x0,                                "", HFILL } },
-    { &hf_sctp_ack_frame,                           { "Chunk acknowledged in frame",                    "sctp.ack_frame",                                       FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } },
-    { &hf_sctp_retransmitted_after_ack,             { "Chunk was acked prior to retransmission",        "sctp.retransmitted_after_ack",                         FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                "", HFILL } }
+    { &hf_source_port,                              { "Source port",                                    "sctp.srcport",                                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_destination_port,                         { "Destination port",                               "sctp.dstport",                                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_port,                                     { "Port",                                           "sctp.port",                                            FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_verification_tag,                         { "Verification tag",                               "sctp.verification_tag",                                FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_checksum,                                 { "Checksum",                                       "sctp.checksum",                                        FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_checksum_bad,                             { "Bad checksum",                                   "sctp.checksum_bad",                                    FT_BOOLEAN, BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_chunk_type,                               { "Chunk type",                                     "sctp.chunk_type",                                      FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                NULL, HFILL } },
+    { &hf_chunk_flags,                              { "Chunk flags",                                    "sctp.chunk_flags",                                     FT_UINT8,   BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_chunk_bit_1,                              { "Bit",                                            "sctp.chunk_bit_1",                                     FT_BOOLEAN, 8,         TFS(&sctp_chunk_bit_1_value),                   SCTP_CHUNK_BIT_1,                   NULL, HFILL } },
+    { &hf_chunk_bit_2,                              { "Bit",                                            "sctp.chunk_bit_2",                                     FT_BOOLEAN, 8,         TFS(&sctp_chunk_bit_2_value),                   SCTP_CHUNK_BIT_2,                   NULL, HFILL } },
+    { &hf_chunk_length,                             { "Chunk length",                                   "sctp.chunk_length",                                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_chunk_padding,                            { "Chunk padding",                                  "sctp.chunk_padding",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_chunk_value,                              { "Chunk value",                                    "sctp.chunk_value",                                     FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cookie,                                   { "Cookie",                                         "sctp.cookie",                                          FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initiate_tag,                             { "Initiate tag",                                   "sctp.initiate_tag",                                    FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_init_chunk_initiate_tag,                  { "Initiate tag",                                   "sctp.init_initiate_tag",                               FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_init_chunk_adv_rec_window_credit,         { "Advertised receiver window credit (a_rwnd)",     "sctp.init_credit",                                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_init_chunk_number_of_outbound_streams,    { "Number of outbound streams",                     "sctp.init_nr_out_streams",                             FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_init_chunk_number_of_inbound_streams,     { "Number of inbound streams",                      "sctp.init_nr_in_streams",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_init_chunk_initial_tsn,                   { "Initial TSN",                                    "sctp.init_initial_tsn",                                FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initack_chunk_initiate_tag,               { "Initiate tag",                                   "sctp.initack_initiate_tag",                            FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initack_chunk_adv_rec_window_credit,      { "Advertised receiver window credit (a_rwnd)",     "sctp.initack_credit",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initack_chunk_number_of_outbound_streams, { "Number of outbound streams",                     "sctp.initack_nr_out_streams",                          FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initack_chunk_number_of_inbound_streams,  { "Number of inbound streams",                      "sctp.initack_nr_in_streams",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_initack_chunk_initial_tsn,                { "Initial TSN",                                    "sctp.initack_initial_tsn",                             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cumulative_tsn_ack,                       { "Cumulative TSN Ack",                             "sctp.cumulative_tsn_ack",                              FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_data_chunk_tsn,                           { "TSN",                                            "sctp.data_tsn",                                        FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_data_chunk_stream_id,                     { "Stream Identifier",                              "sctp.data_sid",                                        FT_UINT16,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_data_chunk_stream_seq_number,             { "Stream sequence number",                         "sctp.data_ssn",                                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_data_chunk_payload_proto_id,              { "Payload protocol identifier",                    "sctp.data_payload_proto_id",                           FT_UINT32,  BASE_DEC,  VALS(sctp_payload_proto_id_values),             0x0,                                NULL, HFILL } },
+    { &hf_data_chunk_e_bit,                         { "E-Bit",                                          "sctp.data_e_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_e_bit_value),              SCTP_DATA_CHUNK_E_BIT,              NULL, HFILL } },
+    { &hf_data_chunk_b_bit,                         { "B-Bit",                                          "sctp.data_b_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_b_bit_value),              SCTP_DATA_CHUNK_B_BIT,              NULL, HFILL } },
+    { &hf_data_chunk_u_bit,                         { "U-Bit",                                          "sctp.data_u_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_u_bit_value),              SCTP_DATA_CHUNK_U_BIT,              NULL, HFILL } },
+    { &hf_data_chunk_i_bit,                         { "I-Bit",                                          "sctp.data_i_bit",                                      FT_BOOLEAN, 8,         TFS(&sctp_data_chunk_i_bit_value),              SCTP_DATA_CHUNK_I_BIT,              NULL, HFILL } },
+    { &hf_sack_chunk_ns,                            { "Nounce sum",                                     "sctp.sack_nounce_sum",                                 FT_UINT8,   BASE_DEC,  NULL,                                           SCTP_SACK_CHUNK_NS_BIT,             NULL, HFILL } },
+    { &hf_sack_chunk_cumulative_tsn_ack,            { "Cumulative TSN ACK",                             "sctp.sack_cumulative_tsn_ack",                         FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_adv_rec_window_credit,         { "Advertised receiver window credit (a_rwnd)",     "sctp.sack_a_rwnd",                                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_number_of_gap_blocks,          { "Number of gap acknowledgement blocks",           "sctp.sack_number_of_gap_blocks",                       FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_number_of_dup_tsns,            { "Number of duplicated TSNs",                      "sctp.sack_number_of_duplicated_tsns",                  FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_gap_block_start,               { "Start",                                          "sctp.sack_gap_block_start",                            FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_gap_block_start_tsn,           { "Start TSN",                                      "sctp.sack_gap_block_start_tsn",                        FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_gap_block_end,                 { "End",                                            "sctp.sack_gap_block_end",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_gap_block_end_tsn,             { "End TSN",                                        "sctp.sack_gap_block_end_tsn",                          FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_number_tsns_gap_acked,         { "Number of TSNs in gap acknowledgement blocks",   "sctp.sack_number_of_tsns_gap_acked",                   FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sack_chunk_duplicate_tsn,                 { "Duplicate TSN",                                  "sctp.sack_duplicate_tsn",                              FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_ns,                         { "Nounce sum",                                     "sctp.nr_sack_nounce_sum",                              FT_UINT8,   BASE_DEC,  NULL,                                           SCTP_NR_SACK_CHUNK_NS_BIT,             NULL, HFILL } },
+    { &hf_nr_sack_chunk_cumulative_tsn_ack,         { "Cumulative TSN ACK",                             "sctp.nr_sack_cumulative_tsn_ack",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_adv_rec_window_credit,      { "Advertised receiver window credit (a_rwnd)",     "sctp.nr_sack_a_rwnd",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_number_of_gap_blocks,       { "Number of gap acknowledgement blocks",           "sctp.nr_sack_number_of_gap_blocks",                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_number_of_nr_gap_blocks,    { "Number of nr-gap acknowledgement blocks",        "sctp.nr_sack_number_of_nr_gap_blocks",                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_number_of_dup_tsns,         { "Number of duplicated TSNs",                      "sctp.nr_sack_number_of_duplicated_tsns",               FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_reserved,                   { "Reserved",                                       "sctp.nr_sack_reserved",                                FT_UINT16,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_gap_block_start,            { "Start",                                          "sctp.nr_sack_gap_block_start",                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_gap_block_start_tsn,        { "Start TSN",                                      "sctp.nr_sack_gap_block_start_tsn",                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_gap_block_end,              { "End",                                            "sctp.nr_sack_gap_block_end",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_gap_block_end_tsn,          { "End TSN",                                        "sctp.nr_sack_gap_block_end_tsn",                       FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_number_tsns_gap_acked,      { "Number of TSNs in gap acknowledgement blocks",   "sctp.nr_sack_number_of_tsns_gap_acked",                FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_nr_gap_block_start,         { "Start",                                          "sctp.nr_sack_nr_gap_block_start",                      FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_nr_gap_block_start_tsn,     { "Start TSN",                                      "sctp.nr_sack_nr_gap_block_start_tsn",                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_nr_gap_block_end,           { "End",                                            "sctp.nr_sack_nr_gap_block_end",                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_nr_gap_block_end_tsn,       { "End TSN",                                        "sctp.nr_sack_nr_gap_block_end_tsn",                    FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_number_tsns_nr_gap_acked,   { "Number of TSNs in nr-gap acknowledgement blocks","sctp.nr_sack_number_of_tsns_nr_gap_acked",             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_nr_sack_chunk_duplicate_tsn,              { "Duplicate TSN",                                  "sctp.nr_sack_duplicate_tsn",                           FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_shutdown_chunk_cumulative_tsn_ack,        { "Cumulative TSN Ack",                             "sctp.shutdown_cumulative_tsn_ack",                     FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_ecne_chunk_lowest_tsn,                    { "Lowest TSN",                                     "sctp.ecne_lowest_tsn",                                 FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cwr_chunk_lowest_tsn,                     { "Lowest TSN",                                     "sctp.cwr_lowest_tsn",                                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_shutdown_complete_chunk_t_bit,            { "T-Bit",                                          "sctp.shutdown_complete_t_bit",                         FT_BOOLEAN, 8,         TFS(&sctp_shutdown_complete_chunk_t_bit_value), SCTP_SHUTDOWN_COMPLETE_CHUNK_T_BIT, NULL, HFILL } },
+    { &hf_abort_chunk_t_bit,                        { "T-Bit",                                          "sctp.abort_t_bit",                                     FT_BOOLEAN, 8,         TFS(&sctp_shutdown_complete_chunk_t_bit_value), SCTP_ABORT_CHUNK_T_BIT,             NULL, HFILL } },
+    { &hf_forward_tsn_chunk_tsn,                    { "New cumulative TSN",                             "sctp.forward_tsn_tsn",                                 FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_forward_tsn_chunk_sid,                    { "Stream identifier",                              "sctp.forward_tsn_sid",                                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_forward_tsn_chunk_ssn,                    { "Stream sequence number",                         "sctp.forward_tsn_ssn",                                 FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_parameter_type,                           { "Parameter type",                                 "sctp.parameter_type",                                  FT_UINT16,  BASE_HEX,  VALS(parameter_identifier_values),              0x0,                                NULL, HFILL } },
+    { &hf_parameter_length,                         { "Parameter length",                               "sctp.parameter_length",                                FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_parameter_value,                          { "Parameter value",                                "sctp.parameter_value",                                 FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_parameter_padding,                        { "Parameter padding",                              "sctp.parameter_padding",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_parameter_bit_1,                          { "Bit",                                            "sctp.parameter_bit_1",                                 FT_BOOLEAN, 16,        TFS(&sctp_parameter_bit_1_value),               SCTP_PARAMETER_BIT_1,               NULL, HFILL } },
+    { &hf_parameter_bit_2,                          { "Bit",                                            "sctp.parameter_bit_2",                                 FT_BOOLEAN, 16,        TFS(&sctp_parameter_bit_2_value),               SCTP_PARAMETER_BIT_2,               NULL, HFILL } },
+    { &hf_ipv4_address,                             { "IP Version 4 address",                           "sctp.parameter_ipv4_address",                          FT_IPv4,    BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_ipv6_address,                             { "IP Version 6 address",                           "sctp.parameter_ipv6_address",                          FT_IPv6,    BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_heartbeat_info,                           { "Heartbeat information",                          "sctp.parameter_heartbeat_information",                 FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_state_cookie,                             { "State cookie",                                   "sctp.parameter_state_cookie",                          FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cookie_preservative_increment,            { "Suggested Cookie life-span increment (msec)",    "sctp.parameter_cookie_preservative_incr",              FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_hostname,                                 { "Hostname",                                       "sctp.parameter_hostname",                              FT_STRING,  BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_supported_address_type,                   { "Supported address type",                         "sctp.parameter_supported_addres_type",                 FT_UINT16,  BASE_DEC,  VALS(address_types_values),                     0x0,                                NULL, HFILL } },
+    { &hf_stream_reset_req_seq_nr,                  { "Stream reset request sequence number",           "sctp.parameter_stream_reset_request_sequence_number",  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_stream_reset_rsp_seq_nr,                  { "Stream reset response sequence number",          "sctp.parameter_stream_reset_response_sequence_number", FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_senders_last_assigned_tsn,                { "Senders last assigned TSN",                      "sctp.parameter_senders_last_assigned_tsn",             FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_senders_next_tsn,                         { "Senders next TSN",                               "sctp.parameter_senders_next_tsn",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_receivers_next_tsn,                       { "Receivers next TSN",                             "sctp.parameter_receivers_next_tsn",                    FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_stream_reset_rsp_result,                  { "Result",                                         "sctp.parameter_stream_reset_response_result",          FT_UINT32,  BASE_DEC,  VALS(stream_reset_result_values),               0x0,                                NULL, HFILL } },
+    { &hf_stream_reset_sid,                         { "Stream Identifier",                              "sctp.parameter_stream_reset_sid",                      FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_asconf_serial,                            { "Serial number",                                  "sctp.asconf_serial_number",                            FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_asconf_ack_serial,                        { "Serial number",                                  "sctp.asconf_ack_serial_number",                        FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_correlation_id,                           { "Correlation_id",                                 "sctp.correlation_id",                                  FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_adap_indication,                          { "Indication",                                     "sctp.adapation_layer_indication",                      FT_UINT32,  BASE_HEX,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_random_number,                            { "Random number",                                  "sctp.random_number",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_chunks_to_auth,                           { "Chunk type",                                     "sctp.chunk_type_to_auth",                              FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                NULL, HFILL } },
+    { &hf_hmac_id,                                  { "HMAC identifier",                                "sctp.hmac_id",                                         FT_UINT16,  BASE_DEC,  VALS(hmac_id_values),                           0x0,                                NULL, HFILL } },
+    { &hf_hmac,                                     { "HMAC",                                           "sctp.hmac",                                            FT_BYTES,   BASE_NONE,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_shared_key_id,                            { "Shared key identifier",                          "sctp.shared_key_id",                                   FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_supported_chunk_type,                     { "Supported chunk type",                           "sctp.supported_chunk_type",                            FT_UINT8,   BASE_DEC,  VALS(chunk_type_values),                        0x0,                                NULL, HFILL } },
+    { &hf_cause_code,                               { "Cause code",                                     "sctp.cause_code",                                      FT_UINT16,  BASE_HEX,  VALS(cause_code_values),                        0x0,                                NULL, HFILL } },
+    { &hf_cause_length,                             { "Cause length",                                   "sctp.cause_length",                                    FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_info,                               { "Cause information",                              "sctp.cause_information",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_padding,                            { "Cause padding",                                  "sctp.cause_padding",                                   FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_stream_identifier,                  { "Stream identifier",                              "sctp.cause_stream_identifier",                         FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_reserved,                           { "Reserved",                                       "sctp.cause_reserved",                                  FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_number_of_missing_parameters,       { "Number of missing parameters",                   "sctp.cause_nr_of_missing_parameters",                  FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_missing_parameter_type,             { "Missing parameter type",                         "sctp.cause_missing_parameter_type",                    FT_UINT16,  BASE_HEX,  VALS(parameter_identifier_values),              0x0,                                NULL, HFILL } },
+    { &hf_cause_measure_of_staleness,               { "Measure of staleness in usec",                   "sctp.cause_measure_of_staleness",                      FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_cause_tsn,                                { "TSN",                                            "sctp.cause_tsn",                                       FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_pktdrop_chunk_m_bit,                      { "M-Bit",                                          "sctp.pckdrop_m_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_m_bit_value),                SCTP_PKTDROP_CHUNK_M_BIT,           NULL, HFILL } },
+    { &hf_pktdrop_chunk_b_bit,                      { "B-Bit",                                          "sctp.pckdrop_b_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_b_bit_value),                SCTP_PKTDROP_CHUNK_B_BIT,           NULL, HFILL } },
+    { &hf_pktdrop_chunk_t_bit,                      { "T-Bit",                                          "sctp.pckdrop_t_bit",                                   FT_BOOLEAN, 8,         TFS(&sctp_pktdropk_t_bit_value),                SCTP_PKTDROP_CHUNK_T_BIT,           NULL, HFILL } },
+    { &hf_pktdrop_chunk_bandwidth,                  { "Bandwidth",                                      "sctp.pktdrop_bandwidth",                               FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_pktdrop_chunk_queuesize,                  { "Queuesize",                                      "sctp.pktdrop_queuesize",                               FT_UINT32,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_pktdrop_chunk_truncated_length,           { "Truncated length",                               "sctp.pktdrop_truncated_length",                        FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_pktdrop_chunk_reserved,                   { "Reserved",                                       "sctp.pktdrop_reserved",                                FT_UINT16,  BASE_DEC,  NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_pktdrop_chunk_data_field,                 { "Data field",                                     "sctp.pktdrop_datafield",                               FT_BYTES,   BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+
+    { &hf_sctp_fragment,                            { "SCTP Fragment",                                  "sctp.fragment",                                        FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_fragments,                           { "Reassembled SCTP Fragments",                     "sctp.fragments",                                       FT_NONE,    BASE_NONE, NULL,                                           0x0,                                NULL, HFILL } },
+    { &hf_sctp_reassembled_in,                      { "Reassembled Message in frame",                   "sctp.reassembled_in",                                  FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_duplicate,                           { "Fragment already seen in frame",                 "sctp.duplicate",                                       FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+
+    { &hf_sctp_rtt,                                 { "The RTT to ACK the chunk was",                   "sctp.rtt",                                             FT_RELATIVE_TIME, BASE_NONE, NULL,                                      0x0,                                NULL, HFILL } },
+    { &hf_sctp_rto,                                 { "Retransmitted after",                            "sctp.retransmission_time",                             FT_RELATIVE_TIME, BASE_NONE, NULL,                                      0x0,                                NULL, HFILL } },
+    { &hf_sctp_retransmission,                      { "This TSN is a retransmission of one in frame",   "sctp.retransmission",                                  FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_retransmitted,                       { "This TSN is retransmitted in frame",             "sctp.retransmitted",                                   FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_retransmitted_count,                 { "TSN was retransmitted this many times",          "sctp.retransmitted_count",                             FT_UINT32, BASE_DEC, NULL,                                             0x0,                                NULL, HFILL } },
+    { &hf_sctp_acked,                               { "This chunk is acked in frame",                   "sctp.acked",                                           FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_ack_tsn,                             { "Acknowledges TSN",                               "sctp.ack",                                             FT_UINT32, BASE_DEC, NULL,                                             0x0,                                NULL, HFILL } },
+    { &hf_sctp_ack_frame,                           { "Chunk acknowledged in frame",                    "sctp.ack_frame",                                       FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } },
+    { &hf_sctp_retransmitted_after_ack,             { "Chunk was acked prior to retransmission",        "sctp.retransmitted_after_ack",                         FT_FRAMENUM, BASE_NONE, NULL,                                          0x0,                                NULL, HFILL } }
 
  };
 
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index fccbf374ed..814d2c3089 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -161,39 +161,39 @@ proto_register_sdlc(void)
 
 		{ &hf_sdlc_n_r,
 		    { "N(R)", "sdlc.control.n_r", FT_UINT8, BASE_DEC,
-		      NULL, XDLC_N_R_MASK, "", HFILL }},
+		      NULL, XDLC_N_R_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_n_s,
 		    { "N(S)", "sdlc.control.n_s", FT_UINT8, BASE_DEC,
-		      NULL, XDLC_N_S_MASK, "", HFILL }},
+		      NULL, XDLC_N_S_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_p,
 		    { "Poll", "sdlc.control.p", FT_BOOLEAN, 8,
-		      TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+		      TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 
 		{ &hf_sdlc_f,
 		    { "Final", "sdlc.control.f", FT_BOOLEAN, 8,
-		      TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+		      TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 
 		{ &hf_sdlc_s_ftype,
 		    { "Supervisory frame type", "sdlc.control.s_ftype", FT_UINT8, BASE_HEX,
-		      VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
+		      VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_u_modifier_cmd,
 		    { "Command", "sdlc.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
-		      VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
+		      VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_u_modifier_resp,
 		    { "Response", "sdlc.control.u_modifier_resp", FT_UINT8, BASE_HEX,
-		      VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
+		      VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_ftype_i,
 		    { "Frame type", "sdlc.control.ftype", FT_UINT8, BASE_HEX,
-		      VALS(ftype_vals), XDLC_I_MASK, "", HFILL }},
+		      VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
 
 		{ &hf_sdlc_ftype_s_u,
 		    { "Frame type", "sdlc.control.ftype", FT_UINT8, BASE_HEX,
-		      VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+		      VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_sdlc,
diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index efefd873ff..f59e33b876 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -1802,7 +1802,7 @@ proto_register_sdp(void)
     { &hf_owner_address_type,
       { "Owner Address Type",
         "sdp.owner.address_type",FT_STRING, BASE_NONE, NULL, 0x0,
-        "Owner Address Type", HFILL }},
+        NULL, HFILL }},
     { &hf_owner_address,
       { "Owner Address",
         "sdp.owner.address",FT_STRING, BASE_NONE, NULL, 0x0,
@@ -1842,7 +1842,7 @@ proto_register_sdp(void)
     { &hf_time_stop,
       { "Session Stop Time",
         "sdp.time.stop",FT_STRING, BASE_NONE, NULL, 0x0,
-        "Session Stop Time", HFILL }},
+        NULL, HFILL }},
     { &hf_repeat_time_interval,
       { "Repeat Interval",
         "sdp.repeat_time.interval",FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-sebek.c b/epan/dissectors/packet-sebek.c
index 8b395726f8..f907b5c7dc 100644
--- a/epan/dissectors/packet-sebek.c
+++ b/epan/dissectors/packet-sebek.c
@@ -293,28 +293,28 @@ proto_register_sebek(void)
 			NULL, 0, "Version Number", HFILL }},
 		{ &hf_sebek_type, {
 			"Type", "sebek.type", FT_UINT16, BASE_DEC,
-			NULL, 0, "Type", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_counter, {
 			"Counter", "sebek.counter", FT_UINT32, BASE_DEC,
-			NULL, 0, "Counter", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_time, {
 			"Time", "sebek.time.sec", FT_ABSOLUTE_TIME, BASE_NONE,
-			NULL, 0, "Time", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_pid, {
 			"Process ID", "sebek.pid", FT_UINT32, BASE_DEC,
-			NULL, 0, "Process ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_uid, {
 			"User ID", "sebek.uid", FT_UINT32, BASE_DEC,
-			NULL, 0, "User ID", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_fd, {
 			"File Descriptor", "sebek.fd", FT_UINT32, BASE_DEC,
 			NULL, 0, "File Descriptor Number", HFILL }},
 		{ &hf_sebek_cmd, {
-			"Command Name", "sebek.cmd", FT_STRING, 0,
-			NULL, 0, "Command Name", HFILL }},
+			"Command Name", "sebek.cmd", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_len, {
 			"Data Length", "sebek.len", FT_UINT32, BASE_DEC,
-			NULL, 0, "Data Length", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_ppid, {
 			"Parent Process ID", "sebek.ppid", FT_UINT32, BASE_DEC,
 			NULL, 0, "Process ID", HFILL }},
@@ -322,16 +322,16 @@ proto_register_sebek(void)
 			"Inode ID", "sebek.inode", FT_UINT32, BASE_DEC,
 			NULL, 0, "Process ID", HFILL }},
 		{ &hf_sebek_data, {
-			"Data", "sebek.data", FT_STRING, 0,
-			NULL, 0, "Data", HFILL }},
+			"Data", "sebek.data", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_sebek_socket_src_ip, {
-			"Socket.local_ip", "sebek.socket.src_ip", FT_IPv4, 0,
+			"Socket.local_ip", "sebek.socket.src_ip", FT_IPv4, BASE_NONE,
 			NULL, 0, "Socket.src_ip", HFILL }},
 		{ &hf_sebek_socket_src_port, {
 			"Socket.local_port", "sebek.socket.src_port", FT_UINT16, BASE_DEC,
 			NULL, 0, "Socket.src_port", HFILL }},
 		{ &hf_sebek_socket_dst_ip, {
-			"Socket.remote_ip", "sebek.socket.dst_ip", FT_IPv4, 0,
+			"Socket.remote_ip", "sebek.socket.dst_ip", FT_IPv4, BASE_NONE,
 			NULL, 0, "Socket.dst_ip", HFILL }},
 		{ &hf_sebek_socket_dst_port, {
 			"Socket.remote_port", "sebek.socket.dst_port", FT_UINT16, BASE_DEC,
@@ -341,7 +341,7 @@ proto_register_sebek(void)
 			NULL, 0, "Socket.call", HFILL }},
 		{ &hf_sebek_socket_proto, {
 			"Socket.ip_proto", "sebek.socket.ip_proto", FT_UINT8, BASE_DEC,
-			NULL, 0, "Socket.ip_proto", HFILL }}
+			NULL, 0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_sebek
diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c
index 34b63c2e9c..3892b2d413 100644
--- a/epan/dissectors/packet-ses.c
+++ b/epan/dissectors/packet-ses.c
@@ -1143,7 +1143,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				VALS(ses_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1155,7 +1155,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				VALS(ses_category0_vals),
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1167,7 +1167,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 
@@ -1180,7 +1180,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1192,7 +1192,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"", HFILL
+				NULL, HFILL
 			}
 		},
 		{
@@ -1203,7 +1203,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Called SS User Reference",
+				NULL,
 				HFILL
 			}
 		},
@@ -1215,7 +1215,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Calling SS User Reference",
+				NULL,
 				HFILL
 			}
 		},
@@ -1227,7 +1227,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Common Reference",
+				NULL,
 				HFILL
 			}
 		},
@@ -1239,7 +1239,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Additional Reference Information",
+				NULL,
 				HFILL
 			}
 		},
@@ -1251,7 +1251,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				RELEASE_TOKEN,
-				"release token",
+				NULL,
 				HFILL
 			}
 		},
@@ -1263,7 +1263,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				MAJOR_ACTIVITY_TOKEN,
-				"major/activity token",
+				NULL,
 				HFILL
 			}
 		},
@@ -1275,7 +1275,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				SYNCHRONIZE_MINOR_TOKEN,
-				"synchronize minor token",
+				NULL,
 				HFILL
 			}
 		},
@@ -1299,7 +1299,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				SES_EXT_CONT,
-				"Able to receive extended concatenated SPDU",
+				NULL,
 				HFILL
 			}
 		},
@@ -1312,7 +1312,7 @@ proto_register_ses(void)
 				BASE_HEX,
 				NULL,
 				0x0,
-				"",
+				NULL,
 				HFILL
 			}
 		},
@@ -1324,7 +1324,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				SES_EXCEPTION_REPORT,
-				"Session exception report",
+				NULL,
 				HFILL
 			}
 		},
@@ -1336,7 +1336,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				DATA_SEPARATION_FUNCTION_UNIT,
-				"Data separation function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1348,7 +1348,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				SYMMETRIC_SYNCHRONIZE_FUNCTION_UNIT,
-				"Symmetric synchronize function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1360,7 +1360,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				TYPED_DATA_FUNCTION_UNIT,
-				"Typed data function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1372,7 +1372,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				EXCEPTION_FUNCTION_UNIT,
-				"Exception function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1384,7 +1384,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				CAPABILITY_DATA_FUNCTION_UNIT,
-				"Capability function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1396,7 +1396,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				NEGOTIATED_RELEASE_FUNCTION_UNIT,
-				"Negotiated release function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1408,7 +1408,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				ACTIVITY_MANAGEMENT_FUNCTION_UNIT,
-				"Activity management function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1420,7 +1420,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				RESYNCHRONIZE_FUNCTION_UNIT,
-				"Resynchronize function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1432,7 +1432,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				MAJOR_SYNCHRONIZE_FUNCTION_UNIT,
-				"Major resynchronize function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1444,7 +1444,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				MINOR_SYNCHRONIZE_FUNCTION_UNIT,
-				"Minor resynchronize function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1456,7 +1456,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				EXPEDITED_DATA_FUNCTION_UNIT,
-				"Expedited data function unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1468,7 +1468,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				DUPLEX_FUNCTION_UNIT,
-				"Duplex functional unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1480,7 +1480,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 16,
 				NULL,
 				HALF_DUPLEX_FUNCTION_UNIT,
-				"Half-duplex functional unit",
+				NULL,
 				HFILL
 			}
 		},
@@ -1493,7 +1493,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"Proposed TSDU Maximum Size, Initiator to Responder",
+				NULL,
 				HFILL
 			}
 		},
@@ -1506,7 +1506,7 @@ proto_register_ses(void)
 				BASE_DEC,
 				NULL,
 				0x0,
-				"Proposed TSDU Maximum Size, Responder to Initiator",
+				NULL,
 				HFILL
 			}
 		},
@@ -1518,7 +1518,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				PROTOCOL_VERSION_1,
-				"Protocol Version 1",
+				NULL,
 				HFILL
 			}
 		},
@@ -1530,7 +1530,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				PROTOCOL_VERSION_2,
-				"Protocol Version 2",
+				NULL,
 				HFILL
 			}
 		},
@@ -1542,7 +1542,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Initial Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1554,7 +1554,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				BEGINNING_SPDU,
-				"beginning of SSDU",
+				NULL,
 				HFILL
 			}
 		},
@@ -1566,7 +1566,7 @@ proto_register_ses(void)
 				FT_BOOLEAN, 8,
 				NULL,
 				END_SPDU,
-				"end of SSDU",
+				NULL,
 				HFILL
 			}
 		},
@@ -1578,7 +1578,7 @@ proto_register_ses(void)
 				FT_UINT8, BASE_HEX,
 				VALS(token_setting_vals),
 				0xC0,
-				"release token setting",
+				NULL,
 				HFILL
 			}
 		},
@@ -1602,7 +1602,7 @@ proto_register_ses(void)
 				FT_UINT8, BASE_HEX,
 				VALS(token_setting_vals),
 				0x0C,
-				"synchronize-minor token setting",
+				NULL,
 				HFILL
 			}
 		},
@@ -1614,7 +1614,7 @@ proto_register_ses(void)
 				FT_UINT8, BASE_HEX,
 				VALS(token_setting_vals),
 				0x03,
-				"data token setting",
+				NULL,
 				HFILL
 			}
 		},
@@ -1626,7 +1626,7 @@ proto_register_ses(void)
 				FT_UINT32, BASE_DEC,
 				NULL,
 				0x0,
-				"Activity Identifier",
+				NULL,
 				HFILL
 			}
 		},
@@ -1638,7 +1638,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1650,7 +1650,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Calling Session Selector",
+				NULL,
 				HFILL
 			}
 		},
@@ -1662,7 +1662,7 @@ proto_register_ses(void)
 				FT_BYTES, BASE_NONE,
 				NULL,
 				0x0,
-				"Called Session Selector",
+				NULL,
 				HFILL
 			}
 		},
@@ -1674,7 +1674,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Second Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1686,7 +1686,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Second Initial Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1698,7 +1698,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Large Initial Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1710,7 +1710,7 @@ proto_register_ses(void)
 				FT_STRING, BASE_NONE,
 				NULL,
 				0x0,
-				"Large Second Initial Serial Number",
+				NULL,
 				HFILL
 			}
 		},
@@ -1723,7 +1723,7 @@ proto_register_ses(void)
 				BASE_HEX,
 				NULL,
 				0x0,
-				"",
+				NULL,
 				HFILL
 			}
 		},
@@ -1737,7 +1737,7 @@ proto_register_ses(void)
 				BASE_HEX,
 				NULL,
 				0x0,
-				"",
+				NULL,
 				HFILL
 			}
 		},
@@ -1752,7 +1752,7 @@ proto_register_ses(void)
 				BASE_HEX,
 				NULL,
 				0x0,
-				"",
+				NULL,
 				HFILL
 			}
 		},
@@ -1767,7 +1767,7 @@ proto_register_ses(void)
 				BASE_HEX,
 				NULL,
 				0x0,
-				"",
+				NULL,
 				HFILL
 			}
 		},
diff --git a/epan/dissectors/packet-sflow.c b/epan/dissectors/packet-sflow.c
index 610e4a79c8..8fa2a6268e 100644
--- a/epan/dissectors/packet-sflow.c
+++ b/epan/dissectors/packet-sflow.c
@@ -1695,7 +1695,7 @@ proto_register_sflow(void)
 		},
 		{ &hf_sflow_fs_rawheader,
 		  { "Header of sampled packet", "sflow.fs.rawheader",
-			FT_BYTES, BASE_HEX, NULL, 0x0,
+			FT_BYTES, BASE_NONE, NULL, 0x0,
 			"Data from sampled header", HFILL }
 		},
 
@@ -1765,7 +1765,7 @@ proto_register_sflow(void)
 		{ &hf_sflow_fs_ip_tcpflags,
 		  { "TCP Flags", "sflow.ip_flags",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			"TCP Flags", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_fs_ip_tos, /* IPv4 */
 		  { "ToS", "sflow.tos",
@@ -1775,7 +1775,7 @@ proto_register_sflow(void)
 		{ &hf_sflow_fs_ip_priority, /* IPv6 */
 		  { "Priority", "sflow.priority",
 			FT_UINT32, BASE_HEX, NULL, 0x0,
-			"Priority", HFILL }
+			NULL, HFILL }
 		},
 
 		/* XXX Fix naming for everything between here and hf_sflow_eth_... */
@@ -1797,21 +1797,21 @@ proto_register_sflow(void)
 		{ &hf_sflow_pri_in,
 		  { "Incoming 802.1p priority", "sflow.pri.in",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Incoming 802.1p priority", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_pri_out,
 		  { "Outgoing 802.1p priority", "sflow.pri.out",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Outgoing 802.1p priority", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_nexthop_v4,
 		  { "Next hop", "sflow.nexthop",
-			FT_IPv4, BASE_DEC, NULL, 0x0,
+			FT_IPv4, BASE_NONE, NULL, 0x0,
 			"Next hop address", HFILL }
 		},
 		{ &hf_sflow_nexthop_v6,
 		  { "Next hop", "sflow.nexthop",
-			FT_IPv6, BASE_HEX, NULL, 0x0,
+			FT_IPv6, BASE_NONE, NULL, 0x0,
 			"Next hop address", HFILL }
 		},
 		{ &hf_sflow_nexthop_src_mask,
@@ -1858,7 +1858,7 @@ proto_register_sflow(void)
 		{ &hf_sflow_community_entries,
 		  { "Gateway Communities", "sflow.communityEntries",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Gateway Communities", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_localpref,
 		  { "localpref", "sflow.localpref",
@@ -1869,17 +1869,17 @@ proto_register_sflow(void)
 		{ &hf_sflow_iftype,
 		  { "Interface Type", "sflow.iftype",
 			FT_UINT32, BASE_DEC, NULL, 0x0,
-			"Interface Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_ifspeed,
 		  { "Interface Speed", "sflow.ifspeed",
 			FT_UINT64, BASE_DEC, NULL, 0x0,
-			"Interface Speed", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_ifdirection,
 		  { "Interface Direction", "sflow.ifdirection",
 			FT_UINT32, BASE_DEC, VALS(if_direction_vals), 0x0,
-			"Interface Direction", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sflow_ifstatus_unused,
 		  { "If status (unused)", "sflow.ifstatus.unused",
diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c
index 9a160488c8..47417270c3 100644
--- a/epan/dissectors/packet-sigcomp.c
+++ b/epan/dissectors/packet-sigcomp.c
@@ -2323,13 +2323,13 @@ proto_register_sigcomp(void)
 		},
 		{ &hf_sigcomp_returned_feedback_item,
 			{ "Returned_feedback item", "sigcomp.returned.feedback.item",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
 			"Returned feedback item", HFILL }
 		},
 		{ &hf_sigcomp_partial_state,
 			{ "Partial state identifier", "sigcomp.partial.state.identifier",
 			FT_STRING, BASE_NONE, NULL, 0x0,          
-			"Partial state identifier", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_remaining_message_bytes,
 			{ "Remaining SigComp message bytes", "sigcomp.remaining-bytes",
@@ -2344,253 +2344,253 @@ proto_register_sigcomp(void)
 		{ &hf_sigcomp_returned_feedback_item_len,
 			{ "Returned feedback item length", "sigcomp.returned.feedback.item.len",
 			FT_UINT8, BASE_DEC, NULL, 0x7f,          
-			"Returned feedback item length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_code_len,
 			{ "Code length","sigcomp.code.len",
 			FT_UINT16, BASE_HEX, NULL, 0xfff0,          
-			"Code length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_destination,
 			{ "Destination","sigcomp.destination",
 			FT_UINT8, BASE_HEX, VALS(&destination_address_encoding_vals), 0xf,          
-			"Destination", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_udvm_bytecode,
 			{ "Uploaded UDVM bytecode","sigcomp.udvm.byte-code",
 			FT_NONE, BASE_NONE, NULL, 0x0,          
-			"Uploaded UDVM bytecode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_udvm_instr,
 			{ "UDVM instruction code","sigcomp.udvm.instr",
 			FT_UINT8, BASE_DEC, VALS(&udvm_instruction_code_vals), 0x0,          
-			"UDVM instruction code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_execution_trace,
 			{ "UDVM execution trace","sigcomp.udvm.execution-trace",
 			FT_NONE, BASE_NONE, NULL, 0x0,          
-			"UDVM execution trace", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_multitype_bytecode,
 			{ "UDVM bytecode", "sigcomp.udvm.multyt.bytecode",
 			FT_UINT8, BASE_HEX, VALS(&display_bytecode_vals), 0x0,          
-			"UDVM bytecode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_reference_bytecode,
 			{ "UDVM bytecode", "sigcomp.udvm.ref.bytecode",
 			FT_UINT8, BASE_HEX, VALS(&display_ref_bytecode_vals), 0x0,          
-			"UDVM bytecode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_literal_bytecode,
 			{ "UDVM bytecode", "sigcomp.udvm.lit.bytecode",
 			FT_UINT8, BASE_HEX, VALS(&display_lit_bytecode_vals), 0x0,          
-			"UDVM bytecode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_operand,
 			{ "UDVM operand", "sigcomp.udvm.operand",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
-			"UDVM operand", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_udvm_length,
-			{ " %Length", "sigcomp.udvm.length",
+			{ "%Length", "sigcomp.udvm.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Length", HFILL }
 		},
 		{ &hf_udvm_addr_length,
-			{ " %Length[memory address]", "sigcomp.udvm.addr.length",
+			{ "%Length[memory address]", "sigcomp.udvm.addr.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Length", HFILL }
 		},
 		{ &hf_udvm_destination,
-			{ " %Destination", "sigcomp.udvm.destination",
+			{ "%Destination", "sigcomp.udvm.destination",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Destination", HFILL }
 		},
 		{ &hf_udvm_addr_destination,
-			{ " %Destination[memory address]", "sigcomp.udvm.addr.destination",
+			{ "%Destination[memory address]", "sigcomp.udvm.addr.destination",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Destination", HFILL }
 		},
 		{ &hf_udvm_at_address,
-			{ " @Address(mem_add_of_inst + D) mod 2^16)", "sigcomp.udvm.at.address",
+			{ "@Address(mem_add_of_inst + D) mod 2^16)", "sigcomp.udvm.at.address",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Address", HFILL }
 		},
 		{ &hf_udvm_address,
-			{ " %Address", "sigcomp.udvm.length",
+			{ "%Address", "sigcomp.udvm.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Address", HFILL }
 		},
 		{ &hf_udvm_literal_num,
-			{ " #n", "sigcomp.udvm.literal-num",
+			{ "#n", "sigcomp.udvm.literal-num",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Literal number", HFILL }
 		},
 		{ &hf_udvm_value,
-			{ " %Value", "sigcomp.udvm.value",
+			{ "%Value", "sigcomp.udvm.value",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Value", HFILL }
 		},
 		{ &hf_udvm_addr_value,
-			{ " %Value[memory address]", "sigcomp.udvm.value",
+			{ "%Value[memory address]", "sigcomp.udvm.value",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Value", HFILL }
 		},
 		{ &hf_partial_identifier_start,
-			{ " %Partial identifier start", "sigcomp.udvm.partial.identifier.start",
+			{ "%Partial identifier start", "sigcomp.udvm.partial.identifier.start",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Partial identifier start", HFILL }
 		},
 		{ &hf_partial_identifier_length,
-			{ " %Partial identifier length", "sigcomp.udvm.partial.identifier.length",
+			{ "%Partial identifier length", "sigcomp.udvm.partial.identifier.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Partial identifier length", HFILL }
 		},
 		{ &hf_state_begin,
-			{ " %State begin", "sigcomp.udvm.state.begin",
+			{ "%State begin", "sigcomp.udvm.state.begin",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State begin", HFILL }
 		},
 		{ &hf_udvm_state_length,
-			{ " %State length", "sigcomp.udvm.state.length",
+			{ "%State length", "sigcomp.udvm.state.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State length", HFILL }
 		},
 
 		{ &hf_udvm_state_length_addr,
-			{ " %State length[memory address]", "sigcomp.udvm.state.length.addr",
+			{ "%State length[memory address]", "sigcomp.udvm.state.length.addr",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State length", HFILL }
 		},
 		{ &hf_udvm_state_address,
-			{ " %State address", "sigcomp.udvm.start.address",
+			{ "%State address", "sigcomp.udvm.start.address",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State address", HFILL }
 		},
 		{ &hf_udvm_state_address_addr,
-			{ " %State address[memory address]", "sigcomp.udvm.start.address.addr",
+			{ "%State address[memory address]", "sigcomp.udvm.start.address.addr",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State address", HFILL }
 		},
 		{ &hf_udvm_state_instr,
-			{ " %State instruction", "sigcomp.udvm.start.instr",
+			{ "%State instruction", "sigcomp.udvm.start.instr",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State instruction", HFILL }
 		},
 		{ &hf_udvm_operand_1,
-			{ " $Operand 1[memory address]", "sigcomp.udvm.operand.1",
+			{ "$Operand 1[memory address]", "sigcomp.udvm.operand.1",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Reference $ Operand 1", HFILL }
 		},
 		{ &hf_udvm_operand_2,
-			{ " %Operand 2", "sigcomp.udvm.operand.2",
+			{ "%Operand 2", "sigcomp.udvm.operand.2",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Operand 2", HFILL }
 		},
 		{ &hf_udvm_operand_2_addr,
-			{ " %Operand 2[memory address]", "sigcomp.udvm.operand.2.addr",
+			{ "%Operand 2[memory address]", "sigcomp.udvm.operand.2.addr",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Operand 2", HFILL }
 		},
 		{ &hf_udvm_j,
-			{ " %j", "sigcomp.udvm.j",
+			{ "%j", "sigcomp.udvm.j",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"j", HFILL }
 		},
 		{ &hf_udvm_addr_j,
-			{ " %j[memory address]", "sigcomp.udvm.addr.j",
+			{ "%j[memory address]", "sigcomp.udvm.addr.j",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"j", HFILL }
 		},
 		{ &hf_udvm_output_start,
-			{ " %Output_start", "sigcomp.output.start",
+			{ "%Output_start", "sigcomp.output.start",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Output start", HFILL }
 		},
 		{ &hf_udvm_addr_output_start,
-			{ " %Output_start[memory address]", "sigcomp.addr.output.start",
+			{ "%Output_start[memory address]", "sigcomp.addr.output.start",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Output start", HFILL }
 		},
 		{ &hf_udvm_output_length,
-			{ " %Output_length", "sigcomp.output.length",
+			{ "%Output_length", "sigcomp.output.length",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Output length", HFILL }
 		},
 		{ &hf_udvm_output_length_addr,
-			{ " %Output_length[memory address]", "sigcomp.output.length.addr",
+			{ "%Output_length[memory address]", "sigcomp.output.length.addr",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Output length", HFILL }
 		},
 		{ &hf_udvm_req_feedback_loc,
-			{ " %Requested feedback location", "sigcomp.req.feedback.loc",
+			{ "%Requested feedback location", "sigcomp.req.feedback.loc",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
 			"Requested feedback location", HFILL }
 		},
 		{ &hf_udvm_min_acc_len,
-			{ " %Minimum access length", "sigcomp.min.acc.len",
+			{ "%Minimum access length", "sigcomp.min.acc.len",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Minimum access length", HFILL }
 		},
 		{ &hf_udvm_state_ret_pri,
-			{ " %State retention priority", "sigcomp.udvm.state.ret.pri",
+			{ "%State retention priority", "sigcomp.udvm.state.ret.pri",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"State retention priority", HFILL }
 		},
 		{ &hf_udvm_ret_param_loc,
-			{ " %Returned parameters location", "sigcomp.ret.param.loc",
+			{ "%Returned parameters location", "sigcomp.ret.param.loc",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Returned parameters location", HFILL }
 		},
 		{ &hf_udvm_position,
-			{ " %Position", "sigcomp.udvm.position",
+			{ "%Position", "sigcomp.udvm.position",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Position", HFILL }
 		},
 		{ &hf_udvm_ref_dest,
-			{ " $Destination[memory address]", "sigcomp.udvm.ref.destination",
+			{ "$Destination[memory address]", "sigcomp.udvm.ref.destination",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"(reference)Destination", HFILL }
 		},
 		{ &hf_udvm_bits,
-			{ " %Bits", "sigcomp.udvm.bits",
+			{ "%Bits", "sigcomp.udvm.bits",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Bits", HFILL }
 		},
 		{ &hf_udvm_lower_bound,
-			{ " %Lower bound", "sigcomp.udvm.lower.bound",
+			{ "%Lower bound", "sigcomp.udvm.lower.bound",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Lower_bound", HFILL }
 		},
 		{ &hf_udvm_upper_bound,
-			{ " %Upper bound", "sigcomp.udvm.upper.bound",
+			{ "%Upper bound", "sigcomp.udvm.upper.bound",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Upper bound", HFILL }
 		},
 		{ &hf_udvm_uncompressed,
-			{ " %Uncompressed", "sigcomp.udvm.uncompressed",
+			{ "%Uncompressed", "sigcomp.udvm.uncompressed",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Uncompressed", HFILL }
 		},
 		{ &hf_udvm_start_value,
-			{ " %Start value", "sigcomp.udvm.start.value",
+			{ "%Start value", "sigcomp.udvm.start.value",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Start value", HFILL }
 		},
 		{ &hf_udvm_offset,
-			{ " %Offset", "sigcomp.udvm.offset",
+			{ "%Offset", "sigcomp.udvm.offset",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Offset", HFILL }
 		},
 		{ &hf_udvm_addr_offset,
-			{ " %Offset[memory address]", "sigcomp.udvm.addr.offset",
+			{ "%Offset[memory address]", "sigcomp.udvm.addr.offset",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
 			"Offset", HFILL }
 		},
 		{ &hf_sigcomp_nack_ver,
 			{ "NACK Version", "sigcomp.nack.ver",
 			FT_UINT8, BASE_DEC, NULL, 0x0f,          
-			"NACK Version", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sigcomp_nack_reason_code,
 			{ "Reason Code", "sigcomp.nack.reason",
@@ -2609,23 +2609,23 @@ proto_register_sigcomp(void)
 		},
 		{ &hf_sigcomp_nack_sha1,
 			{ "SHA-1 Hash of failed message", "sigcomp.nack.sha1",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
 			"NACK SHA-1 Hash of failed message", HFILL }
 		},
 		{ &hf_sigcomp_nack_state_id,
 			{ "State ID (6 - 20 bytes)", "sigcomp.nack.state_id",
-			FT_BYTES, BASE_HEX, NULL, 0x0,          
+			FT_BYTES, BASE_NONE, NULL, 0x0,          
 			"NACK State ID (6 - 20 bytes)", HFILL }
 		},
 		{ &hf_sigcomp_nack_cycles_per_bit,
-			{ "Cycles Per Bit ", "sigcomp.nack.cycles_per_bit",
+			{ "Cycles Per Bit", "sigcomp.nack.cycles_per_bit",
 			FT_UINT8, BASE_DEC, NULL, 0x0,          
 			"NACK Cycles Per Bit", HFILL }
 		},
 		{ &hf_sigcomp_nack_memory_size,
 			{ "Memory size", "sigcomp.memory_size",
 			FT_UINT16, BASE_DEC, NULL, 0x0,          
-			"Memory size", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-simulcrypt.c b/epan/dissectors/packet-simulcrypt.c
index 5abe7fccf6..8431f27bf4 100644
--- a/epan/dissectors/packet-simulcrypt.c
+++ b/epan/dissectors/packet-simulcrypt.c
@@ -601,7 +601,7 @@ void proto_register_simulcrypt (void)
 
 		{ &hf_simulcrypt_transition_delay_start,	
 		{ "Transition delay start", "simulcrypt.transition_delay_start", FT_INT16, BASE_DEC, NULL, 0x0,
-		 "Transition delay start", HFILL }},
+		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_transition_delay_stop,	
 		{ "Transition delay stop", "simulcrypt.transition_delay_stop", FT_INT16, BASE_DEC, NULL, 0x0,
@@ -632,7 +632,7 @@ void proto_register_simulcrypt (void)
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_access_criteria,
-		{ "Access criteria", "simulcrypt.access_criteria", FT_BYTES, BASE_HEX, NULL, 0x0,
+		{ "Access criteria", "simulcrypt.access_criteria", FT_BYTES, BASE_NONE, NULL, 0x0,
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_ecm_stream_id,
@@ -644,7 +644,7 @@ void proto_register_simulcrypt (void)
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_access_criteria_transfer_mode,
-		{ "AC transfer mode", "simulcrypt.access_criteria_transfer_mode", FT_BOOLEAN, 8, NULL, 0x0,
+		{ "AC transfer mode", "simulcrypt.access_criteria_transfer_mode", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_cp_number,
@@ -656,11 +656,11 @@ void proto_register_simulcrypt (void)
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_cp_cw_combination,
-		{ "CP CW combination", "simulcrypt.cp_cw_combination", FT_BYTES, BASE_HEX, NULL, 0x0,
+		{ "CP CW combination", "simulcrypt.cp_cw_combination", FT_BYTES, BASE_NONE, NULL, 0x0,
 		 NULL, HFILL }},
 		 
 		{ &hf_simulcrypt_ecm_datagram,
-		{ "ECM datagram", "simulcrypt.ecm_datagram", FT_BYTES, BASE_HEX, NULL, 0x0,
+		{ "ECM datagram", "simulcrypt.ecm_datagram", FT_BYTES, BASE_NONE, NULL, 0x0,
 		 NULL, HFILL }},
 
 		{ &hf_simulcrypt_cw_encryption,
diff --git a/epan/dissectors/packet-sip.c b/epan/dissectors/packet-sip.c
index eb085ac1ea..327f5acc5c 100644
--- a/epan/dissectors/packet-sip.c
+++ b/epan/dissectors/packet-sip.c
@@ -4082,7 +4082,7 @@ void proto_register_sip(void)
 		{ &hf_header_array[POS_P_CHARGING_FUNCTION_ADDRESSES],
 		       { "P-Charging-Function-Addresses","sip.P-Charging-Function-Addresses",
 		       FT_STRING, BASE_NONE,NULL,0x0,
-			"P-Charging-Function-Addresses", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_header_array[POS_P_CHARGING_VECTOR],
@@ -4177,7 +4177,7 @@ void proto_register_sip(void)
 		{ &hf_header_array[POS_PRIV_ANSWER_MODE],
 		       { "Priv-Answer-mode", 	"sip.Priv-Answer-mode",
 		       FT_STRING, BASE_NONE,NULL,0x0,
-			"Priv-Answer-mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_header_array[POS_PRIVACY],
 		       { "Privacy", 			"sip.Privacy",
@@ -4398,7 +4398,7 @@ void proto_register_sip(void)
 		{ &hf_sip_resend,
 			{ "Resent Packet", "sip.resend",
 			FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_sip_original_frame,
 			{ "Suspected resend of frame",  "sip.resend-original",
@@ -4408,7 +4408,7 @@ void proto_register_sip(void)
 		{ &hf_sip_matching_request_frame,
 			{ "Request Frame",  "sip.response-request",
 			FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-		    	"Request Frame", HFILL}
+		    	NULL, HFILL}
 		},
 		{ &hf_sip_response_time,
 			{ "Response Time (ms)",  "sip.response-time",
@@ -4433,7 +4433,7 @@ void proto_register_sip(void)
 		{ &hf_sip_auth_digest_response,
 			{ "Digest Authentication Response",  "sip.auth.digest.response",
 			FT_STRING, BASE_NONE, NULL, 0x0,
-		    	"SIP Digest Authentication Response Value ", HFILL}
+		    	"SIP Digest Authentication Response Value", HFILL}
 		},
 		{ &hf_sip_auth_nc,
 			{ "Nonce Count",  "sip.auth.nc",
@@ -4602,7 +4602,7 @@ void proto_register_sip(void)
 		{ &hf_raw_sip_line,
 				{ "Raw SIP Line",                "raw_sip.line",
 					FT_STRING, BASE_NONE,NULL,0x0,
-				"Raw SIP Line", HFILL }
+				NULL, HFILL }
         }};
 
 	/* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-sipfrag.c b/epan/dissectors/packet-sipfrag.c
index 0837c959b6..b81e0ee25f 100644
--- a/epan/dissectors/packet-sipfrag.c
+++ b/epan/dissectors/packet-sipfrag.c
@@ -107,7 +107,7 @@ void proto_register_sipfrag(void)
     {
         { &hf_sipfrag_line,
             { "Line",
-              "sipfrag.line",FT_STRING, BASE_NONE, NULL, 0x0, "Line", HFILL
+              "sipfrag.line",FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
             }
         },
     };
diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c
index c8454bfc28..e1e4f7f4bb 100644
--- a/epan/dissectors/packet-skinny.c
+++ b/epan/dissectors/packet-skinny.c
@@ -3092,119 +3092,119 @@ proto_register_skinny(void)
     { &hf_skinny_softKeyMap,
       { "SoftKeyMap","skinny.softKeyMap",
 	FT_UINT16, BASE_HEX, NULL, 0x0,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey0,
       { "SoftKey0", "skinny.softKeyMap.0",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY0,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey1,
       { "SoftKey1", "skinny.softKeyMap.1",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY1,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey2,
       { "SoftKey2", "skinny.softKeyMap.2",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY2,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey3,
       { "SoftKey3", "skinny.softKeyMap.3",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY3,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey4,
       { "SoftKey4", "skinny.softKeyMap.4",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY4,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey5,
       { "SoftKey5", "skinny.softKeyMap.5",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY5,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey6,
       { "SoftKey6", "skinny.softKeyMap.6",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY6,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey7,
       { "SoftKey7", "skinny.softKeyMap.7",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY7,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey8,
       { "SoftKey8", "skinny.softKeyMap.8",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY8,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey9,
       { "SoftKey9", "skinny.softKeyMap.9",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY9,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey10,
       { "SoftKey10", "skinny.softKeyMap.10",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY10,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey11,
       { "SoftKey11", "skinny.softKeyMap.11",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY11,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey12,
       { "SoftKey12", "skinny.softKeyMap.12",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY12,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey13,
       { "SoftKey13", "skinny.softKeyMap.13",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY13,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey14,
       { "SoftKey14", "skinny.softKeyMap.14",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY14,
-	"",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_softKey15,
       { "SoftKey15", "skinny.softKeyMap.15",
 	FT_BOOLEAN, 16, TFS(&softKeyMapValues), SKINNY_SOFTKEY15,
-	"",
+	NULL,
 	HFILL }
     },
 
@@ -3295,21 +3295,21 @@ proto_register_skinny(void)
     { &hf_skinny_dateMinute,
       { "Minute", "skinny.minute",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Minute",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_dateSeconds,
       { "Seconds", "skinny.dateSeconds",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Seconds",
+	NULL,
 	HFILL }
     },
 
     { &hf_skinny_dateMilliseconds,
       { "Milliseconds", "skinny.dateMilliseconds",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Milliseconds",
+	NULL,
 	HFILL }
     },
 
@@ -3917,7 +3917,7 @@ proto_register_skinny(void)
     { &hf_skinny_layout,
       { "Layout", "skinny.layout",
 	FT_UINT32, BASE_DEC, VALS(skinny_Layouts), 0x0,
-	"Layout",
+	NULL,
 	HFILL }
     },
 
@@ -3938,7 +3938,7 @@ proto_register_skinny(void)
     { &hf_skinny_transmitOrReceive,
       { "TransmitOrReceive", "skinny.transmitOrReceive",
 	FT_UINT32, BASE_DEC, VALS(skinny_transmitOrReceive), 0x0,
-	"TransmitOrReceive",
+	NULL,
 	HFILL }
     },
 
@@ -4085,7 +4085,7 @@ proto_register_skinny(void)
     { &hf_skinny_endOfAnnAck,
       { "EndOfAnnAck", "skinny.endOfAnnAck",
 	FT_UINT32, BASE_DEC, VALS(skinny_endOfAnnAck), 0x0,
-	"EndOfAnnAck",
+	NULL,
 	HFILL }
     },
 
@@ -4099,7 +4099,7 @@ proto_register_skinny(void)
     { &hf_skinny_annPlayStatus,
       { "AnnPlayStatus", "skinny.annPlayStatus",
 	FT_UINT32, BASE_DEC, VALS(skinny_annPlayStatus), 0x0,
-	"AnnPlayStatus",
+	NULL,
 	HFILL }
     },
 
@@ -4204,7 +4204,7 @@ proto_register_skinny(void)
     { &hf_skinny_miscCommandType,
       { "MiscCommandType", "skinny.miscCommandType",
 	FT_UINT32, BASE_DEC, VALS(skinny_miscCommandType), 0x0,
-	"MiscCommandType",
+	NULL,
 	HFILL }
     },
 
diff --git a/epan/dissectors/packet-sll.c b/epan/dissectors/packet-sll.c
index 54ea07d8a2..e5af009e05 100644
--- a/epan/dissectors/packet-sll.c
+++ b/epan/dissectors/packet-sll.c
@@ -291,16 +291,16 @@ proto_register_sll(void)
 	static hf_register_info hf[] = {
 		{ &hf_sll_pkttype,
 		{ "Packet type",	"sll.pkttype", FT_UINT16, BASE_DEC,
-		  VALS(packet_type_vals), 0x0, "Packet type", HFILL }},
+		  VALS(packet_type_vals), 0x0, NULL, HFILL }},
 
 		/* ARP hardware type?  With Linux extensions? */
 		{ &hf_sll_hatype,
 		{ "Link-layer address type",	"sll.hatype", FT_UINT16, BASE_DEC,
-		  NULL, 0x0, "Link-layer address type", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sll_halen,
 		{ "Link-layer address length",	"sll.halen", FT_UINT16, BASE_DEC,
-		  NULL, 0x0, "Link-layer address length", HFILL }},
+		  NULL, 0x0, NULL, HFILL }},
 
 		/* Source address if it's an Ethernet-type address */
 		{ &hf_sll_src_eth,
@@ -314,7 +314,7 @@ proto_register_sll(void)
 
 		/* Source address if it's not an Ethernet-type address */
 		{ &hf_sll_src_other,
-		{ "Source",	"sll.src.other", FT_BYTES, BASE_HEX, NULL, 0x0,
+		{ "Source",	"sll.src.other", FT_BYTES, BASE_NONE, NULL, 0x0,
 			"Source link-layer address", HFILL }},
 
 		/* if the protocol field is an internal Linux protocol type */
@@ -334,7 +334,7 @@ proto_register_sll(void)
 
                 { &hf_sll_trailer,
 		{ "Trailer", "sll.trailer", FT_BYTES, BASE_NONE, NULL, 0x0,
-			"Trailer", HFILL }}
+			NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_sll
diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index 6c8792b516..ae180484c7 100644
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -2452,7 +2452,7 @@ proto_register_slow_protocols(void)
     { &hf_lacpdu_actor_reserved,
       { "Reserved",        "slow.lacp.reserved",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
     { &hf_lacpdu_partner_type,
       { "Partner Information",    "slow.lacp.partnerInfo",
@@ -2537,7 +2537,7 @@ proto_register_slow_protocols(void)
     { &hf_lacpdu_partner_reserved,
       { "Reserved",        "slow.lacp.reserved",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
     { &hf_lacpdu_coll_type,
       { "Collector Information",    "slow.lacp.collectorInfo",
@@ -2557,7 +2557,7 @@ proto_register_slow_protocols(void)
     { &hf_lacpdu_coll_reserved,
       { "Reserved",        "slow.lacp.coll_reserved",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
     { &hf_lacpdu_term_type,
       { "Terminator Information",    "slow.lacp.termInfo",
@@ -2572,7 +2572,7 @@ proto_register_slow_protocols(void)
     { &hf_lacpdu_term_reserved,
       { "Reserved",        "slow.lacp.term_reserved",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
 
 /*
@@ -2685,37 +2685,37 @@ proto_register_slow_protocols(void)
     { &hf_oampdu_info_state_parser,
       { "Parser Action",        "slow.oam.info.state.parser",
         FT_UINT8,    BASE_HEX,    VALS(&parser_vals),    0x03,
-        "Parser Action", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_state_mux,
       { "Muxiplexer Action",        "slow.oam.info.state.muxiplexer",
         FT_BOOLEAN,    8,        TFS(&mux),    0x04,
-        "Muxiplexer Action", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig,
       { "OAM Configuration",    "slow.oam.info.oamConfig",
         FT_UINT8,    BASE_HEX,    NULL,    0x0,
-        "OAM Configuration", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig_mode,
       { "OAM Mode",        "slow.oam.info.oamConfig.mode",
         FT_BOOLEAN,    8,        TFS(&oam_mode),    OAMPDU_INFO_CONFIG_MODE,
-        "", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig_uni,
       { "Unidirectional support",        "slow.oam.flags.dyingGasp",
         FT_BOOLEAN,    8,        TFS(&oam_uni),    OAMPDU_INFO_CONFIG_UNI,
-        "Unidirectional support", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig_lpbk,
       { "Loopback support",        "slow.oam.flags.criticalEvent",
         FT_BOOLEAN,    8,        TFS(&oam_lpbk),    OAMPDU_INFO_CONFIG_LPBK,
-        "Loopback support", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig_event,
       { "Link Events support",        "slow.oam.flags.localEvaluating",
         FT_BOOLEAN,    8,        TFS(&oam_event),    OAMPDU_INFO_CONFIG_EVENT,
-        "Link Events support", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_oamConfig_var,
       { "Variable Retrieval",        "slow.oam.flags.localStable",
@@ -2730,12 +2730,12 @@ proto_register_slow_protocols(void)
     { &hf_oampdu_info_oui,
       { "Organizationally Unique Identifier", "slow.oam.info.oui",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_info_vendor,
       { "Vendor Specific Information", "slow.oam.info.vendor",
         FT_BYTES,    BASE_NONE,    NULL,    0x0,
-        "", HFILL }},
+        NULL, HFILL }},
 
     /*
      * Event notification definitions
@@ -2898,11 +2898,11 @@ proto_register_slow_protocols(void)
     { &hf_oampdu_variable_indication,
       { "Variable indication",    "slow.oam.variable.indication",
         FT_UINT8,    BASE_HEX,    VALS(indication_vals),    0x0,
-        "Variable indication", HFILL }},
+        NULL, HFILL }},
 
     { &hf_oampdu_variable_value,
       { "Variable Value",    "slow.oam.variable.value",
-        FT_BYTES,    BASE_HEX,    NULL,    0x0,
+        FT_BYTES,    BASE_NONE,    NULL,    0x0,
         "Value", HFILL }},
 
     /* Loopback Control definitions*/
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c
index 0098ef74a2..cc515807f0 100644
--- a/epan/dissectors/packet-slsk.c
+++ b/epan/dissectors/packet-slsk.c
@@ -2407,133 +2407,133 @@ proto_register_slsk(void)
 	static hf_register_info hf[] = {
 		{ &hf_slsk_integer,
 			{ "Integer", "slsk.integer",
-			FT_UINT32, BASE_DEC, NULL, 0, "Integer", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_string,
 			{ "String", "slsk.string",
-			FT_STRING, BASE_NONE, NULL, 0, "String", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_byte,
 			{ "Byte", "slsk.byte",
-			FT_UINT8, BASE_DEC, NULL, 0, "Byte", HFILL } },
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_message_length,
 			{ "Message Length", "slsk.message.length",
-			FT_UINT32, BASE_DEC, NULL, 0, "Message Length", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_message_code,
 			{ "Message Code", "slsk.message.code",
-			FT_UINT32, BASE_DEC, NULL, 0, "Message Code", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_client_ip,
 			{ "Client IP", "slsk.server.ip",
-			FT_IPv4, BASE_DEC, NULL, 0, "Client IP Address", HFILL } },
+			FT_IPv4, BASE_NONE, NULL, 0, "Client IP Address", HFILL } },
 		{ &hf_slsk_server_ip,
 			{ "SoulSeek Server IP", "slsk.server.ip",
-			FT_UINT32, BASE_DEC, NULL, 0, "SoulSeek Server IP", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_string_length,
 			{ "String Length", "slsk.string.length",
-			FT_UINT32, BASE_DEC, NULL, 0, "String Length", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_username,
 			{ "Username", "slsk.username",
-			FT_STRING, BASE_NONE, NULL, 0, "Username", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_password,
 			{ "Password", "slsk.password",
-			FT_STRING, BASE_NONE, NULL, 0, "Password", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_version,
 			{ "Version", "slsk.version",
-			FT_UINT32, BASE_DEC, NULL, 0, "Version", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_login_successful,
 			{ "Login successful", "slsk.login.successful",
 			FT_UINT8, BASE_DEC, NULL, 0, "Login Successful", HFILL } },
 		{ &hf_slsk_login_message,
 			{ "Login Message", "slsk.login.message",
-			FT_STRING, BASE_NONE, NULL, 0, "Login Message", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_port,
 			{ "Port Number", "slsk.port.number",
-			FT_UINT32, BASE_DEC, NULL, 0, "Port Number", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_ip,
 			{ "IP Address", "slsk.ip.address",
-			FT_IPv4, BASE_DEC, NULL, 0, "IP Address", HFILL } },
+			FT_IPv4, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_user_exists,
 			{ "user exists", "slsk.user.exists",
 			FT_UINT8, BASE_DEC, NULL, 0, "User exists", HFILL } },
 		{ &hf_slsk_status_code,
 			{ "Status Code", "slsk.status.code",
-			FT_UINT32, BASE_DEC, NULL, 0, "Status Code", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_room,
 			{ "Room", "slsk.room",
-			FT_STRING, BASE_NONE, NULL, 0, "Room", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_chat_message,
 			{ "Chat Message", "slsk.chat.message",
-			FT_STRING, BASE_NONE, NULL, 0, "Chat Message", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_users_in_room,
 			{ "Users in Room", "slsk.room.users",
 			FT_UINT32, BASE_DEC, NULL, 0, "Number of Users in Room", HFILL } },
 		{ &hf_slsk_token,
 			{ "Token", "slsk.token",
-			FT_UINT32, BASE_DEC, NULL, 0, "Token", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_connection_type,
 			{ "Connection Type", "slsk.connection.type",
-			FT_STRING, BASE_NONE, NULL, 0, "Connection Type", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_chat_message_id,
 			{ "Chat Message ID", "slsk.chat.message.id",
-			FT_UINT32, BASE_DEC, NULL, 0, "Chat Message ID", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_timestamp,
 			{ "Timestamp", "slsk.timestamp",
-			FT_UINT32, BASE_DEC, NULL, 0, "Timestamp", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_search_text,
 			{ "Search Text", "slsk.search.text",
-			FT_STRING, BASE_NONE, NULL, 0, "Search Text", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_folder_count,
 			{ "Folder Count", "slsk.folder.count",
-			FT_UINT32, BASE_DEC, NULL, 0, "Folder Count", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_file_count,
 			{ "File Count", "slsk.file.count",
-			FT_UINT32, BASE_DEC, NULL, 0, "File Count", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_average_speed,
 			{ "Average Speed", "slsk.average.speed",
-			FT_UINT32, BASE_DEC, NULL, 0, "Average Speed", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_download_number,
 			{ "Download Number", "slsk.download.number",
-			FT_UINT32, BASE_DEC, NULL, 0, "Download Number", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_files,
 			{ "Files", "slsk.files",
-			FT_UINT32, BASE_DEC, NULL, 0, "Files", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_directories,
 			{ "Directories", "slsk.directories",
-			FT_UINT32, BASE_DEC, NULL, 0, "Directories", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_slotsfull,
 			{ "Slots full", "slsk.slots.full",
 			FT_UINT32, BASE_DEC, NULL, 0, "Upload Slots Full", HFILL } },
 		{ &hf_slsk_place_in_queue,
 			{ "Place in Queue", "slsk.queue.place",
-			FT_UINT32, BASE_DEC, NULL, 0, "Place in Queue", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_number_of_rooms,
 			{ "Number of Rooms", "slsk.room.count",
-			FT_UINT32, BASE_DEC, NULL, 0, "Number of Rooms", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_filename,
 			{ "Filename", "slsk.filename",
-			FT_STRING, BASE_NONE, NULL, 0, "Filename", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_directory,
 			{ "Directory", "slsk.directory",
-			FT_STRING, BASE_NONE, NULL, 0, "Directory", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_size,
 			{ "Size", "slsk.size",
 			FT_UINT32, BASE_DEC, NULL, 0, "File Size", HFILL } },
 		{ &hf_slsk_checksum,
 			{ "Checksum", "slsk.checksum",
-			FT_UINT32, BASE_DEC, NULL, 0, "Checksum", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_code,
 			{ "Code", "slsk.code",
-			FT_UINT32, BASE_DEC, NULL, 0, "Code", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_number_of_users,
 			{ "Number of Users", "slsk.user.count",
-			FT_UINT32, BASE_DEC, NULL, 0, "Number of Users", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_number_of_days,
 			{ "Number of Days", "slsk.day.count",
-			FT_UINT32, BASE_DEC, NULL, 0, "Number of Days", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_transfer_direction,
 			{ "Transfer Direction", "slsk.transfer.direction",
-			FT_UINT32, BASE_DEC, NULL, 0, "Transfer Direction", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_user_description,
 			{ "User Description", "slsk.user.description",
-			FT_STRING, BASE_NONE, NULL, 0, "User Description", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_picture_exists,
 			{ "Picture exists", "slsk.user.picture.exists",
 			FT_UINT8, BASE_DEC, NULL, 0, "User has a picture", HFILL } },
@@ -2542,16 +2542,16 @@ proto_register_slsk(void)
 			FT_STRING, BASE_NONE, NULL, 0, "User Picture", HFILL } },
 		{ &hf_slsk_user_uploads,
 			{ "User uploads", "slsk.uploads.user",
-			FT_UINT32, BASE_DEC, NULL, 0, "User uploads", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_total_uploads,
 			{ "Total uploads allowed", "slsk.uploads.total",
-			FT_UINT32, BASE_DEC, NULL, 0, "Total uploads allowed", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_queued_uploads,
 			{ "Queued uploads", "slsk.uploads.queued",
-			FT_UINT32, BASE_DEC, NULL, 0, "Queued uploads", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_slots_available,
 			{ "Upload Slots available", "slsk.uploads.available",
-			FT_UINT8, BASE_DEC, NULL, 0, "Upload Slots available", HFILL } },
+			FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_allowed,
 			{ "Download allowed", "slsk.user.allowed",
 			FT_UINT8, BASE_DEC, NULL, 0, "allowed", HFILL } },
@@ -2560,28 +2560,28 @@ proto_register_slsk(void)
 			FT_NONE, BASE_NONE, NULL, 0, "zlib compressed packet", HFILL } },
 		{ &hf_slsk_parent_min_speed,
 			{ "Parent Min Speed", "slsk.parent.min.speed",
-			FT_UINT32, BASE_DEC, NULL, 0, "Parent Min Speed", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_parent_speed_connection_ratio,
 			{ "Parent Speed Connection Ratio", "slsk.parent.speed.connection.ratio",
-			FT_UINT32, BASE_DEC, NULL, 0, "Parent Speed Connection Ratio", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_seconds_parent_inactivity_before_disconnect,
 			{ "Seconds Parent Inactivity Before Disconnect", "slsk.seconds.parent.inactivity.before.disconnect",
-			FT_UINT32, BASE_DEC, NULL, 0, "Seconds Parent Inactivity Before Disconnect", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_seconds_server_inactivity_before_disconnect,
 			{ "Seconds Server Inactivity Before Disconnect", "slsk.seconds.server.inactivity.before.disconnect",
-			FT_UINT32, BASE_DEC, NULL, 0, "Seconds Server Inactivity Before Disconnect", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_nodes_in_cache_before_disconnect,
 			{ "Nodes In Cache Before Disconnect", "slsk.nodes.in.cache.before.disconnect",
-			FT_UINT32, BASE_DEC, NULL, 0, "Nodes In Cache Before Disconnect", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_seconds_before_ping_children,
 			{ "Seconds Before Ping Children", "slsk.seconds.before.ping.children",
-			FT_UINT32, BASE_DEC, NULL, 0, "Seconds Before Ping Children", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_recommendation,
 			{ "Recommendation", "slsk.recommendation",
-			FT_STRING, BASE_NONE, NULL, 0, "Recommendation", HFILL } },
+			FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } },
 		{ &hf_slsk_ranking,
 			{ "Ranking", "slsk.ranking",
-			FT_UINT32, BASE_DEC, NULL, 0, "Ranking", HFILL } },
+			FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL } },
 	};
 
 /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 0927a739f4..87328bae18 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -918,16 +918,16 @@ proto_register_smb_browse(void)
 		{ &hf_mb_reset_command,
 		  { "ResetBrowserState Command", "browser.reset_cmd", FT_UINT8,
 		    BASE_HEX, VALS(&resetbrowserstate_command_names), 0,
-		    "ResetBrowserState Command", HFILL }},
+		    NULL, HFILL }},
 		{ &hf_mb_reset_demote,
 		  { "Demote LMB", "browser.reset_cmd.demote", FT_BOOLEAN, 
-		    8, TFS(&tfs_demote_to_backup), 0x01, "Demote LMB", HFILL}}, 
+		    8, TFS(&tfs_demote_to_backup), 0x01, NULL, HFILL}}, 
 		{ &hf_mb_reset_flush,
 		  { "Flush Browse List", "browser.reset_cmd.flush", FT_BOOLEAN,
-		    8, TFS(&tfs_flush_browse_list), 0x02, "Flush Browse List", HFILL}},
+		    8, TFS(&tfs_flush_browse_list), 0x02, NULL, HFILL}},
 		{ &hf_mb_reset_stop,
 		  { "Stop Being LMB", "browser.reset_cmd.stop_lmb", FT_BOOLEAN,
-		    8, TFS(&tfs_stop_being_lmb), 0x04, "Stop Being LMB", HFILL}},
+		    8, TFS(&tfs_stop_being_lmb), 0x04, NULL, HFILL}},
 		{ &hf_os_major,
 			{ "OS Major Version", "browser.os_major", FT_UINT8, BASE_DEC,
 			NULL, 0, "Operating System Major Version", HFILL }},
@@ -1042,15 +1042,15 @@ proto_register_smb_browse(void)
 
 		{ &hf_election_version,
 			{ "Election Version", "browser.election.version", FT_UINT8, BASE_DEC,
-			NULL, 0, "Election Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_proto_major,
 			{ "Browser Protocol Major Version", "browser.proto_major", FT_UINT8, BASE_DEC,
-			NULL, 0, "Browser Protocol Major Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_proto_minor,
 			{ "Browser Protocol Minor Version", "browser.proto_minor", FT_UINT8, BASE_DEC,
-			NULL, 0, "Browser Protocol Minor Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_sig_const,
 			{ "Signature", "browser.sig", FT_UINT16, BASE_HEX,
@@ -1066,15 +1066,15 @@ proto_register_smb_browse(void)
 
 		{ &hf_response_computer_name,
 			{ "Response Computer Name", "browser.response_computer_name", FT_STRINGZ, BASE_NONE,
-			NULL, 0, "Response Computer Name", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_election_criteria,
 			{ "Election Criteria", "browser.election.criteria", FT_UINT32, BASE_HEX,
-			NULL, 0, "Election Criteria", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_election_desire,
 			{ "Election Desire", "browser.election.desire", FT_UINT8, BASE_HEX,
-			NULL, 0, "Election Desire", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_election_desire_flags_backup,
 			{ "Backup", "browser.election.desire.backup", FT_BOOLEAN, 8,
@@ -1102,11 +1102,11 @@ proto_register_smb_browse(void)
 
 		{ &hf_election_revision,
 			{ "Election Revision", "browser.election.revision", FT_UINT16, BASE_DEC,
-			NULL, 0, "Election Revision", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_election_os,
 			{ "Election OS", "browser.election.os", FT_UINT8, BASE_HEX,
-			NULL, 0, "Election OS", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 		{ &hf_election_os_wfw,
 			{ "WfW", "browser.election.os.wfw", FT_BOOLEAN, 8,
@@ -1138,7 +1138,7 @@ proto_register_smb_browse(void)
 
 		{ &hf_browser_to_promote,
 			{ "Browser to Promote", "browser.browser_to_promote", FT_STRINGZ, BASE_NONE,
-			NULL, 0, "Browser to Promote", HFILL }},
+			NULL, 0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c
index 2060e5a619..0d63286d70 100644
--- a/epan/dissectors/packet-smb-logon.c
+++ b/epan/dissectors/packet-smb-logon.c
@@ -1129,15 +1129,15 @@ proto_register_smb_logon( void)
 
 		{ &hf_unknown8,
 			{ "Unknown", "smb_netlogon.unknown", FT_UINT8, BASE_HEX,
-			  NULL, 0, "Unknown", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_unknown32,
 			{ "Unknown", "smb_netlogon.unknown", FT_UINT32, BASE_HEX,
-			  NULL, 0, "Unknown", HFILL }},
+			  NULL, 0, NULL, HFILL }},
 
 		{ &hf_domain_guid,
-			{ "Domain GUID", "smb_netlogon.domain.guid", FT_BYTES, BASE_HEX,
-			   NULL, 0x0, "Domain GUID", HFILL }},
+			{ "Domain GUID", "smb_netlogon.domain.guid", FT_BYTES, BASE_NONE,
+			   NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_server_ip, {
 			"Server IP", "smb_netlogon.server_ip", FT_IPv4, BASE_NONE,
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 1c84372628..fa66449fb6 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -16806,7 +16806,7 @@ proto_register_smb(void)
 	static hf_register_info hf[] = {
 	{ &hf_smb_cmd,
 		{ "SMB Command", "smb.cmd", FT_UINT8, BASE_HEX,
-		VALS(smb_cmd_vals), 0x0, "SMB Command", HFILL }},
+		VALS(smb_cmd_vals), 0x0, NULL, HFILL }},
 
 	{ &hf_smb_trans2_subcmd,
 		{ "Subcommand", "smb.trans2.cmd", FT_UINT16, BASE_HEX,
@@ -16853,11 +16853,11 @@ proto_register_smb(void)
 		NULL, 0, "DOS Error Code", HFILL }},
 
 	{ &hf_smb_reserved,
-		{ "Reserved", "smb.reserved", FT_BYTES, BASE_HEX,
+		{ "Reserved", "smb.reserved", FT_BYTES, BASE_NONE,
 		NULL, 0, "Reserved bytes, must be zero", HFILL }},
 
 	{ &hf_smb_sig,
-		{ "Signature", "smb.signature", FT_BYTES, BASE_HEX,
+		{ "Signature", "smb.signature", FT_BYTES, BASE_NONE,
 		NULL, 0, "Signature bytes", HFILL }},
 
 	{ &hf_smb_key,
@@ -16878,7 +16878,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_pid,
 		{ "Process ID", "smb.pid", FT_UINT16, BASE_DEC,
-		NULL, 0, "Process ID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_pid_high,
 		{ "Process ID High", "smb.pid.high", FT_UINT16, BASE_DEC,
@@ -16886,15 +16886,15 @@ proto_register_smb(void)
 
 	{ &hf_smb_tid,
 		{ "Tree ID", "smb.tid", FT_UINT16, BASE_DEC,
-		NULL, 0, "Tree ID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_uid,
 		{ "User ID", "smb.uid", FT_UINT16, BASE_DEC,
-		NULL, 0, "User ID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_mid,
 		{ "Multiplex ID", "smb.mid", FT_UINT16, BASE_DEC,
-		NULL, 0, "Multiplex ID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_flags_lock,
 		{ "Lock and Read", "smb.flags.lock", FT_BOOLEAN, 8,
@@ -16997,7 +16997,7 @@ proto_register_smb(void)
 		NULL, 0, "Encryption key length (must be 0 if not LM2.1 dialect)", HFILL }},
 
 	{ &hf_smb_encryption_key,
-		{ "Encryption Key", "smb.encryption_key", FT_BYTES, BASE_HEX,
+		{ "Encryption Key", "smb.encryption_key", FT_BYTES, BASE_NONE,
 		NULL, 0, "Challenge/Response Encryption Key (for LM2.1 dialect)", HFILL }},
 
 	{ &hf_smb_primary_domain,
@@ -17013,7 +17013,7 @@ proto_register_smb(void)
 		NULL, 0, "Maximum raw buffer size", HFILL }},
 
 	{ &hf_smb_server_guid,
-		{ "Server GUID", "smb.server_guid", FT_BYTES, BASE_HEX,
+		{ "Server GUID", "smb.server_guid", FT_BYTES, BASE_NONE,
 		NULL, 0, "Globally unique identifier for this server", HFILL }},
 
 	{ &hf_smb_security_blob_len,
@@ -17021,7 +17021,7 @@ proto_register_smb(void)
 		NULL, 0, "Security blob length", HFILL }},
 
 	{ &hf_smb_security_blob,
-		{ "Security Blob", "smb.security_blob", FT_BYTES, BASE_HEX,
+		{ "Security Blob", "smb.security_blob", FT_BYTES, BASE_NONE,
 		NULL, 0, "Security blob", HFILL }},
 
 	{ &hf_smb_sm_mode16,
@@ -17146,10 +17146,10 @@ proto_register_smb(void)
 
 	{ &hf_smb_system_time,
 		{ "System Time", "smb.system.time", FT_ABSOLUTE_TIME, BASE_NONE,
-		NULL, 0, "System Time", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unknown,
-		{ "Unknown Data", "smb.unknown", FT_BYTES, BASE_HEX,
+		{ "Unknown Data", "smb.unknown", FT_BYTES, BASE_NONE,
 		NULL, 0, "Unknown Data. Should be implemented by someone", HFILL }},
 
 	{ &hf_smb_dir_name,
@@ -17161,7 +17161,7 @@ proto_register_smb(void)
 		NULL, 0, "Number of times to echo data back", HFILL }},
 
 	{ &hf_smb_echo_data,
-		{ "Echo Data", "smb.echo.data", FT_BYTES, BASE_HEX,
+		{ "Echo Data", "smb.echo.data", FT_BYTES, BASE_NONE,
 		NULL, 0, "Data for SMB Echo Request/Response", HFILL }},
 
 	{ &hf_smb_echo_seq_num,
@@ -17182,15 +17182,15 @@ proto_register_smb(void)
 
 	{ &hf_smb_password,
 		{ "Password", "smb.password", FT_BYTES, BASE_NONE,
-		NULL, 0, "Password", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ansi_password,
 		{ "ANSI Password", "smb.ansi_password", FT_BYTES, BASE_NONE,
-		NULL, 0, "ANSI Password", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unicode_password,
 		{ "Unicode Password", "smb.unicode_password", FT_BYTES, BASE_NONE,
-		NULL, 0, "Unicode Password", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_move_flags_file,
 		{ "Must be file", "smb.move.flags.file", FT_BOOLEAN, 16,
@@ -17250,7 +17250,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_file_name,
 		{ "File Name", "smb.file", FT_STRING, BASE_NONE,
-		NULL, 0, "File Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_open_function_create,
 		{ "Create", "smb.open.function.create", FT_BOOLEAN, 16,
@@ -17350,7 +17350,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_file_size,
 		{ "File Size", "smb.file_size", FT_UINT32, BASE_DEC,
-		NULL, 0, "File Size", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_search_attribute_read_only,
 		{ "Read Only", "smb.search.attribute.read_only", FT_BOOLEAN, 16,
@@ -17378,11 +17378,11 @@ proto_register_smb(void)
 
 	{ &hf_smb_access_mode,
 		{ "Access Mode", "smb.access.mode", FT_UINT16, BASE_DEC,
-		VALS(da_access_vals), 0x0007, "Access Mode", HFILL }},
+		VALS(da_access_vals), 0x0007, NULL, HFILL }},
 
 	{ &hf_smb_access_sharing,
 		{ "Sharing Mode", "smb.access.sharing", FT_UINT16, BASE_DEC,
-		VALS(da_sharing_vals), 0x0070, "Sharing Mode", HFILL }},
+		VALS(da_sharing_vals), 0x0070, NULL, HFILL }},
 
 	{ &hf_smb_access_locality,
 		{ "Locality", "smb.access.locality", FT_UINT16, BASE_DEC,
@@ -17410,7 +17410,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_mac_alloc_block_count,
 	        { "Allocation Block Count", "smb.alloc.count", FT_UINT32, BASE_DEC,
-		  NULL, 0, "Allocation Block Count", HFILL}},
+		  NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_mac_alloc_block_size,
 	        { "Allocation Block Count", "smb.alloc.size", FT_UINT32, BASE_DEC,
@@ -17418,15 +17418,15 @@ proto_register_smb(void)
 
 	{ &hf_smb_mac_free_block_count,
 	        { "Free Block Count", "smb.free_block.count", FT_UINT32, BASE_DEC,
-		  NULL, 0, "Free Block Count", HFILL}},
+		  NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_mac_root_file_count,
 	        { "Root File Count", "smb.root.file.count", FT_UINT32, BASE_DEC,
-	        NULL, 0, "Root File Count", HFILL}},
+	        NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_mac_root_dir_count,
 	  { "Root Directory Count", "smb.root.dir.count", FT_UINT32, BASE_DEC,
-	    NULL, 0, "Root Directory Count", HFILL}},
+	    NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_mac_file_count,
 	  { "Root File Count", "smb.file.count", FT_UINT32, BASE_DEC,
@@ -17438,7 +17438,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_mac_support_flags,
 	  { "Mac Support Flags", "smb.mac.support.flags", FT_UINT32, BASE_DEC,
-	    NULL, 0, "Mac Support Flags", HFILL}},
+	    NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_mac_sup_access_ctrl,
 	  { "Mac Access Control", "smb.mac.access_control", FT_BOOLEAN, 32,
@@ -17493,16 +17493,16 @@ proto_register_smb(void)
 		NULL, 0, "Remaining number of bytes", HFILL }},
 
 	{ &hf_smb_padding,
-		{ "Padding", "smb.padding", FT_BYTES, BASE_HEX,
+		{ "Padding", "smb.padding", FT_BYTES, BASE_NONE,
 		NULL, 0, "Padding or unknown data", HFILL }},
 
 	{ &hf_smb_file_data,
-		{ "File Data", "smb.file_data", FT_BYTES, BASE_HEX,
+		{ "File Data", "smb.file_data", FT_BYTES, BASE_NONE,
 		NULL, 0, "Data read/written to the file", HFILL }},
 
 	{ &hf_smb_mac_fndrinfo,
-	        { "Finder Info", "smb.mac.finderinfo", FT_BYTES, BASE_HEX,
-		  NULL, 0, "Finder Info", HFILL}},
+	        { "Finder Info", "smb.mac.finderinfo", FT_BYTES, BASE_NONE,
+		  NULL, 0, NULL, HFILL}},
 
 	{ &hf_smb_total_data_len,
 		{ "Total Data Length", "smb.total_data_len", FT_UINT16, BASE_DEC,
@@ -17538,7 +17538,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_data_size,
 		{ "Data Size", "smb.data_size", FT_UINT32, BASE_DEC,
-		NULL, 0, "Data Size", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_alloc_size,
 		{ "Allocation Size", "smb.alloc_size", FT_UINT32, BASE_DEC,
@@ -17586,11 +17586,11 @@ proto_register_smb(void)
 
 	{ &hf_smb_data_offset,
 		{ "Data Offset", "smb.data_offset", FT_UINT16, BASE_DEC,
-		NULL, 0, "Data Offset", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_dcm,
 		{ "Data Compaction Mode", "smb.dcm", FT_UINT16, BASE_DEC,
-		NULL, 0, "Data Compaction Mode", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_request_mask,
 		{ "Request Mask", "smb.request.mask", FT_UINT32, BASE_HEX,
@@ -17633,11 +17633,11 @@ proto_register_smb(void)
 		NULL, 0, "Handle for Find operation", HFILL }},
 
 	{ &hf_smb_resume_server_cookie,
-		{ "Server Cookie", "smb.resume.server.cookie", FT_BYTES, BASE_HEX,
+		{ "Server Cookie", "smb.resume.server.cookie", FT_BYTES, BASE_NONE,
 		NULL, 0, "Cookie, must not be modified by the client", HFILL }},
 
 	{ &hf_smb_resume_client_cookie,
-		{ "Client Cookie", "smb.resume.client.cookie", FT_BYTES, BASE_HEX,
+		{ "Client Cookie", "smb.resume.client.cookie", FT_BYTES, BASE_NONE,
 		NULL, 0, "Cookie, must not be modified by the server", HFILL }},
 
 	{ &hf_smb_andxoffset,
@@ -17738,7 +17738,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_vc_num,
 		{ "VC Number", "smb.vc", FT_UINT16, BASE_DEC,
-		NULL, 0, "VC Number", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_password_len,
 		{ "Password Length", "smb.pwlen", FT_UINT16, BASE_DEC,
@@ -17770,7 +17770,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_fs,
 		{ "Native File System", "smb.native_fs", FT_STRING, BASE_NONE,
-		NULL, 0, "Native File System", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_connect_flags_dtid,
 		{ "Disconnect TID", "smb.connect.flags.dtid", FT_BOOLEAN, 16,
@@ -17834,11 +17834,11 @@ proto_register_smb(void)
 
 	{ &hf_smb_data_disp16,
 		{ "Data Displacement", "smb.data_disp", FT_UINT16, BASE_DEC,
-		NULL, 0, "Data Displacement", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_data_offset16,
 		{ "Data Offset", "smb.data_offset", FT_UINT16, BASE_DEC,
-		NULL, 0, "Data Offset", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_data_count32,
 		{ "Data Count", "smb.dc", FT_UINT32, BASE_DEC,
@@ -17846,11 +17846,11 @@ proto_register_smb(void)
 
 	{ &hf_smb_data_disp32,
 		{ "Data Displacement", "smb.data_disp", FT_UINT32, BASE_DEC,
-		NULL, 0, "Data Displacement", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_data_offset32,
 		{ "Data Offset", "smb.data_offset", FT_UINT32, BASE_DEC,
-		NULL, 0, "Data Offset", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_setup_count,
 		{ "Setup Count", "smb.sc", FT_UINT8, BASE_DEC,
@@ -17942,23 +17942,23 @@ proto_register_smb(void)
 
 	{ &hf_smb_ea_flags,
 		{ "EA Flags", "smb.ea.flags", FT_UINT8, BASE_HEX,
-		NULL, 0, "EA Flags", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ea_name_length,
 		{ "EA Name Length", "smb.ea.name_length", FT_UINT8, BASE_DEC,
-		NULL, 0, "EA Name Length", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ea_data_length,
 		{ "EA Data Length", "smb.ea.data_length", FT_UINT16, BASE_DEC,
-		NULL, 0, "EA Data Length", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ea_name,
 		{ "EA Name", "smb.ea.name", FT_STRING, BASE_NONE,
-		NULL, 0, "EA Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ea_data,
 		{ "EA Data", "smb.ea.data", FT_BYTES, BASE_NONE,
-		NULL, 0, "EA Data", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_file_name_len,
 		{ "File Name Len", "smb.file_name_len", FT_UINT32, BASE_DEC,
@@ -18174,7 +18174,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_nt_share_access_delete,
 		{ "Delete", "smb.share.access.delete", FT_BOOLEAN, 32,
-		TFS(&tfs_nt_share_access_delete), SHARE_ACCESS_DELETE, "", HFILL }},
+		TFS(&tfs_nt_share_access_delete), SHARE_ACCESS_DELETE, NULL, HFILL }},
 
 	{ &hf_smb_file_eattr_read_only,
 		{ "Read Only", "smb.file_attribute.read_only", FT_BOOLEAN, 32,
@@ -18257,8 +18257,8 @@ proto_register_smb(void)
 		TFS(&tfs_nt_qsd_sacl), NT_QSD_SACL, "Is SACL security informaton being queried?", HFILL }},
 
 	{ &hf_smb_extended_attributes,
-		{ "Extended Attributes", "smb.ext_attr", FT_BYTES, BASE_HEX,
-		NULL, 0, "Extended Attributes", HFILL }},
+		{ "Extended Attributes", "smb.ext_attr", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_oplock_level,
 		{ "Oplock level", "smb.oplock.level", FT_UINT8, BASE_DEC,
@@ -18270,7 +18270,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_file_id,
 		{ "Server unique file ID", "smb.create.file_id", FT_UINT32, BASE_HEX,
-		NULL, 0, "Server unique file ID", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ea_error_offset,
 		{ "EA Error offset", "smb.ea.error_offset", FT_UINT32, BASE_DEC,
@@ -18410,7 +18410,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_search_pattern,
 		{ "Search Pattern", "smb.search_pattern", FT_STRING, BASE_NONE,
-		NULL, 0, "Search Pattern", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_ff2_backup,
 		{ "Backup Intent", "smb.find_first2.flags.backup", FT_BOOLEAN, 16,
@@ -18460,7 +18460,7 @@ proto_register_smb(void)
 
 	{ &hf_smb_resume,
 		{ "Resume Key", "smb.resume", FT_UINT32, BASE_DEC,
-		NULL, 0, "Resume Key", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_max_referral_level,
 		{ "Max Referral Level", "smb.max_referral_level", FT_UINT16, BASE_DEC,
@@ -18663,7 +18663,7 @@ proto_register_smb(void)
 		NULL, 0, "Length of volume label", HFILL }},
 
 	{ &hf_smb_volume_label,
-		{ "Label", "smb.volume.label", FT_STRING, BASE_DEC,
+		{ "Label", "smb.volume.label", FT_STRING, BASE_NONE,
 		NULL, 0, "Volume label", HFILL }},
 
 	{ &hf_smb_free_alloc_units64,
@@ -18699,7 +18699,7 @@ proto_register_smb(void)
 		NULL, 0, "Length of filesystem name in bytes", HFILL }},
 
 	{ &hf_smb_fs_name,
-		{ "FS Name", "smb.fs_name", FT_STRING, BASE_DEC,
+		{ "FS Name", "smb.fs_name", FT_STRING, BASE_NONE,
 		NULL, 0, "Name of filesystem", HFILL }},
 
 	{ &hf_smb_device_char_removable,
@@ -18852,11 +18852,11 @@ proto_register_smb(void)
 
 	{ &hf_smb_segment,
 		{ "SMB Segment", "smb.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"SMB Segment", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_smb_segments,
 		{ "SMB Segments", "smb.segment.segments", FT_NONE, BASE_NONE, NULL, 0x0,
-			"SMB Segments", HFILL }},
+			NULL, HFILL }},
 
 	{ &hf_smb_unix_major_version,
 	  { "Major Version", "smb.unix.major_version", FT_UINT16, BASE_DEC,
@@ -18868,83 +18868,83 @@ proto_register_smb(void)
 
 	{ &hf_smb_unix_capability_fcntl,
 	  { "FCNTL Capability", "smb.unix.capability.fcntl", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000001, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000001, NULL, HFILL }},
 
 	{ &hf_smb_unix_capability_posix_acl,
 	  { "POSIX ACL Capability", "smb.unix.capability.posix_acl", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000002, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000002, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_read_data,
 	  { "Read Data", "smb.file.accessmask.read_data", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000001, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000001, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_write_data,
 	  { "Write Data", "smb.file.accessmask.write_data", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000002, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000002, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_append_data,
 	  { "Append Data", "smb.file.accessmask.append_data", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000004, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000004, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_read_ea,
 	  { "Read EA", "smb.file.accessmask.read_ea", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000008, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000008, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_write_ea,
 	  { "Write EA", "smb.file.accessmask.write_ea", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000010, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000010, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_execute,
 	  { "Execute", "smb.file.accessmask.execute", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000020, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000020, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_read_attribute,
 	  { "Read Attribute", "smb.file.accessmask.read_attribute", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000080, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000080, NULL, HFILL }},
 
 	{ &hf_smb_file_access_mask_write_attribute,
 	  { "Write Attribute", "smb.file.accessmask.write_attribute", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000100, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000100, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_list,
 	  { "List", "smb.dir.accessmask.list", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000001, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000001, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_add_file,
 	  { "Add File", "smb.dir.accessmask.add_file", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000002, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000002, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_add_subdir,
 	  { "Add Subdir", "smb.dir.accessmask.add_subdir", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000004, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000004, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_read_ea,
 	  { "Read EA", "smb.dir.accessmask.read_ea", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000008, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000008, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_write_ea,
 	  { "Write EA", "smb.dir.accessmask.write_ea", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000010, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000010, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_traverse,
 	  { "Traverse", "smb.dir.accessmask.traverse", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000020, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000020, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_delete_child,
 	  { "Delete Child", "smb.dir.accessmask.delete_child", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000040, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000040, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_read_attribute,
 	  { "Read Attribute", "smb.dir.accessmask.read_attribute", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000080, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000080, NULL, HFILL }},
 
 	{ &hf_smb_dir_access_mask_write_attribute,
 	  { "Write Attribute", "smb.dir.accessmask.write_attribute", FT_BOOLEAN, 32,
-		TFS(&flags_set_truth), 0x00000100, "", HFILL }},
+		TFS(&flags_set_truth), 0x00000100, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_size,
 	  { "File size", "smb.unix.file.size", FT_UINT64, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_num_bytes,
 	  { "Number of bytes", "smb.unix.file.num_bytes", FT_UINT64, BASE_DEC,
@@ -18952,163 +18952,163 @@ proto_register_smb(void)
 
 	{ &hf_smb_unix_file_last_status,
 	  { "Last status change", "smb.unix.file.stime", FT_ABSOLUTE_TIME, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_last_access,
 	  { "Last access", "smb.unix.file.atime", FT_ABSOLUTE_TIME, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_last_change,
 	  { "Last modification", "smb.unix.file.mtime", FT_ABSOLUTE_TIME, BASE_NONE,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_uid,
 	  { "UID", "smb.unix.file.uid", FT_UINT64, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_gid,
 	  { "GID", "smb.unix.file.gid", FT_UINT64, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_type,
 	  { "File type", "smb.unix.file.file_type", FT_UINT32, BASE_DEC,
-	    VALS(unix_file_type_vals), 0, "", HFILL }},
+	    VALS(unix_file_type_vals), 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_dev_major,
 	  { "Major device", "smb.unix.file.dev_major", FT_UINT64, BASE_HEX,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_dev_minor,
 	  { "Minor device", "smb.unix.file.dev_minor", FT_UINT64, BASE_HEX,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_unique_id,
 	  { "Unique ID", "smb.unix.file.unique_id", FT_UINT64, BASE_HEX,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_permissions,
 	  { "File permissions", "smb.unix.file.perms", FT_UINT64, BASE_HEX,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_nlinks,
 	  { "Num links", "smb.unix.file.num_links", FT_UINT64, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_file_link_dest,
 	  { "Link destination", "smb.unix.file.link_dest", FT_STRING,
-	    BASE_NONE, NULL, 0, "", HFILL }},
+	    BASE_NONE, NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_find_file_nextoffset,
 	  { "Next entry offset", "smb.unix.find_file.next_offset", FT_UINT32, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_unix_find_file_resumekey,
 	  { "Resume key", "smb.unix.find_file.resume_key", FT_UINT32, BASE_DEC,
-	    NULL, 0, "", HFILL }},
+	    NULL, 0, NULL, HFILL }},
 
         { &hf_smb_network_unknown,
           { "Unknown field", "smb.unknown", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_create_flags,
           { "Create Flags", "smb.create_flags", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_create_options,
           { "Create Options", "smb.create_options", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_share_access,
           { "Share Access", "smb.share_access", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_access_mask,
           { "Access Mask", "smb.access_mask", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_mode,
           { "Mode", "smb.mode", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_attribute,
           { "Attribute", "smb.attribute", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
         { &hf_smb_reparse_tag,
           { "Reparse Tag", "smb.reparse_tag", FT_UINT32, BASE_HEX,
-            NULL, 0, "", HFILL }},
+            NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_disposition_delete_on_close,
 	  { "Delete on close", "smb.disposition.delete_on_close", FT_BOOLEAN, 8,
-		TFS(&tfs_disposition_delete_on_close), 0x01, "", HFILL }},
+		TFS(&tfs_disposition_delete_on_close), 0x01, NULL, HFILL }},
 
 	{ &hf_smb_pipe_info_flag,
 	  { "Pipe Info", "smb.pipe_info_flag", FT_BOOLEAN, 8,
-		TFS(&tfs_pipe_info_flag), 0x01, "", HFILL }},
+		TFS(&tfs_pipe_info_flag), 0x01, NULL, HFILL }},
 
 	{ &hf_smb_logged_in,
 	  { "Logged In", "smb.logged_in", FT_FRAMENUM, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_logged_out,
 	  { "Logged Out", "smb.logged_out", FT_FRAMENUM, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_file_rw_offset,
 	  { "File Offset", "smb.file.rw.offset", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_file_rw_length,
 	  { "File RW Length", "smb.file.rw.length", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_acl_version,
 	  { "Posix ACL version", "smb.posix_acl.version", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_num_file_aces,
 	  { "Number of file ACEs", "smb.posix_acl.num_file_aces", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_num_def_aces,
 	  { "Number of default ACEs", "smb.posix_acl.num_def_aces", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_type,
 	  { "ACE Type", "smb.posix_acl.ace_type", FT_UINT8, BASE_DEC,
-		VALS(&ace_type_vals), 0, "", HFILL }},
+		VALS(&ace_type_vals), 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_flags,
 	  { "Permissions", "smb.posix_acl.ace_perms", FT_UINT8, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_perm_read,
           {"READ", "smb.posix_acl.ace_perms.read", FT_BOOLEAN, 8,
-		NULL, 0x04, "", HFILL}},
+		NULL, 0x04, NULL, HFILL}},
 
 	{ &hf_smb_posix_ace_perm_write,
           {"WRITE", "smb.posix_acl.ace_perms.write", FT_BOOLEAN, 8,
-		NULL, 0x02, "", HFILL}},
+		NULL, 0x02, NULL, HFILL}},
 
 	{ &hf_smb_posix_ace_perm_execute,
           {"EXECUTE", "smb.posix_acl.ace_perms.execute", FT_BOOLEAN, 8,
-		NULL, 0x01, "", HFILL}},
+		NULL, 0x01, NULL, HFILL}},
 
 	{ &hf_smb_posix_ace_perm_owner_uid,
 	  { "Owner UID", "smb.posix_acl.ace_perms.owner_uid", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_perm_owner_gid,
 	  { "Owner GID", "smb.posix_acl.ace_perms.owner_gid", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_perm_uid,
 	  { "UID", "smb.posix_acl.ace_perms.uid", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb_posix_ace_perm_gid,
 	  { "GID", "smb.posix_acl.ace_perms.gid", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-smb2.c b/epan/dissectors/packet-smb2.c
index b07de7f35c..cbc593edbd 100644
--- a/epan/dissectors/packet-smb2.c
+++ b/epan/dissectors/packet-smb2.c
@@ -5561,10 +5561,10 @@ proto_register_smb2(void)
 		TFS(&tfs_flags_response), SMB2_FLAGS_RESPONSE, "Whether this is an SMB2 Request or Response", HFILL }},
 	{ &hf_smb2_flags_async_cmd,
 		{ "Async command", "smb2.flags.async", FT_BOOLEAN, 32,
-		TFS(&tfs_flags_async_cmd), SMB2_FLAGS_ASYNC_CMD, "", HFILL }},
+		TFS(&tfs_flags_async_cmd), SMB2_FLAGS_ASYNC_CMD, NULL, HFILL }},
 	{ &hf_smb2_flags_dfs_op,
 		{ "DFS operation", "smb2.flags.dfs", FT_BOOLEAN, 32,
-		TFS(&tfs_flags_dfs_op), SMB2_FLAGS_DFS_OP, "", HFILL }},
+		TFS(&tfs_flags_dfs_op), SMB2_FLAGS_DFS_OP, NULL, HFILL }},
 	{ &hf_smb2_flags_chained,
 		{ "Chained", "smb2.flags.chained", FT_BOOLEAN, 32,
 		TFS(&tfs_flags_chained), SMB2_FLAGS_CHAINED, "Whether the pdu continues a chain or not", HFILL }},
@@ -5602,14 +5602,14 @@ proto_register_smb2(void)
 		VALS(smb2_find_info_levels), 0, "Find_Info Infolevel", HFILL }},
 	{ &hf_smb2_find_flags,
 		{ "Find Flags", "smb2.find.flags", FT_UINT8, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_find_pattern,
 		{ "Search Pattern", "smb2.find.pattern", FT_STRING, BASE_NONE,
 		NULL, 0, "Find pattern", HFILL }},
 
 	{ &hf_smb2_find_info_blob,
-		{ "Info", "smb2.security_blob", FT_BYTES, BASE_HEX,
+		{ "Info", "smb2.security_blob", FT_BYTES, BASE_NONE,
 		NULL, 0, "Find Info", HFILL }},
 
 	{ &hf_smb2_ea_size,
@@ -5646,18 +5646,18 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_read_remaining,
 		{ "Read Remaining", "smb2.read_remaining", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_create_flags,
 		{ "Create Flags", "smb2.create_flags", FT_UINT64, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_file_offset,
 		{ "File Offset", "smb2.file_offset", FT_UINT64, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_security_blob,
-		{ "Security Blob", "smb2.security_blob", FT_BYTES, BASE_HEX,
+		{ "Security Blob", "smb2.security_blob", FT_BYTES, BASE_NONE,
 		NULL, 0, "Security blob", HFILL }},
 
 	{ &hf_smb2_ioctl_out_data,
@@ -5690,7 +5690,7 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_domain_id,
 	  { "DomainId", "smb2.domain_id", FT_GUID, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_create_timestamp,
 		{ "Create", "smb2.create.time", FT_ABSOLUTE_TIME, BASE_NONE,
@@ -5701,11 +5701,11 @@ proto_register_smb2(void)
 		NULL, 0, "SMB2 File Id", HFILL }},
 
 	{ &hf_smb2_write_data,
-		{ "Write Data", "smb2.write_data", FT_BYTES, BASE_HEX,
+		{ "Write Data", "smb2.write_data", FT_BYTES, BASE_NONE,
 		NULL, 0, "SMB2 Data to be written", HFILL }},
 
 	{ &hf_smb2_read_data,
-		{ "Read Data", "smb2.read_data", FT_BYTES, BASE_HEX,
+		{ "Read Data", "smb2.read_data", FT_BYTES, BASE_NONE,
 		NULL, 0, "SMB2 Data that is read", HFILL }},
 
 	{ &hf_smb2_last_access_timestamp,
@@ -5834,7 +5834,7 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_disposition_delete_on_close,
 	  { "Delete on close", "smb2.disposition.delete_on_close", FT_BOOLEAN, 8,
-		TFS(&tfs_disposition_delete_on_close), 0x01, "", HFILL }},
+		TFS(&tfs_disposition_delete_on_close), 0x01, NULL, HFILL }},
 
 
 	{ &hf_smb2_create_disposition,
@@ -5843,7 +5843,7 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_create_action,
 		{ "Create Action", "smb2.create.action", FT_UINT32, BASE_DEC,
-		VALS(oa_open_vals), 0, "Create Action", HFILL }},
+		VALS(oa_open_vals), 0, NULL, HFILL }},
 
 	{ &hf_smb2_extrainfo,
 		{ "ExtraInfo", "smb2.create.extrainfo", FT_NONE, BASE_NONE,
@@ -5879,19 +5879,19 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_ea_flags,
 		{ "EA Flags", "smb2.ea.flags", FT_UINT8, BASE_HEX,
-		NULL, 0, "EA Flags", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_ea_name_len,
 		{ "EA Name Length", "smb2.ea.name_len", FT_UINT8, BASE_DEC,
-		NULL, 0, "EA Name Length", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_ea_data_len,
 		{ "EA Data Length", "smb2.ea.data_len", FT_UINT8, BASE_DEC,
-		NULL, 0, "EA Data Length", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_delete_pending,
 		{ "Delete Pending", "smb2.delete_pending", FT_UINT8, BASE_DEC,
-		NULL, 0, "Delete Pending", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_is_directory,
 		{ "Is Directory", "smb2.is_directory", FT_UINT8, BASE_DEC,
@@ -5907,7 +5907,7 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_notify_flags,
 		{ "Notify Flags", "smb2.notify.flags", FT_UINT16, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_buffer_code_len,
 		{ "Length", "smb2.buffer_code.length", FT_UINT16, BASE_DEC,
@@ -5927,11 +5927,11 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_ea_data,
 		{ "EA Data", "smb2.ea.data", FT_STRING, BASE_NONE,
-		NULL, 0, "EA Data", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_ea_name,
 		{ "EA Name", "smb2.ea.name", FT_STRING, BASE_NONE,
-		NULL, 0, "EA Name", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_impersonation_level,
 		{ "Impersonation", "smb2.impersonation.level", FT_UINT32, BASE_DEC,
@@ -5979,39 +5979,39 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_epoch,
 		{ "Epoch", "smb2.epoch", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_credits_requested,
 		{ "Credits requested", "smb2.credits.requested", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_credits_granted,
 		{ "Credits granted", "smb2.credits.granted", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_dialect_count,
 		{ "Dialect count", "smb2.dialect_count", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_dialect,
 		{ "Dialect", "smb2.dialect", FT_UINT16, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_security_mode,
 		{ "Security mode", "smb2.sec_mode", FT_UINT8, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_session_flags,
 		{ "Session Flags", "smb2.session_flags", FT_UINT16, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_lock_count,
 		{ "Lock Count", "smb2.lock_count", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_capabilities,
 		{ "Capabilities", "smb2.capabilities", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_ioctl_shadow_copy_count,
 		{ "Count", "smb2.ioctl.shadow_copy.count", FT_UINT32, BASE_DEC,
@@ -6042,11 +6042,11 @@ proto_register_smb2(void)
 		NULL, 0, "Host Name", HFILL }},
 
 	{ &hf_smb2_signature,
-		{ "Signature", "smb2.signature", FT_BYTES, BASE_HEX,
-		NULL, 0, "Signature", HFILL }},
+		{ "Signature", "smb2.signature", FT_BYTES, BASE_NONE,
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_unknown,
-		{ "unknown", "smb2.unknown", FT_BYTES, BASE_HEX,
+		{ "unknown", "smb2.unknown", FT_BYTES, BASE_NONE,
 		NULL, 0, "Unknown bytes", HFILL }},
 
 	{ &hf_smb2_unknown_timestamp,
@@ -6055,11 +6055,11 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_ses_flags_guest,
 		{ "Guest", "smb2.ses_flags.guest", FT_BOOLEAN, 16,
-		NULL, SES_FLAGS_GUEST, "", HFILL }},
+		NULL, SES_FLAGS_GUEST, NULL, HFILL }},
 
 	{ &hf_smb2_ses_flags_null,
 		{ "Null", "smb2.ses_flags.null", FT_BOOLEAN, 16,
-		NULL, SES_FLAGS_NULL, "", HFILL }},
+		NULL, SES_FLAGS_NULL, NULL, HFILL }},
 
 	{ &hf_smb2_secmode_flags_sign_required,
 		{ "Signing required", "smb2.sec_mode.sign_required", FT_BOOLEAN, 8,
@@ -6091,7 +6091,7 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_channel,
 		{ "Channel", "smb2.channel", FT_UINT32, BASE_DEC,
-		NULL, 0, "Channel", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags,
 		{ "Share flags", "smb2.share_flags", FT_UINT32, BASE_HEX,
@@ -6099,153 +6099,153 @@ proto_register_smb2(void)
 
 	{ &hf_smb2_share_flags_dfs,
 		{ "dfs", "smb2.share_flags.dfs", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_dfs, "", HFILL }},
+		NULL, SHARE_FLAGS_dfs, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags_dfs_root,
 		{ "dfs_root", "smb2.share_flags.dfs_root", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_dfs_root, "", HFILL }},
+		NULL, SHARE_FLAGS_dfs_root, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags_restrict_exclusive_opens,
 		{ "restrict_exclusive_opens", "smb2.share_flags.restrict_exclusive_opens", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_restrict_exclusive_opens, "", HFILL }},
+		NULL, SHARE_FLAGS_restrict_exclusive_opens, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags_force_shared_delete,
 		{ "force_shared_delete", "smb2.share_flags.force_shared_delete", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_force_shared_delete, "", HFILL }},
+		NULL, SHARE_FLAGS_force_shared_delete, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags_allow_namespace_caching,
 		{ "allow_namespace_caching", "smb2.share_flags.allow_namespace_caching", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_allow_namespace_caching, "", HFILL }},
+		NULL, SHARE_FLAGS_allow_namespace_caching, NULL, HFILL }},
 
 	{ &hf_smb2_share_flags_access_based_dir_enum,
 		{ "access_based_dir_enum", "smb2.share_flags.access_based_dir_enum", FT_BOOLEAN, 32,
-		NULL, SHARE_FLAGS_access_based_dir_enum, "", HFILL }},
+		NULL, SHARE_FLAGS_access_based_dir_enum, NULL, HFILL }},
 
 	{ &hf_smb2_share_caching,
 		{ "Caching policy", "smb2.share.caching", FT_UINT32, BASE_HEX,
-		VALS(share_cache_vals), 0, "", HFILL }},
+		VALS(share_cache_vals), 0, NULL, HFILL }},
 
 	{ &hf_smb2_share_caps,
 		{ "Share Capabilities", "smb2.share_caps", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_ioctl_flags,
 		{ "Flags", "smb2.ioctl.flags", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_min_count,
 		{ "Min Count", "smb2.min_count", FT_UINT32, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_remaining_bytes,
-		{ "Remaining Bytes", "smb2.remaining_bytes", FT_UINT32, BASE_DEC,		NULL, 0, "", HFILL }},
+		{ "Remaining Bytes", "smb2.remaining_bytes", FT_UINT32, BASE_DEC,		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_channel_info_offset,
 		{ "Channel Info Offset", "smb2.channel_info_offset", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_channel_info_length,
 		{ "Channel Info Length", "smb2.channel_info_length", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_share_caps_dfs,
 		{ "dfs", "smb2.share_caps.dfs", FT_BOOLEAN, 32,
-		NULL, SHARE_CAPS_DFS, "", HFILL }},
+		NULL, SHARE_CAPS_DFS, NULL, HFILL }},
 
 	{ &hf_smb2_ioctl_is_fsctl,
 		{ "Is FSCTL", "smb2.ioctl.is_fsctl", FT_BOOLEAN, 32,
-		NULL, 0x00000001, "", HFILL }},
+		NULL, 0x00000001, NULL, HFILL }},
 
 	{ &hf_smb2_output_buffer_len,
 		{ "Output Buffer Length", "smb2.output_buffer_len", FT_UINT16, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_close_pq_attrib,
 		{ "PostQuery Attrib", "smb2.close.pq_attrib", FT_BOOLEAN, 16,
-		NULL, 0x0001, "", HFILL }},
+		NULL, 0x0001, NULL, HFILL }},
 
 	{ &hf_smb2_notify_watch_tree,
 		{ "Watch Tree", "smb2.notify.watch_tree", FT_BOOLEAN, 16,
-		NULL, 0x0001, "", HFILL }},
+		NULL, 0x0001, NULL, HFILL }},
 
 	{ &hf_smb2_notify_out_data,
 		{ "Out Data", "smb2.notify.out", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_find_flags_restart_scans,
 		{ "Restart Scans", "smb2.find.restart_scans", FT_BOOLEAN, 8,
-		NULL, SMB2_FIND_FLAG_RESTART_SCANS, "", HFILL }},
+		NULL, SMB2_FIND_FLAG_RESTART_SCANS, NULL, HFILL }},
 
 	{ &hf_smb2_find_flags_single_entry,
 		{ "Single Entry", "smb2.find.single_entry", FT_BOOLEAN, 8,
-		NULL, SMB2_FIND_FLAG_SINGLE_ENTRY, "", HFILL }},
+		NULL, SMB2_FIND_FLAG_SINGLE_ENTRY, NULL, HFILL }},
 
 	{ &hf_smb2_find_flags_index_specified,
 		{ "Index Specified", "smb2.find.index_specified", FT_BOOLEAN, 8,
-		NULL, SMB2_FIND_FLAG_INDEX_SPECIFIED, "", HFILL }},
+		NULL, SMB2_FIND_FLAG_INDEX_SPECIFIED, NULL, HFILL }},
 
 	{ &hf_smb2_find_flags_reopen,
 		{ "Reopen", "smb2.find.reopen", FT_BOOLEAN, 8,
-		NULL, SMB2_FIND_FLAG_REOPEN, "", HFILL }},
+		NULL, SMB2_FIND_FLAG_REOPEN, NULL, HFILL }},
 
 	{ &hf_smb2_file_index,
 		{ "File Index", "smb2.file_index", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_file_directory_info,
 		{ "FileDirectoryInfo", "smb2.find.file_directory_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_full_directory_info,
 		{ "FullDirectoryInfo", "smb2.find.full_directory_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_both_directory_info,
 		{ "FileBothDirectoryInfo", "smb2.find.both_directory_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_id_both_directory_info,
 		{ "FileIdBothDirectoryInfo", "smb2.find.id_both_directory_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_short_name_len,
 		{ "Short Name Length", "smb2.short_name_len", FT_UINT8, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
  
 	{ &hf_smb2_short_name,
 		{ "Short Name", "smb2.shortname", FT_STRING, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 	{ &hf_smb2_file_name_info,
 		{ "FileNameInfo", "smb2.find.name_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_lock_info,
 		{ "Lock Info", "smb2.lock_info", FT_NONE, BASE_NONE,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_lock_length,
 		{ "Length", "smb2.lock_length", FT_UINT64, BASE_DEC,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_lock_flags,
 		{ "Flags", "smb2.lock_flags", FT_UINT32, BASE_HEX,
-		NULL, 0, "", HFILL }},
+		NULL, 0, NULL, HFILL }},
 
 	{ &hf_smb2_lock_flags_shared,
 		{ "Shared", "smb2.lock_flags.shared", FT_BOOLEAN, 32,
-		NULL, 0x00000001, "", HFILL }},
+		NULL, 0x00000001, NULL, HFILL }},
 
 	{ &hf_smb2_lock_flags_exclusive,
 		{ "Exclusive", "smb2.lock_flags.exclusive", FT_BOOLEAN, 32,
-		NULL, 0x00000002, "", HFILL }},
+		NULL, 0x00000002, NULL, HFILL }},
 
 	{ &hf_smb2_lock_flags_unlock,
 		{ "Unlock", "smb2.lock_flags.unlock", FT_BOOLEAN, 32,
-		NULL, 0x00000004, "", HFILL }},
+		NULL, 0x00000004, NULL, HFILL }},
 
 	{ &hf_smb2_lock_flags_fail_immediately,
 		{ "Fail Immediately", "smb2.lock_flags.fail_immediately", FT_BOOLEAN, 32,
-		NULL, 0x00000010, "", HFILL }},
+		NULL, 0x00000010, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-smpp.c b/epan/dissectors/packet-smpp.c
index cdf5601bd5..6d1d558aea 100644
--- a/epan/dissectors/packet-smpp.c
+++ b/epan/dissectors/packet-smpp.c
@@ -2542,21 +2542,21 @@ proto_register_smpp(void)
     /* Setup list of header fields      */
     static hf_register_info hf[] = {
         {   &hf_smpp_command_length,
-            {   "Length    ", "smpp.command_length",
+            {   "Length", "smpp.command_length",
                 FT_UINT32, BASE_DEC, NULL, 0x00,
                 "Total length of the SMPP PDU.",
                 HFILL
             }
         },
         {   &hf_smpp_command_id,
-            {   "Operation ", "smpp.command_id",
+            {   "Operation", "smpp.command_id",
                 FT_UINT32, BASE_HEX, VALS(vals_command_id), 0x00,
                 "Defines the SMPP PDU.",
                 HFILL
             }
         },
         {   &hf_smpp_command_status,
-            {   "Result    ", "smpp.command_status",
+            {   "Result", "smpp.command_status",
                 FT_UINT32, BASE_HEX, VALS(vals_command_status), 0x00,
                 "Indicates success or failure of the SMPP request.",
                 HFILL
@@ -2675,14 +2675,14 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_esm_submit_msg_type,
-            {   "Message type  ", "smpp.esm.submit.msg_type",
+            {   "Message type", "smpp.esm.submit.msg_type",
                 FT_UINT8, BASE_HEX, VALS(vals_esm_submit_msg_type), 0x3C,
                 "Type attribute for this message.",
                 HFILL
             }
         },
         {   &hf_smpp_esm_submit_features,
-            {   "GSM features  ", "smpp.esm.submit.features",
+            {   "GSM features", "smpp.esm.submit.features",
                 FT_UINT8, BASE_HEX, VALS(vals_esm_submit_features), 0xC0,
                 "GSM network specific features.",
                 HFILL
@@ -2732,14 +2732,14 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_regdel_receipt,
-            {   "Delivery receipt  ", "smpp.regdel.receipt",
+            {   "Delivery receipt", "smpp.regdel.receipt",
                 FT_UINT8, BASE_HEX, VALS(vals_regdel_receipt), 0x03,
                 "SMSC delivery receipt request.",
                 HFILL
             }
         },
         {   &hf_smpp_regdel_acks,
-            {   "Message type      ", "smpp.regdel.acks",
+            {   "Message type", "smpp.regdel.acks",
                 FT_UINT8, BASE_HEX, VALS(vals_regdel_acks), 0x0C,
                 "SME acknowledgement request.",
                 HFILL
@@ -2753,7 +2753,7 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_replace_if_present_flag,
-            {   "Replace           ", "smpp.replace_if_present_flag",
+            {   "Replace", "smpp.replace_if_present_flag",
                 FT_UINT8, BASE_HEX, VALS(vals_replace_if_present_flag), 0x01,
                 "Replace the short message with this one or not.",
                 HFILL
@@ -2964,15 +2964,15 @@ proto_register_smpp(void)
         },
     {   &hf_smpp_source_subaddress,
             {   "Source Subaddress", "smpp.source_subaddress",
-                FT_BYTES, BASE_HEX, NULL, 0x00,
-                "Source Subaddress",
+                FT_BYTES, BASE_NONE, NULL, 0x00,
+                NULL,
                 HFILL
             }
         },
     {   &hf_smpp_dest_subaddress,
             {   "Destination Subaddress", "smpp.dest_subaddress",
-                FT_BYTES, BASE_HEX, NULL, 0x00,
-                "Destination Subaddress",
+                FT_BYTES, BASE_NONE, NULL, 0x00,
+                NULL,
                 HFILL
             }
         },
@@ -3131,7 +3131,7 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_msg_wait_type,
-            {   "Type      ", "smpp.msg_wait.type",
+            {   "Type", "smpp.msg_wait.type",
                 FT_UINT8, BASE_HEX, VALS(vals_msg_wait_type), 0x03,
                 "Indicates type of message that is waiting.",
                 HFILL
@@ -3152,7 +3152,7 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_callback_num_scrn,
-            {   "Screening   ", "smpp.callback_num.scrn",
+            {   "Screening", "smpp.callback_num.scrn",
                 FT_UINT8, BASE_HEX, VALS(vals_callback_num_scrn), 0x03,
                 "Controls screening of the callback-number.",
                 HFILL
@@ -3216,7 +3216,7 @@ proto_register_smpp(void)
             }
         },
         {   &hf_smpp_its_session_sequence,
-            {   "Sequence number  ", "smpp.its_session.sequence",
+            {   "Sequence number", "smpp.its_session.sequence",
                 FT_UINT8, BASE_HEX, NULL, 0xFE,
                 "Sequence number of the dialogue unit.",
                 HFILL
@@ -3239,7 +3239,7 @@ proto_register_smpp(void)
         {   &hf_smpp_opt_param,
             {   "Optional parameter", "smpp.opt_param",
                 FT_NONE, BASE_NONE, NULL, 0x00,
-                "Optional parameter",
+                NULL,
                 HFILL
             }
         },
@@ -3315,22 +3315,19 @@ proto_register_smpp(void)
         {       &hf_smpp_dcs_cbs_class,
                 {       "DCS CBS Message class", "smpp.dcs.cbs_class",
                         FT_UINT8, BASE_HEX, VALS(vals_dcs_cbs_class), 0x03,
-                        "Specifies the message class for GSM Cell Broadcast Service, "
-                        "for the Data coding / message handling code group.", HFILL
+                        "Specifies the message class for GSM Cell Broadcast Service, for the Data coding / message handling code group.", HFILL
                 }
         },
         {       &hf_smpp_dcs_wap_charset,
                 {       "DCS Message coding", "smpp.dcs.wap_coding",
                         FT_UINT8, BASE_HEX, VALS(vals_dcs_wap_charset), 0x0C,
-                        "Specifies the used message encoding, "
-                        "as specified by the WAP Forum (WAP over GSM USSD).", HFILL
+                        "Specifies the used message encoding, as specified by the WAP Forum (WAP over GSM USSD).", HFILL
                 }
         },
         {       &hf_smpp_dcs_wap_class,
                 {       "DCS CBS Message class", "smpp.dcs.wap_class",
                         FT_UINT8, BASE_HEX, VALS(vals_dcs_wap_class), 0x03,
-                        "Specifies the message class for GSM Cell Broadcast Service, "
-                        "as specified by the WAP Forum (WAP over GSM USSD).", HFILL
+                        "Specifies the message class for GSM Cell Broadcast Service, as specified by the WAP Forum (WAP over GSM USSD).", HFILL
                 }
         },
         /* Changes in SMPP 5.0 */
@@ -3355,7 +3352,7 @@ proto_register_smpp(void)
         {       &hf_smpp_dest_addr_np_information,
                 {       "Number Portability information", "smpp.dest_addr_np_info",
                         FT_BYTES, BASE_NONE, NULL, 0x00,
-                        "Number Portability information", HFILL
+                        NULL, HFILL
                 }
         },
         {       &hf_smpp_dest_addr_np_resolution,
@@ -3391,7 +3388,7 @@ proto_register_smpp(void)
         {       &hf_smpp_broadcast_channel_indicator,
                 {       "Cell Broadcast channel", "smpp.broadcast_channel_indicator",
                         FT_UINT8, BASE_DEC | BASE_RANGE_STRING, RVALS(vals_broadcast_channel_indicator), 0x00,
-                        "Cell Broadcast channel", HFILL
+                        NULL, HFILL
                 }
         },
         {       &hf_smpp_broadcast_content_type_nw,
diff --git a/epan/dissectors/packet-smrse.c b/epan/dissectors/packet-smrse.c
index 94e72c7c1f..f7c467ce49 100644
--- a/epan/dissectors/packet-smrse.c
+++ b/epan/dissectors/packet-smrse.c
@@ -582,13 +582,13 @@ void proto_register_smrse(void) {
 		NULL, 0, "Reserved byte, must be 126", HFILL }},
 	{ &hf_smrse_tag, {
 		"Tag", "smrse.tag", FT_UINT8, BASE_DEC,
-		VALS(tag_vals), 0, "Tag", HFILL }},
+		VALS(tag_vals), 0, NULL, HFILL }},
 	{ &hf_smrse_length, {
 		"Length", "smrse.length", FT_UINT16, BASE_DEC,
 		NULL, 0, "Length of SMRSE PDU", HFILL }},
     { &hf_smrse_Octet_Format,
       { "octet-Format", "smrse.octet_Format",
-        FT_STRING, BASE_HEX, NULL, 0,
+        FT_STRING, BASE_NONE, NULL, 0,
         "SMS-Address/address-value/octet-format", HFILL }},
 
 
@@ -616,7 +616,7 @@ void proto_register_smrse(void) {
         "smrse.T_address_value", HFILL }},
     { &hf_smrse_octet_format,
       { "octet-format", "smrse.octet_format",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.T_octet_format", HFILL }},
     { &hf_smrse_connect_fail_reason,
       { "connect-fail-reason", "smrse.connect_fail_reason",
@@ -624,11 +624,11 @@ void proto_register_smrse(void) {
         "smrse.Connect_fail", HFILL }},
     { &hf_smrse_mt_priority_request,
       { "mt-priority-request", "smrse.mt_priority_request",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_mt_mms,
       { "mt-mms", "smrse.mt_mms",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_mt_message_reference,
       { "mt-message-reference", "smrse.mt_message_reference",
@@ -644,7 +644,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_mt_user_data,
       { "mt-user-data", "smrse.mt_user_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_mt_origVMSCAddr,
       { "mt-origVMSCAddr", "smrse.mt_origVMSCAddr",
@@ -664,7 +664,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_mo_user_data,
       { "mo-user-data", "smrse.mo_user_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_origVMSCAddr,
       { "origVMSCAddr", "smrse.origVMSCAddr",
@@ -672,7 +672,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_moimsi,
       { "moimsi", "smrse.moimsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.IMSI_Address", HFILL }},
     { &hf_smrse_message_reference,
       { "message-reference", "smrse.message_reference",
@@ -684,7 +684,7 @@ void proto_register_smrse(void) {
         "smrse.Error_reason", HFILL }},
     { &hf_smrse_msg_waiting_set,
       { "msg-waiting-set", "smrse.msg_waiting_set",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "smrse.BOOLEAN", HFILL }},
     { &hf_smrse_alerting_MS_ISDN,
       { "alerting-MS-ISDN", "smrse.alerting_MS_ISDN",
@@ -692,7 +692,7 @@ void proto_register_smrse(void) {
         "smrse.SMS_Address", HFILL }},
     { &hf_smrse_sm_diag_info,
       { "sm-diag-info", "smrse.sm_diag_info",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "smrse.RP_UD", HFILL }},
     { &hf_smrse_ms_address,
       { "ms-address", "smrse.ms_address",
diff --git a/epan/dissectors/packet-smtp.c b/epan/dissectors/packet-smtp.c
index 87635503e9..238736959a 100644
--- a/epan/dissectors/packet-smtp.c
+++ b/epan/dissectors/packet-smtp.c
@@ -826,26 +826,26 @@ proto_register_smtp(void)
 {
   static hf_register_info hf[] = {
     { &hf_smtp_req,
-      { "Request", "smtp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Request", "smtp.req", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_smtp_rsp,
-      { "Response", "smtp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, "", HFILL }},
+      { "Response", "smtp.rsp", FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_smtp_req_command,
       { "Command", "smtp.req.command", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_smtp_req_parameter,
       { "Request parameter", "smtp.req.parameter", FT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_smtp_rsp_code,
       { "Response code", "smtp.response.code", FT_UINT32, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_smtp_rsp_parameter,
       { "Response parameter", "smtp.rsp.parameter", FT_STRING, BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
 
     /* Fragment entries */
     { &hf_smtp_data_fragments,
@@ -856,18 +856,18 @@ proto_register_smtp(void)
 	NULL, 0x00, "Message fragment", HFILL } },
     { &hf_smtp_data_fragment_overlap,
       { "DATA fragment overlap", "smtp.data.fragment.overlap", FT_BOOLEAN,
-	BASE_NONE, NULL, 0x00, "Message fragment overlap", HFILL } },
+	BASE_NONE, NULL, 0x0, "Message fragment overlap", HFILL } },
     { &hf_smtp_data_fragment_overlap_conflicts,
       { "DATA fragment overlapping with conflicting data",
 	"smtp.data.fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL,
-	0x00, "Message fragment overlapping with conflicting data", HFILL } },
+	0x0, "Message fragment overlapping with conflicting data", HFILL } },
     { &hf_smtp_data_fragment_multiple_tails,
       { "DATA has multiple tail fragments",
 	"smtp.data.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
-	NULL, 0x00, "Message has multiple tail fragments", HFILL } },
+	NULL, 0x0, "Message has multiple tail fragments", HFILL } },
     { &hf_smtp_data_fragment_too_long_fragment,
       { "DATA fragment too long", "smtp.data.fragment.too_long_fragment",
-	FT_BOOLEAN, BASE_NONE, NULL, 0x00, "Message fragment too long",
+	FT_BOOLEAN, BASE_NONE, NULL, 0x0, "Message fragment too long",
 	HFILL } },
     { &hf_smtp_data_fragment_error,
       { "DATA defragmentation error", "smtp.data.fragment.error", FT_FRAMENUM,
diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c
index bfc32a75d5..f0d1899fd5 100644
--- a/epan/dissectors/packet-sna.c
+++ b/epan/dissectors/packet-sna.c
@@ -2641,7 +2641,7 @@ proto_register_sna(void)
         static hf_register_info hf[] = {
                 { &hf_sna_th,
                 { "Transmission Header", "sna.th", FT_NONE, BASE_NONE,
-		     NULL, 0x0, "", HFILL }},
+		     NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_0,
                 { "Transmission Header Byte 0", "sna.th.0", FT_UINT8, BASE_HEX,
@@ -2650,94 +2650,94 @@ proto_register_sna(void)
 
                 { &hf_sna_th_fid,
                 { "Format Identifier", "sna.th.fid", FT_UINT8, BASE_HEX,
-		    VALS(sna_th_fid_vals), 0xf0, "", HFILL }},
+		    VALS(sna_th_fid_vals), 0xf0, NULL, HFILL }},
 
                 { &hf_sna_th_mpf,
                 { "Mapping Field", "sna.th.mpf", FT_UINT8,
-		    BASE_DEC, VALS(sna_th_mpf_vals), 0x0c, "", HFILL }},
+		    BASE_DEC, VALS(sna_th_mpf_vals), 0x0c, NULL, HFILL }},
 
 		{ &hf_sna_th_odai,
 		{ "ODAI Assignment Indicator", "sna.th.odai", FT_UINT8,
-		    BASE_DEC, NULL, 0x02, "", HFILL }},
+		    BASE_DEC, NULL, 0x02, NULL, HFILL }},
 
                 { &hf_sna_th_efi,
                 { "Expedited Flow Indicator", "sna.th.efi", FT_UINT8,
-		    BASE_DEC, VALS(sna_th_efi_vals), 0x01, "", HFILL }},
+		    BASE_DEC, VALS(sna_th_efi_vals), 0x01, NULL, HFILL }},
 
                 { &hf_sna_th_daf,
                 { "Destination Address Field", "sna.th.daf", FT_UINT16,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_oaf,
                 { "Origin Address Field", "sna.th.oaf", FT_UINT16, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_snf,
                 { "Sequence Number Field", "sna.th.snf", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_dcf,
                 { "Data Count Field", "sna.th.dcf", FT_UINT16, BASE_DEC,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_lsid,
                 { "Local Session Identification", "sna.th.lsid", FT_UINT8,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_tg_sweep,
                 { "Transmission Group Sweep", "sna.th.tg_sweep", FT_UINT8,
-		    BASE_DEC, VALS(sna_th_tg_sweep_vals), 0x08, "", HFILL }},
+		    BASE_DEC, VALS(sna_th_tg_sweep_vals), 0x08, NULL, HFILL }},
 
                 { &hf_sna_th_er_vr_supp_ind,
                 { "ER and VR Support Indicator", "sna.th.er_vr_supp_ind",
 		    FT_UINT8, BASE_DEC, VALS(sna_th_er_vr_supp_ind_vals),
-		    0x04, "", HFILL }},
+		    0x04, NULL, HFILL }},
 
                 { &hf_sna_th_vr_pac_cnt_ind,
                 { "Virtual Route Pacing Count Indicator",
 		    "sna.th.vr_pac_cnt_ind", FT_UINT8, BASE_DEC,
-		    VALS(sna_th_vr_pac_cnt_ind_vals), 0x02, "", HFILL }},
+		    VALS(sna_th_vr_pac_cnt_ind_vals), 0x02, NULL, HFILL }},
 
                 { &hf_sna_th_ntwk_prty,
                 { "Network Priority", "sna.th.ntwk_prty", FT_UINT8, BASE_DEC,
-		    VALS(sna_th_ntwk_prty_vals), 0x01, "", HFILL }},
+		    VALS(sna_th_ntwk_prty_vals), 0x01, NULL, HFILL }},
 
                 { &hf_sna_th_tgsf,
                 { "Transmission Group Segmenting Field", "sna.th.tgsf",
 		    FT_UINT8, BASE_HEX, VALS(sna_th_tgsf_vals), 0xc0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
                 { &hf_sna_th_mft,
                 { "MPR FID4 Type", "sna.th.mft", FT_BOOLEAN, 8,
-		    NULL, 0x04, "", HFILL }},
+		    NULL, 0x04, NULL, HFILL }},
 
                 { &hf_sna_th_piubf,
                 { "PIU Blocking Field", "sna.th.piubf", FT_UINT8, BASE_HEX,
-		    VALS(sna_th_piubf_vals), 0x03, "", HFILL }},
+		    VALS(sna_th_piubf_vals), 0x03, NULL, HFILL }},
 
                 { &hf_sna_th_iern,
                 { "Initial Explicit Route Number", "sna.th.iern", FT_UINT8,
-		    BASE_DEC, NULL, 0xf0, "", HFILL }},
+		    BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 
                 { &hf_sna_th_nlpoi,
                 { "NLP Offset Indicator", "sna.th.nlpoi", FT_UINT8, BASE_DEC,
-		    VALS(sna_th_nlpoi_vals), 0x80, "", HFILL }},
+		    VALS(sna_th_nlpoi_vals), 0x80, NULL, HFILL }},
 
                 { &hf_sna_th_nlp_cp,
                 { "NLP Count or Padding", "sna.th.nlp_cp", FT_UINT8, BASE_DEC,
-		    NULL, 0x70, "", HFILL }},
+		    NULL, 0x70, NULL, HFILL }},
 
                 { &hf_sna_th_ern,
                 { "Explicit Route Number", "sna.th.ern", FT_UINT8, BASE_DEC,
-		    NULL, 0x0f, "", HFILL }},
+		    NULL, 0x0f, NULL, HFILL }},
 
                 { &hf_sna_th_vrn,
                 { "Virtual Route Number", "sna.th.vrn", FT_UINT8, BASE_DEC,
-		    NULL, 0xf0, "", HFILL }},
+		    NULL, 0xf0, NULL, HFILL }},
 
                 { &hf_sna_th_tpf,
                 { "Transmission Priority Field", "sna.th.tpf", FT_UINT8,
-		    BASE_HEX, VALS(sna_th_tpf_vals), 0x03, "", HFILL }},
+		    BASE_HEX, VALS(sna_th_tpf_vals), 0x03, NULL, HFILL }},
 
                 { &hf_sna_th_vr_cwi,
                 { "Virtual Route Change Window Indicator", "sna.th.vr_cwi",
@@ -2747,7 +2747,7 @@ proto_register_sna(void)
                 { &hf_sna_th_tg_nonfifo_ind,
                 { "Transmission Group Non-FIFO Indicator",
 		    "sna.th.tg_nonfifo_ind", FT_BOOLEAN, 16,
-		    TFS(&sna_th_tg_nonfifo_ind_truth), 0x4000, "", HFILL }},
+		    TFS(&sna_th_tg_nonfifo_ind_truth), 0x4000, NULL, HFILL }},
 
                 { &hf_sna_th_vr_sqti,
                 { "Virtual Route Sequence and Type Indicator", "sna.th.vr_sqti",
@@ -2756,25 +2756,25 @@ proto_register_sna(void)
 
                 { &hf_sna_th_tg_snf,
                 { "Transmission Group Sequence Number Field", "sna.th.tg_snf",
-		    FT_UINT16, BASE_DEC, NULL, 0x0fff, "", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0x0fff, NULL, HFILL }},
 
                 { &hf_sna_th_vrprq,
                 { "Virtual Route Pacing Request", "sna.th.vrprq", FT_BOOLEAN,
-		    16, TFS(&sna_th_vrprq_truth), 0x8000, "", HFILL }},
+		    16, TFS(&sna_th_vrprq_truth), 0x8000, NULL, HFILL }},
 
                 { &hf_sna_th_vrprs,
                 { "Virtual Route Pacing Response", "sna.th.vrprs", FT_BOOLEAN,
-		    16, TFS(&sna_th_vrprs_truth), 0x4000, "", HFILL }},
+		    16, TFS(&sna_th_vrprs_truth), 0x4000, NULL, HFILL }},
 
                 { &hf_sna_th_vr_cwri,
                 { "Virtual Route Change Window Reply Indicator",
 		    "sna.th.vr_cwri", FT_UINT16, BASE_DEC,
-		    VALS(sna_th_vr_cwri_vals), 0x2000, "", HFILL }},
+		    VALS(sna_th_vr_cwri_vals), 0x2000, NULL, HFILL }},
 
                 { &hf_sna_th_vr_rwi,
                 { "Virtual Route Reset Window Indicator", "sna.th.vr_rwi",
 		    FT_BOOLEAN, 16, TFS(&sna_th_vr_rwi_truth), 0x1000,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
                 { &hf_sna_th_vr_snf_send,
                 { "Virtual Route Send Sequence Number Field",
@@ -2783,40 +2783,39 @@ proto_register_sna(void)
 
                 { &hf_sna_th_dsaf,
                 { "Destination Subarea Address Field", "sna.th.dsaf",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_osaf,
                 { "Origin Subarea Address Field", "sna.th.osaf", FT_UINT32,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_snai,
                 { "SNA Indicator", "sna.th.snai", FT_BOOLEAN, 8, NULL, 0x10,
-		    "Used to identify whether the PIU originated or is destined"
-		    " for an SNA or non-SNA device.", HFILL }},
+		    "Used to identify whether the PIU originated or is destined for an SNA or non-SNA device.", HFILL }},
 
                 { &hf_sna_th_def,
                 { "Destination Element Field", "sna.th.def", FT_UINT16,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_oef,
                 { "Origin Element Field", "sna.th.oef", FT_UINT16, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_sa,
-                { "Session Address", "sna.th.sa", FT_BYTES, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+                { "Session Address", "sna.th.sa", FT_BYTES, BASE_NONE,
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_cmd_fmt,
                 { "Command Format", "sna.th.cmd_fmt", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_cmd_type,
                 { "Command Type", "sna.th.cmd_type", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_th_cmd_sn,
                 { "Command Sequence Number", "sna.th.cmd_sn", FT_UINT16,
-		    BASE_DEC, NULL, 0x0, "", HFILL }},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_nhdr,
                 { "Network Layer Packet Header", "sna.nlp.nhdr", FT_NONE,
@@ -2824,47 +2823,47 @@ proto_register_sna(void)
 
                 { &hf_sna_nlp_nhdr_0,
                 { "Network Layer Packet Header Byte 0",	"sna.nlp.nhdr.0",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_nhdr_1,
                 { "Network Layer Packet Header Byte 1", "sna.nlp.nhdr.1",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_sm,
                 { "Switching Mode Field", "sna.nlp.nhdr.sm", FT_UINT8,
-		    BASE_HEX, VALS(sna_nlp_sm_vals), 0xe0, "", HFILL }},
+		    BASE_HEX, VALS(sna_nlp_sm_vals), 0xe0, NULL, HFILL }},
 
                 { &hf_sna_nlp_tpf,
                 { "Transmission Priority Field", "sna.nlp.nhdr.tpf", FT_UINT8,
-		    BASE_HEX, VALS(sna_th_tpf_vals), 0x06, "", HFILL }},
+		    BASE_HEX, VALS(sna_th_tpf_vals), 0x06, NULL, HFILL }},
 
                 { &hf_sna_nlp_ft,
                 { "Function Type", "sna.nlp.nhdr.ft", FT_UINT8, BASE_HEX,
-		    VALS(sna_nlp_ft_vals), 0xF0, "", HFILL }},
+		    VALS(sna_nlp_ft_vals), 0xF0, NULL, HFILL }},
 
                 { &hf_sna_nlp_tspi,
                 { "Time Sensitive Packet Indicator", "sna.nlp.nhdr.tspi",
-		    FT_BOOLEAN, 8, TFS(&sna_nlp_tspi_truth), 0x08, "", HFILL }},
+		    FT_BOOLEAN, 8, TFS(&sna_nlp_tspi_truth), 0x08, NULL, HFILL }},
 
                 { &hf_sna_nlp_slowdn1,
                 { "Slowdown 1", "sna.nlp.nhdr.slowdn1", FT_BOOLEAN, 8,
-		    TFS(&sna_nlp_slowdn1_truth), 0x04, "", HFILL }},
+		    TFS(&sna_nlp_slowdn1_truth), 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_slowdn2,
                 { "Slowdown 2", "sna.nlp.nhdr.slowdn2", FT_BOOLEAN, 8,
-		    TFS(&sna_nlp_slowdn2_truth), 0x02, "", HFILL }},
+		    TFS(&sna_nlp_slowdn2_truth), 0x02, NULL, HFILL }},
 
                 { &hf_sna_nlp_fra,
                 { "Function Routing Address Entry", "sna.nlp.nhdr.fra",
-		    FT_BYTES, BASE_NONE, NULL, 0, "", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
                 { &hf_sna_nlp_anr,
                 { "Automatic Network Routing Entry", "sna.nlp.nhdr.anr",
-		    FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
 
                 { &hf_sna_nlp_frh,
                 { "Transmission Priority Field", "sna.nlp.frh", FT_UINT8,
-		    BASE_HEX, VALS(sna_nlp_frh_vals), 0, "", HFILL }},
+		    BASE_HEX, VALS(sna_nlp_frh_vals), 0, NULL, HFILL }},
 
                 { &hf_sna_nlp_thdr,
                 { "RTP Transport Header", "sna.nlp.thdr", FT_NONE, BASE_NONE,
@@ -2872,51 +2871,51 @@ proto_register_sna(void)
 
                 { &hf_sna_nlp_tcid,
                 { "Transport Connection Identifier", "sna.nlp.thdr.tcid",
-		    FT_BYTES, BASE_HEX, NULL, 0x0, "TCID", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0x0, "TCID", HFILL }},
 
                 { &hf_sna_nlp_thdr_8,
                 { "RTP Transport Packet Header Byte 8", "sna.nlp.thdr.8",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_setupi,
                 { "Setup Indicator", "sna.nlp.thdr.setupi", FT_BOOLEAN, 8,
-		    TFS(&sna_nlp_setupi_truth), 0x40, "", HFILL }},
+		    TFS(&sna_nlp_setupi_truth), 0x40, NULL, HFILL }},
 
                 { &hf_sna_nlp_somi,
                 { "Start Of Message Indicator", "sna.nlp.thdr.somi",
-		    FT_BOOLEAN, 8, TFS(&sna_nlp_somi_truth), 0x20, "", HFILL }},
+		    FT_BOOLEAN, 8, TFS(&sna_nlp_somi_truth), 0x20, NULL, HFILL }},
 
                 { &hf_sna_nlp_eomi,
                 { "End Of Message Indicator", "sna.nlp.thdr.eomi", FT_BOOLEAN,
-		    8, TFS(&sna_nlp_eomi_truth), 0x10, "", HFILL }},
+		    8, TFS(&sna_nlp_eomi_truth), 0x10, NULL, HFILL }},
 
                 { &hf_sna_nlp_sri,
                 { "Session Request Indicator", "sna.nlp.thdr.sri", FT_BOOLEAN,
-		    8, TFS(&sna_nlp_sri_truth), 0x08, "", HFILL }},
+		    8, TFS(&sna_nlp_sri_truth), 0x08, NULL, HFILL }},
 
                 { &hf_sna_nlp_rasapi,
                 { "Reply ASAP Indicator", "sna.nlp.thdr.rasapi", FT_BOOLEAN,
-		    8, TFS(&sna_nlp_rasapi_truth), 0x04, "", HFILL }},
+		    8, TFS(&sna_nlp_rasapi_truth), 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_retryi,
                 { "Retry Indicator", "sna.nlp.thdr.retryi", FT_BOOLEAN,
-		    8, TFS(&sna_nlp_retryi_truth), 0x02, "", HFILL }},
+		    8, TFS(&sna_nlp_retryi_truth), 0x02, NULL, HFILL }},
 
                 { &hf_sna_nlp_thdr_9,
                 { "RTP Transport Packet Header Byte 9", "sna.nlp.thdr.9",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_lmi,
                 { "Last Message Indicator", "sna.nlp.thdr.lmi", FT_BOOLEAN,
-		    8, TFS(&sna_nlp_lmi_truth), 0x80, "", HFILL }},
+		    8, TFS(&sna_nlp_lmi_truth), 0x80, NULL, HFILL }},
 
                 { &hf_sna_nlp_cqfi,
                 { "Connection Qualifier Field Indicator", "sna.nlp.thdr.cqfi",
-		    FT_BOOLEAN, 8, TFS(&sna_nlp_cqfi_truth), 0x08, "", HFILL }},
+		    FT_BOOLEAN, 8, TFS(&sna_nlp_cqfi_truth), 0x08, NULL, HFILL }},
 
                 { &hf_sna_nlp_osi,
                 { "Optional Segments Present Indicator", "sna.nlp.thdr.osi",
-		    FT_BOOLEAN, 8, TFS(&sna_nlp_osi_truth), 0x04, "", HFILL }},
+		    FT_BOOLEAN, 8, TFS(&sna_nlp_osi_truth), 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_offset,
                 { "Data Offset/4", "sna.nlp.thdr.offset", FT_UINT16, BASE_HEX,
@@ -2924,336 +2923,336 @@ proto_register_sna(void)
 
                 { &hf_sna_nlp_dlf,
                 { "Data Length Field", "sna.nlp.thdr.dlf", FT_UINT32, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_bsn,
                 { "Byte Sequence Number", "sna.nlp.thdr.bsn", FT_UINT32,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_len,
                 { "Optional Segment Length/4", "sna.nlp.thdr.optional.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_type,
                 { "Optional Segment Type", "sna.nlp.thdr.optional.type",
-		    FT_UINT8, BASE_HEX, VALS(sna_nlp_opti_vals), 0x0, "",
+		    FT_UINT8, BASE_HEX, VALS(sna_nlp_opti_vals), 0x0, NULL,
 		    HFILL }},
 
                 { &hf_sna_nlp_opti_0d_version,
                 { "Version", "sna.nlp.thdr.optional.0d.version",
 		    FT_UINT16, BASE_HEX, VALS(sna_nlp_opti_0d_version_vals),
-		    0, "", HFILL }},
+		    0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0d_4,
                 { "Connection Setup Byte 4", "sna.nlp.thdr.optional.0e.4",
-		    FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0d_target,
                 { "Target Resource ID Present",
 		    "sna.nlp.thdr.optional.0d.target",
-		    FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0d_arb,
                 { "ARB Flow Control", "sna.nlp.thdr.optional.0d.arb",
-		    FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0d_reliable,
                 { "Reliable Connection", "sna.nlp.thdr.optional.0d.reliable",
-		    FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0d_dedicated,
                 { "Dedicated RTP Connection",
 		    "sna.nlp.thdr.optional.0d.dedicated",
-		    FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_stat,
                 { "Status", "sna.nlp.thdr.optional.0e.stat",
-		    FT_UINT8, BASE_HEX, NULL, 0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_gap,
                 { "Gap Detected", "sna.nlp.thdr.optional.0e.gap",
-		    FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_idle,
                 { "RTP Idle Packet", "sna.nlp.thdr.optional.0e.idle",
-		    FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_nabsp,
                 { "Number Of ABSP", "sna.nlp.thdr.optional.0e.nabsp",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_sync,
                 { "Status Report Number", "sna.nlp.thdr.optional.0e.sync",
-		    FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_echo,
                 { "Status Acknowledge Number", "sna.nlp.thdr.optional.0e.echo",
-		    FT_UINT16, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_rseq,
                 { "Received Sequence Number", "sna.nlp.thdr.optional.0e.rseq",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_abspbeg,
                 { "ABSP Begin", "sna.nlp.thdr.optional.0e.abspbeg",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0e_abspend,
                 { "ABSP End", "sna.nlp.thdr.optional.0e.abspend",
-		    FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_0f_bits,
                 { "Client Bits", "sna.nlp.thdr.optional.0f.bits",
 		    FT_UINT8, BASE_HEX, VALS(sna_nlp_opti_0f_bits_vals),
-		    0x0, "", HFILL }},
+		    0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_10_tcid,
                 { "Transport Connection Identifier",
 		    "sna.nlp.thdr.optional.10.tcid",
-		    FT_BYTES, BASE_HEX, NULL, 0x0, "TCID", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0x0, "TCID", HFILL }},
 
                 { &hf_sna_nlp_opti_12_sense,
                 { "Sense Data", "sna.nlp.thdr.optional.12.sense",
-		    FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_len,
                 { "Length", "sna.nlp.thdr.optional.14.si.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_key,
                 { "Key", "sna.nlp.thdr.optional.14.si.key",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_2,
                 { "Switching Information Byte 2",
 		    "sna.nlp.thdr.optional.14.si.2",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_refifo,
                 { "Resequencing (REFIFO) Indicator",
 		    "sna.nlp.thdr.optional.14.si.refifo",
-		    FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_mobility,
                 { "Mobility Indicator",
 		    "sna.nlp.thdr.optional.14.si.mobility",
-		    FT_BOOLEAN, 8, NULL, 0x40, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_dirsearch,
                 { "Directory Search Required on Path Switch Indicator",
 		    "sna.nlp.thdr.optional.14.si.dirsearch",
-		    FT_BOOLEAN, 8, NULL, 0x20, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_limitres,
                 { "Limited Resource Link Indicator",
 		    "sna.nlp.thdr.optional.14.si.limitres",
-		    FT_BOOLEAN, 8, NULL, 0x10, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_ncescope,
                 { "NCE Scope Indicator",
 		    "sna.nlp.thdr.optional.14.si.ncescope",
-		    FT_BOOLEAN, 8, NULL, 0x08, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x08, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_mnpsrscv,
                 { "MNPS RSCV Retention Indicator",
 		    "sna.nlp.thdr.optional.14.si.mnpsrscv",
-		    FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_maxpsize,
                 { "Maximum Packet Size On Return Path",
 		    "sna.nlp.thdr.optional.14.si.maxpsize",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_switch,
                 { "Path Switch Time", "sna.nlp.thdr.optional.14.si.switch",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_si_alive,
                 { "RTP Alive Timer", "sna.nlp.thdr.optional.14.si.alive",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_rr_len,
                 { "Length", "sna.nlp.thdr.optional.14.rr.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_rr_key,
                 { "Key", "sna.nlp.thdr.optional.14.rr.key",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_rr_2,
                 { "Return Route TG Descriptor Byte 2",
 		    "sna.nlp.thdr.optional.14.rr.2",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_rr_bfe,
                 { "BF Entry Indicator",
 		    "sna.nlp.thdr.optional.14.rr.bfe",
-		    FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_14_rr_num,
                 { "Number Of TG Control Vectors",
 		    "sna.nlp.thdr.optional.14.rr.num",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_2,
                 { "Adaptive Rate Based Segment Byte 2",
 		    "sna.nlp.thdr.optional.22.2",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_type,
                 { "Message Type",
 		    "sna.nlp.thdr.optional.22.type",
 		    FT_UINT8, BASE_HEX,
-		    VALS(sna_nlp_opti_22_type_vals), 0xc0, "", HFILL }},
+		    VALS(sna_nlp_opti_22_type_vals), 0xc0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_raa,
                 { "Rate Adjustment Action",
 		    "sna.nlp.thdr.optional.22.raa",
 		    FT_UINT8, BASE_HEX,
-		    VALS(sna_nlp_opti_22_raa_vals), 0x38, "", HFILL }},
+		    VALS(sna_nlp_opti_22_raa_vals), 0x38, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_parity,
                 { "Parity Indicator",
 		    "sna.nlp.thdr.optional.22.parity",
-		    FT_BOOLEAN, 8, NULL, 0x04, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x04, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_arb,
                 { "ARB Mode",
 		    "sna.nlp.thdr.optional.22.arb",
 		    FT_UINT8, BASE_HEX,
-		    VALS(sna_nlp_opti_22_arb_vals), 0x03, "", HFILL }},
+		    VALS(sna_nlp_opti_22_arb_vals), 0x03, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_3,
                 { "Adaptive Rate Based Segment Byte 3",
 		    "sna.nlp.thdr.optional.22.3",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_ratereq,
                 { "Rate Request Correlator",
 		    "sna.nlp.thdr.optional.22.ratereq",
-		    FT_UINT8, BASE_DEC, NULL, 0xf0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_raterep,
                 { "Rate Reply Correlator",
 		    "sna.nlp.thdr.optional.22.raterep",
-		    FT_UINT8, BASE_DEC, NULL, 0x0f, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_field1,
                 { "Field 1", "sna.nlp.thdr.optional.22.field1",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_field2,
                 { "Field 2", "sna.nlp.thdr.optional.22.field2",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_field3,
                 { "Field 3", "sna.nlp.thdr.optional.22.field3",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_nlp_opti_22_field4,
                 { "Field 4", "sna.nlp.thdr.optional.22.field4",
-		    FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_rh,
                 { "Request/Response Header", "sna.rh", FT_NONE, BASE_NONE,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_rh_0,
                 { "Request/Response Header Byte 0", "sna.rh.0", FT_UINT8,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_rh_1,
                 { "Request/Response Header Byte 1", "sna.rh.1", FT_UINT8,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_rh_2,
                 { "Request/Response Header Byte 2", "sna.rh.2", FT_UINT8,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_rh_rri,
                 { "Request/Response Indicator", "sna.rh.rri", FT_UINT8,
-		    BASE_DEC, VALS(sna_rh_rri_vals), 0x80, "", HFILL }},
+		    BASE_DEC, VALS(sna_rh_rri_vals), 0x80, NULL, HFILL }},
 
                 { &hf_sna_rh_ru_category,
                 { "Request/Response Unit Category", "sna.rh.ru_category",
 		    FT_UINT8, BASE_HEX, VALS(sna_rh_ru_category_vals), 0x60,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_rh_fi,
 		{ "Format Indicator", "sna.rh.fi", FT_BOOLEAN, 8,
-		    TFS(&sna_rh_fi_truth), 0x08, "", HFILL }},
+		    TFS(&sna_rh_fi_truth), 0x08, NULL, HFILL }},
 
 		{ &hf_sna_rh_sdi,
 		{ "Sense Data Included", "sna.rh.sdi", FT_BOOLEAN, 8,
-		    TFS(&sna_rh_sdi_truth), 0x04, "", HFILL }},
+		    TFS(&sna_rh_sdi_truth), 0x04, NULL, HFILL }},
 
 		{ &hf_sna_rh_bci,
 		{ "Begin Chain Indicator", "sna.rh.bci", FT_BOOLEAN, 8,
-		    TFS(&sna_rh_bci_truth), 0x02, "", HFILL }},
+		    TFS(&sna_rh_bci_truth), 0x02, NULL, HFILL }},
 
 		{ &hf_sna_rh_eci,
 		{ "End Chain Indicator", "sna.rh.eci", FT_BOOLEAN, 8,
-		    TFS(&sna_rh_eci_truth), 0x01, "", HFILL }},
+		    TFS(&sna_rh_eci_truth), 0x01, NULL, HFILL }},
 
 		{ &hf_sna_rh_dr1,
 		{ "Definite Response 1 Indicator", "sna.rh.dr1", FT_BOOLEAN,
-		    8, NULL, 0x80, "", HFILL }},
+		    8, NULL, 0x80, NULL, HFILL }},
 
 		{ &hf_sna_rh_lcci,
 		{ "Length-Checked Compression Indicator", "sna.rh.lcci",
-		    FT_BOOLEAN, 8, TFS(&sna_rh_lcci_truth), 0x40, "", HFILL }},
+		    FT_BOOLEAN, 8, TFS(&sna_rh_lcci_truth), 0x40, NULL, HFILL }},
 
 		{ &hf_sna_rh_dr2,
 		{ "Definite Response 2 Indicator", "sna.rh.dr2", FT_BOOLEAN,
-		    8, NULL, 0x20, "", HFILL }},
+		    8, NULL, 0x20, NULL, HFILL }},
 
 		{ &hf_sna_rh_eri,
 		{ "Exception Response Indicator", "sna.rh.eri", FT_BOOLEAN,
-		    8, NULL, 0x10, "", HFILL }},
+		    8, NULL, 0x10, NULL, HFILL }},
 
 		{ &hf_sna_rh_rti,
 		{ "Response Type Indicator", "sna.rh.rti", FT_BOOLEAN,
-		    8, TFS(&sna_rh_rti_truth), 0x10, "", HFILL }},
+		    8, TFS(&sna_rh_rti_truth), 0x10, NULL, HFILL }},
 
 		{ &hf_sna_rh_rlwi,
 		{ "Request Larger Window Indicator", "sna.rh.rlwi", FT_BOOLEAN,
-		    8, NULL, 0x04, "", HFILL }},
+		    8, NULL, 0x04, NULL, HFILL }},
 
 		{ &hf_sna_rh_qri,
 		{ "Queued Response Indicator", "sna.rh.qri", FT_BOOLEAN,
-		    8, TFS(&sna_rh_qri_truth), 0x02, "", HFILL }},
+		    8, TFS(&sna_rh_qri_truth), 0x02, NULL, HFILL }},
 
 		{ &hf_sna_rh_pi,
 		{ "Pacing Indicator", "sna.rh.pi", FT_BOOLEAN,
-		    8, NULL, 0x01, "", HFILL }},
+		    8, NULL, 0x01, NULL, HFILL }},
 
 		{ &hf_sna_rh_bbi,
 		{ "Begin Bracket Indicator", "sna.rh.bbi", FT_BOOLEAN,
-		    8, NULL, 0x80, "", HFILL }},
+		    8, NULL, 0x80, NULL, HFILL }},
 
 		{ &hf_sna_rh_ebi,
 		{ "End Bracket Indicator", "sna.rh.ebi", FT_BOOLEAN,
-		    8, NULL, 0x40, "", HFILL }},
+		    8, NULL, 0x40, NULL, HFILL }},
 
 		{ &hf_sna_rh_cdi,
 		{ "Change Direction Indicator", "sna.rh.cdi", FT_BOOLEAN,
-		    8, NULL, 0x20, "", HFILL }},
+		    8, NULL, 0x20, NULL, HFILL }},
 
 		{ &hf_sna_rh_csi,
 		{ "Code Selection Indicator", "sna.rh.csi", FT_UINT8, BASE_DEC,
-		    VALS(sna_rh_csi_vals), 0x08, "", HFILL }},
+		    VALS(sna_rh_csi_vals), 0x08, NULL, HFILL }},
 
 		{ &hf_sna_rh_edi,
 		{ "Enciphered Data Indicator", "sna.rh.edi", FT_BOOLEAN, 8,
-		    NULL, 0x04, "", HFILL }},
+		    NULL, 0x04, NULL, HFILL }},
 
 		{ &hf_sna_rh_pdi,
 		{ "Padded Data Indicator", "sna.rh.pdi", FT_BOOLEAN, 8, NULL,
-		    0x02, "", HFILL }},
+		    0x02, NULL, HFILL }},
 
 		{ &hf_sna_rh_cebi,
 		{ "Conditional End Bracket Indicator", "sna.rh.cebi",
-		    FT_BOOLEAN, 8, NULL, 0x01, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 
 /*		{ &hf_sna_ru,
 		{ "Request/Response Unit", "sna.ru", FT_NONE, BASE_NONE,
@@ -3261,19 +3260,19 @@ proto_register_sna(void)
 
 		{ &hf_sna_gds,
 		{ "GDS Variable", "sna.gds", FT_NONE, BASE_NONE, NULL, 0x0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_gds_len,
 		{ "GDS Variable Length", "sna.gds.len", FT_UINT16, BASE_DEC,
-		    NULL, 0x7fff, "", HFILL }},
+		    NULL, 0x7fff, NULL, HFILL }},
 
 		{ &hf_sna_gds_cont,
 		{ "Continuation Flag", "sna.gds.cont", FT_BOOLEAN, 16, NULL,
-		    0x8000, "", HFILL }},
+		    0x8000, NULL, HFILL }},
 
 		{ &hf_sna_gds_type,
 		{ "Type of Variable", "sna.gds.type", FT_UINT16, BASE_HEX,
-		    VALS(sna_gds_var_vals), 0x0, "", HFILL }},
+		    VALS(sna_gds_var_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid,
 		{ "XID", "sna.xid", FT_NONE, BASE_NONE, NULL, 0x0,
@@ -3281,43 +3280,43 @@ proto_register_sna(void)
 
 		{ &hf_sna_xid_0,
 		{ "XID Byte 0", "sna.xid.0", FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_format,
 		{ "XID Format", "sna.xid.format", FT_UINT8, BASE_DEC, NULL,
-		    0xf0, "", HFILL }},
+		    0xf0, NULL, HFILL }},
 
 		{ &hf_sna_xid_type,
 		{ "XID Type", "sna.xid.type", FT_UINT8, BASE_DEC,
-		    VALS(sna_xid_type_vals), 0x0f, "", HFILL }},
+		    VALS(sna_xid_type_vals), 0x0f, NULL, HFILL }},
 
 		{ &hf_sna_xid_len,
 		{ "XID Length", "sna.xid.len", FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_id,
 		{ "Node Identification", "sna.xid.id", FT_UINT32, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_idblock,
 		{ "ID Block", "sna.xid.idblock", FT_UINT32, BASE_HEX, NULL,
-		    0xfff00000, "", HFILL }},
+		    0xfff00000, NULL, HFILL }},
 
 		{ &hf_sna_xid_idnum,
 		{ "ID Number", "sna.xid.idnum", FT_UINT32, BASE_HEX, NULL,
-		    0x0fffff, "", HFILL }},
+		    0x0fffff, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_8,
 		{ "Characteristics of XID sender", "sna.xid.type3.8", FT_UINT16,
-		    BASE_HEX, NULL, 0x0, "", HFILL }},
+		    BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_init_self,
 		{ "INIT-SELF support", "sna.xid.type3.initself",
-		    FT_BOOLEAN, 16, NULL, 0x8000, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x8000, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_stand_bind,
 		{ "Stand-Alone BIND Support", "sna.xid.type3.stand_bind",
-		    FT_BOOLEAN, 16, NULL, 0x4000, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x4000, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_gener_bind,
 		{ "Whole BIND PIU generated indicator",
@@ -3331,36 +3330,36 @@ proto_register_sna(void)
 
 		{ &hf_sna_xid_3_actpu,
 		{ "ACTPU suppression indicator", "sna.xid.type3.actpu",
-		    FT_BOOLEAN, 16, NULL, 0x0080, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0080, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_nwnode,
 		{ "Sender is network node", "sna.xid.type3.nwnode",
-		    FT_BOOLEAN, 16, NULL, 0x0040, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0040, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_cp,
 		{ "Control Point Services", "sna.xid.type3.cp",
-		    FT_BOOLEAN, 16, NULL, 0x0020, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0020, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_cpcp,
 		{ "CP-CP session support", "sna.xid.type3.cpcp",
-		    FT_BOOLEAN, 16, NULL, 0x0010, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0010, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_state,
 		{ "XID exchange state indicator", "sna.xid.type3.state",
 		    FT_UINT16, BASE_HEX, VALS(sna_xid_3_state_vals),
-		    0x000c, "", HFILL }},
+		    0x000c, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_nonact,
 		{ "Nonactivation Exchange", "sna.xid.type3.nonact",
-		    FT_BOOLEAN, 16, NULL, 0x0002, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0002, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_cpchange,
 		{ "CP name change support", "sna.xid.type3.cpchange",
-		    FT_BOOLEAN, 16, NULL, 0x0001, "", HFILL }},
+		    FT_BOOLEAN, 16, NULL, 0x0001, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_10,
 		{ "XID Type 3 Byte 10", "sna.xid.type3.10", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_asend_bind,
 		{ "Adaptive BIND pacing support as sender",
@@ -3375,136 +3374,136 @@ proto_register_sna(void)
 		{ &hf_sna_xid_3_quiesce,
 		{ "Quiesce TG Request",
 		    "sna.xid.type3.quiesce", FT_BOOLEAN, 8, NULL, 0x20,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_pucap,
 		{ "PU Capabilities",
 		    "sna.xid.type3.pucap", FT_BOOLEAN, 8, NULL, 0x10,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_pbn,
 		{ "Peripheral Border Node",
 		    "sna.xid.type3.pbn", FT_BOOLEAN, 8, NULL, 0x08,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_pacing,
 		{ "Qualifier for adaptive BIND pacing support",
 		    "sna.xid.type3.pacing", FT_UINT8, BASE_HEX, NULL, 0x03,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_11,
 		{ "XID Type 3 Byte 11", "sna.xid.type3.11", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_tgshare,
 		{ "TG Sharing Prohibited Indicator",
 		    "sna.xid.type3.tgshare", FT_BOOLEAN, 8, NULL, 0x40,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_dedsvc,
 		{ "Dedicated SVC Indicator",
 		    "sna.xid.type3.dedsvc", FT_BOOLEAN, 8, NULL, 0x20,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_12,
 		{ "XID Type 3 Byte 12", "sna.xid.type3.12", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_negcsup,
 		{ "Negotiation Complete Supported",
 		    "sna.xid.type3.negcsup", FT_BOOLEAN, 8, NULL, 0x80,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_negcomp,
 		{ "Negotiation Complete",
 		    "sna.xid.type3.negcomp", FT_BOOLEAN, 8, NULL, 0x40,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_15,
 		{ "XID Type 3 Byte 15", "sna.xid.type3.15", FT_UINT8, BASE_HEX,
-		    NULL, 0x0, "", HFILL }},
+		    NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_partg,
 		{ "Parallel TG Support",
 		    "sna.xid.type3.partg", FT_BOOLEAN, 8, NULL, 0x80,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_dlur,
 		{ "Dependent LU Requester Indicator",
 		    "sna.xid.type3.dlur", FT_BOOLEAN, 8, NULL, 0x40,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_dlus,
 		{ "DLUS Served LU Registration Indicator",
 		    "sna.xid.type3.dlus", FT_BOOLEAN, 8, NULL, 0x20,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_exbn,
 		{ "Extended HPR Border Node",
 		    "sna.xid.type3.exbn", FT_BOOLEAN, 8, NULL, 0x10,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_genodai,
 		{ "Generalized ODAI Usage Option",
 		    "sna.xid.type3.genodai", FT_BOOLEAN, 8, NULL, 0x08,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_branch,
 		{ "Branch Indicator", "sna.xid.type3.branch",
 		    FT_UINT8, BASE_HEX, VALS(sna_xid_3_branch_vals),
-		    0x06, "", HFILL }},
+		    0x06, NULL, HFILL }},
 
 		{ &hf_sna_xid_3_brnn,
 		{ "Option Set 1123 Indicator",
 		    "sna.xid.type3.brnn", FT_BOOLEAN, 8, NULL, 0x01,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_tg,
 		{ "XID TG", "sna.xid.type3.tg", FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_dlc,
 		{ "XID DLC", "sna.xid.type3.dlc", FT_UINT8, BASE_HEX, NULL, 0x0,
-		    "", HFILL }},
+		    NULL, HFILL }},
 
 		{ &hf_sna_xid_3_dlen,
 		{ "DLC Dependent Section Length", "sna.xid.type3.dlen",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_control_len,
                 { "Control Vector Length", "sna.control.len",
-		    FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_control_key,
                 { "Control Vector Key", "sna.control.key",
-		    FT_UINT8, BASE_HEX, VALS(sna_control_vals), 0x0, "",
+		    FT_UINT8, BASE_HEX, VALS(sna_control_vals), 0x0, NULL,
 		    HFILL }},
 
                 { &hf_sna_control_hprkey,
                 { "Control Vector HPR Key", "sna.control.hprkey",
-		    FT_UINT8, BASE_HEX, VALS(sna_control_hpr_vals), 0x0, "",
+		    FT_UINT8, BASE_HEX, VALS(sna_control_hpr_vals), 0x0, NULL,
 		    HFILL }},
 
                 { &hf_sna_control_05_delay,
                 { "Channel Delay", "sna.control.05.delay",
-		    FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }},
+		    FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_control_05_type,
                 { "Network Address Type", "sna.control.05.type",
-		    FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }},
+		    FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
                 { &hf_sna_control_05_ptp,
                 { "Point-to-point", "sna.control.05.ptp",
-		    FT_BOOLEAN, 8, NULL, 0x80, "", HFILL }},
+		    FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
 
                 { &hf_sna_control_0e_type,
                 { "Type", "sna.control.0e.type",
 		    FT_UINT8, BASE_HEX, VALS(sna_control_0e_type_vals),
-		    0, "", HFILL }},
+		    0, NULL, HFILL }},
 
                 { &hf_sna_control_0e_value,
                 { "Value", "sna.control.0e.value",
-		    FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+		    FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_sna,
diff --git a/epan/dissectors/packet-sndcp.c b/epan/dissectors/packet-sndcp.c
index 2d1daa6b67..67a2cef71a 100644
--- a/epan/dissectors/packet-sndcp.c
+++ b/epan/dissectors/packet-sndcp.c
@@ -414,7 +414,7 @@ proto_register_sndcp(void)
       { "First segment indicator bit", 
 	"sndcp.f", 
 	FT_BOOLEAN,8, TFS(&f_bit), MASK_F, 
-	"First segment indicator bit", HFILL 
+	NULL, HFILL 
       }
     },
     { &hf_sndcp_t, 
@@ -428,7 +428,7 @@ proto_register_sndcp(void)
       { "More bit", 
 	"sndcp.m", 
 	FT_BOOLEAN,8, TFS(&m_bit), MASK_M, 
-	"More bit", HFILL 
+	NULL, HFILL 
       }
     },
     { &hf_sndcp_dcomp, 
@@ -449,7 +449,7 @@ proto_register_sndcp(void)
       { "NSAPI", 
 	"sndcp.nsapib", 
 	FT_UINT8, BASE_DEC , VALS(nsapi_t), 0xf, 
-	"Network Layer Service Access Point Identifier ",HFILL 
+	"Network Layer Service Access Point Identifier",HFILL 
       }
     },	
     { &hf_sndcp_segment, 
@@ -463,14 +463,14 @@ proto_register_sndcp(void)
       { "N-PDU", 
 	"sndcp.npdu", 
 	FT_UINT8, BASE_DEC, NULL, 0, 
-	"N-PDU", HFILL 
+	NULL, HFILL 
       }
     },
     { &hf_sndcp_npdu2, 
       { "N-PDU", 
 	"sndcp.npdu", 
 	FT_UINT16, BASE_DEC, NULL, 0x0FFF, 
-	"N-PDU", HFILL 
+	NULL, HFILL 
       }
     },
 
@@ -522,14 +522,14 @@ proto_register_sndcp(void)
       {	"N-PDU Fragment",
 	"npdu.fragment",
 	FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-	"N-PDU Fragment", HFILL
+	NULL, HFILL
       }
     },
     { &hf_npdu_fragments,
       {	"N-PDU Fragments",
 	"npdu.fragments",
 	FT_NONE, BASE_NONE, NULL, 0x0,
-	"N-PDU Fragments", HFILL
+	NULL, HFILL
       }
     }
   };
diff --git a/epan/dissectors/packet-snmp.c b/epan/dissectors/packet-snmp.c
index 1a2b6a3736..38dcea65c0 100644
--- a/epan/dissectors/packet-snmp.c
+++ b/epan/dissectors/packet-snmp.c
@@ -3521,10 +3521,10 @@ proto_register_smux(void)
 	static hf_register_info hf[] = {
 		{ &hf_smux_version,
 		{ "Version", "smux.version", FT_UINT8, BASE_DEC, NULL,
-		    0x0, "", HFILL }},
+		    0x0, NULL, HFILL }},
 		{ &hf_smux_pdutype,
 		{ "PDU type", "smux.pdutype", FT_UINT8, BASE_DEC, VALS(smux_types),
-		    0x0, "", HFILL }},
+		    0x0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_smux,
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c
index b39bdf58a6..3cfa75f83b 100644
--- a/epan/dissectors/packet-socks.c
+++ b/epan/dissectors/packet-socks.c
@@ -1190,67 +1190,67 @@ proto_register_socks( void){
 
 		{ &hf_socks_ver,
 			{ "Version", "socks.version", FT_UINT8, BASE_DEC, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_ip_dst,
 			{ "Remote Address", "socks.dst", FT_IPv4, BASE_NONE, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_ip6_dst,
 			{ "Remote Address(ipv6)", "socks.dstV6", FT_IPv6, BASE_NONE, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_user_name,
 			{ "User Name", "socks.username", FT_STRINGZ, BASE_NONE, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_gssapi_payload,
 			{ "GSSAPI data", "socks.gssapi.data", FT_BYTES, BASE_NONE, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_gssapi_command,
 			{ "SOCKS/GSSAPI command", "socks.gssapi.command", FT_UINT8, BASE_DEC,
-				VALS(gssapi_command_table), 0x0, "", HFILL
+				VALS(gssapi_command_table), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_gssapi_length,
 			{ "SOCKS/GSSAPI data length", "socks.gssapi.length", FT_UINT16, BASE_DEC, NULL,
-				0x0, "", HFILL
+				0x0, NULL, HFILL
 			}
 		},
 		{ &hf_v4a_dns_name,
 			{ "SOCKS v4a Remote Domain Name", "socks.v4a_dns_name", FT_STRINGZ, BASE_NONE,
-				NULL, 0x0, "", HFILL
+				NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_dstport,
 			{ "Remote Port", "socks.dstport", FT_UINT16,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_cmd,
 			{ "Command", "socks.command", FT_UINT8,
-				BASE_DEC,  VALS(cmd_strings), 0x0, "", HFILL
+				BASE_DEC,  VALS(cmd_strings), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_results_4,
 			{ "Results(V4)", "socks.results_v4", FT_UINT8,
-				BASE_DEC, VALS(reply_table_v4), 0x0, "", HFILL
+				BASE_DEC, VALS(reply_table_v4), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_results_5,
 			{ "Results(V5)", "socks.results_v5", FT_UINT8,
-				BASE_DEC, VALS(reply_table_v5), 0x0, "", HFILL
+				BASE_DEC, VALS(reply_table_v5), 0x0, NULL, HFILL
 			}
 		},
 		{ &hf_socks_results,
 			{ "Results(V5)", "socks.results", FT_UINT8,
-				BASE_DEC, NULL, 0x0, "", HFILL
+				BASE_DEC, NULL, 0x0, NULL, HFILL
 			}
 		}
 
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c
index becf07b542..9e7f554604 100644
--- a/epan/dissectors/packet-spnego.c
+++ b/epan/dissectors/packet-spnego.c
@@ -1817,17 +1817,17 @@ void proto_register_spnego(void) {
 	static hf_register_info hf[] = {
 		{ &hf_spnego,
 		  { "SPNEGO", "spnego", FT_NONE, BASE_NONE, NULL, 0x0,
-		    "SPNEGO", HFILL }},
+		    NULL, HFILL }},
 		{ &hf_spnego_wraptoken,
 		  { "wrapToken", "spnego.wraptoken",
 		    FT_NONE, BASE_NONE, NULL, 0x0, "SPNEGO wrapToken",
 		    HFILL}},
 		{ &hf_spnego_krb5,
 		  { "krb5_blob", "spnego.krb5.blob", FT_BYTES,
-		    BASE_NONE, NULL, 0, "krb5_blob", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_spnego_krb5_oid,
 		  { "KRB5 OID", "spnego.krb5_oid", FT_STRING,
-		    BASE_NONE, NULL, 0, "KRB5 OID", HFILL }},
+		    BASE_NONE, NULL, 0, NULL, HFILL }},
 		{ &hf_spnego_krb5_tok_id,
 		  { "krb5_tok_id", "spnego.krb5.tok_id", FT_UINT16, BASE_HEX,
 		    VALS(spnego_krb5_tok_id_vals), 0, "KRB5 Token Id", HFILL}},
@@ -1847,20 +1847,20 @@ void proto_register_spnego(void) {
 		  { "krb5_confounder", "spnego.krb5.confounder", FT_BYTES, BASE_NONE,
 		    NULL, 0, "KRB5 Confounder", HFILL}},
 		{ &hf_spnego_krb5_filler,
-		  { "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_HEX,
+		  { "krb5_filler", "spnego.krb5.filler", FT_BYTES, BASE_NONE,
 		    NULL, 0, "KRB5 Filler", HFILL}},
 		{ &hf_spnego_krb5_cfx_flags,
 		  { "krb5_cfx_flags", "spnego.krb5.cfx_flags", FT_UINT8, BASE_HEX,
 		    NULL, 0, "KRB5 CFX Flags", HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_01,
 		  { "SendByAcceptor", "spnego.krb5.send_by_acceptor", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x01, "", HFILL}},
+		    TFS (&flags_set_truth), 0x01, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_02,
 		  { "Sealed", "spnego.krb5.sealed", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x02, "", HFILL}},
+		    TFS (&flags_set_truth), 0x02, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_flags_04,
 		  { "AcceptorSubkey", "spnego.krb5.acceptor_subkey", FT_BOOLEAN, 8,
-		    TFS (&flags_set_truth), 0x04, "", HFILL}},
+		    TFS (&flags_set_truth), 0x04, NULL, HFILL}},
 		{ &hf_spnego_krb5_cfx_ec,
 		  { "krb5_cfx_ec", "spnego.krb5.cfx_ec", FT_UINT16, BASE_DEC,
 		    NULL, 0, "KRB5 CFX Extra Count", HFILL}},
@@ -1896,15 +1896,15 @@ void proto_register_spnego(void) {
         "spnego.MechTypeList", HFILL }},
     { &hf_spnego_reqFlags,
       { "reqFlags", "spnego.reqFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.ContextFlags", HFILL }},
     { &hf_spnego_mechToken,
       { "mechToken", "spnego.mechToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_mechToken", HFILL }},
     { &hf_spnego_negTokenInit_mechListMIC,
       { "mechListMIC", "spnego.mechListMIC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_NegTokenInit_mechListMIC", HFILL }},
     { &hf_spnego_negResult,
       { "negResult", "spnego.negResult",
@@ -1916,11 +1916,11 @@ void proto_register_spnego(void) {
         "spnego.T_supportedMech", HFILL }},
     { &hf_spnego_responseToken,
       { "responseToken", "spnego.responseToken",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_responseToken", HFILL }},
     { &hf_spnego_mechListMIC,
       { "mechListMIC", "spnego.mechListMIC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "spnego.T_mechListMIC", HFILL }},
     { &hf_spnego_thisMech,
       { "thisMech", "spnego.thisMech",
@@ -1933,31 +1933,31 @@ void proto_register_spnego(void) {
     { &hf_spnego_ContextFlags_delegFlag,
       { "delegFlag", "spnego.delegFlag",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_mutualFlag,
       { "mutualFlag", "spnego.mutualFlag",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_replayFlag,
       { "replayFlag", "spnego.replayFlag",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_sequenceFlag,
       { "sequenceFlag", "spnego.sequenceFlag",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_anonFlag,
       { "anonFlag", "spnego.anonFlag",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_confFlag,
       { "confFlag", "spnego.confFlag",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_spnego_ContextFlags_integFlag,
       { "integFlag", "spnego.integFlag",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-spnego-hfarr.c ---*/
 #line 1376 "packet-spnego-template.c"
diff --git a/epan/dissectors/packet-spp.c b/epan/dissectors/packet-spp.c
index fef1f0ff81..a749fb2a4d 100644
--- a/epan/dissectors/packet-spp.c
+++ b/epan/dissectors/packet-spp.c
@@ -215,62 +215,62 @@ proto_register_spp(void)
 		{ &hf_spp_connection_control,
 		{ "Connection Control",		"spp.ctl",
 		  FT_UINT8,	BASE_HEX,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_connection_control_sys,
 		{ "System Packet",		"spp.ctl.sys",
 		  FT_BOOLEAN,	8,	NULL,	SPP_SYS_PACKET,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_connection_control_send_ack,
 		{ "Send Ack",		"spp.ctl.send_ack",
 		  FT_BOOLEAN,	8,	NULL,	SPP_SEND_ACK,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_connection_control_attn,
 		{ "Attention",		"spp.ctl.attn",
 		  FT_BOOLEAN,	8,	NULL,	SPP_ATTN,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_connection_control_eom,
 		{ "End of Message",	"spp.ctl.eom",
 		  FT_BOOLEAN,	8,	NULL,	SPP_EOM,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_datastream_type,
 		{ "Datastream type",	       	"spp.type",
 		  FT_UINT8,	BASE_HEX,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_src_id,
 		{ "Source Connection ID",	"spp.src",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_dst_id,
 		{ "Destination Connection ID",	"spp.dst",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_seq_nr,
 		{ "Sequence Number",		"spp.seq",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_ack_nr,
 		{ "Acknowledgment Number",	"spp.ack",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_all_nr,
 		{ "Allocation Number",		"spp.alloc",
 		  FT_UINT16,	BASE_DEC,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_spp_rexmt_frame,
 		{ "Retransmitted Frame Number",	"spp.rexmt_frame",
 		  FT_FRAMENUM,	BASE_NONE,	NULL,	0x0,
-		  "", HFILL }},
+		  NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-spray.c b/epan/dissectors/packet-spray.c
index 61c8633710..803a10b6d0 100644
--- a/epan/dissectors/packet-spray.c
+++ b/epan/dissectors/packet-spray.c
@@ -102,9 +102,9 @@ proto_register_spray(void)
 	static hf_register_info hf[] = {
 		{ &hf_spray_procedure_v1, {
 			"V1 Procedure", "spray.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(spray1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(spray1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_spray_sprayarr, {
-			"Data", "spray.sprayarr", FT_BYTES, BASE_DEC,
+			"Data", "spray.sprayarr", FT_BYTES, BASE_NONE,
 			NULL, 0, "Sprayarr data", HFILL }},
 
 		{ &hf_spray_counter, {
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index a96d721139..c40b09f1f5 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -669,25 +669,25 @@ proto_register_sqloracle(void)
 	static hf_register_info hf[] =
 	{
 		{ &hf_sqloracle_operation,
-		  { "Basic Operation", "sqloracle.operation", FT_UINT8, BASE_DEC, VALS(sqloracle_operation_type), 0x0, "", HFILL }
+		  { "Basic Operation", "sqloracle.operation", FT_UINT8, BASE_DEC, VALS(sqloracle_operation_type), 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_func_type,
-		  { "Function Type", "sqloracle.type", FT_UINT8, BASE_DEC, VALS(sql_func_type), 0x0, "", HFILL }
+		  { "Function Type", "sqloracle.type", FT_UINT8, BASE_DEC, VALS(sql_func_type), 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_flag,
-		  { "flag", "sqloracle.flag", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+		  { "flag", "sqloracle.flag", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_num_column,
-			{ "Number of Columns", "sqloracle.nocolumn", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+			{ "Number of Columns", "sqloracle.nocolumn", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_itemNum,
-		  { "Iteration Number", "sqloracle.itemNum", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+		  { "Iteration Number", "sqloracle.itemNum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_numItersThisTime,
-		  { "# of iterations this time", "sqloracle.numItersThisTime", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+		  { "# of iterations this time", "sqloracle.numItersThisTime", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_sqloracle_uacBufLength,
-		  { "user access buffer length", "sqloracle.uacBufLength", FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+		  { "user access buffer length", "sqloracle.uacBufLength", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 /*		{ &hf_sqloracle_ttloac_header,
 			{ "TTLOAC Header", "sqloracle.ttloac_header", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
@@ -756,7 +756,7 @@ proto_register_sqloracle(void)
 		{ "SQL Statement Length",	"sqloracle.stmtlength", FT_UINT8, BASE_DEC, NULL, 0x0,
 			"", HFILL }},
 */		{ &hf_sqloracle_stmt,
-			{ "SQL statement", "sqloracle.stmt", FT_BYTES, BASE_HEX, NULL, 0x0, "", HFILL }
+			{ "SQL statement", "sqloracle.stmt", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		};
 
diff --git a/epan/dissectors/packet-srp.c b/epan/dissectors/packet-srp.c
index 76e3084df2..f0f5659929 100644
--- a/epan/dissectors/packet-srp.c
+++ b/epan/dissectors/packet-srp.c
@@ -201,13 +201,13 @@ void proto_register_srp (void)
 	   "SRP header octet", HFILL }},
 	{&hf_srp_seqno,
 	 { "Sequence Number", "srp.seqno", FT_UINT8, BASE_DEC, NULL, 0x0,
-	   "Sequence Number", HFILL }},
+	   NULL, HFILL }},
 	{&hf_srp_crc,
 	 { "CRC", "srp.crc", FT_UINT16, BASE_HEX, NULL, 0x0,
-	   "CRC", HFILL }},
+	   NULL, HFILL }},
 	{ &hf_srp_crc_bad,
 	  { "Bad CRC","srp.crc_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-	    "", HFILL }},
+	    NULL, HFILL }},
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index 3709db1e07..166d70a56c 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -1458,14 +1458,14 @@ proto_register_srvloc(void)
         {&hf_srvloc_error,
             {"Error Code", "srvloc.err",
             FT_UINT16, BASE_DEC, VALS(srvloc_errs), 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
 	/* Helper function for the Version 2 Header */
         {&hf_srvloc_error_v2,
             {"Error Code", "srvloc.errv2",
             FT_UINT16, BASE_DEC, VALS(srvloc_errs_v2), 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         {&hf_srvloc_xid,
             {"XID", "srvloc.xid",
@@ -1475,64 +1475,64 @@ proto_register_srvloc(void)
         {&hf_srvloc_langtag,
             {"Lang Tag", "srvloc.langtag",
             FT_STRING, BASE_NONE, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         {&hf_srvloc_langtaglen,
             {"Lang Tag Len", "srvloc.langtaglen",
             FT_UINT16, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
         {&hf_srvloc_nextextoff,
             {"Next Extension Offset", "srvloc.nextextoff",
             FT_UINT24, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
 	/* Helper functions for URL and URL Entry parsing - both versions */
 	{&hf_srvloc_url_reserved,
 	 {"Reserved", "srvloc.url.reserved",
-	  FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+	  FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_srvloc_url_lifetime,
 	 {"URL lifetime", "srvloc.url.lifetime",
-	  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+	  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_srvloc_url_urllen,
 	 {"URL Length", "srvloc.url.urllen",
-	  FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+	  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_srvloc_url_url,
 	 {"URL", "srvloc.url.url",
-	  FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+	  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 	},
 	{&hf_srvloc_url_numauths,
 	 {"Num Auths", "srvloc.url.numauths",
-	  FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+	  FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 	},
 
 	/* Helper functions for the common header fields */
         {&hf_srvloc_function,
             {"Function", "srvloc.function",
             FT_UINT8, BASE_DEC, VALS(srvloc_functions), 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         {&hf_srvloc_pktlen,
             {"Packet Length", "srvloc.pktlen",
             FT_UINT24, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         { &hf_srvloc_version,
             { "Version",           "srvloc.version",
             FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
         {&hf_srvloc_flags_v1,
             {"Flags", "srvloc.flags_v1",
             FT_UINT8, BASE_HEX, NULL, 0x0,
-            "", HFILL }
+            NULL, HFILL }
         },
 
 	{ &hf_srvloc_flags_v1_overflow,
@@ -1558,7 +1558,7 @@ proto_register_srvloc(void)
         {&hf_srvloc_flags_v2,
             {"Flags", "srvloc.flags_v2",
             FT_UINT16, BASE_HEX, NULL, 0x0,
-             "", HFILL }
+             NULL, HFILL }
          },
 
 	{ &hf_srvloc_flags_v2_overflow,
@@ -1592,7 +1592,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_authblkv2_slpspi,
 	  { "SLP SPI", "srvloc.authblkv2.slpspi", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* collection of helper functions for Service Request */
@@ -1602,7 +1602,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvreq_prlist,
 	  { "Previous Response List", "srvloc.srvreq.prlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "Previous Response List", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreq_srvtypelen,
 	  { "Service Type Length", "srvloc.srvreq.srvtypelen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1610,7 +1610,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvreq_srvtypelist,
 	  { "Service Type List", "srvloc.srvreq.srvtypelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreq_scopelistlen,
 	  { "Scope List Length", "srvloc.srvreq.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1618,7 +1618,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvreq_scopelist,
 	  { "Scope List", "srvloc.srvreq.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreq_predicatelen,
 	  { "Predicate Length", "srvloc.srvreq.predicatelen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1626,7 +1626,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvreq_predicate,
 	  { "Predicate", "srvloc.srvreq.predicate", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreq_slpspilen,
 	  { "SLP SPI Length", "srvloc.srvreq.slpspilen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1634,39 +1634,39 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvreq_slpspi,
 	  { "SLP SPI", "srvloc.srvreq.slpspi", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* Helper function for Service Request */
 	{ &hf_srvloc_srvrply_urlcount,
 	  { "Number of URLs", "srvloc.srvreq.urlcount", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* Helper functions for Service Registration */
 	{ &hf_srvloc_srvreg_srvtypelen,
 	  { "Service Type Length", "srvloc.srvreq.srvtypelen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_srvtype,
 	  { "Service Type", "srvloc.srvreq.srvtype", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_scopelistlen,
 	  { "Scope List Length", "srvloc.srvreq.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_scopelist,
 	  { "Scope List", "srvloc.srvreq.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_attrlistlen,
 	  { "Attribute List Length", "srvloc.srvreq.attrlistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_attrlist,
 	  { "Attribute List", "srvloc.srvreq.attrlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvreg_attrauthcount,
 	  { "Attr Auths", "srvloc.srvreq.attrauthcount", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1676,19 +1676,19 @@ proto_register_srvloc(void)
 	/* Helper functions for Service Deregistration */
 	{ &hf_srvloc_srvdereg_scopelistlen,
 	  { "Scope List Length", "srvloc.srvdereq.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvdereg_scopelist,
 	  { "Scope List", "srvloc.srvdereq.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvdereg_taglistlen,
 	  { "Tag List Length", "srvloc.srvdereq.taglistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvdereg_taglist,
 	  { "Tag List", "srvloc.srvdereq.taglist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 
@@ -1699,11 +1699,11 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_attrreq_prlist,
 	  { "Previous Response List", "srvloc.attrreq.prlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "Previous Response List", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_urllen,
 	  { "URL Length", "srvloc.attrreq.urllen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_url,
 	  { "Service URL", "srvloc.attrreq.url", FT_STRING, BASE_NONE, NULL, 0x0,
@@ -1715,23 +1715,23 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_attrreq_scopelist,
 	  { "Scope List", "srvloc.attrreq.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_attrlistlen,
 	  { "Attribute List Length", "srvloc.attrreq.attrlistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_attrlist,
 	  { "Attribute List", "srvloc.attrreq.attrlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_taglistlen,
 	  { "Tag List Length", "srvloc.attrreq.taglistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_taglist,
 	  { "Tag List", "srvloc.attrreq.taglist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrreq_slpspilen,
 	  { "SLP SPI Length", "srvloc.attrreq.slpspilen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1739,7 +1739,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_attrreq_slpspi,
 	  { "SLP SPI", "srvloc.attrreq.slpspi", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* collection of helper functions for Attribute Reply */
@@ -1749,7 +1749,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_attrrply_attrlist,
 	  { "Attribute List", "srvloc.attrrply.attrlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_attrrply_attrauthcount,
 	  { "Attr Auths", "srvloc.srvreq.attrauthcount", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1763,11 +1763,11 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_daadvert_urllen,
 	  { "URL Length", "srvloc.daadvert.urllen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_url,
 	  { "URL", "srvloc.daadvert.url", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_scopelistlen,
 	  { "Scope List Length", "srvloc.daadvert.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1775,15 +1775,15 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_daadvert_scopelist,
 	  { "Scope List", "srvloc.daadvert.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_attrlistlen,
 	  { "Attribute List Length", "srvloc.daadvert.attrlistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_attrlist,
 	  { "Attribute List", "srvloc.daadvert.attrlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_slpspilen,
 	  { "SLP SPI Length", "srvloc.daadvert.slpspilen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1791,7 +1791,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_daadvert_slpspi,
 	  { "SLP SPI", "srvloc.daadvert.slpspi", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_daadvert_authcount,
 	  { "Auths", "srvloc.daadvert.authcount", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -1805,7 +1805,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvtypereq_prlist,
 	  { "Previous Response List", "srvloc.srvtypereq.prlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "Previous Response List", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvtypereq_nameauthlistlen,
 	  { "Naming Authority List Length", "srvloc.srvtypereq.nameauthlistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1817,7 +1817,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvtypereq_nameauthlist,
 	  { "Naming Authority List", "srvloc.srvtypereq.nameauthlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvtypereq_scopelistlen,
 	  { "Scope List Length", "srvloc.srvtypereq.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1825,7 +1825,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvtypereq_scopelist,
 	  { "Scope List", "srvloc.srvtypereq.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* collection of helper functions for Service Type Replies */
@@ -1835,7 +1835,7 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvtyperply_srvtype,
 	  { "Service Type", "srvloc.srvtyperply.srvtype", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_srvtyperply_srvtypelistlen,
 	  { "Service Type List Length", "srvloc.srvtypereq.srvtypelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1843,17 +1843,17 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_srvtyperply_srvtypelist,
 	  { "Service Type List", "srvloc.srvtyperply.srvtypelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 
 	/* collection of helper functions for SA Advertisement */
 	{ &hf_srvloc_saadvert_urllen,
 	  { "URL Length", "srvloc.saadvert.urllen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_saadvert_url,
 	  { "URL", "srvloc.saadvert.url", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_saadvert_scopelistlen,
 	  { "Scope List Length", "srvloc.saadvert.scopelistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -1861,27 +1861,27 @@ proto_register_srvloc(void)
 	},
 	{ &hf_srvloc_saadvert_scopelist,
 	  { "Scope List", "srvloc.saadvert.scopelist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_saadvert_attrlistlen,
 	  { "Attribute List Length", "srvloc.saadvert.attrlistlen", FT_UINT16, BASE_DEC, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_saadvert_attrlist,
 	  { "Attribute List", "srvloc.saadvert.attrlist", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	},
 	{ &hf_srvloc_saadvert_authcount,
 	  { "Auths", "srvloc.saadvert.authcount", FT_UINT8, BASE_DEC, NULL, 0x0,
 	    "Number of Authentication Blocks", HFILL}
 	},
 	{ &hf_srvloc_add_ref_ip,
-	  { "IP Address", "srvloc.list.ipaddr", FT_IPv4, BASE_DEC, NULL, 0x0,
+	  { "IP Address", "srvloc.list.ipaddr", FT_IPv4, BASE_NONE, NULL, 0x0,
 	    "IP Address of SLP server", HFILL}
 	},
 	{ &hf_srvloc_srvrply_svcname,
 	  { "Service Name Value", "srvloc.srvrply.svcname", FT_STRING, BASE_NONE, NULL, 0x0,
-	    "", HFILL}
+	    NULL, HFILL}
 	}
     };
 
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c
index b72db883f9..4da7a59c49 100644
--- a/epan/dissectors/packet-sscf-nni.c
+++ b/epan/dissectors/packet-sscf-nni.c
@@ -115,9 +115,9 @@ proto_register_sscf(void)
 {
   static hf_register_info hf[] = 
   { { &hf_status, { "Status", "sscf-nni.status", FT_UINT8, BASE_HEX,
-		    VALS(sscf_status_vals), 0x0, "", HFILL} },
+		    VALS(sscf_status_vals), 0x0, NULL, HFILL} },
     { &hf_spare, { "Spare", "sscf-nni.spare", FT_UINT24, BASE_HEX,
-		    NULL, 0x0, "", HFILL} }
+		    NULL, 0x0, NULL, HFILL} }
   };
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-sscop.c b/epan/dissectors/packet-sscop.c
index bdc3a17439..0635b19c03 100644
--- a/epan/dissectors/packet-sscop.c
+++ b/epan/dissectors/packet-sscop.c
@@ -434,14 +434,14 @@ void
 proto_register_sscop(void)
 {
 	static hf_register_info hf[] = {
-		{ &hf_sscop_type, { "PDU Type", "sscop.type", FT_UINT8, BASE_HEX,	VALS(sscop_type_vals), SSCOP_TYPE_MASK, "", HFILL }},
-		{ &hf_sscop_sq, { "N(SQ)", "sscop.sq", FT_UINT8, BASE_DEC,	NULL, 0x0, "", HFILL }},
-		{ &hf_sscop_mr, { "N(MR)", "sscop.mr", FT_UINT24, BASE_DEC,	NULL, 0x0, "", HFILL }},
-		{ &hf_sscop_s, { "N(S)", "sscop.s", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL }},
-		{ &hf_sscop_ps, { "N(PS)", "sscop.ps", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL }},
-		{ &hf_sscop_r, { "N(R)", "sscop.r", FT_UINT24, BASE_DEC, NULL, 0x0, "", HFILL }},
-		{ &hf_sscop_stat_s, { "N(S)", "sscop.stat.s", FT_UINT24, BASE_DEC, NULL, 0x0,"", HFILL }},
-		{ &hf_sscop_stat_count, { "Number of NACKed pdus", "sscop.stat.count", FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }}
+		{ &hf_sscop_type, { "PDU Type", "sscop.type", FT_UINT8, BASE_HEX,	VALS(sscop_type_vals), SSCOP_TYPE_MASK, NULL, HFILL }},
+		{ &hf_sscop_sq, { "N(SQ)", "sscop.sq", FT_UINT8, BASE_DEC,	NULL, 0x0, NULL, HFILL }},
+		{ &hf_sscop_mr, { "N(MR)", "sscop.mr", FT_UINT24, BASE_DEC,	NULL, 0x0, NULL, HFILL }},
+		{ &hf_sscop_s, { "N(S)", "sscop.s", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		{ &hf_sscop_ps, { "N(PS)", "sscop.ps", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		{ &hf_sscop_r, { "N(R)", "sscop.r", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		{ &hf_sscop_stat_s, { "N(S)", "sscop.stat.s", FT_UINT24, BASE_DEC, NULL, 0x0,NULL, HFILL }},
+		{ &hf_sscop_stat_count, { "Number of NACKed pdus", "sscop.stat.count", FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }}
 	};
 
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c
index d6c840870f..0719717635 100644
--- a/epan/dissectors/packet-ssl.c
+++ b/epan/dissectors/packet-ssl.c
@@ -3957,13 +3957,13 @@ proto_register_ssl(void)
         },
         { &hf_ssl_record_appdata,
           { "Encrypted Application Data", "ssl.app_data",
-            FT_BYTES, BASE_HEX, NULL, 0x0,
+            FT_BYTES, BASE_NONE, NULL, 0x0,
             "Payload is encrypted application data", HFILL }
         },
 
         { &hf_ssl2_record,
           { "SSLv2/PCT Record Header", "ssl.record",
-            FT_NONE, BASE_DEC, NULL, 0x0,
+            FT_NONE, BASE_NONE, NULL, 0x0,
             "SSLv2/PCT record data", HFILL }
         },
         { &hf_ssl2_record_is_escape,
@@ -4023,12 +4023,12 @@ proto_register_ssl(void)
         },
         { &hf_ssl_handshake_random_time,
           { "gmt_unix_time", "ssl.handshake.random_time",
-            FT_ABSOLUTE_TIME, 0, NULL, 0x0,
+            FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
             "Unix time field of random structure", HFILL }
         },
         { &hf_ssl_handshake_random_bytes,
           { "random_bytes", "ssl.handshake.random_bytes",
-            FT_BYTES, 0, NULL, 0x0,
+            FT_BYTES, BASE_NONE, NULL, 0x0,
             "Random challenge used to authenticate server", HFILL }
         },
         { &hf_ssl_handshake_cipher_suites_len,
@@ -4069,7 +4069,7 @@ proto_register_ssl(void)
         { &hf_ssl_handshake_comp_method,
           { "Compression Method", "ssl.handshake.comp_method",
             FT_UINT8, BASE_DEC, VALS(ssl_31_compression_method), 0x0,
-            "Compression Method", HFILL }
+            NULL, HFILL }
         },
         { &hf_ssl_handshake_extensions_len,
           { "Extensions Length", "ssl.handshake.extensions_length",
@@ -4104,7 +4104,7 @@ proto_register_ssl(void)
         { &hf_ssl_handshake_certificate,
           { "Certificate", "ssl.handshake.certificate",
             FT_NONE, BASE_NONE, NULL, 0x0,
-            "Certificate", HFILL }
+            NULL, HFILL }
         },
         { &hf_ssl_handshake_certificate_len,
           { "Certificate Length", "ssl.handshake.certificate_length",
@@ -4124,7 +4124,7 @@ proto_register_ssl(void)
         { &hf_ssl_handshake_cert_type,
           { "Certificate type", "ssl.handshake.cert_type",
             FT_UINT8, BASE_DEC, VALS(ssl_31_client_certificate_type), 0x0,
-            "Certificate type", HFILL }
+            NULL, HFILL }
         },
         { &hf_ssl_handshake_finished,
           { "Verify Data", "ssl.handshake.verify_data",
@@ -4224,7 +4224,7 @@ proto_register_ssl(void)
         { &hf_ssl2_handshake_cert_type,
           { "Certificate Type", "ssl.handshake.cert_type",
             FT_UINT8, BASE_DEC, VALS(ssl_20_certificate_type), 0x0,
-            "Certificate Type", HFILL }
+            NULL, HFILL }
         },
         { &hf_ssl2_handshake_connection_id_len,
           { "Connection ID Length", "ssl.handshake.connection_id_length",
@@ -4284,7 +4284,7 @@ proto_register_ssl(void)
         { &hf_pct_msg_error_type,
           { "PCT Error Code", "pct.msg_error_code",
                 FT_UINT16, BASE_HEX, VALS(pct_error_code), 0x0,
-                "PCT Error Code", HFILL }
+                NULL, HFILL }
         },
         { &hf_pct_handshake_server_cert,
           { "Server Cert", "pct.handshake.server_cert",
@@ -4313,7 +4313,7 @@ proto_register_ssl(void)
 
 		{ &hf_ssl_segment,
 		{ "SSL Segment", "ssl.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"SSL Segment", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_ssl_segments,
 		{ "Reassembled SSL Segments", "ssl.segments", FT_NONE, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-starteam.c b/epan/dissectors/packet-starteam.c
index 21742467a9..b1753b66b8 100644
--- a/epan/dissectors/packet-starteam.c
+++ b/epan/dissectors/packet-starteam.c
@@ -648,7 +648,7 @@ proto_register_starteam(void)
       { "Reserved", "starteam.mdh.reserved", FT_UINT32, BASE_HEX, NULL, 0x0, "MDH reserved", HFILL }},
 
    { &hf_starteam_ph_signature,
-      { "Signature", "starteam.ph.signature", FT_STRINGZ, BASE_HEX, NULL, 0x0, "PH signature", HFILL }},
+      { "Signature", "starteam.ph.signature", FT_STRINGZ, BASE_NONE, NULL, 0x0, "PH signature", HFILL }},
 
    { &hf_starteam_ph_packet_size,
       { "Packet size", "starteam.ph.psize", FT_UINT32, BASE_DEC, NULL, 0x0, "PH packet size", HFILL }},
@@ -663,7 +663,7 @@ proto_register_starteam(void)
       { "Revision level", "starteam.id.level", FT_UINT16, BASE_DEC, NULL, 0x0, "ID revision level", HFILL }},
 
    { &hf_starteam_id_client,
-      { "Client ID", "starteam.id.client", FT_STRINGZ, BASE_HEX, NULL, 0x0, "ID client ID", HFILL }},
+      { "Client ID", "starteam.id.client", FT_STRINGZ, BASE_NONE, NULL, 0x0, "ID client ID", HFILL }},
 
    { &hf_starteam_id_connect,
       { "Connect ID", "starteam.id.connect", FT_UINT32, BASE_HEX, NULL, 0x0, "ID connect ID", HFILL }},
@@ -681,7 +681,7 @@ proto_register_starteam(void)
       { "Command user ID", "starteam.id.commanduserid", FT_UINT32, BASE_HEX, NULL, 0x0, "ID command user ID", HFILL }},
 
    { &hf_starteam_data_data,
-      { "Data", "starteam.data", FT_STRINGZ, BASE_HEX, NULL, 0x0, "Data", HFILL }}
+      { "Data", "starteam.data", FT_STRINGZ, BASE_NONE, NULL, 0x0, NULL, HFILL }}
   };
   static gint *ett[] = {
     &ett_starteam,
diff --git a/epan/dissectors/packet-stat-notify.c b/epan/dissectors/packet-stat-notify.c
index 36ecdd4ab4..11242d090a 100644
--- a/epan/dissectors/packet-stat-notify.c
+++ b/epan/dissectors/packet-stat-notify.c
@@ -77,15 +77,15 @@ proto_register_statnotify(void)
 	static hf_register_info hf[] = {
 		{ &hf_statnotify_procedure_v1, {
 			"V1 Procedure", "statnotify.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(statnotify1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(statnotify1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_statnotify_name, {
-			"Name", "statnotify.name", FT_STRING, BASE_DEC,
+			"Name", "statnotify.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Name of client that changed", HFILL }},
 		{ &hf_statnotify_state, {
 			"State", "statnotify.state", FT_UINT32, BASE_DEC,
 			NULL, 0, "New state of client that changed", HFILL }},
 		{ &hf_statnotify_priv, {
-			"Priv", "statnotify.priv", FT_BYTES, BASE_HEX,
+			"Priv", "statnotify.priv", FT_BYTES, BASE_NONE,
 			NULL, 0, "Client supplied opaque data", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-stat.c b/epan/dissectors/packet-stat.c
index 646fd85ad3..f5a0f74e40 100644
--- a/epan/dissectors/packet-stat.c
+++ b/epan/dissectors/packet-stat.c
@@ -283,30 +283,30 @@ proto_register_stat(void)
 	static hf_register_info hf[] = {
 		{ &hf_stat_procedure_v1, {
 			"V1 Procedure", "stat.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(stat1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(stat1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_stat_mon_name, {
-			"Name", "stat.name", FT_STRING, BASE_DEC,
-			NULL, 0, "Name", HFILL }},
+			"Name", "stat.name", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_stat_stat_res, {
-			"Status Result", "stat.stat_res", FT_NONE,0,
-			NULL, 0, "Status Result", HFILL }},
+			"Status Result", "stat.stat_res", FT_NONE,BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_stat_stat_res_res, {
 			"Result", "stat.stat_res.res", FT_UINT32, BASE_DEC,
-			VALS(stat_res), 0, "Result", HFILL }},
+			VALS(stat_res), 0, NULL, HFILL }},
 		{ &hf_stat_stat_res_state, {
 			"State", "stat.stat_res.state", FT_UINT32, BASE_DEC,
-			NULL, 0, "State", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_stat_mon, {
-			"Monitor", "stat.mon", FT_NONE, 0,
+			"Monitor", "stat.mon", FT_NONE, BASE_NONE,
 			NULL, 0, "Monitor Host", HFILL }},
 		{ &hf_stat_mon_id_name, {
-			"Monitor ID Name", "stat.mon_id.name", FT_STRING, BASE_DEC,
-			NULL, 0, "Monitor ID Name", HFILL }},
+			"Monitor ID Name", "stat.mon_id.name", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_stat_my_id, {
-			"My ID", "stat.my_id", FT_NONE,0,
+			"My ID", "stat.my_id", FT_NONE,BASE_NONE,
 			NULL, 0, "My_ID structure", HFILL }},
 		{ &hf_stat_my_id_hostname, {
-			"Hostname", "stat.my_id.hostname", FT_STRING, BASE_DEC,
+			"Hostname", "stat.my_id.hostname", FT_STRING, BASE_NONE,
 			NULL, 0, "My_ID Host to callback", HFILL }},
 		{ &hf_stat_my_id_prog, {
 			"Program", "stat.my_id.prog", FT_UINT32, BASE_DEC,
@@ -318,13 +318,13 @@ proto_register_stat(void)
 			"Procedure", "stat.my_id.proc", FT_UINT32, BASE_DEC,
 			NULL, 0, "My_ID Procedure to callback", HFILL }},
 		{ &hf_stat_priv, {
-			"Priv", "stat.priv", FT_BYTES, BASE_HEX,
+			"Priv", "stat.priv", FT_BYTES, BASE_NONE,
 			NULL, 0, "Private client supplied opaque data", HFILL }},
 		{ &hf_stat_state, {
 			"State", "stat.state", FT_UINT32, BASE_DEC,
 			NULL, 0, "State of local NSM", HFILL }},
 		{ &hf_stat_stat_chge, {
-			"Status Change", "stat.stat_chge", FT_NONE, 0,
+			"Status Change", "stat.stat_chge", FT_NONE, BASE_NONE,
 			NULL, 0, "Status Change structure", HFILL }},
 	};
 
diff --git a/epan/dissectors/packet-stun.c b/epan/dissectors/packet-stun.c
index 6e6ef1aa6f..fd713d736e 100644
--- a/epan/dissectors/packet-stun.c
+++ b/epan/dissectors/packet-stun.c
@@ -586,19 +586,19 @@ proto_register_stun(void)
 	static hf_register_info hf[] = {
 		{ &hf_stun_type,
 			{ "Message Type",	"stun.type", 	FT_UINT16, 
-			BASE_HEX, 	VALS(messages),	0x0, 	"", 	HFILL }
+			BASE_HEX, 	VALS(messages),	0x0, 	NULL, 	HFILL }
 		},
 		{ &hf_stun_length,
 			{ "Message Length",	"stun.length",	FT_UINT16, 
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun_id,
 			{ "Message Transaction ID",	"stun.id",	FT_BYTES,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun_att,
 			{ "Attributes",		"stun.att",	FT_NONE,
-			0, 		NULL, 	0x0, 	"",	HFILL }
+			BASE_NONE, 		NULL, 	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun_response_in,
 		  { "Response In", "stun.response_in",
@@ -616,91 +616,91 @@ proto_register_stun(void)
 		/* ////////////////////////////////////// */
 		{ &stun_att_type,
 			{ "Attribute Type",	"stun.att.type",	FT_UINT16,
-			BASE_HEX,	VALS(attributes),	0x0, 	"",	HFILL }
+			BASE_HEX,	VALS(attributes),	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_length,
 			{ "Attribute Length",	"stun.att.length",	FT_UINT16,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_value,
 			{ "Value",	"stun.att.value",	FT_BYTES,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_family,
 			{ "Protocol Family",	"stun.att.family",	FT_UINT16,
-			BASE_HEX,	VALS(attributes_family),	0x0, 	"",	HFILL }
+			BASE_HEX,	VALS(attributes_family),	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_ipv4,
 			{ "IP",		"stun.att.ipv4",	FT_IPv4,
-			BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_ipv6,
 			{ "IP",		"stun.att.ipv6",	FT_IPv6,
-			BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_port,
 			{ "Port",	"stun.att.port",	FT_UINT16,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_change_ip,
 			{ "Change IP","stun.att.change.ip",	FT_BOOLEAN,
-			16, 	TFS(&set_flag),	0x0004,	"",	HFILL}
+			16, 	TFS(&set_flag),	0x0004,	NULL,	HFILL}
 		},
 		{ &stun_att_change_port,
 			{ "Change Port","stun.att.change.port",	FT_BOOLEAN,
-			16, 	TFS(&set_flag),	0x0002,	"",	HFILL}
+			16, 	TFS(&set_flag),	0x0002,	NULL,	HFILL}
 		},		
 		{ &stun_att_unknown,
 			{ "Unknown Attribute","stun.att.unknown",	FT_UINT16,
-			BASE_HEX, 	NULL,	0x0,	"",	HFILL}
+			BASE_HEX, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun_att_error_class,
 			{ "Error Class","stun.att.error.class",	FT_UINT8,
-			BASE_DEC, 	NULL,	0x07,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x07,	NULL,	HFILL}
 		},
 		{ &stun_att_error_number,
 			{ "Error Code","stun.att.error",	FT_UINT8,
-			BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun_att_error_reason,
 			{ "Error Reason Phase","stun.att.error.reason",	FT_STRING,
-			BASE_NONE, 	NULL,	0x0,	"",	HFILL}
+			BASE_NONE, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun_att_xor_ipv4,
 			{ "IP (XOR-d)",		"stun.att.ipv4-xord",	FT_IPv4,
-			BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_xor_ipv6,
 			{ "IP (XOR-d)",		"stun.att.ipv6-xord",	FT_IPv6,
-			BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_xor_port,
 			{ "Port (XOR-d)",	"stun.att.port-xord",	FT_UINT16,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_server_string,
 			{ "Server version","stun.att.server",	FT_STRING,
-			BASE_NONE, 	NULL,	0x0,	"",	HFILL}
+			BASE_NONE, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun_att_lifetime,
 			{ "Lifetime",	"stun.att.lifetime",	FT_UINT32,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_magic_cookie,
 			{ "Magic Cookie",	"stun.att.magic.cookie",	FT_UINT32,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_bandwidth,
 			{ "Bandwidth",	"stun.att.bandwidth",	FT_UINT32,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_data,
 			{ "Data",	"stun.att.data",	FT_BYTES,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun_att_connection_request_binding,
 		        { "Connection Request Binding", "stun.att.connection_request_binding", FT_STRING,
-			  BASE_NONE,      NULL, 0x0,    "",     HFILL }
+			  BASE_NONE,      NULL, 0x0,    NULL,     HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-stun2.c b/epan/dissectors/packet-stun2.c
index b0dd72e203..63879010fe 100644
--- a/epan/dissectors/packet-stun2.c
+++ b/epan/dissectors/packet-stun2.c
@@ -1115,45 +1115,45 @@ proto_register_stun2(void)
 
 		{ &hf_stun2_channel,
 		{ "Channel Number",	"stun2.channel",	FT_UINT16,
-		BASE_HEX, 	NULL, 	0x0, 	"",	HFILL }
+		BASE_HEX, 	NULL, 	0x0, 	NULL,	HFILL }
 		},
 
 		/* ////////////////////////////////////// */
 		{ &hf_stun2_type,
 			{ "Message Type",	"stun2.type", 	FT_UINT16,
-			BASE_HEX, 	NULL,	0, 	"", 	HFILL }
+			BASE_HEX, 	NULL,	0, 	NULL, 	HFILL }
 		},
 		{ &hf_stun2_type_class,
 			{ "Message Class",	"stun2.type.class", 	FT_UINT16,
-			BASE_HEX, 	NULL,	0x0110, 	"", 	HFILL }
+			BASE_HEX, 	NULL,	0x0110, 	NULL, 	HFILL }
 		},
 		{ &hf_stun2_type_method,
 			{ "Message Method",	"stun2.type.method", 	FT_UINT16,
-			BASE_HEX, 	NULL,	0x3EEF, 	"", 	HFILL }
+			BASE_HEX, 	NULL,	0x3EEF, 	NULL, 	HFILL }
 		},
 		{ &hf_stun2_type_method_assignment,
 			{ "Message Method Assignment",	"stun2.type.method-assignment", 	FT_UINT16,
-			BASE_HEX, 	NULL,	0x2000, 	"", 	HFILL }
+			BASE_HEX, 	NULL,	0x2000, 	NULL, 	HFILL }
                 },
 		{ &hf_stun2_length,
 		{ "Message Length",	"stun2.length",	FT_UINT16,
-		BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+		BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun2_cookie,
 		{ "Message Cookie",	"stun2.cookie",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun2_id,
 		{ "Message Transaction ID",	"stun2.id",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun2_attributes,
 			{ "Attributes",		"stun2.attributes",	FT_NONE,
-		BASE_NONE,	NULL, 	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL, 	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_stun2_attr,
 			{ "Attribute Type",	"stun2.attribute", 	FT_UINT16,
-			BASE_HEX, 	NULL,	0, 	"", 	HFILL }
+			BASE_HEX, 	NULL,	0, 	NULL, 	HFILL }
 		},
 		{ &hf_stun2_response_in,
 			{ "Response In",	"stun2.response-in", FT_FRAMENUM, 
@@ -1169,156 +1169,156 @@ proto_register_stun2(void)
 		},
 		{ &hf_stun2_duplicate,
 			{ "Duplicated original message in", "stun2.reqduplicate", FT_FRAMENUM, 
-			BASE_DEC, NULL, 0x0, "This is a duplicate of STUN2 message in this frame ", HFILL }
+			BASE_DEC, NULL, 0x0, "This is a duplicate of STUN2 message in this frame", HFILL }
 		},
 		/* ////////////////////////////////////// */
 		{ &stun2_att_type,
 		{ "Attribute Type",	"stun2.att.type",	FT_UINT16,
-		BASE_HEX,	VALS(attributes),	0x0, 	"",	HFILL }
+		BASE_HEX,	VALS(attributes),	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_type_comprehension,
 			{ "Attribute Type Comprehension",	"stun2.att.type.comprehension",	FT_UINT16,
-			BASE_HEX,	NULL,	0x8000, 	"",	HFILL }
+			BASE_HEX,	NULL,	0x8000, 	NULL,	HFILL }
 		},
 		{ &stun2_att_type_assignment,
 			{ "Attribute Type Assignment",	"stun2.att.type.assignment",	FT_UINT16,
-			BASE_HEX,	NULL,	0x4000, 	"",	HFILL }
+			BASE_HEX,	NULL,	0x4000, 	NULL,	HFILL }
 		},
 		{ &stun2_att_length,
 		{ "Attribute Length",	"stun2.att.length",	FT_UINT16,
-		BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+		BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_family,
 		{ "Protocol Family",	"stun2.att.family",	FT_UINT8,
-		BASE_HEX,	VALS(attributes_family),	0x0, 	"",	HFILL }
+		BASE_HEX,	VALS(attributes_family),	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_ipv4,
 		{ "IP",		"stun2.att.ipv4",	FT_IPv4,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_ipv6,
 		{ "IP",		"stun2.att.ipv6",	FT_IPv6,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_port,
 		{ "Port",	"stun2.att.port",	FT_UINT16,
-		BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+		BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_username,
 		{ "Username",	"stun2.att.username",	FT_STRING,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_padding,
 		{ "Padding",	"stun2.att.padding",	FT_UINT16,
-		BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+		BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_hmac,
 		{ "HMAC-SHA1",	"stun2.att.hmac",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_crc32,
 		{ "CRC-32",	"stun2.att.crc32",	FT_UINT32,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_error_class,
 		{ "Error Class","stun2.att.error.class",	FT_UINT8,
-		BASE_DEC, 	NULL,	0x07,	"",	HFILL}
+		BASE_DEC, 	NULL,	0x07,	NULL,	HFILL}
 		},
 		{ &stun2_att_error_number,
 		{ "Error Code","stun2.att.error",	FT_UINT8,
-		BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+		BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun2_att_error_reason,
 		{ "Error Reason Phrase","stun2.att.error.reason",	FT_STRING,
-		BASE_NONE, 	NULL,	0x0,	"",	HFILL}
+		BASE_NONE, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun2_att_realm,
 		{ "Realm",	"stun2.att.realm",	FT_STRING,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_nonce,
 		{ "Nonce",	"stun2.att.nonce",	FT_STRING,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_unknown,
 		{ "Unknown Attribute","stun2.att.unknown",	FT_UINT16,
-		BASE_HEX, 	NULL,	0x0,	"",	HFILL}
+		BASE_HEX, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun2_att_xor_ipv4,
 		{ "IP (XOR-d)",		"stun2.att.ipv4-xord",	FT_BYTES,
-		BASE_NONE,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_xor_ipv6,
 		{ "IP (XOR-d)",		"stun2.att.ipv6-xord",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_xor_port,
 		{ "Port (XOR-d)",	"stun2.att.port-xord",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_icmp_type,
 			{ "ICMP type",		"stun2.att.icmp.type",	FT_UINT8,
-                         BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+                         BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun2_att_icmp_code,
 			{ "ICMP code",		"stun2.att.icmp.code",	FT_UINT8,
-			BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun2_att_software,
 			{ "Software","stun2.att.software",	FT_STRING,
-		BASE_NONE, 	NULL,	0x0,	"",	HFILL}
+		BASE_NONE, 	NULL,	0x0,	NULL,	HFILL}
 		},
 		{ &stun2_att_priority,
 			{ "Priority",		"stun2.att.priority",	FT_UINT32,
-			BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun2_att_tie_breaker,
 			{ "Tie breaker",	"stun2.att.tie-breaker",	FT_BYTES,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_lifetime,
 			{ "Lifetime",		"stun2.att.lifetime",	FT_UINT32,
-			BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun2_att_change_ip,
 			{ "Change IP","stun2.att.change-ip",	FT_BOOLEAN,
-		16, 	TFS(&set_flag),	0x0004,	"",	HFILL}
+		16, 	TFS(&set_flag),	0x0004,	NULL,	HFILL}
 		},
 		{ &stun2_att_change_port,
 			{ "Change Port","stun2.att.change-port",	FT_BOOLEAN,
-			16, 	TFS(&set_flag),	0x0002,	"",	HFILL}
+			16, 	TFS(&set_flag),	0x0002,	NULL,	HFILL}
 		},		
 		{ &stun2_att_reserve_next,
 			{ "Reserve next","stun2.att.even-port.reserve-next",	FT_UINT8,
-			BASE_DEC, 	VALS(attributes_reserve_next),	0x80,	"",	HFILL}
+			BASE_DEC, 	VALS(attributes_reserve_next),	0x80,	NULL,	HFILL}
 		},		
 		{ &stun2_att_cache_timeout,
 			{ "Cache timeout",		"stun2.att.cache-timeout",	FT_UINT32,
-			BASE_DEC, 	NULL,	0x0,	"",	HFILL}
+			BASE_DEC, 	NULL,	0x0,	NULL,	HFILL}
  		},
 		{ &stun2_att_token,
 			{ "Token",	"stun2.att.token",	FT_BYTES,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_value,
 		{ "Value",	"stun2.value",	FT_BYTES,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_NONE,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_reserved,
 		{ "Reserved",	"stun2.att.reserved",	FT_UINT16,
-		BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+		BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_transp,
 		{ "Transport",	"stun2.att.transp",	FT_UINT8,
-		BASE_HEX,	VALS(transportnames),	0x0, 	"",	HFILL }
+		BASE_HEX,	VALS(transportnames),	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_channelnum,
 		{ "Channel-Number",	"stun2.att.channelnum",	FT_UINT16,
-		BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+		BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &stun2_att_bandwidth,
 		{ "Bandwidth",	"stun2.port.bandwidth", 	FT_UINT32,
-		BASE_DEC, 	NULL,	0x0, 	"", HFILL }
+		BASE_DEC, 	NULL,	0x0, 	NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c
index b1e4a1a454..c58b4e2c92 100644
--- a/epan/dissectors/packet-sua.c
+++ b/epan/dissectors/packet-sua.c
@@ -1985,109 +1985,109 @@ proto_register_sua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_version,                               { "Version",                      "sua.version",                                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),      0x0,                      "", HFILL } },
-    { &hf_reserved,                              { "Reserved",                     "sua.reserved",                                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_message_class,                         { "Message Class",                "sua.message_class",                             FT_UINT8,   BASE_DEC,  VALS(message_class_values),         0x0,                      "", HFILL } },
-    { &hf_message_type,                          { "Message Type",                 "sua.message_type",                              FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_message_length,                        { "Message Length",               "sua.message_length",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_parameter_tag,                         { "Parameter Tag",                "sua.parameter_tag",                             FT_UINT16,  BASE_HEX,  VALS(parameter_tag_values),         0x0,                      "", HFILL } },
-    { &hf_v8_parameter_tag,                      { "Parameter Tag",                "sua.parameter_tag",                             FT_UINT16,  BASE_HEX,  VALS(v8_parameter_tag_values),      0x0,                      "", HFILL } },
-    { &hf_parameter_length,                      { "Parameter Length",             "sua.parameter_length",                          FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_parameter_value,                       { "Parameter Value",              "sua.parameter_value",                           FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_parameter_padding,                     { "Padding",                      "sua.parameter_padding",                         FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_info_string,                           { "Info string",                  "sua.info_string",                               FT_STRING,  BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_routing_context,                       { "Routing context",              "sua.routing_context",                           FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_diagnostic_information_info,           { "Diagnostic Information",       "sua.diagnostic_information",                    FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_heartbeat_data,                        { "Heartbeat Data",               "sua.heartbeat_data",                            FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_traffic_mode_type,                     { "Traffic mode Type",            "sua.traffic_mode_type",                         FT_UINT32,  BASE_DEC,  VALS(traffic_mode_type_values),     0x0,                      "", HFILL } },
-    { &hf_error_code,                            { "Error code",                   "sua.error_code",                                FT_UINT32,  BASE_DEC,  VALS(error_code_values),            0x0,                      "", HFILL } },
-    { &hf_v8_error_code,                         { "Error code",                   "sua.error_code",                                FT_UINT32,  BASE_DEC,  VALS(v8_error_code_values),         0x0,                      "", HFILL } },
-    { &hf_status_type,                           { "Status type",                  "sua.status_type",                               FT_UINT16,  BASE_DEC,  VALS(status_type_values),           0x0,                      "", HFILL } },
-    { &hf_status_info,                           { "Status info",                  "sua.status_info",                               FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_congestion_level,                      { "Congestion Level",             "sua.congestion_level",                          FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_asp_identifier,                        { "ASP Identifier",               "sua.asp_identifier",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_mask,                                  { "Mask",                         "sua.affected_point_code_mask",                  FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_dpc,                                   { "Affected DPC",                 "sua.affected_pointcode_dpc",                    FT_UINT24,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_registration_status,                   { "Registration status",          "sua.registration_status",                       FT_UINT32,  BASE_DEC,  VALS(registration_status_values),   0x0,                      "", HFILL } },
-    { &hf_deregistration_status,                 { "Deregistration status",        "sua.deregistration_status",                     FT_UINT32,  BASE_DEC,  VALS(deregistration_status_values), 0x0,                      "", HFILL } },
-    { &hf_local_routing_key_identifier,          { "Local routing key identifier", "sua.local_routing_key_identifier",              FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_source_address_routing_indicator,      { "Routing Indicator",            "sua.source_address_routing_indicator",          FT_UINT16,  BASE_DEC,  VALS(routing_indicator_values),     0x0,                      "", HFILL } },
-    { &hf_source_address_reserved_bits,          { "Reserved Bits",                "sua.source_address_reserved_bits",              FT_UINT16,  BASE_DEC,  NULL,                               ADDRESS_RESERVED_BITMASK, "", HFILL } },
-    { &hf_source_address_gt_bit,                 { "Include GT",                   "sua.source_address_gt_bit",                     FT_BOOLEAN, 16,        NULL,                               ADDRESS_GT_BITMASK,       "", HFILL } },
-    { &hf_source_address_pc_bit,                 { "Include PC",                   "sua.source_address_pc_bit",                     FT_BOOLEAN, 16,        NULL,                               ADDRESS_PC_BITMASK,       "", HFILL } },
-    { &hf_source_address_ssn_bit,                { "Include SSN",                  "sua.source_address_ssn_bit",                    FT_BOOLEAN, 16,        NULL,                               ADDRESS_SSN_BITMASK,      "", HFILL } },
-    { &hf_destination_address_routing_indicator, { "Routing Indicator",            "sua.destination_address_routing_indicator",     FT_UINT16,  BASE_DEC,  VALS(routing_indicator_values),     0x0,                      "", HFILL } },
-    { &hf_destination_address_reserved_bits,     { "Reserved Bits",                "sua.destination_address_reserved_bits",         FT_UINT16,  BASE_DEC,  NULL,                               ADDRESS_RESERVED_BITMASK, "", HFILL } },
-    { &hf_destination_address_gt_bit,            { "Include GT",                   "sua.destination_address_gt_bit",                FT_BOOLEAN, 16,        NULL,                               ADDRESS_GT_BITMASK,       "", HFILL } },
-    { &hf_destination_address_pc_bit,            { "Include PC",                   "sua.destination_address_pc_bit",                FT_BOOLEAN, 16,        NULL,                               ADDRESS_PC_BITMASK,       "", HFILL } },
-    { &hf_destination_address_ssn_bit,           { "Include SSN",                  "sua.destination_address_ssn_bit",               FT_BOOLEAN, 16,        NULL,                               ADDRESS_SSN_BITMASK,      "", HFILL } },
-    { &hf_ss7_hop_counter_counter,               { "SS7 Hop Counter",              "sua.ss7_hop_counter_counter",                   FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_ss7_hop_counter_reserved,              { "Reserved",                     "sua.ss7_hop_counter_reserved",                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_destination_reference_number,          { "Destination Reference Number", "sua.destination_reference_number",              FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_source_reference_number,               { "Source Reference Number",      "sua.source_reference_number",                   FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_cause_reserved,                        { "Reserved",                     "sua.sccp_cause_reserved",                       FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_cause_type,                            { "Cause Type",                   "sua.sccp_cause_type",                           FT_UINT8,   BASE_HEX,  VALS(cause_type_values),            0x0,                      "", HFILL } },
-    { &hf_cause_value,                           { "Cause Value",                  "sua.sccp_cause_value",                          FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_sequence_number_reserved,              { "Reserved",                     "sua.sequence_number_reserved",                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_sequence_number_rec_number,            { "Receive Sequence Number P(R)", "sua.sequence_number_receive_sequence_number",   FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             "", HFILL } },
-    { &hf_sequence_number_more_data_bit,         { "More Data Bit",                "sua.sequence_number_more_data_bit",             FT_BOOLEAN, 8,         TFS(&more_data_bit_value),          MORE_DATA_BIT_MASK,       "", HFILL } },
-    { &hf_sequence_number_sent_number,           { "Sent Sequence Number P(S)",    "sua.sequence_number_sent_sequence_number",      FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             "", HFILL } },
-    { &hf_sequence_number_spare_bit,             { "Spare Bit",                    "sua.sequence_number_spare_bit",                 FT_BOOLEAN, 8,         NULL,                               SPARE_BIT_MASK,           "", HFILL } },
-    { &hf_receive_sequence_number_reserved,      { "Reserved",                     "sua.receive_sequence_number_reserved",          FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_receive_sequence_number_number,        { "Receive Sequence Number P(R)", "sua.receive_sequence_number_number",            FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             "", HFILL } },
-    { &hf_receive_sequence_number_spare_bit,     { "Spare Bit",                    "sua.receive_sequence_number_spare_bit",         FT_BOOLEAN, 8,         NULL,                               SPARE_BIT_MASK,           "", HFILL } },
-    { &hf_asp_capabilities_reserved,             { "Reserved",                     "sua.asp_capabilities_reserved",                 FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_asp_capabilities_reserved_bits,        { "Reserved Bits",                "sua.asp_capabilities_reserved_bits",            FT_UINT8,   BASE_HEX,  NULL,                               RESERVED_BITS_MASK,       "", HFILL } },
-    { &hf_asp_capabilities_a_bit,                { "Protocol Class 3",             "sua.asp_capabilities_a_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      A_BIT_MASK,               "", HFILL } },
-    { &hf_asp_capabilities_b_bit,                { "Protocol Class 2",             "sua.asp_capabilities_b_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      B_BIT_MASK,               "", HFILL } },
-    { &hf_asp_capabilities_c_bit,                { "Protocol Class 1",             "sua.asp_capabilities_c_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      C_BIT_MASK,               "", HFILL } },
-    { &hf_asp_capabilities_d_bit,                { "Protocol Class 0",             "sua.asp_capabilities_d_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      D_BIT_MASK,               "", HFILL } },
-    { &hf_asp_capabilities_interworking,         { "Interworking",                 "sua.asp_capabilities_interworking",             FT_UINT8,   BASE_HEX,  VALS(interworking_values),          0x0,                      "", HFILL } },
-    { &hf_credit,                                { "Credit",                       "sua.credit",                                    FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_cause,                                 { "Cause",                        "sua.cause_user_cause",                          FT_UINT16,  BASE_DEC,  VALS(cause_values),                 0x0,                      "", HFILL } },
-    { &hf_user,                                  { "User",                         "sua.cause_user_user",                           FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_data,                                  { "Data",                         "sua.data",                                      FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_network_appearance,                    { "Network Appearance",           "sua.network_appearance",                        FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_routing_key_identifier,                { "Local Routing Key Identifier", "sua.routing_key_identifier",                    FT_UINT32,  BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_correlation_id,                        { "Correlation ID",               "sua.correlation_id",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_importance_reserved,                   { "Reserved",                     "sua.importance_reserved",                       FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_importance,                            { "Importance",                   "sua.importance_inportance",                     FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_message_priority_reserved,             { "Reserved",                     "sua.message_priority_reserved",                 FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_message_priority,                      { "Message Priority",             "sua.message_priority_priority",                 FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_protocol_class_reserved,               { "Reserved",                     "sua.protcol_class_reserved",                    FT_BYTES,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_return_on_error_bit,                   { "Return On Error Bit",          "sua.protocol_class_return_on_error_bit",        FT_BOOLEAN, 8,         TFS(&return_on_error_bit_value),    RETURN_ON_ERROR_BIT_MASK, "", HFILL } },
-    { &hf_protocol_class,                        { "Protocol Class",               "sua.protocol_class_class",                      FT_UINT8,   BASE_DEC,  NULL,                               PROTOCOL_CLASS_MASK,      "", HFILL } },
-    { &hf_sequence_control,                      { "Sequence Control",             "sua.sequence_control_sequence_control",         FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_first_bit,                             { "First Segment Bit",            "sua.segmentation_first_bit",                    FT_BOOLEAN, 8,         TFS(&first_bit_value),              FIRST_BIT_MASK,           "", HFILL } },
-    { &hf_number_of_remaining_segments,          { "Number of Remaining Segments", "sua.segmentation_number_of_remaining_segments", FT_UINT8,   BASE_DEC,  NULL,                               NUMBER_OF_SEGMENTS_MASK,  "", HFILL } },
-    { &hf_segmentation_reference,                { "Segmentation Reference",       "sua.segmentation_reference",                    FT_UINT24,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_smi_reserved,                          { "Reserved",                     "sua.smi_reserved",                              FT_BYTES,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_smi,                                   { "SMI",                          "sua.smi_smi",                                   FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_tid_label_start,                       { "Start",                        "sua.tid_label_start",                           FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_tid_label_end,                         { "End",                          "sua.tid_label_end",                             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_tid_label_value,                       { "Label Value",                  "sua.tid_label_value",                           FT_UINT16,  BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_drn_label_start,                       { "Start",                        "sua.drn_label_start",                           FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_drn_label_end,                         { "End",                          "sua.drn_label_end",                             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_drn_label_value,                       { "Label Value",                  "sua.drn_label_value",                           FT_UINT16,  BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_gt_reserved,                           { "Reserved",                     "sua.gt_reserved",                               FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_gti,                                   { "GTI",                          "sua.gti",                                       FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_number_of_digits,                      { "Number of Digits",             "sua.global_title_number_of_digits",             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_translation_type,                      { "Translation Type",             "sua.global_title_translation_type",             FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_numbering_plan,                        { "Numbering Plan",               "sua.global_title_numbering_plan",               FT_UINT8,   BASE_HEX,  VALS(numbering_plan_values),        0x0,                      "", HFILL } },
-    { &hf_nature_of_address,                     { "Nature of Address",            "sua.global_title_nature_of_address",            FT_UINT8,   BASE_HEX,  VALS(nature_of_address_values),     0x0,                      "", HFILL } },
-    { &hf_global_title_digits,                   { "Global Title Digits",          "sua.global_title_digits",                       FT_STRING,  BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_point_code_dpc,                        { "Point Code",                   "sua.point_code",                                FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_ssn_reserved,                          { "Reserved",                     "sua.ssn_reserved",                              FT_BYTES,   BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_ssn_number,                            { "Subsystem Number",             "sua.ssn",                                       FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      "", HFILL } },
-    { &hf_ipv4,                                  { "IP Version 4 address",         "sua.ipv4_address",                              FT_IPv4,    BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_hostname,                              { "Hostname",                     "sua.hostname.name",                             FT_STRING,  BASE_NONE, NULL,                               0x0,                      "", HFILL } },
-    { &hf_ipv6,                                  { "IP Version 6 address",         "sua.ipv6_address",                              FT_IPv6,    BASE_NONE, NULL,                               0x0,                      "", HFILL } },
+    { &hf_version,                               { "Version",                      "sua.version",                                   FT_UINT8,   BASE_DEC,  VALS(protocol_version_values),      0x0,                      NULL, HFILL } },
+    { &hf_reserved,                              { "Reserved",                     "sua.reserved",                                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_message_class,                         { "Message Class",                "sua.message_class",                             FT_UINT8,   BASE_DEC,  VALS(message_class_values),         0x0,                      NULL, HFILL } },
+    { &hf_message_type,                          { "Message Type",                 "sua.message_type",                              FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_message_length,                        { "Message Length",               "sua.message_length",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_parameter_tag,                         { "Parameter Tag",                "sua.parameter_tag",                             FT_UINT16,  BASE_HEX,  VALS(parameter_tag_values),         0x0,                      NULL, HFILL } },
+    { &hf_v8_parameter_tag,                      { "Parameter Tag",                "sua.parameter_tag",                             FT_UINT16,  BASE_HEX,  VALS(v8_parameter_tag_values),      0x0,                      NULL, HFILL } },
+    { &hf_parameter_length,                      { "Parameter Length",             "sua.parameter_length",                          FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_parameter_value,                       { "Parameter Value",              "sua.parameter_value",                           FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_parameter_padding,                     { "Padding",                      "sua.parameter_padding",                         FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_info_string,                           { "Info string",                  "sua.info_string",                               FT_STRING,  BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_routing_context,                       { "Routing context",              "sua.routing_context",                           FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_diagnostic_information_info,           { "Diagnostic Information",       "sua.diagnostic_information",                    FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_heartbeat_data,                        { "Heartbeat Data",               "sua.heartbeat_data",                            FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_traffic_mode_type,                     { "Traffic mode Type",            "sua.traffic_mode_type",                         FT_UINT32,  BASE_DEC,  VALS(traffic_mode_type_values),     0x0,                      NULL, HFILL } },
+    { &hf_error_code,                            { "Error code",                   "sua.error_code",                                FT_UINT32,  BASE_DEC,  VALS(error_code_values),            0x0,                      NULL, HFILL } },
+    { &hf_v8_error_code,                         { "Error code",                   "sua.error_code",                                FT_UINT32,  BASE_DEC,  VALS(v8_error_code_values),         0x0,                      NULL, HFILL } },
+    { &hf_status_type,                           { "Status type",                  "sua.status_type",                               FT_UINT16,  BASE_DEC,  VALS(status_type_values),           0x0,                      NULL, HFILL } },
+    { &hf_status_info,                           { "Status info",                  "sua.status_info",                               FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_congestion_level,                      { "Congestion Level",             "sua.congestion_level",                          FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_asp_identifier,                        { "ASP Identifier",               "sua.asp_identifier",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_mask,                                  { "Mask",                         "sua.affected_point_code_mask",                  FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_dpc,                                   { "Affected DPC",                 "sua.affected_pointcode_dpc",                    FT_UINT24,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_registration_status,                   { "Registration status",          "sua.registration_status",                       FT_UINT32,  BASE_DEC,  VALS(registration_status_values),   0x0,                      NULL, HFILL } },
+    { &hf_deregistration_status,                 { "Deregistration status",        "sua.deregistration_status",                     FT_UINT32,  BASE_DEC,  VALS(deregistration_status_values), 0x0,                      NULL, HFILL } },
+    { &hf_local_routing_key_identifier,          { "Local routing key identifier", "sua.local_routing_key_identifier",              FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_source_address_routing_indicator,      { "Routing Indicator",            "sua.source_address_routing_indicator",          FT_UINT16,  BASE_DEC,  VALS(routing_indicator_values),     0x0,                      NULL, HFILL } },
+    { &hf_source_address_reserved_bits,          { "Reserved Bits",                "sua.source_address_reserved_bits",              FT_UINT16,  BASE_DEC,  NULL,                               ADDRESS_RESERVED_BITMASK, NULL, HFILL } },
+    { &hf_source_address_gt_bit,                 { "Include GT",                   "sua.source_address_gt_bit",                     FT_BOOLEAN, 16,        NULL,                               ADDRESS_GT_BITMASK,       NULL, HFILL } },
+    { &hf_source_address_pc_bit,                 { "Include PC",                   "sua.source_address_pc_bit",                     FT_BOOLEAN, 16,        NULL,                               ADDRESS_PC_BITMASK,       NULL, HFILL } },
+    { &hf_source_address_ssn_bit,                { "Include SSN",                  "sua.source_address_ssn_bit",                    FT_BOOLEAN, 16,        NULL,                               ADDRESS_SSN_BITMASK,      NULL, HFILL } },
+    { &hf_destination_address_routing_indicator, { "Routing Indicator",            "sua.destination_address_routing_indicator",     FT_UINT16,  BASE_DEC,  VALS(routing_indicator_values),     0x0,                      NULL, HFILL } },
+    { &hf_destination_address_reserved_bits,     { "Reserved Bits",                "sua.destination_address_reserved_bits",         FT_UINT16,  BASE_DEC,  NULL,                               ADDRESS_RESERVED_BITMASK, NULL, HFILL } },
+    { &hf_destination_address_gt_bit,            { "Include GT",                   "sua.destination_address_gt_bit",                FT_BOOLEAN, 16,        NULL,                               ADDRESS_GT_BITMASK,       NULL, HFILL } },
+    { &hf_destination_address_pc_bit,            { "Include PC",                   "sua.destination_address_pc_bit",                FT_BOOLEAN, 16,        NULL,                               ADDRESS_PC_BITMASK,       NULL, HFILL } },
+    { &hf_destination_address_ssn_bit,           { "Include SSN",                  "sua.destination_address_ssn_bit",               FT_BOOLEAN, 16,        NULL,                               ADDRESS_SSN_BITMASK,      NULL, HFILL } },
+    { &hf_ss7_hop_counter_counter,               { "SS7 Hop Counter",              "sua.ss7_hop_counter_counter",                   FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_ss7_hop_counter_reserved,              { "Reserved",                     "sua.ss7_hop_counter_reserved",                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_destination_reference_number,          { "Destination Reference Number", "sua.destination_reference_number",              FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_source_reference_number,               { "Source Reference Number",      "sua.source_reference_number",                   FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_cause_reserved,                        { "Reserved",                     "sua.sccp_cause_reserved",                       FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_cause_type,                            { "Cause Type",                   "sua.sccp_cause_type",                           FT_UINT8,   BASE_HEX,  VALS(cause_type_values),            0x0,                      NULL, HFILL } },
+    { &hf_cause_value,                           { "Cause Value",                  "sua.sccp_cause_value",                          FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_sequence_number_reserved,              { "Reserved",                     "sua.sequence_number_reserved",                  FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_sequence_number_rec_number,            { "Receive Sequence Number P(R)", "sua.sequence_number_receive_sequence_number",   FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             NULL, HFILL } },
+    { &hf_sequence_number_more_data_bit,         { "More Data Bit",                "sua.sequence_number_more_data_bit",             FT_BOOLEAN, 8,         TFS(&more_data_bit_value),          MORE_DATA_BIT_MASK,       NULL, HFILL } },
+    { &hf_sequence_number_sent_number,           { "Sent Sequence Number P(S)",    "sua.sequence_number_sent_sequence_number",      FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             NULL, HFILL } },
+    { &hf_sequence_number_spare_bit,             { "Spare Bit",                    "sua.sequence_number_spare_bit",                 FT_BOOLEAN, 8,         NULL,                               SPARE_BIT_MASK,           NULL, HFILL } },
+    { &hf_receive_sequence_number_reserved,      { "Reserved",                     "sua.receive_sequence_number_reserved",          FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_receive_sequence_number_number,        { "Receive Sequence Number P(R)", "sua.receive_sequence_number_number",            FT_UINT8,   BASE_DEC,  NULL,                               SEQ_NUM_MASK,             NULL, HFILL } },
+    { &hf_receive_sequence_number_spare_bit,     { "Spare Bit",                    "sua.receive_sequence_number_spare_bit",         FT_BOOLEAN, 8,         NULL,                               SPARE_BIT_MASK,           NULL, HFILL } },
+    { &hf_asp_capabilities_reserved,             { "Reserved",                     "sua.asp_capabilities_reserved",                 FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_asp_capabilities_reserved_bits,        { "Reserved Bits",                "sua.asp_capabilities_reserved_bits",            FT_UINT8,   BASE_HEX,  NULL,                               RESERVED_BITS_MASK,       NULL, HFILL } },
+    { &hf_asp_capabilities_a_bit,                { "Protocol Class 3",             "sua.asp_capabilities_a_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      A_BIT_MASK,               NULL, HFILL } },
+    { &hf_asp_capabilities_b_bit,                { "Protocol Class 2",             "sua.asp_capabilities_b_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      B_BIT_MASK,               NULL, HFILL } },
+    { &hf_asp_capabilities_c_bit,                { "Protocol Class 1",             "sua.asp_capabilities_c_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      C_BIT_MASK,               NULL, HFILL } },
+    { &hf_asp_capabilities_d_bit,                { "Protocol Class 0",             "sua.asp_capabilities_d_bit",                    FT_BOOLEAN, 8,         TFS(&tfs_supported_not_supported),      D_BIT_MASK,               NULL, HFILL } },
+    { &hf_asp_capabilities_interworking,         { "Interworking",                 "sua.asp_capabilities_interworking",             FT_UINT8,   BASE_HEX,  VALS(interworking_values),          0x0,                      NULL, HFILL } },
+    { &hf_credit,                                { "Credit",                       "sua.credit",                                    FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_cause,                                 { "Cause",                        "sua.cause_user_cause",                          FT_UINT16,  BASE_DEC,  VALS(cause_values),                 0x0,                      NULL, HFILL } },
+    { &hf_user,                                  { "User",                         "sua.cause_user_user",                           FT_UINT16,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_data,                                  { "Data",                         "sua.data",                                      FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_network_appearance,                    { "Network Appearance",           "sua.network_appearance",                        FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_routing_key_identifier,                { "Local Routing Key Identifier", "sua.routing_key_identifier",                    FT_UINT32,  BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_correlation_id,                        { "Correlation ID",               "sua.correlation_id",                            FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_importance_reserved,                   { "Reserved",                     "sua.importance_reserved",                       FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_importance,                            { "Importance",                   "sua.importance_inportance",                     FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_message_priority_reserved,             { "Reserved",                     "sua.message_priority_reserved",                 FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_message_priority,                      { "Message Priority",             "sua.message_priority_priority",                 FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_protocol_class_reserved,               { "Reserved",                     "sua.protcol_class_reserved",                    FT_BYTES,   BASE_NONE,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_return_on_error_bit,                   { "Return On Error Bit",          "sua.protocol_class_return_on_error_bit",        FT_BOOLEAN, 8,         TFS(&return_on_error_bit_value),    RETURN_ON_ERROR_BIT_MASK, NULL, HFILL } },
+    { &hf_protocol_class,                        { "Protocol Class",               "sua.protocol_class_class",                      FT_UINT8,   BASE_DEC,  NULL,                               PROTOCOL_CLASS_MASK,      NULL, HFILL } },
+    { &hf_sequence_control,                      { "Sequence Control",             "sua.sequence_control_sequence_control",         FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_first_bit,                             { "First Segment Bit",            "sua.segmentation_first_bit",                    FT_BOOLEAN, 8,         TFS(&first_bit_value),              FIRST_BIT_MASK,           NULL, HFILL } },
+    { &hf_number_of_remaining_segments,          { "Number of Remaining Segments", "sua.segmentation_number_of_remaining_segments", FT_UINT8,   BASE_DEC,  NULL,                               NUMBER_OF_SEGMENTS_MASK,  NULL, HFILL } },
+    { &hf_segmentation_reference,                { "Segmentation Reference",       "sua.segmentation_reference",                    FT_UINT24,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_smi_reserved,                          { "Reserved",                     "sua.smi_reserved",                              FT_BYTES,   BASE_NONE,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_smi,                                   { "SMI",                          "sua.smi_smi",                                   FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_tid_label_start,                       { "Start",                        "sua.tid_label_start",                           FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_tid_label_end,                         { "End",                          "sua.tid_label_end",                             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_tid_label_value,                       { "Label Value",                  "sua.tid_label_value",                           FT_UINT16,  BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_drn_label_start,                       { "Start",                        "sua.drn_label_start",                           FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_drn_label_end,                         { "End",                          "sua.drn_label_end",                             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_drn_label_value,                       { "Label Value",                  "sua.drn_label_value",                           FT_UINT16,  BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_gt_reserved,                           { "Reserved",                     "sua.gt_reserved",                               FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_gti,                                   { "GTI",                          "sua.gti",                                       FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_number_of_digits,                      { "Number of Digits",             "sua.global_title_number_of_digits",             FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_translation_type,                      { "Translation Type",             "sua.global_title_translation_type",             FT_UINT8,   BASE_HEX,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_numbering_plan,                        { "Numbering Plan",               "sua.global_title_numbering_plan",               FT_UINT8,   BASE_HEX,  VALS(numbering_plan_values),        0x0,                      NULL, HFILL } },
+    { &hf_nature_of_address,                     { "Nature of Address",            "sua.global_title_nature_of_address",            FT_UINT8,   BASE_HEX,  VALS(nature_of_address_values),     0x0,                      NULL, HFILL } },
+    { &hf_global_title_digits,                   { "Global Title Digits",          "sua.global_title_digits",                       FT_STRING,  BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_point_code_dpc,                        { "Point Code",                   "sua.point_code",                                FT_UINT32,  BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_ssn_reserved,                          { "Reserved",                     "sua.ssn_reserved",                              FT_BYTES,   BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_ssn_number,                            { "Subsystem Number",             "sua.ssn",                                       FT_UINT8,   BASE_DEC,  NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_ipv4,                                  { "IP Version 4 address",         "sua.ipv4_address",                              FT_IPv4,    BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_hostname,                              { "Hostname",                     "sua.hostname.name",                             FT_STRING,  BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
+    { &hf_ipv6,                                  { "IP Version 6 address",         "sua.ipv6_address",                              FT_IPv6,    BASE_NONE, NULL,                               0x0,                      NULL, HFILL } },
      { &hf_assoc_id,
       { "Association ID", "sccp.assoc.id",
-	FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL}},
+	FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}},
     {&hf_assoc_msg,
 	{"Message in frame", "sccp.assoc.msg",
-	FT_FRAMENUM, BASE_NONE, NULL, 0x00, "", HFILL }
+	FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL }
     },
  };
 
diff --git a/epan/dissectors/packet-symantec.c b/epan/dissectors/packet-symantec.c
index d247be63ef..91d9b3c53d 100644
--- a/epan/dissectors/packet-symantec.c
+++ b/epan/dissectors/packet-symantec.c
@@ -131,10 +131,10 @@ proto_register_symantec(void)
 	static hf_register_info hf[] = {
 		{ &hf_symantec_if,
 		    { "Interface", "symantec.if", FT_IPv4,  BASE_NONE, NULL, 0x0,
-			"Interface", HFILL }},
+			NULL, HFILL }},
 		{ &hf_symantec_etype,
 		    { "Type",    "symantec.type", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_symantec,
diff --git a/epan/dissectors/packet-synergy.c b/epan/dissectors/packet-synergy.c
index ec543a96be..d19119195e 100644
--- a/epan/dissectors/packet-synergy.c
+++ b/epan/dissectors/packet-synergy.c
@@ -367,187 +367,187 @@ proto_register_synergy(void)
 	static hf_register_info hf[] = {
 
 		{ &hf_synergy_unknown,
-			{ "unknown","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "unknown","synergy.unknown",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_handshake,
-			{ "Handshake","synergy.handshake",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Handshake","synergy.handshake",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_handshake_majorversion,
-			{ "Major Version","synergy.handshake.majorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Major Version","synergy.handshake.majorversion",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_handshake_minorversion,
-			{ "Minor Version","synergy.handshake.minorversion",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Minor Version","synergy.handshake.minorversion",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_handshake_clientname,
-			{ "Client Name","synergy.handshake.client",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Client Name","synergy.handshake.client",FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cnop,
-			{ "No Operation","synergy.cnop",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "No Operation","synergy.cnop",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cbye,
-			{ "Close Connection","synergy.cbye",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Close Connection","synergy.cbye",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cinn,
-			{ "Enter Screen","synergy.cinn",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Enter Screen","synergy.cinn",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cinn_x,
-			{ "Screen X","synergy.cinn.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Screen X","synergy.cinn.x",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cinn_y,
-			{ "Screen Y","synergy.cinn.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Screen Y","synergy.cinn.y",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cinn_sequence,
-			{ "Sequence Number","synergy.cinn.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Sequence Number","synergy.cinn.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cinn_modifiermask,
-			{ "Modifier Key Mask","synergy.cinn.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Modifier Key Mask","synergy.cinn.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cout,
-			{ "Leave Screen","synergy.cout",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Leave Screen","synergy.cout",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cclp,
-			{ "Grab Clipboard","synergy.clipboard",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Grab Clipboard","synergy.clipboard",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cclp_clipboardidentifier,
-			{ "Identifier","synergy.clipboard.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Identifier","synergy.clipboard.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_cclp_sequencenumber,
-			{ "Sequence Number","synergy.clipboard.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Sequence Number","synergy.clipboard.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_csec,
-			{ "Screen Saver Change","synergy.screensaver",FT_BOOLEAN, BASE_NONE, NULL, 0x0,"", HFILL }
+			{ "Screen Saver Change","synergy.screensaver",FT_BOOLEAN, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_crop,
-			{ "Reset Options","synergy.resetoptions",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Reset Options","synergy.resetoptions",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_ciak,
-			{ "resolution change acknowledgment","synergy.ack",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "resolution change acknowledgment","synergy.ack",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkdn,
-			{ "Key Pressed","synergy.keypressed",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Pressed","synergy.keypressed",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkdn_keyid,
-			{ "Key Id","synergy.keypressed.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Id","synergy.keypressed.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkdn_keymodifiermask,
-			{ "Key Modifier Mask","synergy.keypressed.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Modifier Mask","synergy.keypressed.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkdn_keybutton,
-			{ "Key Button","synergy.keypressed.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Button","synergy.keypressed.key",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkrp,
-			{ "key auto-repeat","synergy.keyautorepeat",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "key auto-repeat","synergy.keyautorepeat",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkrp_keyid,
-			{ "Key ID","synergy.keyautorepeat.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key ID","synergy.keyautorepeat.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkrp_keymodifiermask,
-			{ "Key modifier Mask","synergy.keyautorepeat.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key modifier Mask","synergy.keyautorepeat.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkrp_numberofrepeats,
-			{ "Number of Repeats","synergy.keyautorepeat.repeat",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Number of Repeats","synergy.keyautorepeat.repeat",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkrp_keybutton,
-			{ "Key Button","synergy.keyautorepeat.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Button","synergy.keyautorepeat.key",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkup,
-			{ "key released","synergy.keyreleased",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "key released","synergy.keyreleased",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkup_keyid,
-			{ "Key Id","synergy.keyreleased.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Id","synergy.keyreleased.keyid",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkup_keymodifiermask,
-			{ "Key Modifier Mask","synergykeyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Modifier Mask","synergykeyreleased.mask",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dkup_keybutton,
-			{ "Key Button","synergy.keyreleased.key",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Key Button","synergy.keyreleased.key",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmdn,
-			{ "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT8, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmup,
-			{ "Mouse Button Released","synergy.mousebuttonreleased",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Mouse Button Released","synergy.mousebuttonreleased",FT_UINT8, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmmv,
-			{ "Mouse Moved","synergy.mousemoved",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Mouse Moved","synergy.mousemoved",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmmv_x,
-			{ "X Axis","synergy.mousemoved.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "X Axis","synergy.mousemoved.x",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmmv_y,
-			{ "Y Axis","synergy.mousemoved.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Y Axis","synergy.mousemoved.y",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmrm,
-			{ "Relative Mouse Move","synergy.relativemousemove",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Relative Mouse Move","synergy.relativemousemove",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmrm_x,
-			{ "X Axis","synergy.relativemousemove.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "X Axis","synergy.relativemousemove.x",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmrm_y,
-			{ "Y Axis","synergy.relativemousemove.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Y Axis","synergy.relativemousemove.y",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dmwm,
-			{ "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Mouse Button Pressed","synergy.mousebuttonpressed",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dclp,
-			{ "Clipboard Data","synergy.clipboarddata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Clipboard Data","synergy.clipboarddata",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dclp_clipboardidentifier,
-			{ "Clipboard Identifier","synergy.clipboarddata.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Clipboard Identifier","synergy.clipboarddata.identifier",FT_UINT8, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dclp_sequencenumber,
-			{ "Sequence Number","synergy.clipboarddata.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Sequence Number","synergy.clipboarddata.sequence",FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dclp_clipboarddata,
-			{ "Clipboard Data","synergy.clipboarddata.data",FT_STRING, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Clipboard Data","synergy.clipboarddata.data",FT_STRING, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf,
-			{ "Client Data","synergy.clientdata",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Client Data","synergy.clientdata",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_clp,
-			{ "coordinate of leftmost pixel on secondary screen","synergy.clps",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "coordinate of leftmost pixel on secondary screen","synergy.clps",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_ctp,
-			{ "coordinate of topmost pixel on secondary screen","synergy.clps.ctp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "coordinate of topmost pixel on secondary screen","synergy.clps.ctp",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_wsp,
-			{ "width of secondary screen in pixels","synergy.clps.wsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "width of secondary screen in pixels","synergy.clps.wsp",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_hsp,
-			{ "height of secondary screen in pixels","synergy.clps.hsp",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "height of secondary screen in pixels","synergy.clps.hsp",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_swz,
-			{ "size of warp zone","synergy.clps.swz",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "size of warp zone","synergy.clps.swz",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_x,
-			{ "x position of the mouse on the secondary screen","synergy.clps.x",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "x position of the mouse on the secondary screen","synergy.clps.x",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dinf_y,
-			{ "y position of the mouse on the secondary screen","synergy.clps.y",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "y position of the mouse on the secondary screen","synergy.clps.y",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_dsop,
-			{ "Set Options","synergy.setoptions",FT_UINT32, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Set Options","synergy.setoptions",FT_UINT32, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_qinf,
-			{ "Query Screen Info","synergy.qinf",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Query Screen Info","synergy.qinf",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_eicv,
-			{ "incompatible versions","synergy.eicv",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "incompatible versions","synergy.eicv",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_eicv_majorversion,
-			{ "Major Version Number","synergy.eicv.major",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Major Version Number","synergy.eicv.major",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_eicv_minorversion,
-			{ "Minor Version Number","synergy.eicv.minor",FT_UINT16, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Minor Version Number","synergy.eicv.minor",FT_UINT16, BASE_DEC, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_ebsy,
-			{ "Connection Already in Use","synergy.ebsy",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Connection Already in Use","synergy.ebsy",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_eunk,
-			{ "Unknown Client","synergy.unknown",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "Unknown Client","synergy.unknown",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 		{ &hf_synergy_ebad,
-			{ "protocol violation","synergy.violation",FT_NONE, BASE_DEC, NULL, 0x0,"", HFILL }
+			{ "protocol violation","synergy.violation",FT_NONE, BASE_NONE, NULL, 0x0,NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-synphasor.c b/epan/dissectors/packet-synphasor.c
index 720ce1bab0..6bb2ff38f4 100644
--- a/epan/dissectors/packet-synphasor.c
+++ b/epan/dissectors/packet-synphasor.c
@@ -1254,7 +1254,7 @@ void proto_register_synphasor(void)
 		  NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_soc,
-		{ "SOC time stamp (UTC)", PROTOCOL_ABBREV ".soc", FT_STRINGZ, BASE_HEX,
+		{ "SOC time stamp (UTC)", PROTOCOL_ABBREV ".soc", FT_STRINGZ, BASE_NONE,
 		  NULL, 0x0, NULL, HFILL }},
 
 		/* Time quality flags in fracsec */
diff --git a/epan/dissectors/packet-t125.c b/epan/dissectors/packet-t125.c
index c959d98b6d..12eb324548 100644
--- a/epan/dissectors/packet-t125.c
+++ b/epan/dissectors/packet-t125.c
@@ -2205,15 +2205,15 @@ void proto_register_t125(void) {
         "t125.INTEGER_0_MAX", HFILL }},
     { &hf_t125_callingDomainSelector,
       { "callingDomainSelector", "t125.callingDomainSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_calledDomainSelector,
       { "calledDomainSelector", "t125.calledDomainSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_upwardFlag,
       { "upwardFlag", "t125.upwardFlag",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "t125.BOOLEAN", HFILL }},
     { &hf_t125_targetParameters,
       { "targetParameters", "t125.targetParameters",
@@ -2229,7 +2229,7 @@ void proto_register_t125(void) {
         "t125.DomainParameters", HFILL }},
     { &hf_t125_userData,
       { "userData", "t125.userData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_result,
       { "result", "t125.result",
@@ -2273,7 +2273,7 @@ void proto_register_t125(void) {
         "t125.T_userId", HFILL }},
     { &hf_t125_joined,
       { "joined", "t125.joined",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "t125.BOOLEAN", HFILL }},
     { &hf_t125_userId_01,
       { "userId", "t125.userId",
@@ -2397,7 +2397,7 @@ void proto_register_t125(void) {
         "t125.Diagnostic", HFILL }},
     { &hf_t125_initialOctets,
       { "initialOctets", "t125.initialOctets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.OCTET_STRING", HFILL }},
     { &hf_t125_initiator,
       { "initiator", "t125.initiator",
@@ -2429,7 +2429,7 @@ void proto_register_t125(void) {
         "t125.ChannelId", HFILL }},
     { &hf_t125_segmentation,
       { "segmentation", "t125.segmentation",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t125.Segmentation", HFILL }},
     { &hf_t125_tokenStatus,
       { "tokenStatus", "t125.tokenStatus",
@@ -2626,11 +2626,11 @@ void proto_register_t125(void) {
     { &hf_t125_Segmentation_begin,
       { "begin", "t125.begin",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_t125_Segmentation_end,
       { "end", "t125.end",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-t125-hfarr.c ---*/
 #line 95 "packet-t125-template.c"
diff --git a/epan/dissectors/packet-t30.c b/epan/dissectors/packet-t30.c
index 2b3fda09e1..5cd27f476f 100644
--- a/epan/dissectors/packet-t30.c
+++ b/epan/dissectors/packet-t30.c
@@ -1267,14 +1267,14 @@ proto_register_t30(void)
             { "ITU-T Country code", "t30.fif.country_code", FT_UINT8, BASE_DEC,
               NULL, 0, NULL, HFILL }},
         {  &hf_t30_fif_non_stand_bytes,
-            { "Non-standard capabilities", "t30.fif.non_standard_cap", FT_BYTES, BASE_HEX,
+            { "Non-standard capabilities", "t30.fif.non_standard_cap", FT_BYTES, BASE_NONE,
               NULL, 0, NULL, HFILL }},
 
         {  &hf_t30_t4_frame_num,
             { "T.4 Frame number", "t30.t4.frame_num", FT_UINT8, BASE_DEC,
               NULL, 0, NULL, HFILL }},
         {  &hf_t30_t4_data,
-            { "T.4 Facsimile data field", "t30.t4.data", FT_BYTES, BASE_HEX,
+            { "T.4 Facsimile data field", "t30.t4.data", FT_BYTES, BASE_NONE,
               NULL, 0, NULL, HFILL }},
 
         {  &hf_t30_partial_page_fcf2,
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c
index 2d0e55aae3..0b0d44241e 100644
--- a/epan/dissectors/packet-t38.c
+++ b/epan/dissectors/packet-t38.c
@@ -1301,7 +1301,7 @@ proto_register_t38(void)
         "t38.T_field_type", HFILL }},
     { &hf_t38_field_data,
       { "field-data", "t38.field_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t38.T_field_data", HFILL }},
     { &hf_t38_seq_number,
       { "seq-number", "t38.seq_number",
@@ -1337,7 +1337,7 @@ proto_register_t38(void)
         "t38.T_fec_data", HFILL }},
     { &hf_t38_fec_data_item,
       { "fec-data item", "t38.fec_data_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "t38.OCTET_STRING", HFILL }},
 
 /*--- End of included file: packet-t38-hfarr.c ---*/
@@ -1359,18 +1359,18 @@ proto_register_t38(void)
 			FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
 		{&hf_t38_fragment_overlap,
 			{"Message fragment overlap", "t38.fragment.overlap",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 		{&hf_t38_fragment_overlap_conflicts,
 			{"Message fragment overlapping with conflicting data",
 			"t38.fragment.overlap.conflicts",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 		{&hf_t38_fragment_multiple_tails,
 			{"Message has multiple tail fragments",
 			"t38.fragment.multiple_tails", 
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 		{&hf_t38_fragment_too_long_fragment,
 			{"Message fragment too long", "t38.fragment.too_long_fragment",
-			FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } },
+			FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL } },
 		{&hf_t38_fragment_error,
 			{"Message defragmentation error", "t38.fragment.error",
 			FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } },
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c
index 6a3798df5c..2e70cfc465 100644
--- a/epan/dissectors/packet-tapa.c
+++ b/epan/dissectors/packet-tapa.c
@@ -479,124 +479,124 @@ proto_register_tapa(void)
 	/* TAPA discover header */
 		{ &hf_tapa_discover_type,
 		{ "Type",	"tapa.discover.type", FT_UINT8, BASE_DEC, VALS(tapa_discover_type_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_flags,
 		{ "Flags",	"tapa.discover.flags", FT_UINT8, BASE_HEX, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_length,
 		{ "Length",	"tapa.discover.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 	/* TAPA discover request */
 		{ &hf_tapa_discover_req_type,
 		{ "Req type",	"tapa.discover.req.type", FT_UINT8, BASE_DEC, VALS(tapa_discover_request_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_req_pad,
 		{ "Req padding",	"tapa.discover.req.pad", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_req_length,
 		{ "Req length",	"tapa.discover.req.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
                 { &hf_tapa_discover_req_value,
                 { "Req value",   "tapa.discover.req.value", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA discover reply */
                 { &hf_tapa_discover_reply_switchip,
                 { "Switch Ip",   "tapa.discover.reply.switchip", FT_IPv4, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_reply_unused,
-		{ "Reply unused ",	"tapa.discover.reply.unused", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+		{ "Reply unused",	"tapa.discover.reply.unused", FT_UINT8, BASE_DEC, NULL,
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_reply_bias,
 		{ "Reply bias",	"tapa.discover.reply.bias", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
                 { &hf_tapa_discover_reply_pad,
                 { "Reply pad",   "tapa.discover.reply.pad", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA discover new request/reply tlv */
 		{ &hf_tapa_discover_newtlv_type,
 		{ "New tlv type",	"tapa.discover.newtlv.type", FT_UINT8, BASE_DEC, VALS(tapa_discover_request_vals),
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_newtlv_pad,
 		{ "New tlv padding",	"tapa.discover.newtlv.pad", FT_UINT8, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
 		{ &hf_tapa_discover_newtlv_length,
 		{ "New tlv length",	"tapa.discover.newtlv.length", FT_UINT16, BASE_DEC, NULL,
-			0x0, "", HFILL }},
+			0x0, NULL, HFILL }},
 
                 { &hf_tapa_discover_newtlv_valuetext,
-                { "New tlv value",   "tapa.discover.newtlv.valuetext", FT_STRING, BASE_DEC, NULL,
-                        0x0, "", HFILL }},
+                { "New tlv value",   "tapa.discover.newtlv.valuetext", FT_STRING, BASE_NONE, NULL,
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_discover_newtlv_valuehex,
                 { "New tlv value",   "tapa.discover.newtlv.valuehex", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA discover unknown packet */
                 { &hf_tapa_discover_unknown,
                 { "Tapa unknown packet",   "tapa.discover.unknown", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA tunnel */
                 { &hf_tapa_tunnel_version,
                 { "Tapa tunnel version",   "tapa.tunnel.version", FT_UINT8, BASE_HEX, NULL,
-                        0xF0, "", HFILL }},
+                        0xF0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_five,
                 { "Tapa tunnel five",   "tapa.tunnel.five", FT_UINT8, BASE_HEX, NULL,
-                        0x0F, "", HFILL }},
+                        0x0F, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_type,
                 { "Tapa tunnel type",   "tapa.tunnel.type", FT_UINT8, BASE_HEX, VALS(tapa_tunnel_type_vals),
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_zero,
                 { "Tapa tunnel zeroes",   "tapa.tunnel.zero", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_dmac,
                 { "Tapa tunnel dest mac",   "tapa.tunnel.dmac", FT_ETHER, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_smac,
                 { "Tapa tunnel src mac",   "tapa.tunnel.smac", FT_ETHER, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA tunnel type 0 */
                 { &hf_tapa_tunnel_0804,
                 { "Tapa tunnel 0804",   "tapa.tunnel.0804", FT_UINT16, BASE_HEX, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_tagsetc,
                 { "Tapa tunnel tags, seqno, pad",   "tapa.tunnel.tags", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 	/* TAPA tunnel type 1 */
                 { &hf_tapa_tunnel_seqno,
                 { "Tapa tunnel seqno",   "tapa.tunnel.seqno", FT_UINT16, BASE_DEC, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
                 { &hf_tapa_tunnel_length,
                 { "Tapa tunnel length",   "tapa.tunnel.length", FT_UINT16, BASE_DEC, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
 
 	/* TAPA tunnel remaining stuff */
                 { &hf_tapa_tunnel_remaining,
                 { "Tapa tunnel all data",   "tapa.tunnel.remaining", FT_BYTES, BASE_NONE, NULL,
-                        0x0, "", HFILL }},
+                        0x0, NULL, HFILL }},
 
         };
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-tcap.c b/epan/dissectors/packet-tcap.c
index 6c6fe3c79a..0c20ea30ba 100644
--- a/epan/dissectors/packet-tcap.c
+++ b/epan/dissectors/packet-tcap.c
@@ -1555,29 +1555,29 @@ proto_register_tcap(void)
 	{ &hf_tcap_tag,
 		{ "Tag",           "tcap.msgtype",
 		FT_UINT8, BASE_HEX, NULL, 0,
-		"", HFILL }
+		NULL, HFILL }
 	},
 	{ &hf_tcap_length,
 		{ "Length", "tcap.len",
 		FT_UINT8, BASE_DEC, NULL, 0,
-		"", HFILL }
+		NULL, HFILL }
 	},
 	{ &hf_tcap_data,
 		{ "Data", "tcap.data",
-		FT_BYTES, BASE_HEX, NULL, 0,
-		"", HFILL }
+		FT_BYTES, BASE_NONE, NULL, 0,
+		NULL, HFILL }
 	},
 		{ &hf_tcap_tid,
 		{ "Transaction Id", "tcap.tid",
-		FT_BYTES, BASE_HEX, NULL, 0,
-		"", HFILL }
+		FT_BYTES, BASE_NONE, NULL, 0,
+		NULL, HFILL }
 	},
 	/* Tcap Service Response Time */
 	{ &hf_tcapsrt_SessionId,
 	  { "Session Id",
 	    "tcap.srt.session_id",
 	    FT_UINT32, BASE_DEC, NULL, 0x0,
-	    "", HFILL }
+	    NULL, HFILL }
 	},
 	{ &hf_tcapsrt_BeginSession,
 	  { "Begin Session",
@@ -1620,7 +1620,7 @@ proto_register_tcap(void)
         "tcap.OBJECT_IDENTIFIER", HFILL }},
     { &hf_tcap_dialog,
       { "dialog", "tcap.dialog",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.Dialog1", HFILL }},
     { &hf_tcap_unidirectional,
       { "unidirectional", "tcap.unidirectional",
@@ -1644,7 +1644,7 @@ proto_register_tcap(void)
         "tcap.Abort", HFILL }},
     { &hf_tcap_dialoguePortion,
       { "dialoguePortion", "tcap.dialoguePortion",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.DialoguePortion", HFILL }},
     { &hf_tcap_components,
       { "components", "tcap.components",
@@ -1652,11 +1652,11 @@ proto_register_tcap(void)
         "tcap.ComponentPortion", HFILL }},
     { &hf_tcap_otid,
       { "otid", "tcap.otid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.OrigTransactionID", HFILL }},
     { &hf_tcap_dtid,
       { "dtid", "tcap.dtid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.DestTransactionID", HFILL }},
     { &hf_tcap_reason,
       { "reason", "tcap.reason",
@@ -1668,7 +1668,7 @@ proto_register_tcap(void)
         "tcap.P_AbortCause", HFILL }},
     { &hf_tcap_u_abortCause,
       { "u-abortCause", "tcap.u_abortCause",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.DialoguePortion", HFILL }},
     { &hf_tcap__untag_item,
       { "Component", "tcap.Component",
@@ -1772,7 +1772,7 @@ proto_register_tcap(void)
         "tcap.AUDT_apdu", HFILL }},
     { &hf_tcap_audt_protocol_version,
       { "protocol-version", "tcap.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.AUDT_protocol_version", HFILL }},
     { &hf_tcap_audt_application_context_name,
       { "application-context-name", "tcap.application_context_name",
@@ -1800,7 +1800,7 @@ proto_register_tcap(void)
         "tcap.ABRT_apdu", HFILL }},
     { &hf_tcap_aarq_protocol_version,
       { "protocol-version", "tcap.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.AARQ_protocol_version", HFILL }},
     { &hf_tcap_aarq_application_context_name,
       { "application-context-name", "tcap.application_context_name",
@@ -1816,7 +1816,7 @@ proto_register_tcap(void)
         "tcap.EXTERNAL", HFILL }},
     { &hf_tcap_aare_protocol_version,
       { "protocol-version", "tcap.protocol_version",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "tcap.AARE_protocol_version", HFILL }},
     { &hf_tcap_aare_application_context_name,
       { "application-context-name", "tcap.application_context_name",
@@ -1861,15 +1861,15 @@ proto_register_tcap(void)
     { &hf_tcap_AUDT_protocol_version_version1,
       { "version1", "tcap.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_tcap_AARQ_protocol_version_version1,
       { "version1", "tcap.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_tcap_AARE_protocol_version_version1,
       { "version1", "tcap.version1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-tcap-hfarr.c ---*/
 #line 319 "packet-tcap-template.c"
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index de541ac96b..146042d428 100644
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -3666,76 +3666,76 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_srcport,
 		{ "Source Port",		"tcp.srcport", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_dstport,
 		{ "Destination Port",		"tcp.dstport", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_port,
 		{ "Source or Destination Port",	"tcp.port", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_stream,
 		{ "Stream index",		"tcp.stream", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_seq,
 		{ "Sequence number",		"tcp.seq", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_nxtseq,
 		{ "Next sequence number",	"tcp.nxtseq", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_ack,
 		{ "Acknowledgement number",	"tcp.ack", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_hdr_len,
 		{ "Header Length",		"tcp.hdr_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags,
 		{ "Flags",			"tcp.flags", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_cwr,
 		{ "Congestion Window Reduced (CWR)",			"tcp.flags.cwr", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_CWR,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_ecn,
 		{ "ECN-Echo",			"tcp.flags.ecn", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_ECN,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_urg,
 		{ "Urgent",			"tcp.flags.urg", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_URG,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_ack,
 		{ "Acknowledgement",		"tcp.flags.ack", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_ACK,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_push,
 		{ "Push",			"tcp.flags.push", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_PUSH,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_reset,
 		{ "Reset",			"tcp.flags.reset", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_RST,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_syn,
 		{ "Syn",			"tcp.flags.syn", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_SYN,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_flags_fin,
 		{ "Fin",			"tcp.flags.fin", FT_BOOLEAN, 8, TFS(&flags_set_truth), TH_FIN,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		/* 32 bits so we can present some values adjusted to window scaling */
 		{ &hf_tcp_window_size,
 		{ "Window size",		"tcp.window_size", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_checksum,
 		{ "Checksum",			"tcp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -3823,7 +3823,7 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_len,
 		  { "TCP Segment Len",            "tcp.len", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_analysis_acks_frame,
 		  { "This is an ACK to the segment in frame",            "tcp.analysis.acks_frame", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
@@ -3847,7 +3847,7 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_urgent_pointer,
 		{ "Urgent pointer",		"tcp.urgent_pointer", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_segment_overlap,
 		{ "Segment overlap",	"tcp.segment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
@@ -3871,7 +3871,7 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_segment,
 		{ "TCP Segment", "tcp.segment", FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"TCP Segment", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tcp_segments,
 		{ "Reassembled TCP Segments", "tcp.segments", FT_NONE, BASE_NONE, NULL, 0x0,
@@ -3883,15 +3883,15 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_options,
 		  { "TCP Options", "tcp.options", FT_BYTES,
-		    BASE_HEX, NULL, 0x0, "TCP Options", HFILL }},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tcp_option_mss,
 		  { "TCP MSS Option", "tcp.options.mss", FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP MSS Option", HFILL }},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tcp_option_mss_val,
 		  { "TCP MSS Option Value", "tcp.options.mss_val", FT_UINT16,
-		    BASE_DEC, NULL, 0x0, "TCP MSS Option Value", HFILL}},
+		    BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_wscale,
 		  { "TCP Window Scale Option", "tcp.options.wscale",
@@ -3906,19 +3906,19 @@ proto_register_tcp(void)
 		{ &hf_tcp_option_sack_perm,
 		  { "TCP Sack Perm Option", "tcp.options.sack_perm",
 		    FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP Sack Perm Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_sack,
 		  { "TCP Sack Option", "tcp.options.sack", FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP Sack Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_sack_sle,
 		  {"TCP Sack Left Edge", "tcp.options.sack_le", FT_UINT32,
-		   BASE_DEC, NULL, 0x0, "TCP Sack Left Edge", HFILL}},
+		   BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_sack_sre,
 		  {"TCP Sack Right Edge", "tcp.options.sack_re", FT_UINT32,
-		   BASE_DEC, NULL, 0x0, "TCP Sack Right Edge", HFILL}},
+		   BASE_DEC, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_echo,
 		  { "TCP Echo Option", "tcp.options.echo", FT_BOOLEAN,
@@ -3927,42 +3927,42 @@ proto_register_tcp(void)
 		{ &hf_tcp_option_echo_reply,
 		  { "TCP Echo Reply Option", "tcp.options.echo_reply",
 		    FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP Echo Reply Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_time_stamp,
 		  { "TCP Time Stamp Option", "tcp.options.time_stamp",
 		    FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP Time Stamp Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_cc,
 		  { "TCP CC Option", "tcp.options.cc", FT_BOOLEAN, BASE_NONE,
-		    NULL, 0x0, "TCP CC Option", HFILL}},
+		    NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_ccnew,
 		  { "TCP CC New Option", "tcp.options.ccnew", FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP CC New Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_ccecho,
 		  { "TCP CC Echo Option", "tcp.options.ccecho", FT_BOOLEAN,
-		    BASE_NONE, NULL, 0x0, "TCP CC Echo Option", HFILL}},
+		    BASE_NONE, NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_md5,
 		  { "TCP MD5 Option", "tcp.options.md5", FT_BOOLEAN, BASE_NONE,
-		    NULL, 0x0, "TCP MD5 Option", HFILL}},
+		    NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_qs,
 		  { "TCP QS Option", "tcp.options.qs", FT_BOOLEAN, BASE_NONE,
-		    NULL, 0x0, "TCP QS Option", HFILL}},
+		    NULL, 0x0, NULL, HFILL}},
 
 		{ &hf_tcp_option_scps,
 		  { "TCP SCPS Capabilities Option", "tcp.options.scps",
 		    FT_BOOLEAN, BASE_NONE, NULL,  0x0,
-		    "TCP SCPS Capabilities Option", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_scps_vector,
 		  { "TCP SCPS Capabilities Vector", "tcp.options.scps.vector",
 		    FT_UINT8, BASE_DEC, NULL, 0x0,
-		    "TCP SCPS Capabilities Vector", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_scps_binding,
 		  { "TCP SCPS Extended Binding Spacce",
@@ -3974,67 +3974,67 @@ proto_register_tcp(void)
 		  { "TCP Selective Negative Acknowledgement Option",
 		    "tcp.options.snack",
 		    FT_BOOLEAN, BASE_NONE, NULL,  0x0,
-		    "TCP Selective Negative Acknowledgement Option", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_snack_offset,
 		  { "TCP SNACK Offset", "tcp.options.snack.offset",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "TCP SNACK Offset", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_snack_size,
 		  { "TCP SNACK Size", "tcp.options.snack.size",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "TCP SNACK Size", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_snack_le,
 		  { "TCP SNACK Left Edge", "tcp.options.snack.le",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "TCP SNACK Left Edge", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_option_snack_re,
 		  { "TCP SNACK Right Edge", "tcp.options.snack.re",
 		    FT_UINT16, BASE_DEC, NULL, 0x0,
-		    "TCP SNACK Right Edge", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_scpsoption_flags_bets,
 		  { "Partial Reliability Capable (BETS)",
 		    "tcp.options.scpsflags.bets", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x80, "", HFILL }},
+		    TFS(&flags_set_truth), 0x80, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_snack1,
 		  { "Short Form SNACK Capable (SNACK1)",
 		    "tcp.options.scpsflags.snack1", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x40, "", HFILL }},
+		    TFS(&flags_set_truth), 0x40, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_snack2,
 		  { "Long Form SNACK Capable (SNACK2)",
 		    "tcp.options.scpsflags.snack2", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x20, "", HFILL }},
+		    TFS(&flags_set_truth), 0x20, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_compress,
 		  { "Lossless Header Compression (COMP)",
 		    "tcp.options.scpsflags.compress", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x10, "", HFILL }},
+		    TFS(&flags_set_truth), 0x10, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_nlts,
 		  { "Network Layer Timestamp (NLTS)",
 		    "tcp.options.scpsflags.nlts", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x8, "", HFILL }},
+		    TFS(&flags_set_truth), 0x8, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_resv1,
 		  { "Reserved Bit 1",
 		    "tcp.options.scpsflags.reserved1", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x4, "", HFILL }},
+		    TFS(&flags_set_truth), 0x4, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_resv2,
 		  { "Reserved Bit 2",
 		    "tcp.options.scpsflags.reserved2", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x2, "", HFILL }},
+		    TFS(&flags_set_truth), 0x2, NULL, HFILL }},
 
 		{ &hf_tcp_scpsoption_flags_resv3,
 		  { "Reserved Bit 3",
 		    "tcp.options.scpsflags.reserved3", FT_BOOLEAN, 8,
-		    TFS(&flags_set_truth), 0x1, "", HFILL }},
+		    TFS(&flags_set_truth), 0x1, NULL, HFILL }},
 
 		{ &hf_tcp_pdu_time,
 		  { "Time until the last segment of this PDU", "tcp.pdu.time", FT_RELATIVE_TIME, BASE_NONE, NULL, 0x0,
@@ -4058,15 +4058,15 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_proc_src_uid,
 		  { "Source process user ID", "tcp.proc.srcuid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Source process user ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_src_pid,
 		  { "Source process ID", "tcp.proc.srcpid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Source process ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_src_uname,
 		  { "Source process user name", "tcp.proc.srcuname", FT_STRING, BASE_NONE, NULL, 0x0,
-		    "Source process user name", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_src_cmd,
 		  { "Source process name", "tcp.proc.srccmd", FT_STRING, BASE_NONE, NULL, 0x0,
@@ -4074,15 +4074,15 @@ proto_register_tcp(void)
 
 		{ &hf_tcp_proc_dst_uid,
 		  { "Destination process user ID", "tcp.proc.dstuid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Destination process user ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_dst_pid,
 		  { "Destination process ID", "tcp.proc.dstpid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Destination process ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_dst_uname,
 		  { "Destination process user name", "tcp.proc.dstuname", FT_STRING, BASE_NONE, NULL, 0x0,
-		    "Destination process user name", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_tcp_proc_dst_cmd,
 		  { "Destination process name", "tcp.proc.dstcmd", FT_STRING, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-tds.c b/epan/dissectors/packet-tds.c
index 78cc165eff..4a35917eef 100644
--- a/epan/dissectors/packet-tds.c
+++ b/epan/dissectors/packet-tds.c
@@ -2007,12 +2007,12 @@ proto_register_tds(void)
 		{ &hf_tds_packet_number,
 			{ "Packet Number",  "tds.packet_number",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Packet Number", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_tds_window,
 			{ "Window",         "tds.window",
 			FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Window", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_tds_fragment_overlap,
 			{ "Segment overlap",	"tds.fragment.overlap",
@@ -2042,12 +2042,12 @@ proto_register_tds(void)
 		{ &hf_tds_fragment,
 			{ "TDS Fragment",	"tds.fragment",
 			FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-			"TDS Fragment", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_tds_fragments,
 			{ "TDS Fragments",	"tds.fragments",
 			FT_NONE, BASE_NONE, NULL, 0x0,
-			"TDS Fragments", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_tds_reassembled_in,
 			{ "Reassembled TDS in frame", "tds.reassembled_in",
@@ -2062,7 +2062,7 @@ proto_register_tds(void)
 		{ &hf_tds7_version,
                         { "TDS version", "tds7login.version",
                         FT_UINT32, BASE_HEX, NULL, 0x0,
-                        "TDS version", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_packet_size,
                         { "Packet Size", "tds7login.packet_size",
@@ -2072,32 +2072,32 @@ proto_register_tds(void)
 		{ &hf_tds7_client_version,
                         { "Client version", "tds7login.client_version",
                         FT_UINT32, BASE_DEC, NULL, 0x0,
-                        "Client version", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_client_pid,
                         { "Client PID", "tds7login.client_pid",
                         FT_UINT32, BASE_DEC, NULL, 0x0,
-                        "Client PID", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_connection_id,
                         { "Connection ID", "tds7login.connection_id",
                         FT_UINT32, BASE_DEC, NULL, 0x0,
-                        "Connection ID", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_option_flags1,
                         { "Option Flags 1", "tds7login.option_flags1",
                         FT_UINT8, BASE_HEX, NULL, 0x0,
-                        "Option Flags 1", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_option_flags2,
                         { "Option Flags 2", "tds7login.option_flags2",
                         FT_UINT8, BASE_HEX, NULL, 0x0,
-                        "Option Flags 2", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_sql_type_flags,
                         { "SQL Type Flags", "tds7login.sql_type_flags",
                         FT_UINT8, BASE_HEX, NULL, 0x0,
-                        "SQL Type Flags", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_reserved_flags,
                         { "Reserved Flags", "tds7login.reserved_flags",
@@ -2107,17 +2107,17 @@ proto_register_tds(void)
 		{ &hf_tds7_time_zone,
                         { "Time Zone", "tds7login.time_zone",
                         FT_UINT32, BASE_HEX, NULL, 0x0,
-                        "Time Zone", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_collation,
                         { "Collation", "tds7login.collation",
                         FT_UINT32, BASE_HEX, NULL, 0x0,
-                        "Collation", HFILL }
+                        NULL, HFILL }
                 },
 		{ &hf_tds7_message,
 			{ "Message", "tds7.message",
 			FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-teamspeak2.c b/epan/dissectors/packet-teamspeak2.c
index 147d75c1d7..c99dc6c042 100644
--- a/epan/dissectors/packet-teamspeak2.c
+++ b/epan/dissectors/packet-teamspeak2.c
@@ -935,7 +935,7 @@ void proto_register_ts2(void)
 		},
 		{ &hf_ts2_unknown,
 		  { "Unknown", "ts2.unknown",
-		    FT_BYTES, BASE_HEX,
+		    FT_BYTES, BASE_NONE,
 		    NULL, 0x0,
 		    NULL, HFILL }
 		},
@@ -1104,27 +1104,27 @@ void proto_register_ts2(void)
 		{ &hf_msg_fragment_overlap,
 		  {"Message fragment overlap", "ts2.fragment.overlap",
 		   FT_BOOLEAN, BASE_NONE,
-		   NULL, 0x00,
+		   NULL, 0x0,
 		   NULL, HFILL } 
 		},
 		{ &hf_msg_fragment_overlap_conflicts,
 		  {"Message fragment overlapping with conflicting data",
 		   "ts2.fragment.overlap.conflicts",
 		   FT_BOOLEAN, BASE_NONE,
-		   NULL, 0x00,
+		   NULL, 0x0,
 		   NULL, HFILL } 
 		},
 		{ &hf_msg_fragment_multiple_tails,
 		  {"Message has multiple tail fragments",
 		   "ts2.fragment.multiple_tails", 
 		   FT_BOOLEAN, BASE_NONE,
-		   NULL, 0x00,
+		   NULL, 0x0,
 		   NULL, HFILL } 
 		},
 		{ &hf_msg_fragment_too_long_fragment,
 		  {"Message fragment too long", "ts2.fragment.too_long_fragment",
 		   FT_BOOLEAN, BASE_NONE,
-		   NULL, 0x00,
+		   NULL, 0x0,
 		   NULL, HFILL } 
 		},
 		{ &hf_msg_fragment_error,
diff --git a/epan/dissectors/packet-teredo.c b/epan/dissectors/packet-teredo.c
index 05abd17d6e..4a856d9dd0 100644
--- a/epan/dissectors/packet-teredo.c
+++ b/epan/dissectors/packet-teredo.c
@@ -343,7 +343,7 @@ proto_register_teredo(void)
 		{ &hf_teredo_auth,
 		{ "Teredo Authentication header", "teredo.auth",
 		  FT_NONE, BASE_NONE, NULL, 0x0,
-		  "Teredo Authentication header", HFILL }},
+		  NULL, HFILL }},
   
 		{ &hf_teredo_auth_idlen,
 		{ "Client identifier length", "teredo.auth.idlen",
@@ -386,12 +386,12 @@ proto_register_teredo(void)
 		{ &hf_teredo_orig_port,
 		{ "Origin UDP port", "teredo.orig.port",
 		  FT_UINT16, BASE_DEC, NULL, 0x0,
-		  "Origin UDP port", HFILL }},
+		  NULL, HFILL }},
 
 		{ &hf_teredo_orig_addr,
 		{ "Origin IPv4 address", "teredo.orig.addr",
 		  FT_IPv4, BASE_NONE, NULL, 0x0,
-		  "Origin IPv4 address", HFILL }},
+		  NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-tftp.c b/epan/dissectors/packet-tftp.c
index e513d12c6e..8439e8c0a6 100644
--- a/epan/dissectors/packet-tftp.c
+++ b/epan/dissectors/packet-tftp.c
@@ -472,17 +472,17 @@ proto_register_tftp(void)
 
     { &hf_tftp_source_file,
       { "Source File",	      "tftp.source_file",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
       	"TFTP source file name", HFILL }},
 
     { &hf_tftp_destination_file,
       { "DESTINATION File",   "tftp.destination_file",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
       	"TFTP source file name", HFILL }},
 
     { &hf_tftp_transfer_type,
       { "Type",	              "tftp.type",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
       	"TFTP transfer type", HFILL }},
 
     { &hf_tftp_blocknum,
@@ -497,18 +497,18 @@ proto_register_tftp(void)
 
     { &hf_tftp_error_string,
       { "Error message",      "tftp.error.message",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
       	"Error string in case of TFTP error message", HFILL }},
 
     { &hf_tftp_option_name,
       { "Option name",              "tftp.option.name",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
     { &hf_tftp_option_value,
       { "Option value",              "tftp.option.value",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
 
   };
   static gint *ett[] = {
diff --git a/epan/dissectors/packet-tipc.c b/epan/dissectors/packet-tipc.c
index 5c53dfd128..9120e20b03 100644
--- a/epan/dissectors/packet-tipc.c
+++ b/epan/dissectors/packet-tipc.c
@@ -2330,19 +2330,19 @@ proto_register_tipc(void)
 		},
 		{ &hf_tipc_msg_fragment_overlap,
 			{ "Message fragment overlap", "tipc.msg.fragment.overlap",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_tipc_msg_fragment_overlap_conflicts,
 			{ "Message fragment overlapping with conflicting data", "tipc.msg.fragment.overlap.conflicts",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_tipc_msg_fragment_multiple_tails,
 			{ "Message has multiple tail fragments", "tipc.msg.fragment.multiple_tails",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_tipc_msg_fragment_too_long_fragment,
 			{ "Message fragment too long", "tipc.msg.fragment.too_long_fragment",
-				FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL }
+				FT_BOOLEAN, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_tipc_msg_fragment_error,
 			{ "Message defragmentation error", "tipc.msg.fragment.error",
@@ -2630,42 +2630,42 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_errorcode,
 			{ "Error code", "tipcv2.errorcode",
 				FT_UINT32, BASE_DEC, VALS(tipcv2_error_code_strings), 0x1e000000,
-				"Error code", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_rer_cnt,
 			{ "Reroute Counter", "tipcv2.rer_cnt",
 				FT_UINT32, BASE_DEC, NULL, 0x01e00000,
-				"Reroute Counter", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_lookup_scope,
 			{ "Lookup Scope", "tipcv2.lookup_scope",
 				FT_UINT32, BASE_DEC, VALS(tipcv2_lookup_scope_strings), 0x00180000,
-				"Lookup Scope", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_opt_p,
 			{ "Options Position", "tipcv2.opt_p",
 				FT_UINT32, BASE_DEC, NULL, 0x00070000,
-				"Options Position", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_broadcast_ack_no,
 			{ "Broadcast Acknowledge Number", "tipcv2.broadcast_ack_no",
 				FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
-				"Broadcast Acknowledge Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_link_level_ack_no,
 			{ "Link Level Acknowledge Number", "tipcv2.link_level_ack_no",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Link Level Acknowledge Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_link_level_seq_no,
 			{ "Link Level Sequence Number", "tipcv2.link_level_seq_no",
 				FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
-				"Link Level Sequence Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_bcast_seq_no,
 			{ "Broadcast Sequence Number", "tipcv2.bcast_seq_no",
 				FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
-				"Broadcast Sequence Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_prev_node,
 			{ "Previous Node", "tipcv2.prev_node",
@@ -2685,12 +2685,12 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_port_name_type,
 			{ "Port name type", "tipcv2.port_name_type",
 				FT_UINT32, BASE_DEC, NULL, 0xffffffff,
-				"Port name type", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_port_name_instance,
 			{ "Port name instance", "tipcv2.port_name_instance",
 				FT_UINT32, BASE_DEC, NULL, 0xffffffff,
-				"Port name instance", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_multicast_lower,
 			{ "Multicast lower bound", "tipcv2.multicast_lower",
@@ -2705,47 +2705,47 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_bcast_seq_gap,
 			{ "Broadcast Sequence Gap", "tipcv2.bcast_seq_gap",
 				FT_UINT32, BASE_DEC, NULL, 0x1F000000,
-				"Broadcast Sequence Gap", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_sequence_gap,
 			{ "Sequence Gap", "tipcv2.seq_gap",
 				FT_UINT32, BASE_DEC, NULL, 0x00FF0000,
-				"Sequence Gap", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_next_sent_broadcast,
 			{ "Next Sent Broadcast", "tipcv2.next_sent_broadcast",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Next Sent Broadcast", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_fragment_number,
 			{ "Fragment Number", "tipcv2.fragment_number",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Fragment Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_fragment_msg_number,
 			{ "Fragment Message Number", "tipcv2.fragment_msg_number",
 				FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
-				"Fragment Message Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_next_sent_packet,
 			{ "Next Sent Packet", "tipcv2.next_sent_packet",
 				FT_UINT32, BASE_DEC, NULL, 0x0000FFFF,
-				"Next Sent Packet", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_session_no,
 			{ "Session Number", "tipcv2.session_no",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Session Number", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_link_prio,
 			{ "Link Priority", "tipcv2.link_prio",
 				FT_UINT32, BASE_DEC, NULL, 0x000001F0,
-				"Link Priority", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_network_plane,
 			{ "Network Plane", "tipcv2.network_plane",
 				FT_UINT32, BASE_DEC, VALS(tipcv2_networkplane_strings), 0x0000000E,
-				"Network Plane", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_probe,
 			{ "Probe", "tipcv2.probe",
@@ -2764,8 +2764,8 @@ proto_register_tipc(void)
 		},
 		{ &hf_tipcv2_bearer_level_orig_addr,
 			{ "Bearer Level Originating Address", "tipcv2.bearer_level_orig_addr",
-				FT_BYTES, BASE_HEX, NULL, 0,
-				"Bearer Level Originating Address", HFILL }
+				FT_BYTES, BASE_NONE, NULL, 0,
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_cluster_address,
 			{ "Cluster Address", "tipcv2.cluster_address",
@@ -2774,7 +2774,7 @@ proto_register_tipc(void)
 		},
 		{ &hf_tipcv2_bitmap,
 			{ "Bitmap", "tipcv2.bitmap",
-				FT_BYTES, BASE_HEX, NULL, 0,
+				FT_BYTES, BASE_NONE, NULL, 0,
 				"Bitmap, indicating to which nodes within that cluster the sending node has direct links", HFILL }
 		},
 		{ &hf_tipcv2_node_address,
@@ -2795,17 +2795,17 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_bcast_tag,
 			{ "Broadcast Tag", "tipcv2.bcast_tag",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Broadcast Tag", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_msg_count,
 			{ "Message Count", "tipcv2.msg_count",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Message Count", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_max_packet,
 			{ "Max Packet", "tipcv2.max_packet",
 				FT_UINT32, BASE_DEC, NULL, 0xFFFF0000,
-				"Max Packet", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_transport_seq_no,
 			{ "Transport Sequence No", "tipcv2.tseq_no",
@@ -2815,22 +2815,22 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_redundant_link,
 			{ "Redundant Link", "tipcv2.redundant_link",
 				FT_UINT32, BASE_DEC, NULL, 0x00001000,
-				"Redundant Link", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_bearer_id,
 			{ "Bearer identity", "tipcv2.bearer_id",
 				FT_UINT32, BASE_DEC, NULL, 0x00000e00,
-				"Bearer identity", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_conn_mgr_msg_ack, /* special CONN_MANAGER payload */
 			{ "Number of Messages Acknowledged", "tipcv2.conn_mgr_msg_ack",
 				FT_UINT32, BASE_DEC, NULL, 0xffff0000,
-				"Number of Messages Acknowledged", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_req_links,
 			{ "Requested Links", "tipcv2.req_links",
 				FT_UINT32, BASE_DEC, NULL, 0x0fff0000,
-				"Requested Links", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_timestamp,
 			{ "Timestamp", "tipcv2.timestamp",
@@ -2840,42 +2840,42 @@ proto_register_tipc(void)
 		{ &hf_tipcv2_item_size,
 			{ "Item Size", "tipcv2.item_size",
 				FT_UINT32, BASE_DEC, NULL, 0xFF000000,
-				"Item Size", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_network_region,
 			{ "Network Region", "tipcv2.network_region",
 				FT_STRING, BASE_NONE, NULL, 0x0,
-				"Network Region", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_local_router,
 			{ "Local Router", "tipcv2.local_router",
 				FT_STRING, BASE_NONE, NULL, 0x0,
-				"Local Router", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_remote_router,
 			{ "Remote Router", "tipcv2.remote_router",
 				FT_STRING, BASE_NONE, NULL, 0x0,
-				"Remote Router", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_dist_dist,
 			{ "Route Distributor Dist", "tipcv2.dist_dist",
 				FT_UINT32, BASE_DEC, VALS(tipcv2_dist_dist_strings), 0x000000f0,
-				"Route Distributor Dist", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_dist_scope,
 			{ "Route Distributor Scope", "tipcv2.dist_scope",
 				FT_UINT32, BASE_DEC, VALS(tipcv2_dist_scope_strings), 0x0000000f,
-				"Route Distributor Scope", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_name_dist_port_id_node,
 			{ "Port Id Node", "tipcv2.port_id_node",
 				FT_STRING, BASE_NONE, NULL, 0x0,
-				"Port Id Node", HFILL }
+				NULL, HFILL }
 		},
 		{ &hf_tipcv2_media_id,
 			{ "Media Id", "tipcv2.media_id",
 				FT_UINT32, BASE_DEC, NULL, 0x000000ff,
-				"Media Id", HFILL }
+				NULL, HFILL }
 		}
 	};
 
diff --git a/epan/dissectors/packet-tnef.c b/epan/dissectors/packet-tnef.c
index f8dfbc7c57..6c50d9f1c9 100644
--- a/epan/dissectors/packet-tnef.c
+++ b/epan/dissectors/packet-tnef.c
@@ -658,156 +658,156 @@ proto_register_tnef(void)
   static hf_register_info hf[] = {
     { &hf_tnef_signature,
       { "Signature", "tnef.signature", FT_UINT32,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_key,
       { "Key", "tnef.key", FT_UINT16,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute,
       { "Attribute", "tnef.attribute", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_lvl,
       { "Type", "tnef.attribute.lvl", FT_UINT8,  BASE_DEC, VALS(tnef_Lvl_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_tag,
       { "Tag", "tnef.attribute.tag", FT_UINT32,  BASE_HEX, VALS(tnef_Attribute_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_tag_type,
       { "Type", "tnef.attribute.tag.type", FT_UINT16,  BASE_HEX, VALS(tnef_Types_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_tag_id,
       { "Tag", "tnef.attribute.tag.id", FT_UINT16,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_length,
       { "Length", "tnef.attribute.length", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_value,
       { "Value", "tnef.attribute.value", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_string,
       { "String", "tnef.attribute.string", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_date,
       { "Date", "tnef.attribute.string", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_display_name,
       { "Display Name", "tnef.attribute.display_name", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_email_address,
       { "Email Address", "tnef.attribute.email_address", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_attribute_date_year, 
-      { "Year", "tnef.attribute.date.year", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Year", "tnef.attribute.date.year", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_month, 
-      { "Month", "tnef.attribute.date.month", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Month", "tnef.attribute.date.month", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_day, 
-      { "Day", "tnef.attribute.date.day", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Day", "tnef.attribute.date.day", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_hour, 
-      { "Hour", "tnef.attribute.date.hour", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Hour", "tnef.attribute.date.hour", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_minute, 
-      { "Minute", "tnef.attribute.date.minute", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Minute", "tnef.attribute.date.minute", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_second, 
-      { "Second", "tnef.attribute.date.second", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Second", "tnef.attribute.date.second", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_attribute_date_day_of_week, 
-      { "Day Of Week", "tnef.attribute.date.day_of_week", FT_UINT16, BASE_DEC, VALS(weekday_vals), 0, "", HFILL }},
+      { "Day Of Week", "tnef.attribute.date.day_of_week", FT_UINT16, BASE_DEC, VALS(weekday_vals), 0, NULL, HFILL }},
     { &hf_tnef_attribute_checksum,
       { "Checksum", "tnef.attribute.checksum", FT_UINT16,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_mapi_props,
       { "MAPI Properties", "tnef.mapi_props", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_version,
       { "Version", "tnef.version", FT_UINT32,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_oem_codepage,
       { "OEM Codepage", "tnef.oem_codepage", FT_UINT64,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_message_class,
       { "Message Class", "tnef.message_class", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_original_message_class,
       { "Original Message Class", "tnef.message_class.original", FT_STRING,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_priority,
       { "Priority", "tnef.priority", FT_UINT16,  BASE_DEC, VALS(tnef_Priority_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_mapi_props_count,
       { "Count", "tnef.mapi_props.count", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property,
       { "Property", "tnef.property", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag,
       { "Tag", "tnef.property.tag", FT_UINT32,  BASE_HEX, VALS(nspi_MAPITAGS_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_type,
       { "Type", "tnef.property.tag.type", FT_UINT16,  BASE_HEX, VALS(nspi_property_types_vals), 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_id,
       { "Tag", "tnef.property.tag.id", FT_UINT16,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_set,
       { "Set", "tnef.attribute.tag.set", FT_GUID,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_kind,
       { "Kind", "tnef.attribute.tag.kind", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_name_id,
       { "Name", "tnef.attribute.tag.name.id", FT_UINT32,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_name_length,
       { "Length", "tnef.attribute.tag.name.length", FT_UINT32,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_property_tag_name_string,
-      { "Name", "tnef.attribute.tag.name.string", FT_STRING,  BASE_HEX, NULL, 0x0,
-      	"", HFILL }},
+      { "Name", "tnef.attribute.tag.name.string", FT_STRING,  BASE_NONE, NULL, 0x0,
+      	NULL, HFILL }},
     { &hf_tnef_property_padding,
       { "Padding", "tnef.property.padding", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_padding,
       { "Padding", "tnef.padding", FT_NONE,  BASE_NONE, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_values_count,
       { "Count", "tnef.values.count", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_value_length,
       { "Length", "tnef.value.length", FT_UINT16,  BASE_DEC, NULL, 0x0,
-      	"", HFILL }},
+      	NULL, HFILL }},
     { &hf_tnef_PropValue_i, 
-      { "I", "tnef.PropValue.i", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "I", "tnef.PropValue.i", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_l, 
-      { "L", "tnef.PropValue.l", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+      { "L", "tnef.PropValue.l", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_b, 
-      { "B", "tnef.PropValue.b", FT_UINT16, BASE_DEC, NULL, 0, "", HFILL }},
+      { "B", "tnef.PropValue.b", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_lpszA, 
-      { "Lpsza", "tnef.PropValue.lpszA", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Lpsza", "tnef.PropValue.lpszA", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_lpszW, 
-      { "Lpszw", "tnef.PropValue.lpszW", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Lpszw", "tnef.PropValue.lpszW", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_lpguid, 
-      { "Lpguid", "tnef.PropValue.lpguid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Lpguid", "tnef.PropValue.lpguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_bin, 
-      { "Bin", "tnef.PropValue.bin", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Bin", "tnef.PropValue.bin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_ft, 
-      { "Ft", "tnef.PropValue.ft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Ft", "tnef.PropValue.ft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_err, 
-      { "Err", "tnef.PropValue.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, "", HFILL }},
+      { "Err", "tnef.PropValue.err", FT_UINT32, BASE_DEC, VALS(nspi_MAPISTATUS_vals), 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVi, 
-      { "Mvi", "tnef.PropValue.MVi", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvi", "tnef.PropValue.MVi", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVl, 
-      { "Mvl", "tnef.PropValue.MVl", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvl", "tnef.PropValue.MVl", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVszA, 
-      { "Mvsza", "tnef.PropValue.MVszA", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvsza", "tnef.PropValue.MVszA", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVbin, 
-      { "Mvbin", "tnef.PropValue.MVbin", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvbin", "tnef.PropValue.MVbin", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVguid, 
-      { "Mvguid", "tnef.PropValue.MVguid", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvguid", "tnef.PropValue.MVguid", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVszW, 
-      { "Mvszw", "tnef.PropValue.MVszW", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvszw", "tnef.PropValue.MVszW", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_MVft, 
-      { "Mvft", "tnef.PropValue.MVft", FT_NONE, BASE_NONE, NULL, 0, "", HFILL }},
+      { "Mvft", "tnef.PropValue.MVft", FT_NONE, BASE_NONE, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_null, 
-      { "Null", "tnef.PropValue.null", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Null", "tnef.PropValue.null", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
     { &hf_tnef_PropValue_object, 
-      { "Object", "tnef.PropValue.object", FT_UINT32, BASE_DEC, NULL, 0, "", HFILL }},
+      { "Object", "tnef.PropValue.object", FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_tnef,
diff --git a/epan/dissectors/packet-tns.c b/epan/dissectors/packet-tns.c
index 65a18743e8..aee1f08ada 100644
--- a/epan/dissectors/packet-tns.c
+++ b/epan/dissectors/packet-tns.c
@@ -1033,186 +1033,186 @@ void proto_register_tns(void)
 
 		{ &hf_tns_version, {
 			"Version", "tns.version", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Version", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_compat_version, {
 			"Version (Compatible)", "tns.compat_version", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Version (Compatible)", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_service_options, {
 			"Service Options", "tns.service_options", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "Service Options", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_sopt_flag_bconn, {
 			"Broken Connect Notify", "tns.so_flag.bconn", FT_BOOLEAN, 16,
-			NULL, 0x2000, "Broken Connect Notify", HFILL }},
+			NULL, 0x2000, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_pc, {
 			"Packet Checksum", "tns.so_flag.pc", FT_BOOLEAN, 16,
-			NULL, 0x1000, "Packet Checksum", HFILL }},
+			NULL, 0x1000, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_hc, {
 			"Header Checksum", "tns.so_flag.hc", FT_BOOLEAN, 16,
-			NULL, 0x0800, "Header Checksum", HFILL }},
+			NULL, 0x0800, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_fd, {
 			"Full Duplex", "tns.so_flag.fd", FT_BOOLEAN, 16,
-			NULL, 0x0400, "Full Duplex", HFILL }},
+			NULL, 0x0400, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_hd, {
 			"Half Duplex", "tns.so_flag.hd", FT_BOOLEAN, 16,
-			NULL, 0x0200, "Half Duplex", HFILL }},
+			NULL, 0x0200, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_dc1, {
 			"Don't Care", "tns.so_flag.dc1", FT_BOOLEAN, 16,
-			NULL, 0x0100, "Don't Care", HFILL }},
+			NULL, 0x0100, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_dc2, {
 			"Don't Care", "tns.so_flag.dc2", FT_BOOLEAN, 16,
-			NULL, 0x0080, "Don't Care", HFILL }},
+			NULL, 0x0080, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_dio, {
 			"Direct IO to Transport", "tns.so_flag.dio", FT_BOOLEAN, 16,
-			NULL, 0x0010, "Direct IO to Transport", HFILL }},
+			NULL, 0x0010, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_ap, {
 			"Attention Processing", "tns.so_flag.ap", FT_BOOLEAN, 16,
-			NULL, 0x0008, "Attention Processing", HFILL }},
+			NULL, 0x0008, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_ra, {
 			"Can Receive Attention", "tns.so_flag.ra", FT_BOOLEAN, 16,
-			NULL, 0x0004, "Can Receive Attention", HFILL }},
+			NULL, 0x0004, NULL, HFILL }},
 		{ &hf_tns_sopt_flag_sa, {
 			"Can Send Attention", "tns.so_flag.sa", FT_BOOLEAN, 16,
-			NULL, 0x0002, "Can Send Attention", HFILL }},
+			NULL, 0x0002, NULL, HFILL }},
 
 
 		{ &hf_tns_sdu_size, {
 			"Session Data Unit Size", "tns.sdu_size", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Session Data Unit Size", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_max_tdu_size, {
 			"Maximum Transmission Data Unit Size", "tns.max_tdu_size", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Maximum Transmission Data Unit Size", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_nt_proto_characteristics, {
 			"NT Protocol Characteristics", "tns.nt_proto_characteristics", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "NT Protocol Characteristics", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_hangon, {
 			"Hangon to listener connect", "tns.ntp_flag.hangon", FT_BOOLEAN, 16,
-			NULL, 0x8000, "Hangon to listener connect", HFILL }},
+			NULL, 0x8000, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_crel, {
 			"Confirmed release", "tns.ntp_flag.crel", FT_BOOLEAN, 16,
-			NULL, 0x4000, "Confirmed release", HFILL }},
+			NULL, 0x4000, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_tduio, {
 			"TDU based IO", "tns.ntp_flag.tduio", FT_BOOLEAN, 16,
-			NULL, 0x2000, "TDU based IO", HFILL }},
+			NULL, 0x2000, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_srun, {
 			"Spawner running", "tns.ntp_flag.srun", FT_BOOLEAN, 16,
-			NULL, 0x1000, "Spawner running", HFILL }},
+			NULL, 0x1000, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_dtest, {
 			"Data test", "tns.ntp_flag.dtest", FT_BOOLEAN, 16,
 			NULL, 0x0800, "Data Test", HFILL }},
 		{ &hf_tns_ntp_flag_cbio, {
 			"Callback IO supported", "tns.ntp_flag.cbio", FT_BOOLEAN, 16,
-			NULL, 0x0400, "Callback IO supported", HFILL }},
+			NULL, 0x0400, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_asio, {
 			"ASync IO Supported", "tns.ntp_flag.asio", FT_BOOLEAN, 16,
-			NULL, 0x0200, "ASync IO Supported", HFILL }},
+			NULL, 0x0200, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_pio, {
 			"Packet oriented IO", "tns.ntp_flag.pio", FT_BOOLEAN, 16,
-			NULL, 0x0100, "Packet oriented IO", HFILL }},
+			NULL, 0x0100, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_grant, {
 			"Can grant connection to another", "tns.ntp_flag.grant", FT_BOOLEAN, 16,
-			NULL, 0x0080, "Can grant connection to another", HFILL }},
+			NULL, 0x0080, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_handoff, {
 			"Can handoff connection to another", "tns.ntp_flag.handoff", FT_BOOLEAN, 16,
-			NULL, 0x0040, "Can handoff connection to another", HFILL }},
+			NULL, 0x0040, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_sigio, {
 			"Generate SIGIO signal", "tns.ntp_flag.sigio", FT_BOOLEAN, 16,
-			NULL, 0x0020, "Generate SIGIO signal", HFILL }},
+			NULL, 0x0020, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_sigpipe, {
 			"Generate SIGPIPE signal", "tns.ntp_flag.sigpipe", FT_BOOLEAN, 16,
-			NULL, 0x0010, "Generate SIGPIPE signal", HFILL }},
+			NULL, 0x0010, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_sigurg, {
 			"Generate SIGURG signal", "tns.ntp_flag.sigurg", FT_BOOLEAN, 16,
-			NULL, 0x0008, "Generate SIGURG signal", HFILL }},
+			NULL, 0x0008, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_urgentio, {
 			"Urgent IO supported", "tns.ntp_flag.urgentio", FT_BOOLEAN, 16,
-			NULL, 0x0004, "Urgent IO supported", HFILL }},
+			NULL, 0x0004, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_fdio, {
 			"Full duplex IO supported", "tns.ntp_flag.dfio", FT_BOOLEAN, 16,
-			NULL, 0x0002, "Full duplex IO supported", HFILL }},
+			NULL, 0x0002, NULL, HFILL }},
 		{ &hf_tns_ntp_flag_testop, {
 			"Test operation", "tns.ntp_flag.testop", FT_BOOLEAN, 16,
-			NULL, 0x0001, "Test operation", HFILL }},
+			NULL, 0x0001, NULL, HFILL }},
 
 
 
 
 		{ &hf_tns_line_turnaround, {
 			"Line Turnaround Value", "tns.line_turnaround", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Line Turnaround Value", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_value_of_one, {
 			"Value of 1 in Hardware", "tns.value_of_one", FT_BYTES, BASE_NONE,
-			NULL, 0x0, "Value of 1 in Hardware", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_connect, {
 			"Connect", "tns.connect", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Connect", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_connect_data_length, {
 			"Length of Connect Data", "tns.connect_data_length", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Length of Connect Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_connect_data_offset, {
 			"Offset to Connect Data", "tns.connect_data_offset", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Offset to Connect Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_connect_data_max, {
 			"Maximum Receivable Connect Data", "tns.connect_data_max", FT_UINT32, BASE_DEC,
-			NULL, 0x0, "Maximum Receivable Connect Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_connect_flags0, {
 			"Connect Flags 0", "tns.connect_flags0", FT_UINT8, BASE_HEX,
-			NULL, 0x0, "Connect Flags 0", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_connect_flags1, {
 			"Connect Flags 1", "tns.connect_flags1", FT_UINT8, BASE_HEX,
-			NULL, 0x0, "Connect Flags 1", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_conn_flag_nareq, {
 			"NA services required", "tns.connect_flags.nareq", FT_BOOLEAN, 8,
-			NULL, 0x10, "NA services required", HFILL }},
+			NULL, 0x10, NULL, HFILL }},
 		{ &hf_tns_conn_flag_nalink, {
 			"NA services linked in", "tns.connect_flags.nalink", FT_BOOLEAN, 8,
-			NULL, 0x08, "NA services linked in", HFILL }},
+			NULL, 0x08, NULL, HFILL }},
 		{ &hf_tns_conn_flag_enablena, {
 			"NA services enabled", "tns.connect_flags.enablena", FT_BOOLEAN, 8,
-			NULL, 0x04, "NA services enabled", HFILL }},
+			NULL, 0x04, NULL, HFILL }},
 		{ &hf_tns_conn_flag_ichg, {
 			"Interchange is involved", "tns.connect_flags.ichg", FT_BOOLEAN, 8,
-			NULL, 0x02, "Interchange is involved", HFILL }},
+			NULL, 0x02, NULL, HFILL }},
 		{ &hf_tns_conn_flag_wantna, {
 			"NA services wanted", "tns.connect_flags.wantna", FT_BOOLEAN, 8,
-			NULL, 0x01, "NA services wanted", HFILL }},
+			NULL, 0x01, NULL, HFILL }},
 
 
 		{ &hf_tns_trace_cf1, {
 			"Trace Cross Facility Item 1", "tns.trace_cf1", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "Trace Cross Facility Item 1", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_trace_cf2, {
 			"Trace Cross Facility Item 2", "tns.trace_cf2", FT_UINT32, BASE_HEX,
-			NULL, 0x0, "Trace Cross Facility Item 2", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_trace_cid, {
 			"Trace Unique Connection ID", "tns.trace_cid", FT_UINT64, BASE_HEX,
-			NULL, 0x0, "Trace Unique Connection ID", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_connect_data, {
 			"Connect Data", "tns.connect_data", FT_STRING, BASE_NONE,
-			NULL, 0x0, "Connect Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_accept, {
 			"Accept", "tns.accept", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Accept", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_accept_data_length, {
 			"Accept Data Length", "tns.accept_data_length", FT_UINT16, BASE_DEC,
 			NULL, 0x0, "Length of Accept Data", HFILL }},
 		{ &hf_tns_accept_data, {
 			"Accept Data", "tns.accept_data", FT_STRING, BASE_NONE,
-			NULL, 0x0, "Accept Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_accept_data_offset, {
 			"Offset to Accept Data", "tns.accept_data_offset", FT_UINT16, BASE_DEC,
-			NULL, 0x0, "Offset to Accept Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 
 		{ &hf_tns_refuse, {
 			"Refuse", "tns.refuse", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Refuse", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_refuse_reason_user, {
 			"Refuse Reason (User)", "tns.refuse_reason_user", FT_UINT8, BASE_HEX,
 			NULL, 0x0, "Refuse Reason from Application", HFILL }},
@@ -1224,11 +1224,11 @@ void proto_register_tns(void)
 			NULL, 0x0, "Length of Refuse Data", HFILL }},
 		{ &hf_tns_refuse_data, {
 			"Refuse Data", "tns.refuse_data", FT_STRING, BASE_NONE,
-			NULL, 0x0, "Refuse Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_abort, {
 			"Abort", "tns.abort", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Abort", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_abort_reason_user, {
 			"Abort Reason (User)", "tns.abort_reason_user", FT_UINT8, BASE_HEX,
 			NULL, 0x0, "Abort Reason from Application", HFILL }},
@@ -1237,80 +1237,80 @@ void proto_register_tns(void)
 			NULL, 0x0, "Abort Reason from System", HFILL }},
 		{ &hf_tns_abort_data, {
 			"Abort Data", "tns.abort_data", FT_STRING, BASE_NONE,
-			NULL, 0x0, "Abort Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_marker, {
 			"Marker", "tns.marker", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Marker", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_marker_type, {
 			"Marker Type", "tns.marker.type", FT_UINT8, BASE_HEX,
-			VALS(tns_marker_types), 0x0, "Marker Type", HFILL }},
+			VALS(tns_marker_types), 0x0, NULL, HFILL }},
 		{ &hf_tns_marker_data_byte, {
 			"Marker Data Byte", "tns.marker.databyte", FT_UINT8, BASE_HEX,
-			NULL, 0x0, "Marker Data Byte", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_marker_data, {
 			"Marker Data", "tns.marker.data", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "Marker Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_control, {
 			"Control", "tns.control", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Control", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_control_cmd, {
 			"Control Command", "tns.control.cmd", FT_UINT16, BASE_HEX,
-			VALS(tns_control_cmds), 0x0, "Control Command", HFILL }},
+			VALS(tns_control_cmds), 0x0, NULL, HFILL }},
 		{ &hf_tns_control_data, {
-			"Control Data", "tns.control.data", FT_BYTES, BASE_HEX,
-			NULL, 0x0, "Control Data", HFILL }},
+			"Control Data", "tns.control.data", FT_BYTES, BASE_NONE,
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_redirect, {
 			"Redirect", "tns.redirect", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Redirect", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_redirect_data_length, {
 			"Redirect Data Length", "tns.redirect_data_length", FT_UINT16, BASE_DEC,
 			NULL, 0x0, "Length of Redirect Data", HFILL }},
 		{ &hf_tns_redirect_data, {
 			"Redirect Data", "tns.redirect_data", FT_STRING, BASE_NONE,
-			NULL, 0x0, "Redirect Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_data, {
 			"Data", "tns.data", FT_BOOLEAN, BASE_NONE,
-			NULL, 0x0, "Data", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_tns_data_flag, {
 			"Data Flag", "tns.data_flag", FT_UINT16, BASE_HEX,
-			NULL, 0x0, "Data Flag", HFILL }},
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_data_flag_send, {
 			"Send Token", "tns.data_flag.send", FT_BOOLEAN, 16,
-			NULL, 0x1, "Send Token", HFILL }},
+			NULL, 0x1, NULL, HFILL }},
 		{ &hf_tns_data_flag_rc, {
 			"Request Confirmation", "tns.data_flag.rc", FT_BOOLEAN, 16,
-			NULL, 0x2, "Request Confirmation", HFILL }},
+			NULL, 0x2, NULL, HFILL }},
 		{ &hf_tns_data_flag_c, {
 			"Confirmation", "tns.data_flag.c", FT_BOOLEAN, 16,
-			NULL, 0x4, "Confirmation", HFILL }},
+			NULL, 0x4, NULL, HFILL }},
 		{ &hf_tns_data_flag_reserved, {
 			"Reserved", "tns.data_flag.reserved", FT_BOOLEAN, 16,
-			NULL, 0x8, "Reserved", HFILL }},
+			NULL, 0x8, NULL, HFILL }},
 		{ &hf_tns_data_flag_more, {
 			"More Data to Come", "tns.data_flag.more", FT_BOOLEAN, 16,
-			NULL, 0x20, "More Data to Come", HFILL }},
+			NULL, 0x20, NULL, HFILL }},
 		{ &hf_tns_data_flag_eof, {
 			"End of File", "tns.data_flag.eof", FT_BOOLEAN, 16,
-			NULL, 0x40, "End of File", HFILL }},
+			NULL, 0x40, NULL, HFILL }},
 		{ &hf_tns_data_flag_dic, {
 			"Do Immediate Confirmation", "tns.data_flag.dic", FT_BOOLEAN, 16,
-			NULL, 0x80, "Do Immediate Confirmation", HFILL }},
+			NULL, 0x80, NULL, HFILL }},
 		{ &hf_tns_data_flag_rts, {
 			"Request To Send", "tns.data_flag.rts", FT_BOOLEAN, 16,
-			NULL, 0x100, "Request To Send", HFILL }},
+			NULL, 0x100, NULL, HFILL }},
 		{ &hf_tns_data_flag_sntt, {
 			"Send NT Trailer", "tns.data_flag.sntt", FT_BOOLEAN, 16,
-			NULL, 0x200, "Send NT Trailer", HFILL }},
+			NULL, 0x200, NULL, HFILL }},
 
 
 		{ &hf_tns_reserved_byte, {
-			"Reserved Byte", "tns.reserved_byte", FT_BYTES, BASE_HEX,
-			NULL, 0x0, "Reserved Byte", HFILL }},
+			"Reserved Byte", "tns.reserved_byte", FT_BYTES, BASE_NONE,
+			NULL, 0x0, NULL, HFILL }},
 		{ &hf_tns_packet_type, {
 			"Packet Type", "tns.type", FT_UINT8, BASE_DEC,
 			VALS(tns_type_vals), 0x0, "Type of TNS packet", HFILL }}
diff --git a/epan/dissectors/packet-tr.c b/epan/dissectors/packet-tr.c
index 44628ee6af..da231037f2 100644
--- a/epan/dissectors/packet-tr.c
+++ b/epan/dissectors/packet-tr.c
@@ -644,35 +644,35 @@ proto_register_tr(void)
 	static hf_register_info hf[] = {
 		{ &hf_tr_ac,
 		{ "Access Control",	"tr.ac", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_priority,
 		{ "Priority",		"tr.priority", FT_UINT8, BASE_DEC, NULL, 0xe0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_frame,
 		{ "Frame",		"tr.frame", FT_BOOLEAN, 8, TFS(&ac_truth), 0x10,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_monitor_cnt,
 		{ "Monitor Count",	"tr.monitor_cnt", FT_UINT8, BASE_DEC, NULL, 0x08,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_priority_reservation,
 		{ "Priority Reservation","tr.priority_reservation", FT_UINT8, BASE_DEC, NULL, 0x07,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_fc,
 		{ "Frame Control",	"tr.fc", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_fc_type,
 		{ "Frame Type",		"tr.frame_type", FT_UINT8, BASE_DEC, VALS(frame_vals), 0xc0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_fc_pcf,
 		{ "Frame PCF",		"tr.frame_pcf", FT_UINT8, BASE_DEC, VALS(pcf_vals), 0x0f,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_dst,
 		{ "Destination",	"tr.dst", FT_ETHER, BASE_NONE,  NULL, 0x0,
@@ -688,12 +688,11 @@ proto_register_tr(void)
 
 		{ &hf_tr_sr,
 		{ "Source Routed",	"tr.sr", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"Source Routed", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_rif_bytes,
 		{ "RIF Bytes",		"tr.rif_bytes", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"Number of bytes in Routing Information Fields, including "
-			"the two bytes of Routing Control Field", HFILL }},
+			"Number of bytes in Routing Information Fields, including the two bytes of Routing Control Field", HFILL }},
 
 		{ &hf_tr_broadcast,
 		{ "Broadcast Type",	"tr.broadcast", FT_UINT8, BASE_DEC, VALS(broadcast_vals), 0x0,
@@ -702,7 +701,7 @@ proto_register_tr(void)
 		{ &hf_tr_max_frame_size,
 		{ "Maximum Frame Size",	"tr.max_frame_size", FT_UINT8, BASE_DEC, VALS(max_frame_size_vals),
 			0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_direction,
 		{ "Direction",		"tr.direction", FT_UINT8, BASE_DEC, VALS(direction_vals), 0x0,
@@ -714,11 +713,11 @@ proto_register_tr(void)
 
 		{ &hf_tr_rif_ring,
 		{ "RIF Ring",		"tr.rif.ring", FT_UINT16, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_tr_rif_bridge,
 		{ "RIF Bridge",		"tr.rif.bridge", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_token_ring,
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index 5550920c61..c3bbfacb34 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -331,75 +331,75 @@ proto_register_trmac(void)
         static hf_register_info hf[] = {
                 { &hf_trmac_mv,
                 { "Major Vector",			"trmac.mvec", FT_UINT8, BASE_HEX, major_vector_vs, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
                 { &hf_trmac_length,
                 { "Total Length",			"trmac.length", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
                 { &hf_trmac_srcclass,
                 { "Source Class",			"trmac.srcclass", FT_UINT8, BASE_HEX, classes_vs, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
                 { &hf_trmac_dstclass,
                 { "Destination Class",			"trmac.dstclass", FT_UINT8, BASE_HEX, classes_vs, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
                 { &hf_trmac_sv,
                 { "Sub-Vector",				"trmac.svec", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_iso,
 		{ "Isolating Errors",			"trmac.errors.iso", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_line,
 		{ "Line Errors",			"trmac.errors.line", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_internal,
 		{ "Internal Errors",			"trmac.errors.internal", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_burst,
 		{ "Burst Errors",			"trmac.errors.burst", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_ac,
 		{ "A/C Errors",				"trmac.errors.ac", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_abort,
 		{ "Abort Delimiter Transmitted Errors",	"trmac.errors.abort", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_noniso,
 		{ "Non-Isolating Errors",		"trmac.errors.noniso", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_lost,
 		{ "Lost Frame Errors",			"trmac.errors.lost", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_congestion,
 		{ "Receiver Congestion Errors",		"trmac.errors.congestion", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_fc,
 		{ "Frame-Copied Errors",		"trmac.errors.fc", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_freq,
 		{ "Frequency Errors",			"trmac.errors.freq", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_errors_token,
 		{ "Token Errors",			"trmac.errors.token", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_trmac_naun,
 		{ "NAUN",				"trmac.naun", FT_ETHER, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_tr_mac,
diff --git a/epan/dissectors/packet-tsp.c b/epan/dissectors/packet-tsp.c
index 028c4a47de..9490490022 100644
--- a/epan/dissectors/packet-tsp.c
+++ b/epan/dissectors/packet-tsp.c
@@ -199,18 +199,18 @@ proto_register_tsp(void)
     { &hf_tsp_hopcnt,
       { "Hop Count", "tsp.hopcnt",
 	FT_UINT8, BASE_DEC, NULL, 0x0,
-	"Hop Count", HFILL }},
+	NULL, HFILL }},
     { &hf_tsp_time_sec,
       { "Seconds", "tsp.sec",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Seconds", HFILL }},
+	NULL, HFILL }},
     { &hf_tsp_time_usec,
       { "Microseconds", "tsp.usec",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Microseconds", HFILL }},
+	NULL, HFILL }},
     { &hf_tsp_name,
       { "Machine Name", "tsp.name",
-	FT_STRINGZ, BASE_DEC, NULL, 0x0,
+	FT_STRINGZ, BASE_NONE, NULL, 0x0,
 	"Sender Machine Name", HFILL }}
   };
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 417bdb6657..5c0b23827a 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -290,7 +290,7 @@ void proto_register_turbocell(void)
 
         { &hf_turbocell_ip,
             { "IP", "turbocell.ip",
-            FT_IPv4, BASE_DEC, NULL, 0,
+            FT_IPv4, BASE_NONE, NULL, 0,
             "IP adress of base station ?", HFILL }
         },
 
@@ -308,7 +308,7 @@ void proto_register_turbocell(void)
         { &hf_turbocell_name,
             { "Network Name", "turbocell.name",
             FT_STRINGZ, BASE_NONE, NULL, 0,
-            "Network Name", HFILL }
+            NULL, HFILL }
         },
         STATION(0),STATION(1),STATION(2),STATION(3),STATION(4),STATION(5),STATION(6),STATION(7),STATION(8),STATION(9),
         STATION(10),STATION(11),STATION(12),STATION(13),STATION(14),STATION(15),STATION(16),STATION(17),STATION(18),STATION(19),
@@ -319,11 +319,11 @@ void proto_register_turbocell(void)
   static hf_register_info aggregate_fields[] = {
         { &hf_turbocell_aggregate_msdu_header_text,
             {"MAC Service Data Unit (MSDU)",	"turbocell_aggregate.msduheader",
-            FT_UINT16, BASE_DEC, 0, 0x0000, "MAC Service Data Unit (MSDU)", HFILL }
+            FT_UINT16, BASE_DEC, 0, 0x0000, NULL, HFILL }
         },
         { &hf_turbocell_aggregate_msdu_len,
             {"MSDU length", "turbocell_aggregate.msdulen",
-            FT_UINT16, BASE_DEC_HEX, 0, 0x0FFF, "MSDU length", HFILL }
+            FT_UINT16, BASE_DEC_HEX, 0, 0x0FFF, NULL, HFILL }
         },
         { &hf_turbocell_aggregate_len,
             { "Total Length", "turbocell_aggregate.len",
@@ -338,7 +338,7 @@ void proto_register_turbocell(void)
         { &hf_turbocell_aggregate_unknown2,
             { "Unknown", "turbocell_aggregate.unknown2",
             FT_UINT8, BASE_HEX, NULL, 0xF0,
-            "have the values 0x4,0xC or 0x8 ", HFILL }
+            "have the values 0x4,0xC or 0x8", HFILL }
         },
   };
 
diff --git a/epan/dissectors/packet-turnchannel.c b/epan/dissectors/packet-turnchannel.c
index c1d0f93f0e..5537352a57 100644
--- a/epan/dissectors/packet-turnchannel.c
+++ b/epan/dissectors/packet-turnchannel.c
@@ -185,11 +185,11 @@ proto_register_turnchannel(void)
 	static hf_register_info hf[] = {
 		{ &hf_turnchannel_id,
 			{ "TURN Channel ID",	"turnchannel.id",	FT_UINT16,
-			BASE_HEX,	NULL,	0x0, 	"",	HFILL }
+			BASE_HEX,	NULL,	0x0, 	NULL,	HFILL }
 		},
 		{ &hf_turnchannel_len,
 			{ "Data Length",  "turnchannel.length",	FT_UINT16,
-			BASE_DEC,	NULL,	0x0, 	"",	HFILL }
+			BASE_DEC,	NULL,	0x0, 	NULL,	HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-tzsp.c b/epan/dissectors/packet-tzsp.c
index bfa0d7dd8d..85cbb79581 100644
--- a/epan/dissectors/packet-tzsp.c
+++ b/epan/dissectors/packet-tzsp.c
@@ -442,16 +442,16 @@ proto_register_tzsp(void)
 	static hf_register_info hf[] = {
 		{ &hf_tzsp_version, {
 			"Version", "tzsp.version", FT_UINT8, BASE_DEC,
-			NULL, 0, "Version", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_tzsp_type, {
 			"Type", "tzsp.type", FT_UINT8, BASE_DEC,
-			VALS(tzsp_type), 0, "Type", HFILL }},
+			VALS(tzsp_type), 0, NULL, HFILL }},
 		{ &hf_tzsp_encap, {
 			"Encapsulation", "tzsp.encap", FT_UINT16, BASE_DEC,
-			NULL, 0, "Encapsulation", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_status_field, {
 			"Status", "tzsp.wlan.status", FT_UINT16, BASE_HEX,
-				NULL, 0, "Status", HFILL }},
+				NULL, 0, NULL, HFILL }},
 		{ &hf_status_msg_type, {
 			"Type", "tzsp.wlan.status.msg_type", FT_UINT8, BASE_HEX,
 			VALS(msg_type), 0, "Message type", HFILL }},
@@ -460,33 +460,33 @@ proto_register_tzsp(void)
 			NULL, 0, "MAC port", HFILL }},
 		{ &hf_status_pcf, {
 			"PCF", "tzsp.wlan.status.pcf", FT_BOOLEAN, BASE_NONE,
-			TFS (&pcf_flag), 0, "Point Coordination Function", HFILL }},
+			TFS (&pcf_flag), 0x0, "Point Coordination Function", HFILL }},
 		{ &hf_status_undecrypted, {
 			"Undecrypted", "tzsp.wlan.status.undecrypted", FT_BOOLEAN, BASE_NONE,
-			TFS (&undecr_flag), 0, "Undecrypted", HFILL }},
+			TFS (&undecr_flag), 0x0, NULL, HFILL }},
 		{ &hf_status_fcs_error, {
 			"FCS", "tzsp.wlan.status.fcs_err", FT_BOOLEAN, BASE_NONE,
-			TFS (&fcs_err_flag), 0, "Frame check sequence", HFILL }},
+			TFS (&fcs_err_flag), 0x0, "Frame check sequence", HFILL }},
 		{ &hf_time, {
 			"Time", "tzsp.wlan.time", FT_UINT32, BASE_HEX,
-			NULL, 0, "Time", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_silence, {
 			"Silence", "tzsp.wlan.silence", FT_INT8, BASE_DEC,
-			NULL, 0, "Silence", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_original_length, {
 			"Original Length", "tzsp.original_length", FT_INT16, BASE_DEC,
 			NULL, 0, "OrigLength", HFILL }},
 		{ &hf_signal, {
 			"Signal", "tzsp.wlan.signal", FT_INT8, BASE_DEC,
-			NULL, 0, "Signal", HFILL }},
+			NULL, 0, NULL, HFILL }},
 		{ &hf_rate, {
 			"Rate", "tzsp.wlan.rate", FT_UINT8, BASE_DEC,
-			VALS(rates), 0, "Rate", HFILL }},
+			VALS(rates), 0, NULL, HFILL }},
 		{ &hf_channel, {
 			"Channel", "tzsp.wlan.channel", FT_UINT8, BASE_DEC,
-			VALS(channels), 0, "Channel", HFILL }},
+			VALS(channels), 0, NULL, HFILL }},
 		{ &hf_unknown, {
-			"Unknown tag", "tzsp.unknown", FT_BYTES, BASE_HEX,
+			"Unknown tag", "tzsp.unknown", FT_BYTES, BASE_NONE,
 			NULL, 0, "Unknown", HFILL }},
 		{ &hf_sensormac, {
 			"Sensor Address", "tzsp.sensormac", FT_ETHER, BASE_HEX,
diff --git a/epan/dissectors/packet-ucp.c b/epan/dissectors/packet-ucp.c
index 1e2aadaf19..83c036aa8c 100644
--- a/epan/dissectors/packet-ucp.c
+++ b/epan/dissectors/packet-ucp.c
@@ -2006,7 +2006,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_oper_section,
 	    { "Data", "ucp.parm",
-	      FT_NONE, BASE_DEC, NULL, 0x00,
+	      FT_NONE, BASE_NONE, NULL, 0x00,
 	      "The actual content of the operation.",
 	      HFILL
 	    }
@@ -2223,7 +2223,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_parm_LRP,
 	    { "LRP", "ucp.parm.LRP",
-	      FT_STRING, BASE_DEC, NULL, 0x00,
+	      FT_STRING, BASE_NONE, NULL, 0x00,
 	      "Legitimisation code for repetition.",
 	      HFILL
 	    }
@@ -2237,7 +2237,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_parm_LPR,
 	    { "LPR", "ucp.parm.LPR",
-	      FT_STRING, BASE_DEC, NULL, 0x00,
+	      FT_STRING, BASE_NONE, NULL, 0x00,
 	      "Legitimisation code for priority requested.",
 	      HFILL
 	    }
@@ -2251,7 +2251,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_parm_LUM,
 	    { "LUM", "ucp.parm.LUM",
-	      FT_STRING, BASE_DEC, NULL, 0x00,
+	      FT_STRING, BASE_NONE, NULL, 0x00,
 	      "Legitimisation code for urgent message.",
 	      HFILL
 	    }
@@ -2265,7 +2265,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_parm_LRC,
 	    { "LRC", "ucp.parm.LRC",
-	      FT_STRING, BASE_DEC, NULL, 0x00,
+	      FT_STRING, BASE_NONE, NULL, 0x00,
 	      "Legitimisation code for reverse charging.",
 	      HFILL
 	    }
@@ -2488,14 +2488,14 @@ proto_register_ucp(void)
 	    }
 	},
 	{ &hf_ucp_parm_NB,
-	    { "  NB", "ucp.parm.NB",
+	    { "NB", "ucp.parm.NB",
 	      FT_STRING, BASE_NONE, NULL, 0x00,
 	      "No. of bits in Transparent Data (TD) message.",
 	      HFILL
 	    }
 	},
 	{ &hf_ucp_data_section,
-	    { "  Data", "ucp.message",
+	    { "Data", "ucp.message",
 	      FT_NONE, BASE_NONE, NULL, 0x00,
 	      "The actual message or data.",
 	      HFILL
@@ -2559,7 +2559,7 @@ proto_register_ucp(void)
 	},
 	{ &hf_ucp_parm_XSer,
 	    { "Extra services:", "ucp.parm.XSer",
-	      FT_NONE, BASE_DEC, NULL, 0x00,
+	      FT_NONE, BASE_NONE, NULL, 0x00,
 	      "Extra services.",
 	      HFILL
 	    }
diff --git a/epan/dissectors/packet-udld.c b/epan/dissectors/packet-udld.c
index 0ecac1cfff..9ddb5cf78e 100644
--- a/epan/dissectors/packet-udld.c
+++ b/epan/dissectors/packet-udld.c
@@ -250,35 +250,35 @@ proto_register_udld(void)
     static hf_register_info hf[] = {
 	{ &hf_udld_version,
 	{ "Version",		"udld.version",  FT_UINT8, BASE_DEC, NULL, 0xE0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_opcode,
 	{ "Opcode",		"udld.opcode", FT_UINT8, BASE_DEC, VALS(opcode_vals), 0x1F,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_flags,
 	{ "Flags",		"udld.flags", FT_UINT8, BASE_DEC, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_flags_rt,
 	{ "Recommended timeout",		"udld.flags.rt", FT_UINT8, BASE_HEX, NULL, 0x80,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_flags_rsy,
 	{ "ReSynch",		"udld.flags.rsy", FT_UINT8, BASE_HEX, NULL, 0x40,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_checksum,
 	{ "Checksum",		"udld.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_tlvtype,
 	{ "Type",		"udld.tlv.type", FT_UINT16, BASE_HEX, VALS(type_vals), 0x0,
-	  "", HFILL }},
+	  NULL, HFILL }},
 
 	{ &hf_udld_tlvlength,
 	{ "Length",		"udld.tlv.len", FT_UINT16, BASE_DEC, NULL, 0x0,
-	  "", HFILL }}
+	  NULL, HFILL }}
     };
     static gint *ett[] = {
 	&ett_udld,
diff --git a/epan/dissectors/packet-udp.c b/epan/dissectors/packet-udp.c
index da2e884c50..caeb000f00 100644
--- a/epan/dissectors/packet-udp.c
+++ b/epan/dissectors/packet-udp.c
@@ -618,19 +618,19 @@ proto_register_udp(void)
 	static hf_register_info hf[] = {
 		{ &hf_udp_srcport,
 		{ "Source Port",	"udp.srcport", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_udp_dstport,
 		{ "Destination Port",	"udp.dstport", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_udp_port,
 		{ "Source or Destination Port",	"udp.port", FT_UINT16, BASE_DEC,  NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_udp_length,
 		{ "Length",		"udp.length", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_udp_checksum,
 		{ "Checksum",		"udp.checksum", FT_UINT16, BASE_HEX, NULL, 0x0,
@@ -646,15 +646,15 @@ proto_register_udp(void)
 
 		{ &hf_udp_proc_src_uid,
 		  { "Source process user ID", "udp.proc.srcuid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Source process user ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_src_pid,
 		  { "Source process ID", "udp.proc.srcpid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Source process ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_src_uname,
 		  { "Source process user name", "udp.proc.srcuname", FT_STRING, BASE_NONE, NULL, 0x0,
-		    "Source process user name", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_src_cmd,
 		  { "Source process name", "udp.proc.srccmd", FT_STRING, BASE_NONE, NULL, 0x0,
@@ -662,15 +662,15 @@ proto_register_udp(void)
 
 		{ &hf_udp_proc_dst_uid,
 		  { "Destination process user ID", "udp.proc.dstuid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Destination process user ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_dst_pid,
 		  { "Destination process ID", "udp.proc.dstpid", FT_UINT32, BASE_DEC, NULL, 0x0,
-		    "Destination process ID", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_dst_uname,
 		  { "Destination process user name", "udp.proc.dstuname", FT_STRING, BASE_NONE, NULL, 0x0,
-		    "Destination process user name", HFILL}},
+		    NULL, HFILL}},
 
 		{ &hf_udp_proc_dst_cmd,
 		  { "Destination process name", "udp.proc.dstcmd", FT_STRING, BASE_NONE, NULL, 0x0,
@@ -680,11 +680,11 @@ proto_register_udp(void)
 	static hf_register_info hf_lite[] = {
 		{ &hf_udplite_checksum_coverage_bad,
 		{ "Bad Checksum coverage",	"udp.checksum_coverage_bad", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_udplite_checksum_coverage,
 		{ "Checksum coverage",	"udp.checksum_coverage", FT_UINT16, BASE_DEC, NULL, 0x0,
-			"", HFILL }}
+			NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ulp.c b/epan/dissectors/packet-ulp.c
index 9b236c2fda..021685a0ca 100644
--- a/epan/dissectors/packet-ulp.c
+++ b/epan/dissectors/packet-ulp.c
@@ -2287,11 +2287,11 @@ void proto_register_ulp(void) {
         "ulp.SLPMode", HFILL }},
     { &hf_ulp_mAC,
       { "mAC", "ulp.mAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.MAC", HFILL }},
     { &hf_ulp_keyIdentity,
       { "keyIdentity", "ulp.keyIdentity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.KeyIdentity", HFILL }},
     { &hf_ulp_notificationType,
       { "notificationType", "ulp.notificationType",
@@ -2303,7 +2303,7 @@ void proto_register_ulp(void) {
         "ulp.EncodingType", HFILL }},
     { &hf_ulp_requestorId,
       { "requestorId", "ulp.requestorId",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_1_maxReqLength", HFILL }},
     { &hf_ulp_requestorIdType,
       { "requestorIdType", "ulp.requestorIdType",
@@ -2311,7 +2311,7 @@ void proto_register_ulp(void) {
         "ulp.FormatIndicator", HFILL }},
     { &hf_ulp_clientName,
       { "clientName", "ulp.clientName",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_1_maxClientLength", HFILL }},
     { &hf_ulp_clientNameType,
       { "clientNameType", "ulp.clientNameType",
@@ -2339,43 +2339,43 @@ void proto_register_ulp(void) {
         "ulp.PosProtocol", HFILL }},
     { &hf_ulp_agpsSETassisted,
       { "agpsSETassisted", "ulp.agpsSETassisted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_agpsSETBased,
       { "agpsSETBased", "ulp.agpsSETBased",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_autonomousGPS,
       { "autonomousGPS", "ulp.autonomousGPS",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_aFLT,
       { "aFLT", "ulp.aFLT",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_eCID,
       { "eCID", "ulp.eCID",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_eOTD,
       { "eOTD", "ulp.eOTD",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_oTDOA,
       { "oTDOA", "ulp.oTDOA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_tia801,
       { "tia801", "ulp.tia801",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_rrlp,
       { "rrlp", "ulp.rrlp",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_rrc,
       { "rrc", "ulp.rrc",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_sETAuthKey,
       { "sETAuthKey", "ulp.sETAuthKey",
@@ -2383,15 +2383,15 @@ void proto_register_ulp(void) {
         "ulp.SETAuthKey", HFILL }},
     { &hf_ulp_keyIdentity4,
       { "keyIdentity4", "ulp.keyIdentity4",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.KeyIdentity4", HFILL }},
     { &hf_ulp_shortKey,
       { "shortKey", "ulp.shortKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_128", HFILL }},
     { &hf_ulp_longKey,
       { "longKey", "ulp.longKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_256", HFILL }},
     { &hf_ulp_requestedAssistData,
       { "requestedAssistData", "ulp.requestedAssistData",
@@ -2407,43 +2407,43 @@ void proto_register_ulp(void) {
         "ulp.SUPLPOS", HFILL }},
     { &hf_ulp_ver,
       { "ver", "ulp.ver",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.Ver", HFILL }},
     { &hf_ulp_almanacRequested,
       { "almanacRequested", "ulp.almanacRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_utcModelRequested,
       { "utcModelRequested", "ulp.utcModelRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_ionosphericModelRequested,
       { "ionosphericModelRequested", "ulp.ionosphericModelRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_dgpsCorrectionsRequested,
       { "dgpsCorrectionsRequested", "ulp.dgpsCorrectionsRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_referenceLocationRequested,
       { "referenceLocationRequested", "ulp.referenceLocationRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_referenceTimeRequested,
       { "referenceTimeRequested", "ulp.referenceTimeRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_acquisitionAssistanceRequested,
       { "acquisitionAssistanceRequested", "ulp.acquisitionAssistanceRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_realTimeIntegrityRequested,
       { "realTimeIntegrityRequested", "ulp.realTimeIntegrityRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_navigationModelRequested,
       { "navigationModelRequested", "ulp.navigationModelRequested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "ulp.BOOLEAN", HFILL }},
     { &hf_ulp_navigationModelData,
       { "navigationModelData", "ulp.navigationModelData",
@@ -2491,15 +2491,15 @@ void proto_register_ulp(void) {
         "ulp.Velocity", HFILL }},
     { &hf_ulp_tia801payload,
       { "tia801payload", "ulp.tia801payload",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_1_8192", HFILL }},
     { &hf_ulp_rrcPayload,
       { "rrcPayload", "ulp.rrcPayload",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_1_8192", HFILL }},
     { &hf_ulp_rrlpPayload,
       { "rrlpPayload", "ulp.rrlpPayload",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.T_rrlpPayload", HFILL }},
     { &hf_ulp_statusCode,
       { "statusCode", "ulp.statusCode",
@@ -2507,11 +2507,11 @@ void proto_register_ulp(void) {
         "ulp.StatusCode", HFILL }},
     { &hf_ulp_sETNonce,
       { "sETNonce", "ulp.sETNonce",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.SETNonce", HFILL }},
     { &hf_ulp_keyIdentity2,
       { "keyIdentity2", "ulp.keyIdentity2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.KeyIdentity2", HFILL }},
     { &hf_ulp_sPCAuthKey,
       { "sPCAuthKey", "ulp.sPCAuthKey",
@@ -2519,7 +2519,7 @@ void proto_register_ulp(void) {
         "ulp.SPCAuthKey", HFILL }},
     { &hf_ulp_keyIdentity3,
       { "keyIdentity3", "ulp.keyIdentity3",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.KeyIdentity3", HFILL }},
     { &hf_ulp_maj,
       { "maj", "ulp.maj",
@@ -2551,19 +2551,19 @@ void proto_register_ulp(void) {
         "ulp.SETId", HFILL }},
     { &hf_ulp_msisdn,
       { "msisdn", "ulp.msisdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.T_msisdn", HFILL }},
     { &hf_ulp_mdn,
       { "mdn", "ulp.mdn",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_8", HFILL }},
     { &hf_ulp_minsi,
       { "min", "ulp.min",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_34", HFILL }},
     { &hf_ulp_imsi,
       { "imsi", "ulp.imsi",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.T_imsi", HFILL }},
     { &hf_ulp_nai,
       { "nai", "ulp.nai",
@@ -2575,7 +2575,7 @@ void proto_register_ulp(void) {
         "ulp.IPAddress", HFILL }},
     { &hf_ulp_sessionSlpID,
       { "sessionID", "ulp.sessionID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.OCTET_STRING_SIZE_4", HFILL }},
     { &hf_ulp_slpId,
       { "slpId", "ulp.slpId",
@@ -2883,31 +2883,31 @@ void proto_register_ulp(void) {
         "ulp.Horandveruncert", HFILL }},
     { &hf_ulp_bearing,
       { "bearing", "ulp.bearing",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_9", HFILL }},
     { &hf_ulp_horspeed,
       { "horspeed", "ulp.horspeed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_16", HFILL }},
     { &hf_ulp_verdirect,
       { "verdirect", "ulp.verdirect",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_1", HFILL }},
     { &hf_ulp_verspeed,
       { "verspeed", "ulp.verspeed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_8", HFILL }},
     { &hf_ulp_uncertspeed,
       { "uncertspeed", "ulp.uncertspeed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_8", HFILL }},
     { &hf_ulp_horuncertspeed,
       { "horuncertspeed", "ulp.horuncertspeed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_8", HFILL }},
     { &hf_ulp_veruncertspeed,
       { "veruncertspeed", "ulp.veruncertspeed",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ulp.BIT_STRING_SIZE_8", HFILL }},
 
 /*--- End of included file: packet-ulp-hfarr.c ---*/
diff --git a/epan/dissectors/packet-uma.c b/epan/dissectors/packet-uma.c
index 81926392ea..332801c1da 100644
--- a/epan/dissectors/packet-uma.c
+++ b/epan/dissectors/packet-uma.c
@@ -1849,52 +1849,52 @@ proto_register_uma(void)
 		{ &hf_uma_length_indicator,
 			{ "Length Indicator","uma.li",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Length Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_pd,
 			{ "Protocol Discriminator","uma.pd",
 			FT_UINT8, BASE_DEC, VALS(uma_pd_vals), 0x0f,
-			"Protocol Discriminator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_skip_ind,
 			{ "Skip Indicator",           "uma.skip.ind",
 			FT_UINT8, BASE_DEC, NULL, 0xf0,
-			"Skip Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_msg_type,
 			{ "URR Message Type", "uma.urr.msg.type",
 			FT_UINT16, BASE_DEC, VALS(uma_urr_msg_type_vals), 0x0,
-			"URR Message Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urlc_msg_type,
 			{ "URLC Message Type", "uma.urlc.msg.type",
 			FT_UINT8, BASE_DEC, VALS(uma_urlc_msg_type_vals), 0x0,
-			"URLC Message Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urlc_TLLI,
 			{ "Temporary Logical Link Identifier","uma.urlc.tlli",
-			FT_BYTES,BASE_DEC,  NULL, 0x0,
-			"Temporary Logical Link Identifier", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urlc_seq_nr,
 			{ "Sequence Number","uma.urlc.seq.nr",
-			FT_BYTES,BASE_DEC,  NULL, 0x0,
-			"Sequence Number", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_IE,
 			{ "URR Information Element","uma.urr.ie.type",
 			FT_UINT8, BASE_DEC, VALS(uma_urr_IE_type_vals), 0x0,
-			"URR Information Element", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_IE_len,
 			{ "URR Information Element length","uma.urr.ie.len",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"URR Information Element length", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_mobile_identity_type,
 			{ "Mobile Identity Type","uma.urr.ie.mobileid.type",
 			FT_UINT8, BASE_DEC, VALS(uma_urr_mobile_identity_type_vals), 0x07,
-			"Mobile Identity Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_odde_even_ind,
 			{ "Odd/even indication","uma.urr.oddevenind",
@@ -1904,22 +1904,22 @@ proto_register_uma(void)
 		{ &hf_uma_urr_imsi,
 			{ "IMSI", "uma_urr.imsi",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"IMSI", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_imei,
 			{ "IMEI", "uma_urr.imei",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"IMEI", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_imeisv,
 			{ "IMEISV", "uma_urr.imeisv",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"IMEISV", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_tmsi_p_tmsi,
 			{ "TMSI/P-TMSI", "uma_urr.tmsi_p_tmsi",
 			FT_STRING, BASE_NONE, NULL, 0,
-			"TMSI/P-TMSI", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uri,
 			{ "GAN Release Indicator","uma.urr.uri",
@@ -1929,49 +1929,49 @@ proto_register_uma(void)
 		{ &hf_uma_urr_radio_type_of_id,
 			{ "Type of identity","uma.urr.radio_type_of_id",
 			FT_UINT8, BASE_DEC, VALS(radio_type_of_id_vals), 0x0f,
-			"Type of identity", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_radio_id,
 			{ "Radio Identity","uma.urr.radio_id",
 			FT_ETHER, BASE_DEC, NULL, 0x00,
-			"Radio Identity", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_uma_urr_cell_id,
 			{ "Cell Identity","uma.urr.cell_id",
 			FT_UINT16, BASE_DEC, NULL, 0x00,
-			"Cell Identity", HFILL }
+			NULL, HFILL }
 		},
 
 		{ &hf_uma_urr_mcc,
 			{ "Mobile Country Code","uma.urr.mcc",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Mobile Country Code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_mnc,
 			{ "Mobile network code","uma.urr.mnc",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Mobile network code ", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_lac,
 			{ "Location area code","uma.urr.lac",
 			FT_UINT16, BASE_DEC, NULL, 0x0,
-			"Location area code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_gci,
 			{ "GCI, GSM Coverage Indicator","uma.urr.gci",
 			FT_UINT8, BASE_DEC,  VALS(uma_gci_vals), 0x0,
-			"GCI, GSM Coverage Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_tura,
 			{ "TURA, Type of Unlicensed Radio","uma.urr.tura",
 			FT_UINT8,BASE_DEC,  VALS(uma_tura_vals), 0xf,
-			"TURA, Type of Unlicensed Radio", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_gc,
 			{ "GC, GERAN Capable","uma.urr.gc",
 			FT_UINT8,BASE_DEC,  VALS(uma_gc_vals), 0x10,
-			"GC, GERAN Capable", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uc,
 			{ "UC, UTRAN Capable","uma.urr.uc",
@@ -1981,7 +1981,7 @@ proto_register_uma(void)
 		{ &hf_uma_urr_rrs,
 			{ "RTP Redundancy Support(RRS)","uma.urr.rrs",
 			FT_UINT8,BASE_DEC, VALS(uma_rrs_vals), 0x01,
-			"RTP Redundancy Support(RRS)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_gmsi,
 			{ "GMSI, GAN Mode Support Indicator)","uma.urr.gmsi",
@@ -1991,137 +1991,137 @@ proto_register_uma(void)
 		{ &hf_uma_urr_psho,
 			{ "PS HO, PS Handover Capable","uma.urr.psho",
 			FT_UINT8,BASE_DEC, VALS(uma_ps_ho_vals), 0x02,
-			"PS HO, PS Handover Capable", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_IP_Address_type,
 			{ "IP address type number value","uma.urr.ip_type",
 			FT_UINT8,BASE_DEC,  VALS(IP_address_type_vals), 0x0,
-			"IP address type number value", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_FQDN,
 		       { "Fully Qualified Domain/Host Name (FQDN)", "uma.urr.fqdn",
 		       FT_STRING, BASE_NONE,NULL,0x0,
-			"Fully Qualified Domain/Host Name (FQDN)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_sgw_ipv4,
 			{ "SGW IPv4 address","uma.urr.sgwipv4",
 			FT_IPv4,BASE_NONE,  NULL, 0x0,
-			"SGW IPv4 address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_redirection_counter,
 			{ "Redirection Counter","uma.urr.redirection_counter",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Redirection Counter", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_dis_rej_cau,
 			{ "Discovery Reject Cause","uma.urr.is_rej_cau",
 			FT_UINT8,BASE_DEC,  VALS(uma_discovery_reject_cause_vals), 0x0,
-			"Discovery Reject Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ECMC,
 			{ "ECMC, Early Classmark Sending Control","uma.urr.is_rej_cau",
 			FT_UINT8,BASE_DEC,  VALS(ECMC_vals), 0x2,
-			"ECMC, Early Classmark Sending Control", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_NMO,
 			{ "NMO, Network Mode of Operation","uma.urr.NMO",
 			FT_UINT8,BASE_DEC,  VALS(NMO_vals), 0xc,
-			"NMO, Network Mode of Operation", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_GPRS,
 			{ "GPRS, GPRS Availability","uma.urr.is_rej_cau",
 			FT_UINT8,BASE_DEC,  VALS(GPRS_avail_vals), 0x10,
-			"GPRS, GPRS Availability", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_DTM,
 			{ "DTM, Dual Transfer Mode of Operation by network","uma.urr.dtm",
 			FT_UINT8,BASE_DEC,  VALS(DTM_vals), 0x20,
-			"DTM, Dual Transfer Mode of Operation by network", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ATT,
 			{ "ATT, Attach-detach allowed","uma.urr.att",
 			FT_UINT8,BASE_DEC,  VALS(ATT_vals), 0x40,
-			"ATT, Attach-detach allowed", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_MSCR,
 			{ "MSCR, MSC Release","uma.urr.mscr",
 			FT_UINT8,BASE_DEC,  VALS(MSCR_vals), 0x80,
-			"MSCR, MSC Release", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_T3212_timer,
 			{ "T3212 Timer value(seconds)","uma.urr.t3212",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"T3212 Timer value(seconds)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_RAC,
 			{ "Routing Area Code","uma.urr.rac",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Routing Area Code", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ap_location,
 			{ "AP Location","uma.urr.ap_location",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"AP Location", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_SGSNR,
 			{ "SGSN Release","uma.urr.SGSNR",
 			FT_UINT8,BASE_DEC,  VALS(SGSNR_vals), 0x01,
-			"SGSN Release", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ECMP,
 			{ "ECMP, Emergency Call Mode Preference","uma.urr.ECMP",
 			FT_UINT8,BASE_DEC,  VALS(ECMP_vals), 0x02,
-			"ECMP, Emergency Call Mode Preference", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_RE,
 			{ "RE, Call reestablishment allowed","uma.urr.RE",
 			FT_UINT8,BASE_DEC,  VALS(RE_vals), 0x04,
-			"RE, Call reestablishment allowed", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_PFCFM,
 			{ "PFCFM, PFC_FEATURE_MODE","uma.urr.PFCFM",
 			FT_UINT8,BASE_DEC,  VALS(PFCFM_vals), 0x08,
-			"PFCFM, PFC_FEATURE_MODE", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_3GECS,
 			{ "3GECS, 3G Early Classmark Sending Restriction","uma.urr.3GECS",
 			FT_UINT8,BASE_DEC,  VALS(Three_GECS_vals), 0x10,
-			"3GECS, 3G Early Classmark Sending Restriction", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_bcc,
 			{ "BCC","uma.urr.bcc",
 			FT_UINT8,BASE_DEC,  NULL, 0x07,
-			"BCC", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ncc,
 			{ "NCC","uma.urr.ncc",
 			FT_UINT8,BASE_DEC,  NULL, 0x38,
-			"NCC", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_TU3907_timer,
 			{ "TU3907 Timer value(seconds)","uma.urr.tu3907",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"TU3907 Timer value(seconds)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_GSM_RR_state,
 			{ "GSM RR State value","uma.urr.gsmrrstate",
 			FT_UINT8,BASE_DEC,  VALS(uma_GRS_GSM_RR_State_vals), 0x7,
-			"GSM RR State value", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_gan_band,
 			{ "UMA Band","uma.urr.umaband",
 			FT_UINT8,BASE_DEC,  VALS(uma_gan_band_vals), 0x0f,
-			"UMA Band", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_URR_state,
 			{ "URR State","uma.urr.state",
 			FT_UINT8,BASE_DEC,  VALS(URR_state_vals), 0x03,
-			"URR State", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_register_reject_cause,
 			{ "Register Reject Cause","uma.urr.state",
 			FT_UINT8,BASE_DEC,  VALS(register_reject_cause_vals), 0x0,
-			"Register Reject Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_TU3906_timer,
 			{ "TU3907 Timer value(seconds)","uma.urr.tu3906",
@@ -2136,27 +2136,27 @@ proto_register_uma(void)
 		{ &hf_uma_urr_TU3902_timer,
 			{ "TU3902 Timer value(seconds)","uma.urr.tu3902",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"TU3902 Timer value(seconds)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_communication_port,
 			{ "Communication Port","uma.urr.communication_port",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"Communication Port", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_L3_Message,
 			{ "L3 message contents","uma.urr.l3",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"L3 message contents", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_L3_protocol_discriminator,
 			{ "Protocol discriminator","uma.urr.L3_protocol_discriminator",
 			FT_UINT8,BASE_DEC,  VALS(protocol_discriminator_vals), 0x0f,
-			"Protocol discriminator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_sc,
 			{ "SC","uma.urr.SC",
 			FT_UINT8,BASE_DEC,  VALS(SC_vals), 0x1,
-			"SC", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_algorithm_id,
 			{ "Algorithm identifier","uma.urr.algorithm_identifier",
@@ -2166,12 +2166,12 @@ proto_register_uma(void)
 		{ &hf_uma_urr_GPRS_resumption,
 			{ "GPRS resumption ACK","uma.urr.GPRS_resumption",
 			FT_UINT8,BASE_DEC,  VALS(GPRS_resumption_vals), 0x1,
-			"GPRS resumption ACK", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ULQI,
 			{ "ULQI, UL Quality Indication","uma.urr.ULQI",
 			FT_UINT8,BASE_DEC,  VALS(uma_ulqi_vals), 0x0f,
-			"ULQI, UL Quality Indication", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_TU3920_timer,
 			{ "TU3920 Timer value(seconds)","uma.urr.tu3920",
@@ -2181,7 +2181,7 @@ proto_register_uma(void)
 		{ &hf_uma_urr_peak_tpt_cls,
 			{ "PEAK_THROUGHPUT_CLASS","uma.urr.peak_tpt_cls",
 			FT_UINT8,BASE_DEC,  NULL, 0x0f,
-			"PEAK_THROUGHPUT_CLASS", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_radio_pri,
 			{ "Radio Priority","uma.urr.radio_pri",
@@ -2191,137 +2191,137 @@ proto_register_uma(void)
 		{ &hf_uma_urr_rlc_mode,
 			{ "RLC mode","uma.urr.rrlc_mode",
 			FT_UINT8,BASE_DEC,  VALS(rlc_mode_vals), 0x80,
-			"RLC mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ga_psr_cause,
 			{ "GA-PSR Cause","uma.urr.ga_psr_cause",
 			FT_UINT8,BASE_DEC,  VALS(uma_ga_psr_cause_vals), 0x0,
-			"GA-PSR Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_udr,
 			{ "User Data Rate value (bits/s)","uma.urr.URLCcause",
 			FT_UINT32,BASE_DEC,  NULL, 0x0,
-			"User Data Rate value (bits/s)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_TU4001_timer,
 			{ "TU4001 Timer value(seconds)","uma.urr.tu4001",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"TU4001 Timer value(seconds)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_LS,
 			{ "Location Status(LS)","uma.urr.LS",
 			FT_UINT8,BASE_DEC,  VALS(LS_vals), 0x3,
-			"Location Status(LS)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_cipher_res,
 			{ "Cipher Response(CR)","uma.urr.CR",
 			FT_UINT8,BASE_DEC,  VALS(CR_vals), 0x3,
-			"Cipher Response(CR)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_rand_val,
 			{ "Ciphering Command RAND value","uma.rand_val",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"Ciphering Command RAND value", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ciphering_command_mac,
 			{ "Ciphering Command MAC (Message Authentication Code)","uma.ciphering_command_mac",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"Ciphering Command MAC (Message Authentication Code)", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ciphering_key_seq_num,
 			{ "Values for the ciphering key","uma.ciphering_key_seq_num",
 			FT_UINT8,BASE_DEC,  NULL, 0x7,
-			"Values for the ciphering key", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_sapi_id,
 			{ "SAPI ID","uma.sapi_id",
 			FT_UINT8,BASE_DEC,  VALS(sapi_id_vals), 0x7,
-			"SAPI ID", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_establishment_cause,
 			{ "Establishment Cause","uma.urr.establishment_cause",
 			FT_UINT8,BASE_DEC,  VALS(establishment_cause_vals), 0x0,
-			"Establishment Cause", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_channel,
 			{ "Channel","uma.urr.establishment_cause",
 			FT_UINT8,BASE_DEC,  VALS(channel_vals), 0x3,
-			"Channel", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_PDU_in_error,
 			{ "PDU in Error,","uma.urr.PDU_in_error",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"PDU in Error,", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_sample_size,
 			{ "Sample Size","uma.urr.sample_size",
 			FT_UINT8,BASE_DEC,  VALS(sample_size_vals), 0x0,
-			"Sample Size", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_payload_type,
 			{ "Payload Type","uma.urr.sample_size",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Payload Type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_LLC_PDU,
 			{ "LLC-PDU","uma.urr.llc_pdu",
-			FT_BYTES,BASE_HEX,  NULL, 0x0,
-			"LLC-PDU", HFILL }
+			FT_BYTES,BASE_NONE,  NULL, 0x0,
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_LBLI,
 			{ "LBLI, Location Black List indicator","uma.urr.LBLI",
 			FT_UINT8,BASE_DEC,  VALS(LBLI_vals), 0x0,
-			"LBLI, Location Black List indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_RI,
 			{ "Reset Indicator(RI)","uma.urr.RI",
 			FT_UINT8,BASE_DEC,  VALS(RI_vals), 0x1,
-			"Reset Indicator(RI)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_TU4003_timer,
 			{ "TU4003 Timer value(seconds)","uma.urr.tu4003",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"TU4003 Timer value(seconds)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ap_service_name_type,
 			{ "AP Service Name type","uma.urr.ap_service_name_type",
 			FT_UINT8,BASE_DEC,  VALS(ap_service_name_type_vals), 0x0,
-			"AP Service Name type", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ap_Service_name_value,
 			{ "AP Service Name Value","uma.urr.ap_service_name_value",
 			FT_STRING,BASE_NONE,  NULL, 0x0,
-			"AP Service Name Value", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uma_service_zone_icon_ind,
 			{ "UMA Service Zone Icon Indicator","uma.urr.uma_service_zone_icon_ind",
 			FT_UINT8,BASE_DEC,  VALS(uma_service_zone_icon_ind_vals), 0x0,
-			"UMA Service Zone Icon Indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uma_service_zone_str_len,
 			{ "Length of UMA Service Zone string","uma.urr.service_zone_str_len",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Length of UMA Service Zone string", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_window_size,
 			{ "Window Size","uma.urr.uma_window_size",
 			FT_UINT8,BASE_DEC,  VALS(window_size_vals), 0x03,
-			"Window Size", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uma_codec_mode,
 			{ "GAN A/Gb Mode Codec Mode","uma.urr.uma_codec_mode",
 			FT_UINT8,BASE_DEC,  NULL, 0xc0,
-			"GAN A/Gb Mode Codec Mode", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_UTRAN_cell_id_disc,
 			{ "UTRAN Cell Identification Discriminator","uma.urr.uma_UTRAN_cell_id_disc",
 			FT_UINT8,BASE_DEC,  VALS(UTRAN_cell_id_disc_vals), 0x0f,
-			"UTRAN Cell Identification Discriminator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_suti,
 			{ "SUTI, Serving GANC table indicator","uma.urr.uma_suti",
 			FT_UINT8,BASE_DEC,  VALS(suti_vals), 0x01,
-			"SUTI, Serving GANC table indicator", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uma_mps,
 			{ "UMPS, Manual PLMN Selection indicator","uma.urr.mps",
@@ -2331,47 +2331,47 @@ proto_register_uma(void)
 		{ &hf_uma_urr_num_of_plms,
 			{ "Number of PLMN:s","uma.urr.num_of_plms",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Number of PLMN:s", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_cbs,
 			{ "CBS Cell Broadcast Service","uma.urr.cbs",
 			FT_UINT8,BASE_DEC,  VALS(cbs_vals), 0x01,
-			"CBS Cell Broadcast Service", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_num_of_cbs_frms,
 			{ "Number of CBS Frames","uma.urr.num_of_cbs_frms",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"Number of CBS Frames", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_ms_radio_id,
 			{ "MS Radio Identity","uma.urr.ms_radio_id",
 			FT_ETHER, BASE_DEC, NULL, 0x00,
-			"MS Radio Identity", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_uma_service_zone_str,
 			{ "UMA Service Zone string,","uma.urr.uma_service_zone_str",
 			FT_STRING,BASE_NONE,  NULL, 0x0,
-			"UMA Service Zone string,", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_unc_ipv4,
 			{ "UNC IPv4 address","uma.urr.uncipv4",
 			FT_IPv4,BASE_NONE,  NULL, 0x0,
-			"UNC IPv4 address", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_unc_FQDN,
 		       { "UNC Fully Qualified Domain/Host Name (FQDN)", "uma.urr.unc_fqdn",
 		       FT_STRING, BASE_NONE,NULL,0x0,
-			"UNC Fully Qualified Domain/Host Name (FQDN)", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_GPRS_user_data_transport_ipv4,
 			{ "IP address for GPRS user data transport","uma.urr.gprs_usr_data_ipv4",
 			FT_IPv4,BASE_NONE,  NULL, 0x0,
-			"IP address for GPRS user data transport", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_GPRS_port,
 			{ "UDP Port for GPRS user data transport","uma.urr.gprs_port",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"UDP Port for GPRS user data transport", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_UNC_tcp_port,
 			{ "UNC TCP port","uma.urr.gprs_port",
@@ -2381,17 +2381,17 @@ proto_register_uma(void)
 		{ &hf_uma_urr_RTP_port,
 			{ "RTP UDP port","uma.urr.rtp_port",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"RTP UDP port", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_RTCP_port,
 			{ "RTCP UDP port","uma.urr.rtcp_port",
 			FT_UINT16,BASE_DEC,  NULL, 0x0,
-			"RTCP UDP port", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_uma_urr_RXLEV_NCELL,
 			{ "RX Level","uma.urr.rxlevel",
 			FT_UINT8,BASE_DEC,  NULL, 0x0,
-			"RX Level", HFILL }
+			NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 24264dce12..650402bb86 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -3052,7 +3052,7 @@ void proto_register_fp(void)
         { &hf_fp_channel_type,
             { "Channel Type",
               "fp.channel-type", FT_UINT8, BASE_HEX, VALS(channel_type_vals), 0x0,
-              "Channel Type", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_division,
@@ -3070,13 +3070,13 @@ void proto_register_fp(void)
         { &hf_fp_header_crc,
             { "Header CRC",
               "fp.header-crc", FT_UINT8, BASE_HEX, NULL, 0xfe,
-              "Header CRC", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_ft,
             { "Frame Type",
               "fp.ft", FT_UINT8, BASE_HEX, VALS(data_control_vals), 0x01,
-              "Frame Type", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_cfn,
@@ -3111,7 +3111,7 @@ void proto_register_fp(void)
         },
         { &hf_fp_tb,
             { "TB",
-              "fp.tb", FT_BYTES, BASE_HEX, NULL, 0x0,
+              "fp.tb", FT_BYTES, BASE_NONE, NULL, 0x0,
               "Transport Block", HFILL
             }
         },
@@ -3142,7 +3142,7 @@ void proto_register_fp(void)
         { &hf_fp_propagation_delay,
             { "Propagation Delay",
               "fp.propagation-delay", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "Propagation Delay", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_dch_control_frame_type,
@@ -3160,13 +3160,13 @@ void proto_register_fp(void)
         { &hf_fp_quality_estimate,
             { "Quality Estimate",
               "fp.dch.quality-estimate", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Quality Estimate", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_payload_crc,
             { "Payload CRC",
               "fp.payload-crc", FT_UINT16, BASE_HEX, 0, 0x0,
-              "Payload CRC", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_common_control_frame_type,
@@ -3226,7 +3226,7 @@ void proto_register_fp(void)
         { &hf_fp_received_sync_ul_timing_deviation,
             { "Received SYNC UL Timing Deviation",
               "fp.rx-sync-ul-timing-deviation", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Received SYNC UL Timing Deviation", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_pch_pi,
@@ -3274,13 +3274,13 @@ void proto_register_fp(void)
         { &hf_fp_dch_e_rucch_flag,
             { "E-RUCCH Flag",
               "fp.common.control.e-rucch-flag", FT_UINT8, BASE_DEC, VALS(e_rucch_flag_vals), 0x0,
-              "E-RUCCH Flag", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_edch_header_crc,
             { "E-DCH Header CRC",
               "fp.edch.header-crc", FT_UINT16, BASE_HEX, 0, 0xfef,
-              "E-DCH Header CRC", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_edch_fsn,
@@ -3310,7 +3310,7 @@ void proto_register_fp(void)
         { &hf_fp_edch_number_of_mac_es_pdus,
             { "Number of Mac-es PDUs",
               "fp.edch.number-of-mac-es-pdus", FT_UINT8, BASE_DEC, 0, 0xf0,
-              "Number of Mac-es PDUs", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_edch_ddi,
@@ -3334,7 +3334,7 @@ void proto_register_fp(void)
         { &hf_fp_edch_number_of_mac_d_pdus,
             { "Number of Mac-d PDUs",
               "fp.edch.number-of-mac-d-pdus", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Number of Mac-d PDUs", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_edch_pdu_padding,
@@ -3352,7 +3352,7 @@ void proto_register_fp(void)
         { &hf_fp_edch_mac_es_pdu,
             { "MAC-es PDU",
               "fp.edch.mac-es-pdu", FT_NONE, BASE_NONE, NULL, 0x0,
-              "MAC-es PDU", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_frame_seq_nr,
@@ -3388,13 +3388,13 @@ void proto_register_fp(void)
         { &hf_fp_drt_indicator,
             { "DRT Indicator",
               "fp.drt-indicator", FT_UINT8, BASE_DEC, 0, 0x01,
-              "DRT Indicator", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_fach_indicator,
             { "FACH Indicator",
               "fp.fach-indicator", FT_UINT8, BASE_DEC, 0, 0x80,
-              "FACH Indicator", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_total_pdu_blocks,
@@ -3406,25 +3406,25 @@ void proto_register_fp(void)
         { &hf_fp_drt,
             { "DRT",
               "fp.drt", FT_UINT16, BASE_DEC, 0, 0x0,
-              "DRT", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hrnti,
             { "HRNTI",
               "fp.hrnti", FT_UINT16, BASE_DEC, 0, 0x0,
-              "HRNTI", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_measurement_result,
             { "RACH Measurement Result",
               "fp.rach-measurement-result", FT_UINT16, BASE_DEC, 0, 0x0,
-              "RACH Measurement Result", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_lchid,
             { "Logical Channel ID",
               "fp.lchid", FT_UINT8, BASE_DEC, 0, 0x0,
-              "Logical Channel ID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_pdu_length_in_block,
@@ -3454,7 +3454,7 @@ void proto_register_fp(void)
         { &hf_fp_hsdsch_credits,
             { "HS-DSCH Credits",
               "fp.hsdsch-credits", FT_UINT16, BASE_DEC, 0, 0x0,
-              "HS-DSCH Credits", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_max_macd_pdu_len,
@@ -3472,7 +3472,7 @@ void proto_register_fp(void)
         { &hf_fp_hsdsch_interval,
             { "HS-DSCH Interval in milliseconds",
               "fp.hsdsch-interval", FT_UINT8, BASE_DEC, 0, 0x0,
-              "HS-DSCH Interval in milliseconds", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_calculated_rate,
@@ -3502,49 +3502,49 @@ void proto_register_fp(void)
         { &hf_fp_hsdsch_new_ie_flags,
             { "New IEs flags",
               "fp.hsdsch.new-ie-flags", FT_STRING, BASE_NONE, 0, 0x0,
-              "New IEs flags", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[0],
             { "DRT IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x80,
-              "DRT IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[1],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x40,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[2],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x20,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[3],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x10,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[4],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x08,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[5],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x04,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[6],
             { "New IE present",
               "fp.hsdsch.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x02,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_hsdsch_new_ie_flag[7],
@@ -3585,19 +3585,19 @@ void proto_register_fp(void)
         },
         { &hf_fp_mac_d_pdu,
             { "MAC-d PDU",
-              "fp.mac-d-pdu", FT_BYTES, BASE_HEX, NULL, 0x0,
-              "MAC-d PDU", HFILL
+              "fp.mac-d-pdu", FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_fp_data,
             { "Data",
-              "fp.data", FT_BYTES, BASE_HEX, NULL, 0x0,
-              "Data", HFILL
+              "fp.data", FT_BYTES, BASE_NONE, NULL, 0x0,
+              NULL, HFILL
             }
         },
         { &hf_fp_crcis,
             { "CRCIs",
-              "fp.crcis", FT_BYTES, BASE_HEX, NULL, 0x0,
+              "fp.crcis", FT_BYTES, BASE_NONE, NULL, 0x0,
               "CRC Indicators for uplink TBs", HFILL
             }
         },
@@ -3652,37 +3652,37 @@ void proto_register_fp(void)
         { &hf_fp_code_number,
             { "Code number",
               "fp.code-number", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "Code number", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_spreading_factor,
             { "Spreading factor",
               "fp.spreading-factor", FT_UINT8, BASE_DEC, VALS(spreading_factor_vals), 0xf0,
-              "Spreading factor", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_mc_info,
             { "MC info",
               "fp.mc-info", FT_UINT8, BASE_DEC, NULL, 0x0e,
-              "MC info", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_new_ie_flags,
             { "New IEs flags",
               "fp.rach.new-ie-flags", FT_STRING, BASE_NONE, 0, 0x0,
-              "New IEs flags", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_new_ie_flag_unused[0],
             { "New IE present",
               "fp.rach.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x80,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_new_ie_flag_unused[1],
             { "New IE present",
               "fp.rach.new-ie-flag", FT_UINT8, BASE_DEC, 0, 0x40,
-              "New IE present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_new_ie_flag_unused[2],
@@ -3718,55 +3718,55 @@ void proto_register_fp(void)
         { &hf_fp_rach_cell_portion_id_present,
             { "Cell portion ID present",
               "fp.rach.cell-portion-id-present", FT_UINT8, BASE_DEC, 0, 0x01,
-              "Cell portion ID present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_angle_of_arrival_present,
             { "Angle of arrival present",
               "fp.rach.angle-of-arrival-present", FT_UINT8, BASE_DEC, 0, 0x01,
-              "Angle of arrival present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_ext_propagation_delay_present,
             { "Ext Propagation Delay Present",
               "fp.rach.ext-propagation-delay-present", FT_UINT8, BASE_DEC, 0, 0x02,
-              "Ext Propagation Delay Present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_ext_rx_sync_ul_timing_deviation_present,
             { "Ext Received Sync UL Timing Deviation present",
               "fp.rach.ext-rx-sync-ul-timing-deviation-present", FT_UINT8, BASE_DEC, 0, 0x02,
-              "Ext Received Sync UL Timing Deviation present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_rach_ext_rx_timing_deviation_present,
             { "Ext Rx Timing Deviation present",
               "fp.rach.ext-rx-timing-deviation-present", FT_UINT8, BASE_DEC, 0, 0x01,
-              "Ext Rx Timing Deviation present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_cell_portion_id,
             { "Cell Portion ID",
               "fp.cell-portion-id", FT_UINT8, BASE_DEC, NULL, 0x3f,
-              "Cell Portion ID", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_ext_propagation_delay,
             { "Ext Propagation Delay",
               "fp.ext-propagation-delay", FT_UINT16, BASE_DEC, NULL, 0x03ff,
-              "Ext Propagation Delay", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_angle_of_arrival,
             { "Angle of Arrival",
               "fp.angle-of-arrival", FT_UINT16, BASE_DEC, NULL, 0x03ff,
-              "Angle of Arrival", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_ext_received_sync_ul_timing_deviation,
             { "Ext Received SYNC UL Timing Deviation",
               "fp.ext-received-sync-ul-timing-deviation", FT_UINT16, BASE_DEC, NULL, 0x1fff,
-              "Ext Received SYNC UL Timing Deviation", HFILL
+              NULL, HFILL
             }
         },
 
@@ -3774,25 +3774,25 @@ void proto_register_fp(void)
         { &hf_fp_radio_interface_parameter_update_flag[0],
             { "CFN valid",
               "fp.radio-interface-param.cfn-valid", FT_UINT16, BASE_DEC, 0, 0x0001,
-              "CFN valid", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_radio_interface_parameter_update_flag[1],
             { "TPC PO valid",
               "fp.radio-interface-param.tpc-po-valid", FT_UINT16, BASE_DEC, 0, 0x0002,
-              "TPC PO valid", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_radio_interface_parameter_update_flag[2],
             { "DPC mode valid",
               "fp.radio-interface-param.dpc-mode-valid", FT_UINT16, BASE_DEC, 0, 0x0004,
-              "DPC mode valid", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_radio_interface_parameter_update_flag[3],
             { "RL sets indicator valid",
               "fp.radio-interface_param.rl-sets-indicator-valid", FT_UINT16, BASE_DEC, 0, 0x0020,
-              "RL sets indicator valid", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_radio_interface_parameter_update_flag[4],
@@ -3810,13 +3810,13 @@ void proto_register_fp(void)
         { &hf_fp_tpc_po,
             { "TPC PO",
               "fp.tpc-po", FT_UINT8, BASE_DEC, NULL, 0x1f,
-              "TPC PO", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_multiple_rl_set_indicator,
             { "Multiple RL sets indicator",
               "fp.multiple-rl-sets-indicator", FT_UINT8, BASE_DEC, NULL, 0x80,
-              "Multiple RL sets indicator", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_max_ue_tx_pow,
@@ -3828,31 +3828,31 @@ void proto_register_fp(void)
         { &hf_fp_congestion_status,
             { "Congestion Status",
               "fp.congestion-status", FT_UINT8, BASE_DEC, VALS(congestion_status_vals), 0x0,
-              "Congestion Status", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_e_rucch_present,
             { "E-RUCCH Present",
               "fp.erucch-present", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "E-RUCCH Present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_extended_bits_present,
             { "Extended Bits Present",
               "fp.extended-bits-present", FT_UINT8, BASE_DEC, NULL, 0x0,
-              "Extended Bits Present", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_extended_bits,
             { "Extended Bits",
               "fp.extended-bits", FT_UINT8, BASE_HEX, NULL, 0x0,
-              "Extended Bits", HFILL
+              NULL, HFILL
             }
         },
         { &hf_fp_spare_extension,
             { "Spare Extension",
               "fp.spare-extension", FT_NONE, BASE_NONE, NULL, 0x0,
-              "Spare Extension", HFILL
+              NULL, HFILL
             }
         },
 
diff --git a/epan/dissectors/packet-usb-masstorage.c b/epan/dissectors/packet-usb-masstorage.c
index 6685b62aa0..6e0ecd251b 100644
--- a/epan/dissectors/packet-usb-masstorage.c
+++ b/epan/dissectors/packet-usb-masstorage.c
@@ -374,59 +374,59 @@ proto_register_usb_ms(void)
     static hf_register_info hf[] = {
         { &hf_usb_ms_dCBWSignature,
         { "Signature", "usbms.dCBWSignature", FT_UINT32, BASE_HEX, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCBWTag,
         { "Tag", "usbms.dCBWTag", FT_UINT32, BASE_HEX, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCBWDataTransferLength,
         { "DataTransferLength", "usbms.dCBWDataTransferLength", FT_UINT32, BASE_DEC, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCBWFlags,
         { "Flags", "usbms.dCBWFlags", FT_UINT8, BASE_HEX, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCBWLUN,
         { "LUN", "usbms.dCBWLUN", FT_UINT8, BASE_HEX, 
-          NULL, 0x0f, "", HFILL }},
+          NULL, 0x0f, NULL, HFILL }},
 
         { &hf_usb_ms_dCBWCBLength,
         { "CDB Length", "usbms.dCBWCBLength", FT_UINT8, BASE_HEX, 
-          NULL, 0x1f, "", HFILL }},
+          NULL, 0x1f, NULL, HFILL }},
 
         { &hf_usb_ms_dCSWSignature,
         { "Signature", "usbms.dCSWSignature", FT_UINT32, BASE_HEX, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCSWDataResidue,
         { "DataResidue", "usbms.dCSWDataResidue", FT_UINT32, BASE_DEC, 
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_dCSWStatus,
         { "Status", "usbms.dCSWStatus", FT_UINT8, BASE_HEX, 
-          VALS(status_vals), 0x0, "", HFILL }},
+          VALS(status_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_ms_request,
         { "bRequest", "usbms.setup.bRequest", FT_UINT8, BASE_HEX, VALS(setup_request_names_vals), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_ms_value,
         { "wValue", "usbms.setup.wValue", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_ms_index,
         { "wIndex", "usbms.setup.wIndex", FT_UINT16, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_ms_length,
         { "wLength", "usbms.setup.wLength", FT_UINT16, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
                 
         { &hf_usb_ms_maxlun,
         { "Max LUN", "usbms.setup.maxlun", FT_UINT8, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
                 
     };
     
diff --git a/epan/dissectors/packet-usb.c b/epan/dissectors/packet-usb.c
index c44bc3c101..6bd2698724 100644
--- a/epan/dissectors/packet-usb.c
+++ b/epan/dissectors/packet-usb.c
@@ -2054,17 +2054,17 @@ proto_register_usb(void)
         { &hf_usb_urb_id,
         { "URB id", "usb.urb_id", FT_UINT64, BASE_HEX,
                 NULL, 0x0,
-                "URB id", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_urb_type,
         { "URB type", "usb.urb_type", FT_STRING, BASE_NONE,
                 NULL, 0x0,
-                "URB type", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_transfer_type,
         { "URB transfer type", "usb.transfer_type", FT_UINT8, BASE_DEC,
                 VALS(usb_transfer_type_vals), 0x0,
-                "URB transfer type", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_endpoint_number,
         { "Endpoint", "usb.endpoint_number", FT_UINT8, BASE_HEX, NULL, 0x0,
@@ -2077,7 +2077,7 @@ proto_register_usb(void)
         { &hf_usb_bus_id,
         { "URB bus id", "usb.bus_id", FT_UINT16, BASE_DEC,
                 NULL, 0x0,
-                "URB bus id", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_setup_flag,
         { "Device setup request", "usb.setup_flag", FT_STRING, BASE_NONE,
@@ -2092,7 +2092,7 @@ proto_register_usb(void)
         { &hf_usb_urb_status,
         { "URB status", "usb.urb_status", FT_INT32, BASE_DEC,
                 VALS(usb_urb_status_vals), 0x0,
-                "URB status", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_urb_len,
         { "URB length [bytes]", "usb.urb_len", FT_UINT32, BASE_DEC, NULL, 0x0,
@@ -2114,209 +2114,209 @@ proto_register_usb(void)
     /* Fields from usb20.pdf, Table 9-2 'Format of Setup Data' */
         { &hf_usb_bmRequestType,
         { "bmRequestType", "usb.bmRequestType", FT_UINT8, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_request,
         { "bRequest", "usb.setup.bRequest", FT_UINT8, BASE_DEC, VALS(setup_request_names_vals), 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_value,
         { "wValue", "usb.setup.wValue", FT_UINT16, BASE_HEX, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_index,
         { "wIndex", "usb.setup.wIndex", FT_UINT16, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_length,
         { "wLength", "usb.setup.wLength", FT_UINT16, BASE_DEC, NULL, 0x0,
-                "", HFILL }},
+                NULL, HFILL }},
 
         { &hf_usb_wFeatureSelector,
         { "wFeatureSelector", "usb.setup.wFeatureSelector", FT_UINT16, BASE_DEC,
-	   VALS(usb_feature_selector_vals), 0x0, "", HFILL }},
+	   VALS(usb_feature_selector_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_wInterface,
         { "wInterface", "usb.setup.wInterface", FT_UINT16, BASE_DEC,
-	   NULL, 0x0, "", HFILL }},
+	   NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_wStatus,
         { "wStatus", "usb.setup.wStatus", FT_UINT16, BASE_HEX,
-	   NULL, 0x0, "", HFILL }},
+	   NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_wFrameNumber,
         { "wFrameNumber", "usb.setup.wFrameNumber", FT_UINT16, BASE_DEC,
-	   NULL, 0x0, "", HFILL }},
+	   NULL, 0x0, NULL, HFILL }},
 
     /* --------------------------------- */
         { &hf_usb_data,
         {"Application Data", "usb.data",
-            FT_BYTES, BASE_HEX, NULL, 0x0,
+            FT_BYTES, BASE_NONE, NULL, 0x0,
             "Payload is application data", HFILL }},
 
         { &hf_usb_bmRequestType_direction,
         { "Direction", "usb.bmRequestType.direction", FT_BOOLEAN, 8,
-          TFS(&tfs_bmrequesttype_direction), USB_DIR_IN, "", HFILL }},
+          TFS(&tfs_bmrequesttype_direction), USB_DIR_IN, NULL, HFILL }},
 
         { &hf_usb_bmRequestType_type,
         { "Type", "usb.bmRequestType.type", FT_UINT8, BASE_HEX,
-          VALS(bmrequesttype_type_vals), USB_TYPE_MASK, "", HFILL }},
+          VALS(bmrequesttype_type_vals), USB_TYPE_MASK, NULL, HFILL }},
 
         { &hf_usb_bmRequestType_recipient,
         { "Recipient", "usb.bmRequestType.recipient", FT_UINT8, BASE_HEX,
-          VALS(bmrequesttype_recipient_vals), 0x1f, "", HFILL }},
+          VALS(bmrequesttype_recipient_vals), 0x1f, NULL, HFILL }},
 
         { &hf_usb_bDescriptorType,
         { "bDescriptorType", "usb.bDescriptorType", FT_UINT8, BASE_DEC,
-          VALS(descriptor_type_vals), 0x0, "", HFILL }},
+          VALS(descriptor_type_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_descriptor_index,
         { "Descriptor Index", "usb.DescriptorIndex", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_language_id,
         { "Language Id", "usb.LanguageId", FT_UINT16, BASE_HEX,
-          VALS(usb_langid_vals), 0x0, "", HFILL }},
+          VALS(usb_langid_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_bLength,
         { "bLength", "usb.bLength", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bcdUSB,
         { "bcdUSB", "usb.bcdUSB", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bDeviceClass,
         { "bDeviceClass", "usb.bDeviceClass", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bDeviceSubClass,
         { "bDeviceSubClass", "usb.bDeviceSubClass", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bDeviceProtocol,
         { "bDeviceProtocol", "usb.bDeviceProtocol", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bMaxPacketSize0,
         { "bMaxPacketSize0", "usb.bMaxPacketSize0", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_idVendor,
         { "idVendor", "usb.idVendor", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_idProduct,
         { "idProduct", "usb.idProduct", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bcdDevice,
         { "bcdDevice", "usb.bcdDevice", FT_UINT16, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_iManufacturer,
         { "iManufacturer", "usb.iManufacturer", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_iProduct,
         { "iProduct", "usb.iProduct", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_iSerialNumber,
         { "iSerialNumber", "usb.iSerialNumber", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bNumConfigurations,
         { "bNumConfigurations", "usb.bNumConfigurations", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_wLANGID,
         { "wLANGID", "usb.wLANGID", FT_UINT16, BASE_HEX,
-          VALS(usb_langid_vals), 0x0, "", HFILL }},
+          VALS(usb_langid_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_bString,
         { "bString", "usb.bString", FT_STRING, BASE_NONE,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bInterfaceNumber,
         { "bInterfaceNumber", "usb.bInterfaceNumber", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bAlternateSetting,
         { "bAlternateSetting","usb.bAlternateSetting", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bNumEndpoints,
         { "bNumEndpoints","usb.bNumEndpoints", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bInterfaceClass,
         { "bInterfaceClass", "usb.bInterfaceClass", FT_UINT8, BASE_HEX,
-          VALS(usb_interfaceclass_vals), 0x0, "", HFILL }},
+          VALS(usb_interfaceclass_vals), 0x0, NULL, HFILL }},
 
         { &hf_usb_bInterfaceSubClass,
         { "bInterfaceSubClass", "usb.bInterfaceSubClass", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bInterfaceProtocol,
         { "bInterfaceProtocol", "usb.bInterfaceProtocol", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_iInterface,
         { "iInterface", "usb.iInterface", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bEndpointAddress,
         { "bEndpointAddress", "usb.bEndpointAddress", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_configuration_bmAttributes,
         { "Configuration bmAttributes", "usb.configuration.bmAttributes", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bmAttributes,
         { "bmAttributes", "usb.bmAttributes", FT_UINT8, BASE_HEX,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bEndpointAttributeTransfer,
         { "Transfertype", "usb.bmAttributes.transfer", FT_UINT8, BASE_HEX,
-          VALS(usb_bmAttributes_transfer_vals), 0x03, "", HFILL }},
+          VALS(usb_bmAttributes_transfer_vals), 0x03, NULL, HFILL }},
 
         { &hf_usb_bEndpointAttributeSynchonisation,
         { "Synchronisationtype", "usb.bmAttributes.sync", FT_UINT8, BASE_HEX,
-          VALS(usb_bmAttributes_sync_vals), 0x0c, "", HFILL }},
+          VALS(usb_bmAttributes_sync_vals), 0x0c, NULL, HFILL }},
 
         { &hf_usb_bEndpointAttributeBehaviour,
         { "Behaviourtype", "usb.bmAttributes.behaviour", FT_UINT8, BASE_HEX,
-          VALS(usb_bmAttributes_behaviour_vals), 0x30, "", HFILL }},
+          VALS(usb_bmAttributes_behaviour_vals), 0x30, NULL, HFILL }},
 
         { &hf_usb_wMaxPacketSize,
         { "wMaxPacketSize", "usb.wMaxPacketSize", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bInterval,
         { "bInterval", "usb.bInterval", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_wTotalLength,
         { "wTotalLength", "usb.wTotalLength", FT_UINT16, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bNumInterfaces,
         { "bNumInterfaces", "usb.bNumInterfaces", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bConfigurationValue,
         { "bConfigurationValue", "usb.bConfigurationValue", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_iConfiguration,
         { "iConfiguration", "usb.iConfiguration", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_bMaxPower,
         { "bMaxPower", "usb.bMaxPower", FT_UINT8, BASE_DEC,
-          NULL, 0x0, "", HFILL }},
+          NULL, 0x0, NULL, HFILL }},
 
         { &hf_usb_configuration_legacy10buspowered,
         { "Must be 1", "usb.configuration.legacy10buspowered", FT_BOOLEAN, 8,
@@ -2324,19 +2324,19 @@ proto_register_usb(void)
 
         { &hf_usb_configuration_selfpowered,
         { "Self-Powered", "usb.configuration.selfpowered", FT_BOOLEAN, 8,
-          TFS(&tfs_selfpowered), 0x40, "", HFILL }},
+          TFS(&tfs_selfpowered), 0x40, NULL, HFILL }},
 
         { &hf_usb_configuration_remotewakeup,
         { "Remote Wakeup", "usb.configuration.remotewakeup", FT_BOOLEAN, 8,
-          TFS(&tfs_remotewakeup), 0x20, "", HFILL }},
+          TFS(&tfs_remotewakeup), 0x20, NULL, HFILL }},
 
         { &hf_usb_bEndpointAddress_number,
         { "Endpoint Number", "usb.bEndpointAddress.number", FT_UINT8, BASE_HEX,
-          NULL, 0x0f, "", HFILL }},
+          NULL, 0x0f, NULL, HFILL }},
 
         { &hf_usb_bEndpointAddress_direction,
         { "Direction", "usb.bEndpointAddress.direction", FT_BOOLEAN, 8,
-          TFS(&tfs_endpoint_direction), 0x80, "", HFILL }},
+          TFS(&tfs_endpoint_direction), 0x80, NULL, HFILL }},
 
 	{ &hf_usb_request_in,
 		{ "Request in", "usb.request_in", FT_FRAMENUM, BASE_NONE,
diff --git a/epan/dissectors/packet-uts.c b/epan/dissectors/packet-uts.c
index c71b91c66c..d36cc796fd 100644
--- a/epan/dissectors/packet-uts.c
+++ b/epan/dissectors/packet-uts.c
@@ -351,22 +351,22 @@ proto_register_uts(void)
 	    FT_UINT8,	BASE_HEX,	NULL, 0, "Device Identifier address",	HFILL }}, 
 	{ &hf_retxrequest,
 	  { "ReTxRequst",  "uts.retxrequst",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Re-transmit Request",	HFILL }}, 
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Re-transmit Request",	HFILL }}, 
 	{ &hf_ack,
 	  { "Ack",	   "uts.ack",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Ack",			HFILL }}, 
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Ack",			HFILL }}, 
 	{ &hf_replyrequest,
 	  { "ReplyRequst", "uts.replyrequest",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Reply Request",	HFILL }},
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Reply Request",	HFILL }},
 	{ &hf_busy,
 	  { "Busy",	   "uts.busy",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Busy",		HFILL }},
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Busy",		HFILL }},
 	{ &hf_notbusy,
 	  { "NotBusy",	   "uts.notbusy",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Not Busy",		HFILL }},
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Not Busy",		HFILL }},
 	{ &hf_msgwaiting,
 	  { "MsgWaiting",  "uts.msgwaiting",
-	    FT_BOOLEAN,	BASE_NONE,	NULL, 0, "TRUE if Message Waiting",	HFILL }},
+	    FT_BOOLEAN,	BASE_NONE,	NULL, 0x0, "TRUE if Message Waiting",	HFILL }},
         { &hf_function,
 	  { "Function",    "uts.function",
 	    FT_UINT8,	BASE_HEX,	NULL, 0, "Function Code value",		HFILL }},
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index b3ae47456a..004e075a78 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -242,49 +242,49 @@ proto_register_v120(void)
     static hf_register_info hf[] = {
 	{ &hf_v120_address,
 	  { "Link Address", "v120.address", FT_UINT16, BASE_HEX, NULL,
-		  0x0, "", HFILL }},
+		  0x0, NULL, HFILL }},
 	{ &hf_v120_control,
 	  { "Control Field", "v120.control", FT_UINT16, BASE_HEX, NULL, 0x0,
-	  	"", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_v120_n_r,
 	    { "N(R)", "v120.control.n_r", FT_UINT16, BASE_DEC,
-		NULL, XDLC_N_R_EXT_MASK, "", HFILL }},
+		NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }},
 	{ &hf_v120_n_s,
 	    { "N(S)", "v120.control.n_s", FT_UINT16, BASE_DEC,
-		NULL, XDLC_N_S_EXT_MASK, "", HFILL }},
+		NULL, XDLC_N_S_EXT_MASK, NULL, HFILL }},
 	{ &hf_v120_p,
 	    { "Poll", "v120.control.p", FT_BOOLEAN, 8,
-		TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+		TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 	{ &hf_v120_p_ext,
 	    { "Poll", "v120.control.p", FT_BOOLEAN, 16,
-		TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }},
+		TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }},
 	{ &hf_v120_f,
 	    { "Final", "v120.control.f", FT_BOOLEAN, 8,
-		TFS(&flags_set_truth), XDLC_P_F, "", HFILL }},
+		TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }},
 	{ &hf_v120_f_ext,
 	    { "Final", "v120.control.f", FT_BOOLEAN, 16,
-		TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }},
+		TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }},
 	{ &hf_v120_s_ftype,
 	    { "Supervisory frame type", "v120.control.s_ftype", FT_UINT16, BASE_HEX,
-		VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }},
+		VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }},
 	{ &hf_v120_u_modifier_cmd,
 	    { "Command", "v120.control.u_modifier_cmd", FT_UINT8, BASE_HEX,
-		VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }},
+		VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 	{ &hf_v120_u_modifier_resp,
 	    { "Response", "v120.control.u_modifier_resp", FT_UINT8, BASE_HEX,
-		VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }},
+		VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }},
 	{ &hf_v120_ftype_i,
 	    { "Frame type", "v120.control.ftype", FT_UINT16, BASE_HEX,
-		VALS(ftype_vals), XDLC_I_MASK, "", HFILL }},
+		VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }},
 	{ &hf_v120_ftype_s_u,
 	    { "Frame type", "v120.control.ftype", FT_UINT8, BASE_HEX,
-		VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+		VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
 	{ &hf_v120_ftype_s_u_ext,
 	    { "Frame type", "v120.control.ftype", FT_UINT16, BASE_HEX,
-		VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }},
+		VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }},
 	{ &hf_v120_header,
 	  { "Header Field", "v120.header", FT_STRING, BASE_NONE, NULL, 0x0,
-	  	"", HFILL }},
+	  	NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_v120,
diff --git a/epan/dissectors/packet-v5ua.c b/epan/dissectors/packet-v5ua.c
index a4f50c2472..e0b3e80c34 100644
--- a/epan/dissectors/packet-v5ua.c
+++ b/epan/dissectors/packet-v5ua.c
@@ -1987,7 +1987,7 @@ proto_register_v5ua(void)
 		{ &hf_version,
 			{ "Version",                "v5ua.version",
 			   FT_UINT8,    BASE_DEC, VALS(v5ua_protocol_version_values),0x0,
-			   "", HFILL } },
+			   NULL, HFILL } },
 		{ &hf_reserved,
 			{ "Reserved",               "v5ua.reserved",
 			   FT_UINT8,    BASE_HEX, NULL,                             0x0,
diff --git a/epan/dissectors/packet-vj.c b/epan/dissectors/packet-vj.c
index 5ee51f0dd3..6d076c1a21 100644
--- a/epan/dissectors/packet-vj.c
+++ b/epan/dissectors/packet-vj.c
@@ -814,7 +814,7 @@ proto_register_vj(void)
   static hf_register_info hf[] = {
     { &hf_vj_change_mask,
       { "Change mask",	"vj.change_mask",	FT_UINT8, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_vj_change_mask_c,
       { "Connection changed",		"vj.change_mask_c",	FT_BOOLEAN, 8,
         NULL, NEW_C, "Connection number changed", HFILL }},
@@ -826,7 +826,7 @@ proto_register_vj(void)
         NULL, CHANGE_PUSH_BIT, "TCP PSH flag set", HFILL }},
     { &hf_vj_change_mask_s,
       { "Sequence number changed",	"vj.change_mask_s",	FT_BOOLEAN, 8,
-        NULL, NEW_S, "Sequence number changed", HFILL }},
+        NULL, NEW_S, NULL, HFILL }},
     { &hf_vj_change_mask_a,
       { "Ack number changed",		"vj.change_mask_a",	FT_BOOLEAN, 8,
         NULL, NEW_A, "Acknowledgement sequence number changed", HFILL }},
@@ -835,16 +835,16 @@ proto_register_vj(void)
         NULL, NEW_W, "TCP window changed", HFILL }},
     { &hf_vj_change_mask_u,
       { "Urgent pointer set",		"vj.change_mask_u",	FT_BOOLEAN, 8,
-        NULL, NEW_U, "Urgent pointer set", HFILL }},
+        NULL, NEW_U, NULL, HFILL }},
     { &hf_vj_connection_number,
       { "Connection number",	"vj.connection_number",	FT_UINT8, BASE_DEC,
-        NULL, 0x0, "Connection number", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_vj_tcp_cksum,
       { "TCP checksum",			"vj.tcp_cksum",	FT_UINT16, BASE_HEX,
-        NULL, 0x0, "TCP checksum", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_vj_urp,
       { "Urgent pointer",		"vj.urp",	FT_UINT16, BASE_DEC,
-        NULL, 0x0, "Urgent pointer", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_vj_win_delta,
       { "Window delta",			"vj.win_delta",	FT_INT16, BASE_DEC,
         NULL, 0x0, "Delta for window", HFILL }},
diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c
index 272c3837f2..87b9e27f4d 100644
--- a/epan/dissectors/packet-vnc.c
+++ b/epan/dissectors/packet-vnc.c
@@ -2504,7 +2504,7 @@ proto_register_vnc(void)
 		{ &hf_vnc_auth_result,
 		  { "Authentication result", "vnc.auth_result",
 		    FT_UINT32, BASE_DEC, VALS(auth_result_vs), 0x0,
-		    "Authentication result", HFILL }
+		    NULL, HFILL }
 		},
 		{ &hf_vnc_auth_error,
 		  { "Authentication error", "vnc.auth_error",
@@ -2850,7 +2850,7 @@ proto_register_vnc(void)
 		{ &hf_vnc_rre_bg_pixel,
 		  { "Background pixel value", "vnc.rre_bg_pixel",
 		    FT_BYTES, BASE_NONE, NULL, 0x0,
-		    "Background pixel value", HFILL }
+		    NULL, HFILL }
 		},
 
 		{ &hf_vnc_rre_subrect_pixel,
@@ -2998,7 +2998,7 @@ proto_register_vnc(void)
 		{ &hf_vnc_zrle_palette_size,
 		  { "Palette size", "vnc.zrle_palette_size",
 		    FT_UINT8, BASE_DEC, NULL, 0x7F, /* Lower 7 bits */
-		    "Palette size", HFILL }
+		    NULL, HFILL }
 		},
 
 		{ &hf_vnc_zrle_data,
diff --git a/epan/dissectors/packet-vrrp.c b/epan/dissectors/packet-vrrp.c
index ee63372955..4abfb9e534 100644
--- a/epan/dissectors/packet-vrrp.c
+++ b/epan/dissectors/packet-vrrp.c
@@ -271,12 +271,12 @@ void proto_register_vrrp(void)
 
                 { &hf_vrrp_ip,
                   {"IP Address", "vrrp.ip_addr",
-                   FT_IPv4, 0, NULL, 0x0,
+                   FT_IPv4, BASE_NONE, NULL, 0x0,
                    "IP address associated with the virtual router", HFILL }},
 
                 { &hf_vrrp_ip6,
                   {"IPv6 Address", "vrrp.ipv6_addr",
-                   FT_IPv6, 0, NULL, 0x0,
+                   FT_IPv6, BASE_NONE, NULL, 0x0,
                    "IPv6 address associated with the virtual router", HFILL }},
         };
 
diff --git a/epan/dissectors/packet-vtp.c b/epan/dissectors/packet-vtp.c
index e3e4e3c0ba..f9e1d444ea 100644
--- a/epan/dissectors/packet-vtp.c
+++ b/epan/dissectors/packet-vtp.c
@@ -593,11 +593,11 @@ proto_register_vtp(void)
 	static hf_register_info hf[] = {
 		{ &hf_vtp_version,
 		{ "Version",	"vtp.version", FT_UINT8, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_vtp_code,
 		{ "Code",	"vtp.code", FT_UINT8, BASE_HEX, VALS(type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_vtp_followers,
 		{ "Followers",	"vtp.followers", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -608,7 +608,7 @@ proto_register_vtp(void)
 			"Length of management domain string", HFILL }},
 
 		{ &hf_vtp_md,
-		{ "Management Domain", "vtp.md", FT_STRING, BASE_DEC, NULL, 0,
+		{ "Management Domain", "vtp.md", FT_STRING, BASE_NONE, NULL, 0,
 			"Management domain", HFILL }},
 
 		{ &hf_vtp_conf_rev_num,
@@ -620,12 +620,12 @@ proto_register_vtp(void)
 			"IP address of the updater", HFILL }},
 
 		{ &hf_vtp_upd_ts,
-		{ "Update Timestamp", "vtp.upd_ts", FT_STRING, BASE_DEC, NULL, 0,
+		{ "Update Timestamp", "vtp.upd_ts", FT_STRING, BASE_NONE, NULL, 0,
 			"Time stamp of the current configuration revision", HFILL }},
 
 		{ &hf_vtp_md5_digest,
-		{ "MD5 Digest",	"vtp.md5_digest", FT_BYTES, BASE_HEX, NULL, 0x0,
-			"", HFILL }},
+		{ "MD5 Digest",	"vtp.md5_digest", FT_BYTES, BASE_NONE, NULL, 0x0,
+			NULL, HFILL }},
 
 		{ &hf_vtp_seq_num,
 		{ "Sequence Number",	"vtp.seq_num", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -641,7 +641,7 @@ proto_register_vtp(void)
 
 		{ &hf_vtp_vlan_status_vlan_susp,
 		{ "VLAN suspended",	"vtp.vlan_info.status.vlan_susp", FT_BOOLEAN, 8, NULL, VLAN_SUSPENDED,
-			"VLAN suspended", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_vtp_vlan_type,
 		{ "VLAN Type",	"vtp.vlan_info.vlan_type", FT_UINT8, BASE_HEX, VALS(vlan_type_vals), 0x0,
@@ -664,16 +664,16 @@ proto_register_vtp(void)
 			"IEEE 802.10 security association identifier for this VLAN", HFILL }},
 
 		{ &hf_vtp_vlan_name,
-		{ "VLAN Name", "vtp.vlan_info.vlan_name", FT_STRING, BASE_DEC, NULL, 0,
+		{ "VLAN Name", "vtp.vlan_info.vlan_name", FT_STRING, BASE_NONE, NULL, 0,
 			"VLAN name", HFILL }},
 
 		{ &hf_vtp_vlan_tlvtype,
 		{ "Type",	"vtp.vlan_info.tlv_type", FT_UINT8, BASE_HEX, VALS(vlan_tlv_type_vals), 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_vtp_vlan_tlvlength,
 		{ "Length",	"vtp.vlan_info.tlv_len", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
         };
 	static gint *ett[] = {
 		&ett_vtp,
diff --git a/epan/dissectors/packet-wassp.c b/epan/dissectors/packet-wassp.c
index e4a4295ac5..492a288d79 100644
--- a/epan/dissectors/packet-wassp.c
+++ b/epan/dissectors/packet-wassp.c
@@ -1006,11 +1006,11 @@ proto_register_wassp(void)
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_soft_version,
-		{ "RU-SOFT-VERSION", "wassp.ru.soft.version", FT_STRING, BASE_DEC, NULL,
+		{ "RU-SOFT-VERSION", "wassp.ru.soft.version", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_serial_number,
-		{ "RU-SERIAL-NUMBER", "wassp.ru.serial.number", FT_STRING, BASE_DEC, NULL,
+		{ "RU-SERIAL-NUMBER", "wassp.ru.serial.number", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_challenge,
@@ -1034,7 +1034,7 @@ proto_register_wassp(void)
 				0x0, NULL, HFILL }},
 
 		{ &hf_image_path,
-		{ "IMAGE-PATH", "wassp.image.path", FT_STRING, BASE_DEC, NULL,
+		{ "IMAGE-PATH", "wassp.image.path", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_config,
@@ -1046,7 +1046,7 @@ proto_register_wassp(void)
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_session_key,
-		{ "RU-SESSION-KEY", "wassp.ru.session.key", FT_STRING, BASE_DEC, NULL,
+		{ "RU-SESSION-KEY", "wassp.ru.session.key", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_message_type,
@@ -1066,7 +1066,7 @@ proto_register_wassp(void)
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_model,
-		{ "RU-MODEL", "wassp.ru.model", FT_STRING, BASE_DEC, NULL,
+		{ "RU-MODEL", "wassp.ru.model", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_scan_mode,
@@ -1094,7 +1094,7 @@ proto_register_wassp(void)
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_trap,
-		{ "RU-TRAP", "wassp.ru.trap", FT_STRING, BASE_DEC, NULL,
+		{ "RU-TRAP", "wassp.ru.trap", FT_STRING, BASE_NONE, NULL,
 				0x0, NULL, HFILL }},
 
 		{ &hf_ru_scan_times,
@@ -1666,7 +1666,7 @@ proto_register_wassp(void)
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_disc_retry_delay,
-		{ "DISC_RETRY_DELAY",	"wassp.config.disc.retry.delay", FT_BYTES, BASE_HEX, NULL,
+		{ "DISC_RETRY_DELAY",	"wassp.config.disc.retry.delay", FT_BYTES, BASE_NONE, NULL,
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_logging_alarm_sev,
@@ -1763,7 +1763,7 @@ proto_register_wassp(void)
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_vns_qos_up_value,
-		{ "V_QOS_UP_VALUE",	"wassp.config.vns.qos.up.value", FT_BYTES, BASE_HEX, NULL,
+		{ "V_QOS_UP_VALUE",	"wassp.config.vns.qos.up.value", FT_BYTES, BASE_NONE, NULL,
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_vns_priority_override,
@@ -1988,7 +1988,7 @@ proto_register_wassp(void)
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_radio_acs_ch_list,
-		{ "R_ACS_CH_LIST",	"wassp.config.radio.acs.ch.list", FT_BYTES, BASE_HEX, NULL,
+		{ "R_ACS_CH_LIST",	"wassp.config.radio.acs.ch.list", FT_BYTES, BASE_NONE, NULL,
 			0x0, NULL, HFILL }},
 
 		{ &hf_config_radio_tx_power_adj,
diff --git a/epan/dissectors/packet-wcp.c b/epan/dissectors/packet-wcp.c
index 7814741f75..7b21abd37b 100644
--- a/epan/dissectors/packet-wcp.c
+++ b/epan/dissectors/packet-wcp.c
@@ -624,13 +624,13 @@ proto_register_wcp(void)
 	  	"Packet Checksum", HFILL }},
 	{ &hf_wcp_tid,
 	  { "TID", "wcp.tid", FT_UINT16, BASE_DEC, NULL, 0,
-	  	"TID", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_wcp_rev,
 	  { "Revision", "wcp.rev", FT_UINT8, BASE_DEC, NULL, 0,
-	  	"Revision", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_wcp_init,
 	  { "Initiator", "wcp.init", FT_UINT8, BASE_DEC, NULL, 0,
-	  	"Initiator", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_wcp_seq_size,
 	  { "Seq Size", "wcp.seq_size", FT_UINT8, BASE_DEC, NULL, 0,
 	  	"Sequence Size", HFILL }},
@@ -663,7 +663,7 @@ proto_register_wcp(void)
 	  	"Per Packet Compression", HFILL }},
 	{ &hf_wcp_pib,
 	  { "PIB", "wcp.pib", FT_UINT8, BASE_DEC, NULL, 0,
-	  	"PIB", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_wcp_comp_bits,
 	  { "Compress Flag", "wcp.flag", FT_UINT8, BASE_HEX, NULL, 0,
 	  	"Compressed byte flag", HFILL }},
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index fe39715e5a..aa6972f01a 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -94,10 +94,10 @@ proto_register_wfleet_hdlc(void)
   static hf_register_info hf[] = {
     { &hf_wfleet_hdlc_addr,
       { "Address", "wfleet_hdlc.address", FT_UINT8, BASE_HEX,
-        NULL, 0x0, "", HFILL }},
+        NULL, 0x0, NULL, HFILL }},
     { &hf_wfleet_hdlc_cmd,
       { "Command", "wfleet_hdlc.command", FT_UINT8, BASE_HEX,
-        VALS(wfleet_hdlc_cmd_vals), 0x0, "", HFILL }},
+        VALS(wfleet_hdlc_cmd_vals), 0x0, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_wfleet_hdlc,
diff --git a/epan/dissectors/packet-who.c b/epan/dissectors/packet-who.c
index 537aed6743..a8bb9d08b1 100644
--- a/epan/dissectors/packet-who.c
+++ b/epan/dissectors/packet-who.c
@@ -233,59 +233,59 @@ proto_register_who(void)
 	static hf_register_info hf[] = {
 		{ &hf_who_vers,
 		{ "Version",	"who.vers", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_type,
 		{ "Type",	"who.type", FT_UINT8, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_sendtime,
 		{ "Send Time",	"who.sendtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_recvtime,
 		{ "Receive Time", "who.recvtime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_hostname,
 		{ "Hostname", "who.hostname", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_loadav_5,
 		{ "Load Average Over Past  5 Minutes", "who.loadav_5", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_loadav_10,
 		{ "Load Average Over Past 10 Minutes", "who.loadav_10", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_loadav_15,
 		{ "Load Average Over Past 15 Minutes", "who.loadav_15", FT_DOUBLE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_boottime,
 		{ "Boot Time", "who.boottime", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_whoent,
 		{ "Who utmp Entry", "who.whoent", FT_NONE, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_tty,
 		{ "TTY Name", "who.tty", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_uid,
 		{ "User ID", "who.uid", FT_STRING, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_timeon,
 		{ "Time On", "who.timeon", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 
 		{ &hf_who_idle,
 		{ "Time Idle", "who.idle", FT_UINT32, BASE_DEC, NULL, 0x0,
-			"", HFILL }},
+			NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c
index e0a67d2538..ab200ac2cf 100644
--- a/epan/dissectors/packet-windows-common.c
+++ b/epan/dissectors/packet-windows-common.c
@@ -2543,7 +2543,7 @@ proto_do_register_windows_common(int proto_smb)
 		/* SIDs */
 
 		{ &hf_nt_sid,
-		  { "SID", "nt.sid", FT_STRING, BASE_DEC,
+		  { "SID", "nt.sid", FT_STRING, BASE_NONE,
 		    NULL, 0, "SID: Security Identifier", HFILL }},
 
 		{ &hf_nt_sid_revision,
@@ -2617,171 +2617,171 @@ proto_do_register_windows_common(int proto_smb)
 		{ &hf_access_generic_read,
 		  { "Generic read", "nt.access_mask.generic_read",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    GENERIC_READ_ACCESS, "Generic read", HFILL }},
+		    GENERIC_READ_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_generic_write,
 		  { "Generic write", "nt.access_mask.generic_write",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    GENERIC_WRITE_ACCESS, "Generic write", HFILL }},
+		    GENERIC_WRITE_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_generic_execute,
 		  { "Generic execute", "nt.access_mask.generic_execute",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    GENERIC_EXECUTE_ACCESS, "Generic execute", HFILL }},
+		    GENERIC_EXECUTE_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_generic_all,
 		  { "Generic all", "nt.access_mask.generic_all",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    GENERIC_ALL_ACCESS, "Generic all", HFILL }},
+		    GENERIC_ALL_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_maximum_allowed,
 		  { "Maximum allowed", "nt.access_mask.maximum_allowed",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    MAXIMUM_ALLOWED_ACCESS, "Maximum allowed", HFILL }},
+		    MAXIMUM_ALLOWED_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_sacl,
 		  { "Access SACL", "nt.access_mask.access_sacl",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    ACCESS_SACL_ACCESS, "Access SACL", HFILL }},
+		    ACCESS_SACL_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_standard_read_control,
 		  { "Read control", "nt.access_mask.read_control",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    READ_CONTROL_ACCESS, "Read control", HFILL }},
+		    READ_CONTROL_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_standard_delete,
 		  { "Delete", "nt.access_mask.delete",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    DELETE_ACCESS, "Delete", HFILL }},
+		    DELETE_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_standard_synchronise,
 		  { "Synchronise", "nt.access_mask.synchronise",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    SYNCHRONIZE_ACCESS, "Synchronise", HFILL }},
+		    SYNCHRONIZE_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_standard_write_dac,
 		  { "Write DAC", "nt.access_mask.write_dac",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    WRITE_DAC_ACCESS, "Write DAC", HFILL }},
+		    WRITE_DAC_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_standard_write_owner,
 		  { "Write owner", "nt.access_mask.write_owner",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    WRITE_OWNER_ACCESS, "Write owner", HFILL }},
+		    WRITE_OWNER_ACCESS, NULL, HFILL }},
 
 		{ &hf_access_specific_15,
 		  { "Specific access, bit 15", "nt.access_mask.specific_15",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x8000, "Specific access, bit 15", HFILL }},
+		    0x8000, NULL, HFILL }},
 
 		{ &hf_access_specific_14,
 		  { "Specific access, bit 14", "nt.access_mask.specific_14",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x4000, "Specific access, bit 14", HFILL }},
+		    0x4000, NULL, HFILL }},
 
 		{ &hf_access_specific_13,
 		  { "Specific access, bit 13", "nt.access_mask.specific_13",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x2000, "Specific access, bit 13", HFILL }},
+		    0x2000, NULL, HFILL }},
 
 		{ &hf_access_specific_12,
 		  { "Specific access, bit 12", "nt.access_mask.specific_12",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x1000, "Specific access, bit 12", HFILL }},
+		    0x1000, NULL, HFILL }},
 
 		{ &hf_access_specific_11,
 		  { "Specific access, bit 11", "nt.access_mask.specific_11",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0800, "Specific access, bit 11", HFILL }},
+		    0x0800, NULL, HFILL }},
 
 		{ &hf_access_specific_10,
 		  { "Specific access, bit 10", "nt.access_mask.specific_10",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0400, "Specific access, bit 10", HFILL }},
+		    0x0400, NULL, HFILL }},
 
 		{ &hf_access_specific_9,
 		  { "Specific access, bit 9", "nt.access_mask.specific_9",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0200, "Specific access, bit 9", HFILL }},
+		    0x0200, NULL, HFILL }},
 
 		{ &hf_access_specific_8,
 		  { "Specific access, bit 8", "nt.access_mask.specific_8",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0100, "Specific access, bit 8", HFILL }},
+		    0x0100, NULL, HFILL }},
 
 		{ &hf_access_specific_7,
 		  { "Specific access, bit 7", "nt.access_mask.specific_7",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0080, "Specific access, bit 7", HFILL }},
+		    0x0080, NULL, HFILL }},
 
 		{ &hf_access_specific_6,
 		  { "Specific access, bit 6", "nt.access_mask.specific_6",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0040, "Specific access, bit 6", HFILL }},
+		    0x0040, NULL, HFILL }},
 
 		{ &hf_access_specific_5,
 		  { "Specific access, bit 5", "nt.access_mask.specific_5",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0020, "Specific access, bit 5", HFILL }},
+		    0x0020, NULL, HFILL }},
 
 		{ &hf_access_specific_4,
 		  { "Specific access, bit 4", "nt.access_mask.specific_4",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0010, "Specific access, bit 4", HFILL }},
+		    0x0010, NULL, HFILL }},
 
 		{ &hf_access_specific_3,
 		  { "Specific access, bit 3", "nt.access_mask.specific_3",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0008, "Specific access, bit 3", HFILL }},
+		    0x0008, NULL, HFILL }},
 
 		{ &hf_access_specific_2,
 		  { "Specific access, bit 2", "nt.access_mask.specific_2",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0004, "Specific access, bit 2", HFILL }},
+		    0x0004, NULL, HFILL }},
 
 		{ &hf_access_specific_1,
 		  { "Specific access, bit 1", "nt.access_mask.specific_1",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0002, "Specific access, bit 1", HFILL }},
+		    0x0002, NULL, HFILL }},
 
 		{ &hf_access_specific_0,
 		  { "Specific access, bit 0", "nt.access_mask.specific_0",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x0001, "Specific access, bit 0", HFILL }},
+		    0x0001, NULL, HFILL }},
 
 		{ &hf_nt_ace_flags_object_type_present,
 		  { "Object Type Present", "nt.ace.object.flags.object_type_present",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x00000001, "", HFILL }},
+		    0x00000001, NULL, HFILL }},
 
 		{ &hf_nt_ace_flags_inherited_object_type_present,
 		  { "Inherited Object Type Present", "nt.ace.object.flags.inherited_object_type_present",
 		    FT_BOOLEAN, 32, TFS(&flags_set_truth),
-		    0x00000002, "", HFILL }},
+		    0x00000002, NULL, HFILL }},
 
 	        { &hf_nt_ace_guid,
 		  { "GUID", "nt.ace.object.guid", FT_GUID, BASE_NONE,
-		    NULL, 0, "", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 	        { &hf_nt_ace_inherited_guid,
 		  { "Inherited GUID", "nt.ace.object.inherited_guid", FT_GUID, BASE_NONE,
-		    NULL, 0, "", HFILL }},
+		    NULL, 0, NULL, HFILL }},
 
 		{ &hf_nt_security_information_sacl,
 		  { "SACL", "nt.sec_info.sacl", FT_BOOLEAN, 32,
-		    TFS(&flags_sec_info_sacl), 0x00000008, "", HFILL }},
+		    TFS(&flags_sec_info_sacl), 0x00000008, NULL, HFILL }},
 
 		{ &hf_nt_security_information_dacl,
 		  { "DACL", "nt.sec_info.dacl", FT_BOOLEAN, 32,
-		    TFS(&flags_sec_info_dacl), 0x00000004, "", HFILL }},
+		    TFS(&flags_sec_info_dacl), 0x00000004, NULL, HFILL }},
 
 		{ &hf_nt_security_information_group,
 		  { "Group", "nt.sec_info.group", FT_BOOLEAN, 32,
-		    TFS(&flags_sec_info_group), 0x00000002, "", HFILL }},
+		    TFS(&flags_sec_info_group), 0x00000002, NULL, HFILL }},
 
 		{ &hf_nt_security_information_owner,
 		  { "Owner", "nt.sec_info.owner", FT_BOOLEAN, 32,
-		    TFS(&flags_sec_info_owner), 0x00000001, "", HFILL }},
+		    TFS(&flags_sec_info_owner), 0x00000001, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-wlancertextn.c b/epan/dissectors/packet-wlancertextn.c
index b05e23d67c..1fa3375a85 100644
--- a/epan/dissectors/packet-wlancertextn.c
+++ b/epan/dissectors/packet-wlancertextn.c
@@ -126,7 +126,7 @@ void proto_register_wlancertextn(void) {
         "wlancertextn.SSIDList", HFILL }},
     { &hf_wlancertextn_SSIDList_item,
       { "SSID", "wlancertextn.SSID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "wlancertextn.SSID", HFILL }},
 
 /*--- End of included file: packet-wlancertextn-hfarr.c ---*/
diff --git a/epan/dissectors/packet-wlccp.c b/epan/dissectors/packet-wlccp.c
index 9fd559e1fb..e33396d48a 100644
--- a/epan/dissectors/packet-wlccp.c
+++ b/epan/dissectors/packet-wlccp.c
@@ -4143,7 +4143,7 @@ proto_register_wlccp_oui(void)
 		{ &hf_llc_wlccp_pid,
 		  { "PID", "llc.wlccp_pid",
 		    FT_UINT16, BASE_HEX, VALS(cisco_pid_vals),
-		    0x0, "", HFILL }
+		    0x0, NULL, HFILL }
 		}
 	};
 	
diff --git a/epan/dissectors/packet-wol.c b/epan/dissectors/packet-wol.c
index 035e5518f8..012b9196a9 100644
--- a/epan/dissectors/packet-wol.c
+++ b/epan/dissectors/packet-wol.c
@@ -298,13 +298,13 @@ proto_register_wol(void)
     static hf_register_info hf[] = {
         { &hf_wol_sync,
             { "Sync stream", "wol.sync",
-            FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }},
+            FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
         { &hf_wol_mac,
             { "MAC", "wol.mac",
-            FT_ETHER, BASE_HEX, NULL, 0, "", HFILL }},
+            FT_ETHER, BASE_HEX, NULL, 0, NULL, HFILL }},
         { &hf_wol_passwd,
             { "Password", "wol.passwd",
-            FT_BYTES, BASE_HEX, NULL, 0, "", HFILL }}
+            FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}
     };
 
 /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-wow.c b/epan/dissectors/packet-wow.c
index 1e0f94b786..64b9723268 100644
--- a/epan/dissectors/packet-wow.c
+++ b/epan/dissectors/packet-wow.c
@@ -567,7 +567,7 @@ proto_register_wow(void)
 		{ &hf_wow_srp_m1,
 		  { "SRP M1", "wow.srp.m1",
 		    FT_BYTES, BASE_NONE, 0, 0,
-		    "Secure Remote Password protocol 'M1' value ", HFILL }
+		    "Secure Remote Password protocol 'M1' value", HFILL }
 		},
 		{ &hf_wow_crc_hash,
 		  { "CRC hash", "wow.crc_hash",
diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c
index b6d31127cd..c4194f3585 100644
--- a/epan/dissectors/packet-wps.c
+++ b/epan/dissectors/packet-wps.c
@@ -1484,7 +1484,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_authenticator, 
       { "Authenticator", "wps.authenticator", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_config_methods, 
       { "Configuration Methods", "wps.config_methods", 
@@ -1523,10 +1523,10 @@ proto_register_wps(void)
         FT_UINT16, BASE_HEX, VALS(eapwps_tlv_configuration_error_vals), 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_confirmation_url4, 
       { "Confirmation URL4", "wps.confirmation_url4", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_confirmation_url6, 
       { "Confirmation URL6", "wps.confirmation_url6", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_connection_type, 
       { "Connection Type", "wps.connection_type", 
@@ -1543,31 +1543,31 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_credential,  /* Encrypted  */
       { "Credential", "wps.credential", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_device_name, 
       { "Device Name", "wps.device_name", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_device_password_id, 
       { "Device Password ID", "wps.device_password_id", 
         FT_UINT16, BASE_HEX, VALS(eapwps_tlv_device_password_id_vals), 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_e_hash1, 
       { "Enrollee Hash 1", "wps.e_hash1", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_e_hash2, 
       { "Enrollee Hash 2", "wps.e_hash2", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_e_snonce1, 
       { "Enrollee SNounce 1", "wps.e_snonce1", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_e_snonce2, 
       { "Enrollee SNounce 2", "wps.e_snonce2", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_encrypted_settings, /* Encrypted !  */
       { "Encrypted Settings", "wps.encrypted_settings", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_encryption_type, 
       { "Encryption Type", "wps.encryption_type", 
@@ -1590,7 +1590,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_enrollee_nonce, 
       { "Enrollee Nonce", "wps.enrollee_nonce", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_feature_id, 
       { "Feature ID", "wps.feature_id", 
@@ -1598,17 +1598,17 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_identity, 
       { "Identity", "wps.identity", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_identity_proof, /* Encrypted !  */
       { "Identity Proof", "wps.identity_proof", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_key_wrap_authenticator, 
       { "Key Wrap Authenticator", "wps.key_wrap_authenticator", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_key_identifier, 
       { "Key Identifier", "wps.key_identifier", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_mac_address, 
       { "MAC", "wps.mac_address", 
@@ -1616,7 +1616,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_manufacturer, 
       { "Manufacturer", "wps.manufacturer", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_message_type, 
       { "Message Type", "wps.message_type", 
@@ -1624,10 +1624,10 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_model_name, 
       { "Model Name", "wps.model_name", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_model_number, 
       { "Model Number", "wps.model_number", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_network_index, 
       { "Network Index", "wps.network_index", 
@@ -1635,20 +1635,20 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_network_key, 
       { "Network Key", "wps.network_key", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_network_key_index, 
       { "Network Key Index", "wps.network_key_index", 
         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_new_device_name, 
       { "New Device Name", "wps.new_device_name", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_new_password, 
       { "New Password", "wps.new_password", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_oob_device_password, 
       { "OOB Device Password", "wps.oob_device_password", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_os_version, 
       { "OS Version", "wps.os_version", 
@@ -1667,7 +1667,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_public_key, 
       { "Public Key", "wps.public_key", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_radio_enabled, /* Add info  */
       { "Radio Enabled", "wps.radio_enabled", 
@@ -1684,13 +1684,13 @@ proto_register_wps(void)
         FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_registrar_list, 
       { "Registrar list", "wps.registrar_list", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_registrar_max, 
       { "Registrar max", "wps.registrar_max", 
         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_registrar_nonce, 
       { "Registrar Nonce", "wps.registrar_nonce", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_request_type, 
       { "Request Type", "wps.request_type", 
@@ -1705,16 +1705,16 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_r_hash1, 
       { "Registrar Hash 1", "wps.r_hash1", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_r_hash2, 
       { "Registrar Hash 2", "wps.r_hash2", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_r_snonce1, 
       { "Registrar Snonce1", "wps.r_snonce1", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_r_snonce2, 
       { "Registrar Snonce 2", "wps.r_snonce2", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_selected_registrar, 
       { "Selected Registrar", "wps.selected_registrar", 
@@ -1722,7 +1722,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_serial_number, 
       { "Serial Number", "wps.serial_number", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_wifi_protected_setup_state, 
       { "Wifi Protected Setup State", "wps.wifi_protected_setup_state", 
@@ -1730,7 +1730,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_ssid, 
       { "SSID", "wps.ssid", 
-        FT_STRING, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_total_networks, 
       { "Total Networks", "wps.total_networks", 
@@ -1738,14 +1738,14 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_uuid_e, 
       { "UUID Enrollee", "wps.uuid_e", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_uuid_r, 
       { "UUID Registrar", "wps.uuid_r", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_vendor_extension, 
       { "Vendor Extension", "wps.vendor_extension", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_version, 
       { "Version", "wps.version", 
@@ -1753,14 +1753,14 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_x509_certificate_request, 
       { "X509 Certificate Request", "wps.x509_certificate_request", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_x509_certificate, 
       { "X509 Certificate", "wps.x509_certificate", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_eap_identity, 
       { "EAP Identity", "wps.eap_identity", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_message_counter, 
       { "Message Counter", "wps.message_counter", 
@@ -1768,11 +1768,11 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_public_key_hash, 
       { "Public Key Hash", "wps.public_key_hash", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_rekey_key, 
       { "Rekey Key", "wps.rekey_key", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_key_lifetime, 
       { "Key Lifetime", "wps.key_lifetime", 
         FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
@@ -1787,20 +1787,20 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_primary_device_type, 
       { "Primary Device Type", "wps.primary_device_type", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_primary_device_type_category, 
       { "Category", "wps.primary_device_type.category", 
         FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_primary_device_type_oui, 
       { "OUI", "wps.primary_device_type.oui", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_primary_device_type_subcategory, 
       { "Subcategory", "wps.primary_device_type.subcategory", 
         FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_secondary_device_type_list, 
       { "Secondary Device Type List", "wps.secondary_device_type_list", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_portable_device, /* Add info  */
       { "Portable Device", "wps.portable_device", 
@@ -1811,14 +1811,14 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_application_extension, 
       { "Application Extension", "wps.application_extension", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_eap_type, 
       { "EAP Type", "wps.eap_type", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_initialization_vector, 
       { "Initialization Vector", "wps.initialization_vector", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
     { &hf_eapwps_tlv_key_provided_automatically, /* Add info  */
       { "Key Provided Automatically", "wps.key_provided_automatically", 
@@ -1829,7 +1829,7 @@ proto_register_wps(void)
 
     { &hf_eapwps_tlv_appsessionkey, 
       { "AppSessionKey", "wps.appsessionkey", 
-        FT_BYTES, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+        FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
     { &hf_eapwps_tlv_weptransmitkey, 
       { "WEP Transmit Key", "wps.weptransmitkey", 
         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-wsmp.c b/epan/dissectors/packet-wsmp.c
index 207e503781..b0632a1b3a 100644
--- a/epan/dissectors/packet-wsmp.c
+++ b/epan/dissectors/packet-wsmp.c
@@ -146,38 +146,38 @@ proto_register_wsmp(void)
         static hf_register_info hf[] = {
                 { &hf_wsmp_version,
                         { "Version",           "wsmp.version", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_security,
                         { "Security",           "wsmp.security", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_channel,
                         { "Channel", "wsmp.channel", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_rate,
                         { "Rate", "wsmp.rate", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_txpower,
                         { "Transmit power", "wsmp.txpower", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_appclass,
                         { "App class", "wsmp.appclass", FT_UINT8, BASE_DEC, NULL, 0x0,          
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_acmlength,
                         { "Acm Length", "wsmp.acmlength", FT_UINT8, BASE_DEC, NULL, 0x0,     
-                                "", HFILL }},
+                                NULL, HFILL }},
 
                 { &hf_wsmp_acm,
                         { "Application Context Data", "wsmp.acm", FT_STRING,
                                 BASE_NONE, NULL, 0x0, "Acm", HFILL }},
                 { &hf_wsmp_wsmlength,
                         { "WSM Length", "wsmp.wsmlength", FT_UINT16, BASE_DEC, NULL, 0x0,     
-                                "", HFILL }},
+                                NULL, HFILL }},
         };
 
         /* Setup protocol subtree array */
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index 09165503ef..b7a39cc4c4 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -7508,7 +7508,7 @@ proto_register_sir(void)
 		{ &hf_sir_cpi_tag,
 			{	"CPITag",
 				"wap.sir.cpi_tag",
-				FT_BYTES, BASE_HEX, NULL, 0x00,
+				FT_BYTES, BASE_NONE, NULL, 0x00,
 				"CPITag (OTA-HTTP)", HFILL
 			}
 		}
diff --git a/epan/dissectors/packet-wtls.c b/epan/dissectors/packet-wtls.c
index 7e93e79f42..c424cd787c 100644
--- a/epan/dissectors/packet-wtls.c
+++ b/epan/dissectors/packet-wtls.c
@@ -1082,182 +1082,182 @@ proto_register_wtls(void)
 			{ 	"Record",
 				"wtls.record",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f,
-				"Record", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_record_type,
 			{ 	"Record Type",
 				"wtls.rec_type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_record_type ), 0x0f,
-				"Record Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_record_length,
 			{ 	"Record Length",
 				"wtls.rec_length",
 				 FT_UINT16, BASE_DEC, NULL, 0x00,
-				"Record Length", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_record_sequence,
 			{ 	"Record Sequence",
 				"wtls.rec_seq",
 				 FT_UINT16, BASE_DEC, NULL, 0x00,
-				"Record Sequence", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_record_ciphered,
 			{ 	"Record Ciphered",
 				"wtls.rec_cipher",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Record Ciphered", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands,
 			{ 	"Handshake",
 				"wtls.handshake",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_handshake_type ), 0x00,
-				"Handshake", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_type,
 			{ 	"Type",
 				"wtls.handshake.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_handshake_type ), 0x00,
-				"Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_length,
 			{ 	"Length",
 				"wtls.handshake.length",
 				 FT_UINT16, BASE_DEC, NULL, 0x00,
-				"Length", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello,
 			{ 	"Client Hello",
 				"wtls.handshake.client_hello",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Client Hello", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_version,
 			{ 	"Version",
 				"wtls.handshake.client_hello.version",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Version", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_gmt,
 			{ 	"Time GMT",
 				"wtls.handshake.client_hello.gmt",
 				 FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-				"Time GMT", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_random,
 			{ 	"Random",
 				"wtls.handshake.client_hello.random",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Random", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_session,
 			{ 	"Session ID",
 				"wtls.handshake.client_hello.sessionid",
 				 FT_UINT64, BASE_HEX_DEC, NULL, 0x00,
-				"Session ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_session_str,
 			{ 	"Session ID",
 				"wtls.handshake.client_hello.session.str",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Session ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_cli_key_id,
 			{ 	"Client Keys",
 				"wtls.handshake.client_hello.client_keys_id",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-			 	"Client Keys"     , HFILL
+			 	NULL     , HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_cli_key_len,
 			{ 	"Length",
 				"wtls.handshake.client_hello.client_keys_len",
 				 FT_UINT16, BASE_DEC, NULL, 0x00,
-			 	"Length"          , HFILL
+			 	NULL          , HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_trust_key_id,
 			{ 	"Trusted Keys",
 				"wtls.handshake.client_hello.trusted_keys_id",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-			 	"Trusted Keys"          , HFILL
+			 	NULL          , HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_exchange,
 			{ 	"Key Exchange",
 				"wtls.handshake.client_hello.key.key_exchange",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_key_exchange_suite ), 0x00,
-				"Key Exchange", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_exchange_suite,
 			{ 	"Suite",
 				"wtls.handshake.client_hello.key.key_exchange.suite",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_key_exchange_suite ), 0x00,
-				"Suite", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_parameter_index,
 			{ 	"Parameter Index",
 				"wtls.handshake.client_hello.parameter_index",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Parameter Index", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_parameter_set,
 			{ 	"Parameter Set",
 				"wtls.handshake.client_hello.parameter",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Parameter Set", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_identifier_type,
 			{ 	"Identifier Type",
 				"wtls.handshake.client_hello.ident_type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00,
-				"Identifier Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_identifier_charset,
 			{ 	"Identifier CharSet",
 				"wtls.handshake.client_hello.ident_charset",
 				 FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00,
-				"Identifier CharSet", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_identifier_size,
 			{ 	"Identifier Size",
 				"wtls.handshake.client_hello.ident_size",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Identifier Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_identifier,
 			{ 	"Identifier",
 				"wtls.handshake.client_hello.identifier",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Identifier", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_identifier_str,
 			{ 	"Identifier Name",
 				"wtls.handshake.client_hello.ident_name",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Identifier Name", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_cipher_suite,
@@ -1271,294 +1271,294 @@ proto_register_wtls(void)
 			{ 	"Cipher",
 				"wtls.handshake.client_hello.cipher",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Cipher", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_compression_methods,
 			{ 	"Compression Methods",
 				"wtls.handshake.client_hello.comp_methods",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Compression Methods", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_compression,
 			{ 	"Compression",
 				"wtls.handshake.client_hello.compression",
 				 FT_UINT8, BASE_HEX, VALS ( wtls_vals_compression ), 0x00,
-				"Compression", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_sequence_mode,
 			{ 	"Sequence Mode",
 				"wtls.handshake.client_hello.sequence_mode",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_sequence_mode ), 0x00,
-				"Sequence Mode", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_cli_hello_key_refresh,
 			{ 	"Refresh",
 				"wtls.handshake.client_hello.refresh",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Refresh", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello,
 			{ 	"Server Hello",
 				"wtls.handshake.server_hello",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Server Hello", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_version,
 			{ 	"Version",
 				"wtls.handshake.server_hello.version",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Version", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_gmt,
 			{ 	"Time GMT",
 				"wtls.handshake.server_hello.gmt",
 				 FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-				"Time GMT", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_random,
 			{ 	"Random",
 				"wtls.handshake.server_hello.random",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Random", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_session,
 			{ 	"Session ID",
 				"wtls.handshake.server_hello.sessionid",
 				 FT_UINT64, BASE_HEX_DEC, NULL, 0x00,
-				"Session ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_session_str,
 			{ 	"Session ID",
 				"wtls.handshake.server_hello.session.str",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Session ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_cli_key_id,
 			{ 	"Client Key ID",
 				"wtls.handshake.server_hello.key",
 				 FT_UINT8, BASE_HEX, NULL, 0x00,
-				"Client Key ID", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_cipher_suite_item,
 			{ 	"Cipher",
 				"wtls.handshake.server_hello.cipher",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Cipher", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_cipher_bulk,
 			{ 	"Cipher Bulk",
 				"wtls.handshake.server_hello.cipher.bulk",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_cipher_bulk ), 0x00,
-				"Cipher Bulk", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_cipher_mac,
 			{ 	"Cipher MAC",
 				"wtls.handshake.server_hello.cipher.mac",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_cipher_mac ), 0x00,
-				"Cipher MAC", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_compression,
 			{ 	"Compression",
 				"wtls.handshake.server_hello.compression",
 				 FT_UINT8, BASE_HEX, VALS ( wtls_vals_compression ), 0x00,
-				"Compression", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_sequence_mode,
 			{ 	"Sequence Mode",
 				"wtls.handshake.server_hello.sequence_mode",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_sequence_mode ), 0x00,
-				"Sequence Mode", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_serv_hello_key_refresh,
 			{ 	"Refresh",
 				"wtls.handshake.server_hello.refresh",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Refresh", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificates,
 			{ 	"Certificates",
 				"wtls.handshake.certificates",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Certificates", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate,
 			{ 	"Certificate",
 				"wtls.handshake.certificate",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Certificate", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_type,
 			{ 	"Type",
 				"wtls.handshake.certificate.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_certificate_type ), 0x00,
-				"Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_version,
 			{ 	"Version",
 				"wtls.handshake.certificate.version",
 				 FT_UINT8, BASE_HEX, NULL, 0x00,
-				"Version", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_signature_type,
 			{ 	"Signature Type",
 				"wtls.handshake.certificate.signature.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_certificate_signature ), 0x00,
-				"Signature Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_signature,
 			{ 	"Signature Size",
 				"wtls.handshake.certificate.signature.signature",
 				 FT_UINT32, BASE_DEC, NULL, 0x00,
-				"Signature Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_issuer_type,
 			{ 	"Issuer",
 				"wtls.handshake.certificate.issuer.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00,
-				"Issuer", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_issuer_charset,
 			{ 	"Charset",
 				"wtls.handshake.certificate.issuer.charset",
 				 FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00,
-				"Charset", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_issuer_size,
 			{ 	"Size",
 				"wtls.handshake.certificate.issuer.size",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_issuer_name,
 			{ 	"Name",
 				"wtls.handshake.certificate.issuer.name",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Name", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_valid_not_before,
 			{ 	"Valid not before",
 				"wtls.handshake.certificate.before",
 				 FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-				"Valid not before", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_valid_not_after,
 			{ 	"Valid not after",
 				"wtls.handshake.certificate.after",
 				 FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x00,
-				"Valid not after", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_subject_type,
 			{ 	"Subject",
 				"wtls.handshake.certificate.subject.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_identifier_type ), 0x00,
-				"Subject", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_subject_charset,
 			{ 	"Charset",
 				"wtls.handshake.certificate.subject.charset",
 				 FT_UINT16, BASE_HEX, VALS ( vals_character_sets ), 0x00,
-				"Charset", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_subject_size,
 			{ 	"Size",
 				"wtls.handshake.certificate.subject.size",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_subject_name,
 			{ 	"Name",
 				"wtls.handshake.certificate.subject.name",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Name", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_public_key_type,
 			{ 	"Public Key Type",
 				"wtls.handshake.certificate.public.type",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_public_key_type ), 0x00,
-				"Public Key Type", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_key_parameter_index,
 			{ 	"Parameter Index",
 				"wtls.handshake.certificate.parameter_index",
 				 FT_UINT8, BASE_DEC, NULL, 0x00,
-				"Parameter Index", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_key_parameter_set,
 			{ 	"Parameter Set",
 				"wtls.handshake.certificate.parameter",
 				 FT_STRING, BASE_NONE, NULL, 0x00,
-				"Parameter Set", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_rsa_exponent,
 			{ 	"RSA Exponent Size",
 				"wtls.handshake.certificate.rsa.exponent",
 				 FT_UINT32, BASE_DEC, NULL, 0x00,
-				"RSA Exponent Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_hands_certificate_wtls_rsa_modules,
 			{ 	"RSA Modulus Size",
 				"wtls.handshake.certificate.rsa.modules",
 				 FT_UINT32, BASE_DEC, NULL, 0x00,
-				"RSA Modulus Size", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_alert,
 			{ 	"Alert",
 				"wtls.alert",
 				 FT_NONE, BASE_NONE, NULL, 0x00,
-				"Alert", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_alert_level,
 			{ 	"Level",
 				"wtls.alert.level",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_alert_level ), 0x00,
-				"Level", HFILL
+				NULL, HFILL
 			}
 		},
 		{ &hf_wtls_alert_description,
 			{ 	"Description",
 				"wtls.alert.description",
 				 FT_UINT8, BASE_DEC, VALS ( wtls_vals_alert_description ), 0x00,
-				"Description", HFILL
+				NULL, HFILL
 			}
 		},
 	};
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index 5601a9dc81..b68ad943ae 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -831,56 +831,56 @@ proto_register_wtp(void)
 	    { 	"Continue Flag",
 		"wtp.continue_flag",
 		FT_BOOLEAN, 8, TFS( &continue_truth ), 0x80,
-		"Continue Flag", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_pdu_type,
 	    { 	"PDU Type",
 		"wtp.pdu_type",
 		FT_UINT8, BASE_HEX, VALS( vals_wtp_pdu_type ), 0x78,
-		"PDU Type", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_flag_Trailer,
 	    { 	"Trailer Flags",
 		"wtp.trailer_flags",
 		FT_UINT8, BASE_HEX, VALS( vals_transaction_trailer ), 0x06,
-		"Trailer Flags", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_flag_RID,
 	    { 	"Re-transmission Indicator",
 		"wtp.RID",
 		FT_BOOLEAN, 8, TFS( &RID_truth ), 0x01,
-		"Re-transmission Indicator", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_flag_TID_response,
 	    { 	"TID Response",
 		"wtp.TID.response",
 		FT_BOOLEAN, 16, TFS( &tid_response_truth ), 0x8000,
-		"TID Response", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_flag_TID,
 	    { 	"Transaction ID",
 		"wtp.TID",
 		FT_UINT16, BASE_HEX, NULL, 0x7FFF,
-		"Transaction ID", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Inv_version,
 	    { 	"Version",
 		"wtp.header.version",
 		FT_UINT8, BASE_HEX, VALS( vals_version ), 0xC0,
-		"Version", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Inv_flag_TIDNew,
 	    { 	"TIDNew",
 		"wtp.header.TIDNew",
 		FT_BOOLEAN, 8, TFS( &TIDNew_truth ), 0x20,
-		"TIDNew", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Inv_flag_UP,
@@ -894,35 +894,35 @@ proto_register_wtp(void)
 	    { 	"Reserved",
 		"wtp.inv.reserved",
 		FT_UINT8, BASE_HEX, NULL, 0x0C,
-		"Reserved", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Inv_TransactionClass,
 	    { 	"Transaction Class",
 		"wtp.inv.transaction_class",
 		FT_UINT8, BASE_HEX, VALS( vals_transaction_classes ), 0x03,
-		"Transaction Class", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Ack_flag_TVETOK,
 	    { 	"Tve/Tok flag",
 		"wtp.ack.tvetok",
 		FT_BOOLEAN, 8, TFS( &TVETOK_truth ), 0x04,
-		"Tve/Tok flag", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Abort_type,
 	    { 	"Abort Type",
 		"wtp.abort.type",
 		FT_UINT8, BASE_HEX, VALS ( vals_abort_type ), 0x07,
-		"Abort Type", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_Abort_reason_provider,
 	    { 	"Abort Reason",
 		"wtp.abort.reason.provider",
 		FT_UINT8, BASE_HEX, VALS ( vals_abort_reason_provider ), 0x00,
-		"Abort Reason", HFILL
+		NULL, HFILL
 	    }
 	},
 	/* Assume WSP is the user and use its reason codes */
@@ -930,35 +930,35 @@ proto_register_wtp(void)
 	    { 	"Abort Reason",
 		"wtp.abort.reason.user",
 		FT_UINT8, BASE_HEX, VALS ( vals_wsp_reason_codes ), 0x00,
-		"Abort Reason", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_sequence_number,
 	    { 	"Packet Sequence Number",
 		"wtp.header.sequence",
 		FT_UINT8, BASE_DEC, NULL, 0x00,
-		"Packet Sequence Number", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_missing_packets,
 	    { 	"Missing Packets",
 		"wtp.header.missing_packets",
 		FT_UINT8, BASE_DEC, NULL, 0x00,
-		"Missing Packets", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_header_variable_part,
 	    { 	"Header: Variable part",
 		"wtp.header_variable_part",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
+		FT_BYTES, BASE_NONE, NULL, 0x0,
 		"Variable part of the header", HFILL
 	    }
 	},
 	{ &hf_wtp_data,
 	    { 	"Data",
 		"wtp.header_data",
-		FT_BYTES, BASE_HEX, NULL, 0x0,
-		"Data", HFILL
+		FT_BYTES, BASE_NONE, NULL, 0x0,
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_tpi_type,
@@ -1044,14 +1044,14 @@ proto_register_wtp(void)
 	    {	"WTP Fragment",
 		"wtp.fragment",
 		FT_FRAMENUM, BASE_NONE, NULL, 0x0,
-		"WTP Fragment", HFILL
+		NULL, HFILL
 	    }
 	},
 	{ &hf_wtp_fragments,
 	    {	"WTP Fragments",
 		"wtp.fragments",
 		FT_NONE, BASE_NONE, NULL, 0x0,
-		"WTP Fragments", HFILL
+		NULL, HFILL
 	    }
 	},
     };
diff --git a/epan/dissectors/packet-x224.c b/epan/dissectors/packet-x224.c
index ad6aab0079..da3e2aa5cd 100644
--- a/epan/dissectors/packet-x224.c
+++ b/epan/dissectors/packet-x224.c
@@ -283,31 +283,31 @@ proto_register_x224(void)
 	{
 	{ &hf_x224_length, {
 	"Length", "x224.length", FT_UINT8, BASE_DEC,
-	NULL, 0, "", HFILL }},
+	NULL, 0, NULL, HFILL }},
 
 	{ &hf_x224_code, {
 	"Code", "x224.code", FT_UINT8, BASE_HEX,
-	VALS(code_vals), 0xf0, "", HFILL }},
+	VALS(code_vals), 0xf0, NULL, HFILL }},
 
 	{ &hf_x224_src_ref, {
 	"SRC-REF", "x224.src_ref", FT_UINT16, BASE_HEX,
-	NULL, 0, "", HFILL }},
+	NULL, 0, NULL, HFILL }},
 
 	{ &hf_x224_dst_ref, {
 	"DST-REF", "x224.dst_ref", FT_UINT16, BASE_HEX,
-	NULL, 0, "", HFILL }},
+	NULL, 0, NULL, HFILL }},
 
 	{ &hf_x224_class, {
 	"Class", "x224.class", FT_UINT8, BASE_HEX,
-	VALS(class_option_vals), 0xf0, "", HFILL }},
+	VALS(class_option_vals), 0xf0, NULL, HFILL }},
 
 	{ &hf_x224_nr, {
 	"NR", "x224.nr", FT_UINT8, BASE_HEX,
-	NULL, 0x7f, "", HFILL }},
+	NULL, 0x7f, NULL, HFILL }},
 
 	{ &hf_x224_eot, {
 	"EOT", "x224.eot", FT_BOOLEAN, 8,
-	NULL, 0x80, "", HFILL }},
+	NULL, 0x80, NULL, HFILL }},
 
 	};
 
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 2662b0477d..b865cf443e 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -2625,13 +2625,13 @@ proto_register_x25(void)
 	  	"Logical Channel Number", HFILL }},
 	{ &hf_x25_type,
 	  { "Packet Type", "x25.type", FT_UINT8, BASE_HEX, VALS(vals_x25_type), 0x0,
-	  	"Packet Type", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_x25_type_fc_mod8,
 	  { "Packet Type", "x25.type", FT_UINT8, BASE_HEX, VALS(vals_x25_type), 0x1F,
-	  	"Packet Type", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_x25_type_data,
 	  { "Packet Type", "x25.type", FT_UINT8, BASE_HEX, VALS(vals_x25_type), 0x01,
-	  	"Packet Type", HFILL }},
+	  	NULL, HFILL }},
 	{ &hf_x25_p_r_mod8,
 	  { "P(R)", "x25.p_r", FT_UINT8, BASE_DEC, NULL, 0xE0,
 	  	"Packet Receive Sequence Number", HFILL }},
@@ -2676,7 +2676,7 @@ proto_register_x25(void)
 	
 	{ &hf_x25_segments,
 	  { "X.25 Fragments", "x25.fragments", FT_NONE, BASE_NONE, NULL, 0x0,
-	    "X.25 Fragments", HFILL }},
+	    NULL, HFILL }},
     };
     static gint *ett[] = {
         &ett_x25,
diff --git a/epan/dissectors/packet-x2ap.c b/epan/dissectors/packet-x2ap.c
index d367681456..2602591a59 100644
--- a/epan/dissectors/packet-x2ap.c
+++ b/epan/dissectors/packet-x2ap.c
@@ -3047,11 +3047,11 @@ void proto_register_x2ap(void) {
         "x2ap.ServedCells", HFILL }},
     { &hf_x2ap_TargeteNBtoSource_eNBTransparentContainer_PDU,
       { "TargeteNBtoSource-eNBTransparentContainer", "x2ap.TargeteNBtoSource_eNBTransparentContainer",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TargeteNBtoSource_eNBTransparentContainer", HFILL }},
     { &hf_x2ap_TimeToWait_PDU,
       { "TimeToWait", "x2ap.TimeToWait",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TimeToWait", HFILL }},
     { &hf_x2ap_TraceActivation_PDU,
       { "TraceActivation", "x2ap.TraceActivation",
@@ -3247,7 +3247,7 @@ void proto_register_x2ap(void) {
         "x2ap.T_extensionValue", HFILL }},
     { &hf_x2ap_BroadcastPLMNs_Item_item,
       { "PLMN-Identity", "x2ap.PLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_radioNetwork,
       { "radioNetwork", "x2ap.radioNetwork",
@@ -3311,23 +3311,23 @@ void proto_register_x2ap(void) {
         "x2ap.TypeOfError", HFILL }},
     { &hf_x2ap_pLMN_Identity,
       { "pLMN-Identity", "x2ap.pLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_eUTRANcellIdentifier,
       { "eUTRANcellIdentifier", "x2ap.eUTRANcellIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.EUTRANCellIdentifier", HFILL }},
     { &hf_x2ap_macro_eNB_ID,
       { "macro-eNB-ID", "x2ap.macro_eNB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_20", HFILL }},
     { &hf_x2ap_home_eNB_ID,
       { "home-eNB-ID", "x2ap.home_eNB_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_28", HFILL }},
     { &hf_x2ap_EPLMNs_item,
       { "PLMN-Identity", "x2ap.PLMN_Identity",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_ForbiddenTAs_item,
       { "ForbiddenTAs-Item", "x2ap.ForbiddenTAs_Item",
@@ -3339,7 +3339,7 @@ void proto_register_x2ap(void) {
         "x2ap.ForbiddenTACs", HFILL }},
     { &hf_x2ap_ForbiddenTACs_item,
       { "TAC", "x2ap.TAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TAC", HFILL }},
     { &hf_x2ap_ForbiddenLAs_item,
       { "ForbiddenLAs-Item", "x2ap.ForbiddenLAs_Item",
@@ -3351,7 +3351,7 @@ void proto_register_x2ap(void) {
         "x2ap.ForbiddenLACs", HFILL }},
     { &hf_x2ap_ForbiddenLACs_item,
       { "LAC", "x2ap.LAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.LAC", HFILL }},
     { &hf_x2ap_sAE_Bearer_MaximumBitrateDL,
       { "sAE-Bearer-MaximumBitrateDL", "x2ap.sAE_Bearer_MaximumBitrateDL",
@@ -3375,11 +3375,11 @@ void proto_register_x2ap(void) {
         "x2ap.ENB_ID", HFILL }},
     { &hf_x2ap_transportLayerAddress,
       { "transportLayerAddress", "x2ap.transportLayerAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TransportLayerAddress", HFILL }},
     { &hf_x2ap_gTP_TEID,
       { "gTP-TEID", "x2ap.gTP_TEID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.GTP_TEI", HFILL }},
     { &hf_x2ap_GUGroupIDList_item,
       { "GU-Group-ID", "x2ap.GU_Group_ID",
@@ -3387,7 +3387,7 @@ void proto_register_x2ap(void) {
         "x2ap.GU_Group_ID", HFILL }},
     { &hf_x2ap_mME_Group_ID,
       { "mME-Group-ID", "x2ap.mME_Group_ID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.MME_Group_ID", HFILL }},
     { &hf_x2ap_gU_Group_ID,
       { "gU-Group-ID", "x2ap.gU_Group_ID",
@@ -3395,11 +3395,11 @@ void proto_register_x2ap(void) {
         "x2ap.GU_Group_ID", HFILL }},
     { &hf_x2ap_mMME_Code,
       { "mMME-Code", "x2ap.mMME_Code",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.MME_Code", HFILL }},
     { &hf_x2ap_servingPLMN,
       { "servingPLMN", "x2ap.servingPLMN",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.PLMN_Identity", HFILL }},
     { &hf_x2ap_equivalentPLMNs,
       { "equivalentPLMNs", "x2ap.equivalentPLMNs",
@@ -3451,7 +3451,7 @@ void proto_register_x2ap(void) {
         "x2ap.ReportArea", HFILL }},
     { &hf_x2ap_rNTP_PerPRB,
       { "rNTP-PerPRB", "x2ap.rNTP_PerPRB",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.BIT_STRING_SIZE_6_110_", HFILL }},
     { &hf_x2ap_rNTP_Threshold,
       { "rNTP-Threshold", "x2ap.rNTP_Threshold",
@@ -3495,7 +3495,7 @@ void proto_register_x2ap(void) {
         "x2ap.ECGI", HFILL }},
     { &hf_x2ap_tAC,
       { "tAC", "x2ap.tAC",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TAC", HFILL }},
     { &hf_x2ap_broadcastPLMNs,
       { "broadcastPLMNs", "x2ap.broadcastPLMNs",
@@ -3515,7 +3515,7 @@ void proto_register_x2ap(void) {
         "x2ap.Cell_Transmission_Bandwidth", HFILL }},
     { &hf_x2ap_traceReference,
       { "traceReference", "x2ap.traceReference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.TraceReference", HFILL }},
     { &hf_x2ap_interfacesToTrace,
       { "interfacesToTrace", "x2ap.interfacesToTrace",
@@ -3543,7 +3543,7 @@ void proto_register_x2ap(void) {
         "x2ap.UL_HighInterferenceIndicationInfo_Item", HFILL }},
     { &hf_x2ap_ul_interferenceindication,
       { "ul-interferenceindication", "x2ap.ul_interferenceindication",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.UL_HighInterferenceIndication", HFILL }},
     { &hf_x2ap_target_Cell_ID,
       { "target-Cell-ID", "x2ap.target_Cell_ID",
@@ -3571,7 +3571,7 @@ void proto_register_x2ap(void) {
         "x2ap.Bearers_ToBeSetup_List", HFILL }},
     { &hf_x2ap_rRC_Context,
       { "rRC-Context", "x2ap.rRC_Context",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.RRC_Context", HFILL }},
     { &hf_x2ap_handoverRestrictionList,
       { "handoverRestrictionList", "x2ap.handoverRestrictionList",
@@ -3631,7 +3631,7 @@ void proto_register_x2ap(void) {
         "x2ap.ProtocolIE_Single_Container", HFILL }},
     { &hf_x2ap_receiveStatusofULPDCPSDUs,
       { "receiveStatusofULPDCPSDUs", "x2ap.receiveStatusofULPDCPSDUs",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x2ap.ReceiveStatusofULPDCPSDUs", HFILL }},
     { &hf_x2ap_uL_COUNTvalue,
       { "uL-COUNTvalue", "x2ap.uL_COUNTvalue",
diff --git a/epan/dissectors/packet-x411.c b/epan/dissectors/packet-x411.c
index b0c36d4adf..1d780ff1f8 100644
--- a/epan/dissectors/packet-x411.c
+++ b/epan/dissectors/packet-x411.c
@@ -8554,11 +8554,11 @@ void proto_register_x411(void) {
         "x411.ContentIdentifier", HFILL }},
     { &hf_x411_PerMessageIndicators_PDU,
       { "PerMessageIndicators", "x411.PerMessageIndicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PerMessageIndicators", HFILL }},
     { &hf_x411_OriginatorReportRequest_PDU,
       { "OriginatorReportRequest", "x411.OriginatorReportRequest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OriginatorReportRequest", HFILL }},
     { &hf_x411_DeferredDeliveryTime_PDU,
       { "DeferredDeliveryTime", "x411.DeferredDeliveryTime",
@@ -8578,7 +8578,7 @@ void proto_register_x411(void) {
         "x411.MessageDeliveryTime", HFILL }},
     { &hf_x411_DeliveryFlags_PDU,
       { "DeliveryFlags", "x411.DeliveryFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.DeliveryFlags", HFILL }},
     { &hf_x411_SubjectSubmissionIdentifier_PDU,
       { "SubjectSubmissionIdentifier", "x411.SubjectSubmissionIdentifier",
@@ -8618,7 +8618,7 @@ void proto_register_x411(void) {
         "x411.PhysicalForwardingAddressRequest", HFILL }},
     { &hf_x411_PhysicalDeliveryModes_PDU,
       { "PhysicalDeliveryModes", "x411.PhysicalDeliveryModes",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PhysicalDeliveryModes", HFILL }},
     { &hf_x411_RegisteredMailType_PDU,
       { "RegisteredMailType", "x411.RegisteredMailType",
@@ -8742,7 +8742,7 @@ void proto_register_x411(void) {
         "x411.CertificateSelectors", HFILL }},
     { &hf_x411_Content_PDU,
       { "Content", "x411.Content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Content", HFILL }},
     { &hf_x411_MTSIdentifier_PDU,
       { "MTSIdentifier", "x411.MTSIdentifier",
@@ -8930,7 +8930,7 @@ void proto_register_x411(void) {
         "x411.AsymmetricToken", HFILL }},
     { &hf_x411_BindTokenSignedData_PDU,
       { "BindTokenSignedData", "x411.BindTokenSignedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BindTokenSignedData", HFILL }},
     { &hf_x411_MessageTokenSignedData_PDU,
       { "MessageTokenSignedData", "x411.MessageTokenSignedData",
@@ -8998,7 +8998,7 @@ void proto_register_x411(void) {
         "x411.MessageTransferEnvelope", HFILL }},
     { &hf_x411_content,
       { "content", "x411.content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Content", HFILL }},
     { &hf_x411_report_envelope,
       { "envelope", "x411.envelope",
@@ -9034,7 +9034,7 @@ void proto_register_x411(void) {
         "x411.Priority", HFILL }},
     { &hf_x411_per_message_indicators,
       { "per-message-indicators", "x411.per_message_indicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PerMessageIndicators", HFILL }},
     { &hf_x411_deferred_delivery_time,
       { "deferred-delivery-time", "x411.deferred_delivery_time",
@@ -9078,7 +9078,7 @@ void proto_register_x411(void) {
         "x411.OriginallySpecifiedRecipientNumber", HFILL }},
     { &hf_x411_per_recipient_indicators,
       { "per-recipient-indicators", "x411.per_recipient_indicators",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.PerRecipientIndicators", HFILL }},
     { &hf_x411_explicit_conversion,
       { "explicit-conversion", "x411.explicit_conversion",
@@ -9118,7 +9118,7 @@ void proto_register_x411(void) {
         "x411.SubjectIntermediateTraceInformation", HFILL }},
     { &hf_x411_returned_content,
       { "returned-content", "x411.returned_content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Content", HFILL }},
     { &hf_x411_additional_information,
       { "additional-information", "x411.additional_information",
@@ -9222,7 +9222,7 @@ void proto_register_x411(void) {
         "x411.DeferredTime", HFILL }},
     { &hf_x411_other_actions,
       { "other-actions", "x411.other_actions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OtherActions", HFILL }},
     { &hf_x411__untag_item,
       { "TraceInformationElement", "x411.TraceInformationElement",
@@ -9298,7 +9298,7 @@ void proto_register_x411(void) {
         "x411.IA5String_SIZE_0_ub_password_length", HFILL }},
     { &hf_x411_octet_string,
       { "octet-string", "x411.octet_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OCTET_STRING_SIZE_0_ub_password_length", HFILL }},
     { &hf_x411_bind_token,
       { "bind-token", "x411.bind_token",
@@ -9326,11 +9326,11 @@ void proto_register_x411(void) {
         "x411.UTCTime", HFILL }},
     { &hf_x411_random1,
       { "random1", "x411.random1",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BIT_STRING", HFILL }},
     { &hf_x411_random2,
       { "random2", "x411.random2",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BIT_STRING", HFILL }},
     { &hf_x411_algorithmIdentifier,
       { "algorithmIdentifier", "x411.algorithmIdentifier",
@@ -9338,7 +9338,7 @@ void proto_register_x411(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x411_encrypted,
       { "encrypted", "x411.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BIT_STRING", HFILL }},
     { &hf_x411_SecurityContext_item,
       { "SecurityLabel", "x411.SecurityLabel",
@@ -9370,11 +9370,11 @@ void proto_register_x411(void) {
         "x411.RecipientName", HFILL }},
     { &hf_x411_waiting_operations,
       { "waiting-operations", "x411.waiting_operations",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Operations", HFILL }},
     { &hf_x411_waiting_messages,
       { "waiting-messages", "x411.waiting_messages",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.WaitingMessages", HFILL }},
     { &hf_x411_waiting_content_types,
       { "waiting-content-types", "x411.waiting_content_types",
@@ -9410,11 +9410,11 @@ void proto_register_x411(void) {
         "x411.ExtensionField", HFILL }},
     { &hf_x411_restrict,
       { "restrict", "x411.restrict",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x411.BOOLEAN", HFILL }},
     { &hf_x411_permissible_operations,
       { "permissible-operations", "x411.permissible_operations",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Operations", HFILL }},
     { &hf_x411_permissible_maximum_content_length,
       { "permissible-maximum-content-length", "x411.permissible_maximum_content_length",
@@ -9586,11 +9586,11 @@ void proto_register_x411(void) {
         "x411.Restriction", HFILL }},
     { &hf_x411_permitted,
       { "permitted", "x411.permitted",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x411.BOOLEAN", HFILL }},
     { &hf_x411_source_type,
       { "source-type", "x411.source_type",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.T_source_type", HFILL }},
     { &hf_x411_source_name,
       { "source-name", "x411.source_name",
@@ -9606,7 +9606,7 @@ void proto_register_x411(void) {
         "x411.ORName", HFILL }},
     { &hf_x411_standard_parameters,
       { "standard-parameters", "x411.standard_parameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.T_standard_parameters", HFILL }},
     { &hf_x411_type_extensions,
       { "extensions", "x411.extensions",
@@ -9626,7 +9626,7 @@ void proto_register_x411(void) {
         "x411.RecipientName", HFILL }},
     { &hf_x411_originator_report_request,
       { "originator-report-request", "x411.originator_report_request",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OriginatorReportRequest", HFILL }},
     { &hf_x411_probe_recipient_name,
       { "recipient-name", "x411.recipient_name",
@@ -9654,7 +9654,7 @@ void proto_register_x411(void) {
         "x411.DeliveredOriginatorName", HFILL }},
     { &hf_x411_delivery_flags,
       { "delivery-flags", "x411.delivery_flags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.DeliveryFlags", HFILL }},
     { &hf_x411_other_recipient_names,
       { "other-recipient-names", "x411.other_recipient_names",
@@ -9730,7 +9730,7 @@ void proto_register_x411(void) {
         "x411.ExtensionType", HFILL }},
     { &hf_x411_criticality,
       { "criticality", "x411.criticality",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.Criticality", HFILL }},
     { &hf_x411_extension_value,
       { "value", "x411.value",
@@ -9746,7 +9746,7 @@ void proto_register_x411(void) {
         "x411.IA5String", HFILL }},
     { &hf_x411_octets,
       { "octets", "x411.octets",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OCTET_STRING", HFILL }},
     { &hf_x411_RedirectionHistory_item,
       { "Redirection", "x411.Redirection",
@@ -10090,7 +10090,7 @@ void proto_register_x411(void) {
         "x411.ExtendedEncodedInformationType", HFILL }},
     { &hf_x411_g3_facsimile,
       { "g3-facsimile", "x411.g3_facsimile",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x411_teletex,
       { "teletex", "x411.teletex",
@@ -10106,7 +10106,7 @@ void proto_register_x411(void) {
         "x411.TeletexString", HFILL }},
     { &hf_x411_page_formats,
       { "page-formats", "x411.page_formats",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OCTET_STRING", HFILL }},
     { &hf_x411_miscellaneous_terminal_capabilities,
       { "miscellaneous-terminal-capabilities", "x411.miscellaneous_terminal_capabilities",
@@ -10114,7 +10114,7 @@ void proto_register_x411(void) {
         "x411.TeletexString", HFILL }},
     { &hf_x411_private_use,
       { "private-use", "x411.private_use",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.OCTET_STRING", HFILL }},
     { &hf_x411_token_type_identifier,
       { "token-type-identifier", "x411.token_type_identifier",
@@ -10154,7 +10154,7 @@ void proto_register_x411(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x411_encrypted_data,
       { "encrypted-data", "x411.encrypted_data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BIT_STRING", HFILL }},
     { &hf_x411_asymmetric_token_data,
       { "asymmetric-token-data", "x411.asymmetric_token_data",
@@ -10194,11 +10194,11 @@ void proto_register_x411(void) {
         "x411.INTEGER", HFILL }},
     { &hf_x411_content_confidentiality_key,
       { "content-confidentiality-key", "x411.content_confidentiality_key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.EncryptionKey", HFILL }},
     { &hf_x411_content_integrity_key,
       { "content-integrity-key", "x411.content_integrity_key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.EncryptionKey", HFILL }},
     { &hf_x411_security_policy_identifier,
       { "security-policy-identifier", "x411.security_policy_identifier",
@@ -10246,7 +10246,7 @@ void proto_register_x411(void) {
         "x411.RTTPapdu", HFILL }},
     { &hf_x411_rttr_apdu,
       { "rttr-apdu", "x411.rttr_apdu",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.RTTRapdu", HFILL }},
     { &hf_x411_rtab_apdu,
       { "rtab-apdu", "x411.rtab_apdu",
@@ -10258,7 +10258,7 @@ void proto_register_x411(void) {
         "x411.AbortReason", HFILL }},
     { &hf_x411_reflectedParameter,
       { "reflectedParameter", "x411.reflectedParameter",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BIT_STRING", HFILL }},
     { &hf_x411_userdataAB,
       { "userdataAB", "x411.userdataAB",
@@ -10298,7 +10298,7 @@ void proto_register_x411(void) {
         "x509if.Name", HFILL }},
     { &hf_x411_built_in_encoded_information_types,
       { "built-in-encoded-information-types", "x411.built_in_encoded_information_types",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.BuiltInEncodedInformationTypes", HFILL }},
     { &hf_x411_extended_encoded_information_types,
       { "extended-encoded-information-types", "x411.extended_encoded_information_types",
@@ -10307,319 +10307,319 @@ void proto_register_x411(void) {
     { &hf_x411_PerRecipientIndicators_responsibility,
       { "responsibility", "x411.responsibility",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_originating_MTA_report,
       { "originating-MTA-report", "x411.originating-MTA-report",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_originating_MTA_non_delivery_report,
       { "originating-MTA-non-delivery-report", "x411.originating-MTA-non-delivery-report",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_originator_report,
       { "originator-report", "x411.originator-report",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_originator_non_delivery_report,
       { "originator-non-delivery-report", "x411.originator-non-delivery-report",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_reserved_5,
       { "reserved-5", "x411.reserved-5",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_reserved_6,
       { "reserved-6", "x411.reserved-6",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerRecipientIndicators_reserved_7,
       { "reserved-7", "x411.reserved-7",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_OtherActions_redirected,
       { "redirected", "x411.redirected",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_OtherActions_dl_operation,
       { "dl-operation", "x411.dl-operation",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_Operations_probe_submission_or_report_delivery,
       { "probe-submission-or-report-delivery", "x411.probe-submission-or-report-delivery",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_Operations_message_submission_or_message_delivery,
       { "message-submission-or-message-delivery", "x411.message-submission-or-message-delivery",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_WaitingMessages_long_content,
       { "long-content", "x411.long-content",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_WaitingMessages_low_priority,
       { "low-priority", "x411.low-priority",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_WaitingMessages_other_security_labels,
       { "other-security-labels", "x411.other-security-labels",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_source_type_originated_by,
       { "originated-by", "x411.originated-by",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_source_type_redirected_by,
       { "redirected-by", "x411.redirected-by",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_source_type_dl_expanded_by,
       { "dl-expanded-by", "x411.dl-expanded-by",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_user_name,
       { "user-name", "x411.user-name",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_user_address,
       { "user-address", "x411.user-address",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_deliverable_class,
       { "deliverable-class", "x411.deliverable-class",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_default_delivery_controls,
       { "default-delivery-controls", "x411.default-delivery-controls",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_redirections,
       { "redirections", "x411.redirections",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_T_standard_parameters_restricted_delivery,
       { "restricted-delivery", "x411.restricted-delivery",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_disclosure_of_other_recipients,
       { "disclosure-of-other-recipients", "x411.disclosure-of-other-recipients",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_implicit_conversion_prohibited,
       { "implicit-conversion-prohibited", "x411.implicit-conversion-prohibited",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_alternate_recipient_allowed,
       { "alternate-recipient-allowed", "x411.alternate-recipient-allowed",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_content_return_request,
       { "content-return-request", "x411.content-return-request",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_reserved,
       { "reserved", "x411.reserved",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_bit_5,
       { "bit-5", "x411.bit-5",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_bit_6,
       { "bit-6", "x411.bit-6",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PerMessageIndicators_U_service_message,
       { "service-message", "x411.service-message",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_OriginatorReportRequest_report,
       { "report", "x411.report",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_OriginatorReportRequest_non_delivery_report,
       { "non-delivery-report", "x411.non-delivery-report",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_DeliveryFlags_implicit_conversion_prohibited,
       { "implicit-conversion-prohibited", "x411.implicit-conversion-prohibited",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_Criticality_for_submission,
       { "for-submission", "x411.for-submission",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_Criticality_for_transfer,
       { "for-transfer", "x411.for-transfer",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_Criticality_for_delivery,
       { "for-delivery", "x411.for-delivery",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_ordinary_mail,
       { "ordinary-mail", "x411.ordinary-mail",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_special_delivery,
       { "special-delivery", "x411.special-delivery",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_express_mail,
       { "express-mail", "x411.express-mail",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_counter_collection,
       { "counter-collection", "x411.counter-collection",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_counter_collection_with_telephone_advice,
       { "counter-collection-with-telephone-advice", "x411.counter-collection-with-telephone-advice",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_counter_collection_with_telex_advice,
       { "counter-collection-with-telex-advice", "x411.counter-collection-with-telex-advice",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_counter_collection_with_teletex_advice,
       { "counter-collection-with-teletex-advice", "x411.counter-collection-with-teletex-advice",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_PhysicalDeliveryModes_bureau_fax_delivery,
       { "bureau-fax-delivery", "x411.bureau-fax-delivery",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_unknown,
       { "unknown", "x411.unknown",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_ia5_text,
       { "ia5-text", "x411.ia5-text",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_g3_facsimile,
       { "g3-facsimile", "x411.g3-facsimile",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_g4_class_1,
       { "g4-class-1", "x411.g4-class-1",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_teletex,
       { "teletex", "x411.teletex",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_videotex,
       { "videotex", "x411.videotex",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_voice,
       { "voice", "x411.voice",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_sfd,
       { "sfd", "x411.sfd",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_BuiltInEncodedInformationTypes_mixed_mode,
       { "mixed-mode", "x411.mixed-mode",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_two_dimensional,
       { "two-dimensional", "x411.two-dimensional",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_fine_resolution,
       { "fine-resolution", "x411.fine-resolution",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_unlimited_length,
       { "unlimited-length", "x411.unlimited-length",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_b4_length,
       { "b4-length", "x411.b4-length",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_a3_width,
       { "a3-width", "x411.a3-width",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_b4_width,
       { "b4-width", "x411.b4-width",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_t6_coding,
       { "t6-coding", "x411.t6-coding",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_uncompressed,
       { "uncompressed", "x411.uncompressed",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_width_middle_864_of_1728,
       { "width-middle-864-of-1728", "x411.width-middle-864-of-1728",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_width_middle_1216_of_1728,
       { "width-middle-1216-of-1728", "x411.width-middle-1216-of-1728",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_resolution_type,
       { "resolution-type", "x411.resolution-type",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_resolution_400x400,
       { "resolution-400x400", "x411.resolution-400x400",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_resolution_300x300,
       { "resolution-300x300", "x411.resolution-300x300",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_resolution_8x15,
       { "resolution-8x15", "x411.resolution-8x15",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_edi,
       { "edi", "x411.edi",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_dtm,
       { "dtm", "x411.dtm",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_bft,
       { "bft", "x411.bft",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_mixed_mode,
       { "mixed-mode", "x411.mixed-mode",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_character_mode,
       { "character-mode", "x411.character-mode",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_twelve_bits,
       { "twelve-bits", "x411.twelve-bits",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_preferred_huffmann,
       { "preferred-huffmann", "x411.preferred-huffmann",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_full_colour,
       { "full-colour", "x411.full-colour",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_jpeg,
       { "jpeg", "x411.jpeg",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x411_G3FacsimileNonBasicParameters_processable_mode_26,
       { "processable-mode-26", "x411.processable-mode-26",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x411-hfarr.c ---*/
 #line 256 "packet-x411-template.c"
diff --git a/epan/dissectors/packet-x420.c b/epan/dissectors/packet-x420.c
index 9c400cf285..570576e764 100644
--- a/epan/dissectors/packet-x420.c
+++ b/epan/dissectors/packet-x420.c
@@ -4390,7 +4390,7 @@ void proto_register_x420(void) {
         "x420.SensitivityField", HFILL }},
     { &hf_x420_AutoForwardedField_PDU,
       { "AutoForwardedField", "x420.AutoForwardedField",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.AutoForwardedField", HFILL }},
     { &hf_x420_Body_PDU,
       { "Body", "x420.Body",
@@ -4442,7 +4442,7 @@ void proto_register_x420(void) {
         "x420.EncryptedParameters", HFILL }},
     { &hf_x420_EncryptedData_PDU,
       { "EncryptedData", "x420.EncryptedData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.EncryptedData", HFILL }},
     { &hf_x420_MessageParameters_PDU,
       { "MessageParameters", "x420.MessageParameters",
@@ -4454,7 +4454,7 @@ void proto_register_x420(void) {
         "x420.MessageData", HFILL }},
     { &hf_x420_BilaterallyDefinedBodyPart_PDU,
       { "BilaterallyDefinedBodyPart", "x420.BilaterallyDefinedBodyPart",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BilaterallyDefinedBodyPart", HFILL }},
     { &hf_x420_IPN_PDU,
       { "IPN", "x420.IPN",
@@ -4578,7 +4578,7 @@ void proto_register_x420(void) {
         "x420.VoiceParameters", HFILL }},
     { &hf_x420_VoiceData_PDU,
       { "VoiceData", "x420.VoiceData",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.VoiceData", HFILL }},
     { &hf_x420_ForwardedContentParameters_PDU,
       { "ForwardedContentParameters", "x420.ForwardedContentParameters",
@@ -4634,7 +4634,7 @@ void proto_register_x420(void) {
         "x420.RecipientCategory", HFILL }},
     { &hf_x420_RecipientSecurityRequest_PDU,
       { "RecipientSecurityRequest", "x420.RecipientSecurityRequest",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.RecipientSecurityRequest", HFILL }},
     { &hf_x420_IpnSecurityResponse_PDU,
       { "IpnSecurityResponse", "x420.IpnSecurityResponse",
@@ -4734,7 +4734,7 @@ void proto_register_x420(void) {
         "x420.SensitivityField", HFILL }},
     { &hf_x420_auto_forwarded,
       { "auto-forwarded", "x420.auto_forwarded",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.AutoForwardedField", HFILL }},
     { &hf_x420_extensions,
       { "extensions", "x420.extensions",
@@ -4754,11 +4754,11 @@ void proto_register_x420(void) {
         "x420.ORDescriptor", HFILL }},
     { &hf_x420_notification_requests,
       { "notification-requests", "x420.notification_requests",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.NotificationRequests", HFILL }},
     { &hf_x420_reply_requested,
       { "reply-requested", "x420.reply_requested",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_recipient_extensions,
       { "recipient-extensions", "x420.recipient_extensions",
@@ -4854,7 +4854,7 @@ void proto_register_x420(void) {
         "x420.MixedModeBodyPart", HFILL }},
     { &hf_x420_bilaterally_defined,
       { "bilaterally-defined", "x420.bilaterally_defined",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BilaterallyDefinedBodyPart", HFILL }},
     { &hf_x420_nationally_defined,
       { "nationally-defined", "x420.nationally_defined",
@@ -4898,11 +4898,11 @@ void proto_register_x420(void) {
         "x420.INTEGER", HFILL }},
     { &hf_x420_g3facsimile_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x420_G3FacsimileData_item,
       { "G3FacsimileData item", "x420.G3FacsimileData_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_G4Class1BodyPart_item,
       { "Interchange-Data-Element", "x420.Interchange_Data_Element",
@@ -4922,7 +4922,7 @@ void proto_register_x420(void) {
         "x420.TeletexData", HFILL }},
     { &hf_x420_telex_compatible,
       { "telex-compatible", "x420.telex_compatible",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_teletex_non_basic_parameters,
       { "non-basic-parameters", "x420.non_basic_parameters",
@@ -4950,7 +4950,7 @@ void proto_register_x420(void) {
         "x420.EncryptedParameters", HFILL }},
     { &hf_x420_encrypted_data,
       { "data", "x420.data",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.EncryptedData", HFILL }},
     { &hf_x420_algorithm_identifier,
       { "algorithm-identifier", "x420.algorithm_identifier",
@@ -5118,7 +5118,7 @@ void proto_register_x420(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x420_encrypted,
       { "encrypted", "x420.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_content_security_label,
       { "content-security-label", "x420.content_security_label",
@@ -5270,7 +5270,7 @@ void proto_register_x420(void) {
         "x420.GraphicString", HFILL }},
     { &hf_x420_application_cross_reference,
       { "application-cross-reference", "x420.application_cross_reference",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OCTET_STRING", HFILL }},
     { &hf_x420_message_reference,
       { "message-reference", "x420.message_reference",
@@ -5358,7 +5358,7 @@ void proto_register_x420(void) {
         "x420.T_compression_algorithm_param", HFILL }},
     { &hf_x420_permitted_actions,
       { "permitted-actions", "x420.permitted_actions",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "ftam.Permitted_Actions_Attribute", HFILL }},
     { &hf_x420_storage_account,
       { "storage-account", "x420.storage_account",
@@ -5454,7 +5454,7 @@ void proto_register_x420(void) {
         "x420.Access_Control_Element", HFILL }},
     { &hf_x420_action_list,
       { "action-list", "x420.action_list",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.Access_Request", HFILL }},
     { &hf_x420_concurrency_access,
       { "concurrency-access", "x420.concurrency_access",
@@ -5518,7 +5518,7 @@ void proto_register_x420(void) {
         "x420.GraphicString", HFILL }},
     { &hf_x420_octet_string,
       { "octet-string", "x420.octet_string",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OCTET_STRING", HFILL }},
     { &hf_x420_Pass_Passwords_item,
       { "Password", "x420.Password",
@@ -5598,7 +5598,7 @@ void proto_register_x420(void) {
         "x420.INTEGER", HFILL }},
     { &hf_x420_processed,
       { "processed", "x420.processed",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x420.BOOLEAN", HFILL }},
     { &hf_x420_data,
       { "data", "x420.data",
@@ -5670,7 +5670,7 @@ void proto_register_x420(void) {
         "x420.T_content_or_arguments", HFILL }},
     { &hf_x420_original_content,
       { "original-content", "x420.original_content",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.OriginalContent", HFILL }},
     { &hf_x420_original_security_arguments,
       { "original-security-arguments", "x420.original_security_arguments",
@@ -5714,7 +5714,7 @@ void proto_register_x420(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x420_encrypted_key,
       { "encrypted-key", "x420.encrypted_key",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x420.BIT_STRING", HFILL }},
     { &hf_x420_recipient_certificate_selector,
       { "recipient-certificate-selector", "x420.recipient_certificate_selector",
@@ -5759,71 +5759,71 @@ void proto_register_x420(void) {
     { &hf_x420_NotificationRequests_rn,
       { "rn", "x420.rn",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_nrn,
       { "nrn", "x420.nrn",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_ipm_return,
       { "ipm-return", "x420.ipm-return",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_an_supported,
       { "an-supported", "x420.an-supported",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_NotificationRequests_suppress_an,
       { "suppress-an", "x420.suppress-an",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_read,
       { "read", "x420.read",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_insert,
       { "insert", "x420.insert",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_replace,
       { "replace", "x420.replace",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_extend,
       { "extend", "x420.extend",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_erase,
       { "erase", "x420.erase",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_read_attribute,
       { "read-attribute", "x420.read-attribute",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_change_attribute,
       { "change-attribute", "x420.change-attribute",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_Access_Request_delete_object,
       { "delete-object", "x420.delete-object",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_content_non_repudiation,
       { "content-non-repudiation", "x420.content-non-repudiation",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_content_proof,
       { "content-proof", "x420.content-proof",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_ipn_non_repudiation,
       { "ipn-non-repudiation", "x420.ipn-non-repudiation",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x420_RecipientSecurityRequest_ipn_proof,
       { "ipn-proof", "x420.ipn-proof",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x420-hfarr.c ---*/
 #line 129 "packet-x420-template.c"
diff --git a/epan/dissectors/packet-x509af.c b/epan/dissectors/packet-x509af.c
index 6f6226cb82..2598416158 100644
--- a/epan/dissectors/packet-x509af.c
+++ b/epan/dissectors/packet-x509af.c
@@ -933,11 +933,11 @@ void proto_register_x509af(void) {
     { &hf_x509af_algorithm_id,
       { "Algorithm Id", "x509af.algorithm.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "Algorithm Id", HFILL }},
+        NULL, HFILL }},
     { &hf_x509af_extension_id,
       { "Extension Id", "x509af.extension.id",
         FT_OID, BASE_NONE, NULL, 0,
-        "Extension Id", HFILL }},
+        NULL, HFILL }},
 
 /*--- Included file: packet-x509af-hfarr.c ---*/
 #line 1 "packet-x509af-hfarr.c"
@@ -995,11 +995,11 @@ void proto_register_x509af(void) {
         "x509af.SubjectPublicKeyInfo", HFILL }},
     { &hf_x509af_issuerUniqueIdentifier,
       { "issuerUniqueIdentifier", "x509af.issuerUniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_subjectUniqueIdentifier,
       { "subjectUniqueIdentifier", "x509af.subjectUniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_extensions,
       { "extensions", "x509af.extensions",
@@ -1011,7 +1011,7 @@ void proto_register_x509af(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_encrypted,
       { "encrypted", "x509af.encrypted",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_rdnSequence,
       { "rdnSequence", "x509af.rdnSequence",
@@ -1039,7 +1039,7 @@ void proto_register_x509af(void) {
         "x509af.AlgorithmIdentifier", HFILL }},
     { &hf_x509af_subjectPublicKey,
       { "subjectPublicKey", "x509af.subjectPublicKey",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.BIT_STRING", HFILL }},
     { &hf_x509af_utcTime,
       { "utcTime", "x509af.utcTime",
@@ -1059,11 +1059,11 @@ void proto_register_x509af(void) {
         "x509af.T_extnId", HFILL }},
     { &hf_x509af_critical,
       { "critical", "x509af.critical",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509af.BOOLEAN", HFILL }},
     { &hf_x509af_extnValue,
       { "extnValue", "x509af.extnValue",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509af.T_extnValue", HFILL }},
     { &hf_x509af_userCertificate,
       { "userCertificate", "x509af.userCertificate",
@@ -1183,7 +1183,7 @@ void proto_register_x509af(void) {
         "x509if.Attribute", HFILL }},
     { &hf_x509af_issuerUniqueID,
       { "issuerUniqueID", "x509af.issuerUniqueID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_serial,
       { "serial", "x509af.serial",
@@ -1191,7 +1191,7 @@ void proto_register_x509af(void) {
         "x509af.CertificateSerialNumber", HFILL }},
     { &hf_x509af_issuerUID,
       { "issuerUID", "x509af.issuerUID",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509af_notBeforeTime,
       { "notBeforeTime", "x509af.notBeforeTime",
diff --git a/epan/dissectors/packet-x509ce.c b/epan/dissectors/packet-x509ce.c
index 016d562439..f7ad693eaa 100644
--- a/epan/dissectors/packet-x509ce.c
+++ b/epan/dissectors/packet-x509ce.c
@@ -1845,11 +1845,11 @@ void proto_register_x509ce(void) {
     { &hf_x509ce_id_ce_baseUpdateTime,
       { "baseUpdateTime", "x509ce.id_ce_baseUpdateTime",
         FT_STRING, BASE_NONE, NULL, 0,
-        "baseUpdateTime", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_id_ce_invalidityDate,
       { "invalidityDate", "x509ce.id_ce_invalidityDate",
         FT_STRING, BASE_NONE, NULL, 0,
-        "invalidityDate", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_object_identifier_id, 
       { "Id", "x509ce.id", FT_OID, BASE_NONE, NULL, 0,
 	"Object identifier Id", HFILL }},
@@ -1866,11 +1866,11 @@ void proto_register_x509ce(void) {
         "x509ce.AuthorityKeyIdentifier", HFILL }},
     { &hf_x509ce_SubjectKeyIdentifier_PDU,
       { "SubjectKeyIdentifier", "x509ce.SubjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.SubjectKeyIdentifier", HFILL }},
     { &hf_x509ce_KeyUsage_PDU,
       { "KeyUsage", "x509ce.KeyUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.KeyUsage", HFILL }},
     { &hf_x509ce_KeyPurposeIDs_PDU,
       { "KeyPurposeIDs", "x509ce.KeyPurposeIDs",
@@ -2010,7 +2010,7 @@ void proto_register_x509ce(void) {
         "x509ce.EntrustVersionInfo", HFILL }},
     { &hf_x509ce_keyIdentifier,
       { "keyIdentifier", "x509ce.keyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.KeyIdentifier", HFILL }},
     { &hf_x509ce_authorityCertIssuer,
       { "authorityCertIssuer", "x509ce.authorityCertIssuer",
@@ -2102,7 +2102,7 @@ void proto_register_x509ce(void) {
         "x509ce.T_uniformResourceIdentifier", HFILL }},
     { &hf_x509ce_iPAddress,
       { "iPAddress", "x509ce.iPAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.T_iPAddress", HFILL }},
     { &hf_x509ce_registeredID,
       { "registeredID", "x509ce.registeredID",
@@ -2130,7 +2130,7 @@ void proto_register_x509ce(void) {
         "x509if.Attribute", HFILL }},
     { &hf_x509ce_cA,
       { "cA", "x509ce.cA",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_pathLenConstraint,
       { "pathLenConstraint", "x509ce.pathLenConstraint",
@@ -2182,11 +2182,11 @@ void proto_register_x509ce(void) {
         "x509ce.DistributionPointName", HFILL }},
     { &hf_x509ce_onlyContains,
       { "onlyContains", "x509ce.onlyContains",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.OnlyCertificateTypes", HFILL }},
     { &hf_x509ce_onlySomeReasons,
       { "onlySomeReasons", "x509ce.onlySomeReasons",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.ReasonFlags", HFILL }},
     { &hf_x509ce_serialNumberRange,
       { "serialNumberRange", "x509ce.serialNumberRange",
@@ -2278,7 +2278,7 @@ void proto_register_x509ce(void) {
         "x509ce.DistributionPoint", HFILL }},
     { &hf_x509ce_reasons,
       { "reasons", "x509ce.reasons",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.ReasonFlags", HFILL }},
     { &hf_x509ce_cRLIssuer,
       { "cRLIssuer", "x509ce.cRLIssuer",
@@ -2294,15 +2294,15 @@ void proto_register_x509ce(void) {
         "x509if.RelativeDistinguishedName", HFILL }},
     { &hf_x509ce_onlyContainsUserPublicKeyCerts,
       { "onlyContainsUserPublicKeyCerts", "x509ce.onlyContainsUserPublicKeyCerts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_onlyContainsCACerts,
       { "onlyContainsCACerts", "x509ce.onlyContainsCACerts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_indirectCRL,
       { "indirectCRL", "x509ce.indirectCRL",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_ToBeRevokedSyntax_item,
       { "ToBeRevokedGroup", "x509ce.ToBeRevokedGroup",
@@ -2362,15 +2362,15 @@ void proto_register_x509ce(void) {
         "x509ce.RevokedCertificateGroup", HFILL }},
     { &hf_x509ce_containsUserAttributeCerts,
       { "containsUserAttributeCerts", "x509ce.containsUserAttributeCerts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_containsAACerts,
       { "containsAACerts", "x509ce.containsAACerts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_containsSOAPublicKeyCerts,
       { "containsSOAPublicKeyCerts", "x509ce.containsSOAPublicKeyCerts",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509ce.BOOLEAN", HFILL }},
     { &hf_x509ce_serialNumber,
       { "serialNumber", "x509ce.serialNumber",
@@ -2382,7 +2382,7 @@ void proto_register_x509ce(void) {
         "x509if.Name", HFILL }},
     { &hf_x509ce_subjectKeyIdentifier,
       { "subjectKeyIdentifier", "x509ce.subjectKeyIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.SubjectKeyIdentifier", HFILL }},
     { &hf_x509ce_authorityKeyIdentifier,
       { "authorityKeyIdentifier", "x509ce.authorityKeyIdentifier",
@@ -2402,7 +2402,7 @@ void proto_register_x509ce(void) {
         "x509ce.OBJECT_IDENTIFIER", HFILL }},
     { &hf_x509ce_keyUsage,
       { "keyUsage", "x509ce.keyUsage",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.KeyUsage", HFILL }},
     { &hf_x509ce_subjectAltName,
       { "subjectAltName", "x509ce.subjectAltName",
@@ -2466,7 +2466,7 @@ void proto_register_x509ce(void) {
         "x509ce.CRLNumber", HFILL }},
     { &hf_x509ce_reasonFlags,
       { "reasonFlags", "x509ce.reasonFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.ReasonFlags", HFILL }},
     { &hf_x509ce_dateAndTime,
       { "dateAndTime", "x509ce.dateAndTime",
@@ -2514,116 +2514,116 @@ void proto_register_x509ce(void) {
         "x509ce.GeneralString", HFILL }},
     { &hf_x509ce_entrustVersInfoFlags,
       { "entrustVersInfoFlags", "x509ce.entrustVersInfoFlags",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509ce.EntrustInfoFlags", HFILL }},
     { &hf_x509ce_KeyUsage_digitalSignature,
       { "digitalSignature", "x509ce.digitalSignature",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_contentCommitment,
       { "contentCommitment", "x509ce.contentCommitment",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyEncipherment,
       { "keyEncipherment", "x509ce.keyEncipherment",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_dataEncipherment,
       { "dataEncipherment", "x509ce.dataEncipherment",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyAgreement,
       { "keyAgreement", "x509ce.keyAgreement",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_keyCertSign,
       { "keyCertSign", "x509ce.keyCertSign",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_cRLSign,
       { "cRLSign", "x509ce.cRLSign",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_encipherOnly,
       { "encipherOnly", "x509ce.encipherOnly",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_KeyUsage_decipherOnly,
       { "decipherOnly", "x509ce.decipherOnly",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_user,
       { "user", "x509ce.user",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_authority,
       { "authority", "x509ce.authority",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_OnlyCertificateTypes_attribute,
       { "attribute", "x509ce.attribute",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_unused,
       { "unused", "x509ce.unused",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_keyCompromise,
       { "keyCompromise", "x509ce.keyCompromise",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_cACompromise,
       { "cACompromise", "x509ce.cACompromise",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_affiliationChanged,
       { "affiliationChanged", "x509ce.affiliationChanged",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_superseded,
       { "superseded", "x509ce.superseded",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_cessationOfOperation,
       { "cessationOfOperation", "x509ce.cessationOfOperation",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_certificateHold,
       { "certificateHold", "x509ce.certificateHold",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_privilegeWithdrawn,
       { "privilegeWithdrawn", "x509ce.privilegeWithdrawn",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_ReasonFlags_aACompromise,
       { "aACompromise", "x509ce.aACompromise",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_keyUpdateAllowed,
       { "keyUpdateAllowed", "x509ce.keyUpdateAllowed",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_newExtensions,
       { "newExtensions", "x509ce.newExtensions",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_pKIXCertificate,
       { "pKIXCertificate", "x509ce.pKIXCertificate",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_enterpriseCategory,
       { "enterpriseCategory", "x509ce.enterpriseCategory",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_webCategory,
       { "webCategory", "x509ce.webCategory",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509ce_EntrustInfoFlags_sETCategory,
       { "sETCategory", "x509ce.sETCategory",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x509ce-hfarr.c ---*/
 #line 102 "packet-x509ce-template.c"
diff --git a/epan/dissectors/packet-x509if.c b/epan/dissectors/packet-x509if.c
index 1dedf068c5..7894f9a24b 100644
--- a/epan/dissectors/packet-x509if.c
+++ b/epan/dissectors/packet-x509if.c
@@ -2125,7 +2125,7 @@ void proto_register_x509if(void) {
       { "Id", "x509if.id", FT_OID, BASE_NONE, NULL, 0,
 	"Object identifier Id", HFILL }},
     { &hf_x509if_any_string, 
-      { "AnyString", "x509if.any.String", FT_BYTES, BASE_HEX,
+      { "AnyString", "x509if.any.String", FT_BYTES, BASE_NONE,
 	    NULL, 0, "This is any String", HFILL }},
 			 
 
@@ -2145,7 +2145,7 @@ void proto_register_x509if(void) {
         "x509if.HierarchyLevel", HFILL }},
     { &hf_x509if_HierarchyBelow_PDU,
       { "HierarchyBelow", "x509if.HierarchyBelow",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.HierarchyBelow", HFILL }},
     { &hf_x509if_type,
       { "type", "x509if.type",
@@ -2193,7 +2193,7 @@ void proto_register_x509if(void) {
         "x509if.T_contextValues_item", HFILL }},
     { &hf_x509if_fallback,
       { "fallback", "x509if.fallback",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_type_01,
       { "type", "x509if.type",
@@ -2265,7 +2265,7 @@ void proto_register_x509if(void) {
         "x509if.T_atadv_value", HFILL }},
     { &hf_x509if_primaryDistinguished,
       { "primaryDistinguished", "x509if.primaryDistinguished",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_valueswithContext,
       { "valuesWithContext", "x509if.valuesWithContext",
@@ -2413,7 +2413,7 @@ void proto_register_x509if(void) {
         "x509if.T_attributeType", HFILL }},
     { &hf_x509if_includeSubtypes,
       { "includeSubtypes", "x509if.includeSubtypes",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509if.BOOLEAN", HFILL }},
     { &hf_x509if_ra_selectedValues,
       { "selectedValues", "x509if.selectedValues",
@@ -2713,7 +2713,7 @@ void proto_register_x509if(void) {
         "x509if.AttributeType", HFILL }},
     { &hf_x509if_allowedSubset,
       { "allowedSubset", "x509if.allowedSubset",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509if.AllowedSubset", HFILL }},
     { &hf_x509if_imposedSubset,
       { "imposedSubset", "x509if.imposedSubset",
@@ -2738,15 +2738,15 @@ void proto_register_x509if(void) {
     { &hf_x509if_AllowedSubset_baseObject,
       { "baseObject", "x509if.baseObject",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_AllowedSubset_oneLevel,
       { "oneLevel", "x509if.oneLevel",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509if_AllowedSubset_wholeSubtree,
       { "wholeSubtree", "x509if.wholeSubtree",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x509if-hfarr.c ---*/
 #line 124 "packet-x509if-template.c"
diff --git a/epan/dissectors/packet-x509sat.c b/epan/dissectors/packet-x509sat.c
index 91cdc0affe..c40edd9c9e 100644
--- a/epan/dissectors/packet-x509sat.c
+++ b/epan/dissectors/packet-x509sat.c
@@ -1746,7 +1746,7 @@ void proto_register_x509sat(void) {
         "x509sat.DirectoryString", HFILL }},
     { &hf_x509sat_UniqueIdentifier_PDU,
       { "UniqueIdentifier", "x509sat.UniqueIdentifier",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509sat_CountryName_PDU,
       { "CountryName", "x509sat.CountryName",
@@ -1814,11 +1814,11 @@ void proto_register_x509sat(void) {
         "x509sat.ObjectIdentifier", HFILL }},
     { &hf_x509sat_OctetString_PDU,
       { "OctetString", "x509sat.OctetString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OctetString", HFILL }},
     { &hf_x509sat_BitString_PDU,
       { "BitString", "x509sat.BitString",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.BitString", HFILL }},
     { &hf_x509sat_Integer_PDU,
       { "Integer", "x509sat.Integer",
@@ -1826,7 +1826,7 @@ void proto_register_x509sat(void) {
         "x509sat.Integer", HFILL }},
     { &hf_x509sat_Boolean_PDU,
       { "Boolean", "x509sat.Boolean",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509sat.Boolean", HFILL }},
     { &hf_x509sat_SyntaxGeneralizedTime_PDU,
       { "SyntaxGeneralizedTime", "x509sat.SyntaxGeneralizedTime",
@@ -1962,7 +1962,7 @@ void proto_register_x509sat(void) {
         "x509sat.TelephoneNumber", HFILL }},
     { &hf_x509sat_parameters,
       { "parameters", "x509sat.parameters",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x411.G3FacsimileNonBasicParameters", HFILL }},
     { &hf_x509sat_PreferredDeliveryMethod_item,
       { "PreferredDeliveryMethod item", "x509sat.PreferredDeliveryMethod_item",
@@ -1970,15 +1970,15 @@ void proto_register_x509sat(void) {
         "x509sat.PreferredDeliveryMethod_item", HFILL }},
     { &hf_x509sat_pSelector,
       { "pSelector", "x509sat.pSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_sSelector,
       { "sSelector", "x509sat.sSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_tSelector,
       { "tSelector", "x509sat.tSelector",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_nAddresses,
       { "nAddresses", "x509sat.nAddresses",
@@ -1986,11 +1986,11 @@ void proto_register_x509sat(void) {
         "x509sat.T_nAddresses", HFILL }},
     { &hf_x509sat_nAddresses_item,
       { "nAddresses item", "x509sat.nAddresses_item",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_nAddress,
       { "nAddress", "x509sat.nAddress",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_profiles,
       { "profiles", "x509sat.profiles",
@@ -2006,7 +2006,7 @@ void proto_register_x509sat(void) {
         "x509if.DistinguishedName", HFILL }},
     { &hf_x509sat_uid,
       { "uid", "x509sat.uid",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.UniqueIdentifier", HFILL }},
     { &hf_x509sat_matchingRuleUsed,
       { "matchingRuleUsed", "x509sat.matchingRuleUsed",
@@ -2050,15 +2050,15 @@ void proto_register_x509sat(void) {
         "x509sat.OctetSubstringAssertion_item", HFILL }},
     { &hf_x509sat_initial_substring,
       { "initial", "x509sat.initial",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_any_substring,
       { "any", "x509sat.any",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_finall_substring,
       { "final", "x509sat.final",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.OCTET_STRING", HFILL }},
     { &hf_x509sat_ZonalSelect_item,
       { "AttributeType", "x509sat.AttributeType",
@@ -2090,7 +2090,7 @@ void proto_register_x509sat(void) {
         "x509sat.Period", HFILL }},
     { &hf_x509sat_notThisTime,
       { "notThisTime", "x509sat.notThisTime",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509sat.BOOLEAN", HFILL }},
     { &hf_x509sat_timeZone,
       { "timeZone", "x509sat.timeZone",
@@ -2118,7 +2118,7 @@ void proto_register_x509sat(void) {
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitDay,
       { "bitDay", "x509sat.bitDay",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.T_bitDay", HFILL }},
     { &hf_x509sat_dayOf,
       { "dayOf", "x509sat.dayOf",
@@ -2142,7 +2142,7 @@ void proto_register_x509sat(void) {
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitWeek,
       { "bitWeek", "x509sat.bitWeek",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.T_bitWeek", HFILL }},
     { &hf_x509sat_months,
       { "months", "x509sat.months",
@@ -2162,7 +2162,7 @@ void proto_register_x509sat(void) {
         "x509sat.INTEGER", HFILL }},
     { &hf_x509sat_bitMonth,
       { "bitMonth", "x509sat.bitMonth",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.T_bitMonth", HFILL }},
     { &hf_x509sat_years,
       { "years", "x509sat.years",
@@ -2198,7 +2198,7 @@ void proto_register_x509sat(void) {
         "x509sat.T_intNamedDays", HFILL }},
     { &hf_x509sat_bitNamedDays,
       { "bitNamedDays", "x509sat.bitNamedDays",
-        FT_BYTES, BASE_HEX, NULL, 0,
+        FT_BYTES, BASE_NONE, NULL, 0,
         "x509sat.T_bitNamedDays", HFILL }},
     { &hf_x509sat_startDayTime,
       { "startDayTime", "x509sat.startDayTime",
@@ -2234,7 +2234,7 @@ void proto_register_x509sat(void) {
         "x509sat.T_between", HFILL }},
     { &hf_x509sat_entirely,
       { "entirely", "x509sat.entirely",
-        FT_BOOLEAN, 8, NULL, 0,
+        FT_BOOLEAN, BASE_NONE, NULL, 0x0,
         "x509sat.BOOLEAN", HFILL }},
     { &hf_x509sat_localeID1,
       { "localeID1", "x509sat.localeID1",
@@ -2247,127 +2247,127 @@ void proto_register_x509sat(void) {
     { &hf_x509sat_T_bitDay_sunday,
       { "sunday", "x509sat.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_monday,
       { "monday", "x509sat.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_tuesday,
       { "tuesday", "x509sat.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_wednesday,
       { "wednesday", "x509sat.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_thursday,
       { "thursday", "x509sat.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_friday,
       { "friday", "x509sat.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitDay_saturday,
       { "saturday", "x509sat.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week1,
       { "week1", "x509sat.week1",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week2,
       { "week2", "x509sat.week2",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week3,
       { "week3", "x509sat.week3",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week4,
       { "week4", "x509sat.week4",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitWeek_week5,
       { "week5", "x509sat.week5",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_january,
       { "january", "x509sat.january",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_february,
       { "february", "x509sat.february",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_march,
       { "march", "x509sat.march",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_april,
       { "april", "x509sat.april",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_may,
       { "may", "x509sat.may",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_june,
       { "june", "x509sat.june",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_july,
       { "july", "x509sat.july",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_august,
       { "august", "x509sat.august",
         FT_BOOLEAN, 8, NULL, 0x01,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_september,
       { "september", "x509sat.september",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_october,
       { "october", "x509sat.october",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_november,
       { "november", "x509sat.november",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitMonth_december,
       { "december", "x509sat.december",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_sunday,
       { "sunday", "x509sat.sunday",
         FT_BOOLEAN, 8, NULL, 0x80,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_monday,
       { "monday", "x509sat.monday",
         FT_BOOLEAN, 8, NULL, 0x40,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_tuesday,
       { "tuesday", "x509sat.tuesday",
         FT_BOOLEAN, 8, NULL, 0x20,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_wednesday,
       { "wednesday", "x509sat.wednesday",
         FT_BOOLEAN, 8, NULL, 0x10,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_thursday,
       { "thursday", "x509sat.thursday",
         FT_BOOLEAN, 8, NULL, 0x08,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_friday,
       { "friday", "x509sat.friday",
         FT_BOOLEAN, 8, NULL, 0x04,
-        "", HFILL }},
+        NULL, HFILL }},
     { &hf_x509sat_T_bitNamedDays_saturday,
       { "saturday", "x509sat.saturday",
         FT_BOOLEAN, 8, NULL, 0x02,
-        "", HFILL }},
+        NULL, HFILL }},
 
 /*--- End of included file: packet-x509sat-hfarr.c ---*/
 #line 63 "packet-x509sat-template.c"
diff --git a/epan/dissectors/packet-xdmcp.c b/epan/dissectors/packet-xdmcp.c
index 0be134558a..96f41c6ab8 100644
--- a/epan/dissectors/packet-xdmcp.c
+++ b/epan/dissectors/packet-xdmcp.c
@@ -462,7 +462,7 @@ void proto_register_xdmcp(void)
     { &hf_xdmcp_opcode,
       { "Opcode",              "xdmcp.opcode",
       FT_UINT16, BASE_HEX, VALS(opcode_vals), 0,
-      "Opcode", HFILL }
+      NULL, HFILL }
     },
     { &hf_xdmcp_length,
       { "Message length",     "xdmcp.length",
@@ -471,23 +471,23 @@ void proto_register_xdmcp(void)
     },
     { &hf_xdmcp_authentication_name,
       { "Authentication name",     "xdmcp.authentication_name",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Authentication name", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_authorization_name,
       { "Authorization name",     "xdmcp.authorization_name",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Authorization name", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_hostname,
       { "Hostname",     "xdmcp.hostname",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Hostname", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_status,
       { "Status",     "xdmcp.status",
-      FT_STRING, BASE_DEC, NULL, 0,
-      "Status", HFILL }
+      FT_STRING, BASE_NONE, NULL, 0,
+      NULL, HFILL }
     },
     { &hf_xdmcp_session_id,
       { "Session ID",     "xdmcp.session_id",
@@ -497,7 +497,7 @@ void proto_register_xdmcp(void)
     { &hf_xdmcp_display_number,
       { "Display number",     "xdmcp.display_number",
       FT_UINT16, BASE_DEC, NULL, 0,
-      "Display number", HFILL }
+      NULL, HFILL }
     },
   };
 
diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c
index 1ecfbaed58..32d2c3c58a 100644
--- a/epan/dissectors/packet-xml.c
+++ b/epan/dissectors/packet-xml.c
@@ -1336,14 +1336,14 @@ proto_register_xml(void) {
 	};
 
 	static hf_register_info hf_base[] = {
-		{ &hf_xmlpi, {"XMLPI", "xml.xmlpi", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &hf_comment, {"Comment", "xml.comment", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &hf_unknowwn_attrib, {"Attribute", "xml.attribute", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &hf_doctype, {"Doctype", "xml.doctype", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &hf_dtd_tag, {"DTD Tag", "xml.dtdtag", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &unknown_ns.hf_cdata, {"CDATA", "xml.cdata", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &unknown_ns.hf_tag, {"Tag", "xml.tag", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }},
-		{ &xml_ns.hf_cdata, {"Unknown", "xml.unknown", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }}
+		{ &hf_xmlpi, {"XMLPI", "xml.xmlpi", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_comment, {"Comment", "xml.comment", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_unknowwn_attrib, {"Attribute", "xml.attribute", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_doctype, {"Doctype", "xml.doctype", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &hf_dtd_tag, {"DTD Tag", "xml.dtdtag", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &unknown_ns.hf_cdata, {"CDATA", "xml.cdata", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &unknown_ns.hf_tag, {"Tag", "xml.tag", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+		{ &xml_ns.hf_cdata, {"Unknown", "xml.unknown", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }}
     };
 	module_t* xml_module;
 
diff --git a/epan/dissectors/packet-xot.c b/epan/dissectors/packet-xot.c
index fd7acf2ddd..fbec7fb72e 100644
--- a/epan/dissectors/packet-xot.c
+++ b/epan/dissectors/packet-xot.c
@@ -373,7 +373,7 @@ proto_register_xot(void)
 
 		{ &hf_x25_type,
 			{ "Packet Type", "x.25.type", FT_UINT8, BASE_HEX,
-			VALS(vals_x25_type), 0x0, "Packet Type", HFILL }},
+			VALS(vals_x25_type), 0x0, NULL, HFILL }},
 
 		{ &hf_xot_pvc_version,
 			{ "Version", "xot.pvc.version", FT_UINT8, BASE_HEX,
diff --git a/epan/dissectors/packet-xtp.c b/epan/dissectors/packet-xtp.c
index ab48ba6b6e..72084428a5 100644
--- a/epan/dissectors/packet-xtp.c
+++ b/epan/dissectors/packet-xtp.c
@@ -1029,262 +1029,262 @@ proto_register_xtp(void)
 		{ &hf_xtp_key,
 			{ "Key",           "xtp.key",
 			FT_UINT64, BASE_HEX, NULL, 0x0,
-			"", HFILL }
+			NULL, HFILL }
 		},
 		{ &hf_xtp_cmd,
 			{ "Command", "xtp.cmd",
-			FT_UINT32, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options,
 			{ "Options", "xtp.cmd.options",
-			FT_UINT24, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_UINT24, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_nocheck,
 			{ "NOCHECK", "xtp.cmd.options.nocheck",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_NOCHECK, "", HFILL }
+			XTP_CMD_OPTIONS_NOCHECK, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_edge,
 			{ "EDGE", "xtp.cmd.options.edge",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_EDGE, "", HFILL }
+			XTP_CMD_OPTIONS_EDGE, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_noerr,
 			{ "NOERR", "xtp.cmd.options.noerr",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_NOERR, "", HFILL }
+			XTP_CMD_OPTIONS_NOERR, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_multi,
 			{ "MULTI", "xtp.cmd.options.multi",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_MULTI, "", HFILL }
+			XTP_CMD_OPTIONS_MULTI, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_res,
 			{ "RES", "xtp.cmd.options.res",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_RES, "", HFILL }
+			XTP_CMD_OPTIONS_RES, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_sort,
 			{ "SORT", "xtp.cmd.options.sort",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_SORT, "", HFILL }
+			XTP_CMD_OPTIONS_SORT, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_noflow,
 			{ "NOFLOW", "xtp.cmd.options.noflow",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_NOFLOW, "", HFILL }
+			XTP_CMD_OPTIONS_NOFLOW, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_fastnak,
 			{ "FASTNAK", "xtp.cmd.options.fastnak",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_FASTNAK, "", HFILL }
+			XTP_CMD_OPTIONS_FASTNAK, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_sreq,
 			{ "SREQ", "xtp.cmd.options.sreq",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_SREQ, "", HFILL }
+			XTP_CMD_OPTIONS_SREQ, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_dreq,
 			{ "DREQ", "xtp.cmd.options.dreq",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_DREQ, "", HFILL }
+			XTP_CMD_OPTIONS_DREQ, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_rclose,
 			{ "RCLOSE", "xtp.cmd.options.rclose",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_RCLOSE, "", HFILL }
+			XTP_CMD_OPTIONS_RCLOSE, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_wclose,
 			{ "WCLOSE", "xtp.cmd.options.wclose",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_WCLOSE, "", HFILL }
+			XTP_CMD_OPTIONS_WCLOSE, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_eom,
 			{ "EOM", "xtp.cmd.options.eom",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_EOM, "", HFILL }
+			XTP_CMD_OPTIONS_EOM, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_end,
 			{ "END", "xtp.cmd.options.end",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_END, "", HFILL }
+			XTP_CMD_OPTIONS_END, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_options_btag,
 			{ "BTAG", "xtp.cmd.options.btag",
 			FT_BOOLEAN, 24, TFS(&tfs_set_notset), 
-			XTP_CMD_OPTIONS_BTAG, "", HFILL }
+			XTP_CMD_OPTIONS_BTAG, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_ptype,
 			{ "Packet type", "xtp.cmd.ptype",
-			FT_UINT8, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_ptype_ver,
 			{ "Version", "xtp.cmd.ptype.ver",
-			FT_UINT8, BASE_DEC, VALS(version_vals), 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, VALS(version_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cmd_ptype_pformat,
 			{ "Format", "xtp.cmd.ptype.pformat",
-			FT_UINT8, BASE_DEC, VALS(pformat_vals), 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, VALS(pformat_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_dlen,
 			{ "Data length", "xtp.dlen",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_sort,
 			{ "Sort", "xtp.sort",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_sync,
 			{ "Synchronizing handshake", "xtp.sync",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_seq,
 			{ "Sequence number", "xtp.seq",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* control segment */
 		{ &hf_xtp_cntl_rseq,
 			{ "Received sequence number", "xtp.cntl.rseq",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cntl_alloc,
 			{ "Allocation", "xtp.cntl.alloc",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_cntl_echo,
 			{ "Synchronizing handshake echo", "xtp.cntl.echo",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_rseq,
 			{ "Received sequence number", "xtp.ecntl.rseq",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_alloc,
 			{ "Allocation", "xtp.ecntl.alloc",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_echo,
 			{ "Synchronizing handshake echo", "xtp.ecntl.echo",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_nspan,
 			{ "Number of spans", "xtp.ecntl.nspan",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_span_left,
 			{ "Span left edge", "xtp.ecntl.span_le",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_ecntl_span_right,
 			{ "Span right edge", "xtp.ecntl.span_re",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tcntl_rseq,
 			{ "Received sequence number", "xtp.tcntl.rseq",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tcntl_alloc,
 			{ "Allocation", "xtp.tcntl.alloc",
-			FT_UINT64, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tcntl_echo,
 			{ "Synchronizing handshake echo", "xtp.tcntl.echo",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tcntl_rsvd,
 			{ "Reserved", "xtp.tcntl.rsvd",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tcntl_xkey,
 			{ "Exchange key", "xtp.tcntl.xkey",
-			FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		/* traffic specifier */
 		{ &hf_xtp_tspec_tlen,
 			{ "Length", "xtp.tspec.tlen",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_service,
 			{ "Service", "xtp.tspec.service",
-			FT_UINT8, BASE_DEC, VALS(service_vals), 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, VALS(service_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_tformat,
 			{ "Format", "xtp.tspec.format",
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_traffic,
 			{ "Traffic", "xtp.tspec.traffic",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_maxdata,
 			{ "Maxdata", "xtp.tspec.maxdata",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_inrate,
 			{ "Incoming rate", "xtp.tspec.inrate",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_inburst,
 			{ "Incoming burst size", "xtp.tspec.inburst",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_outrate,
 			{ "Outgoing rate", "xtp.tspec.outrate",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_tspec_outburst,
 			{ "Outgoing burst size", "xtp.tspec.outburst",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* address segment */
 		{ &hf_xtp_aseg_alen,
 			{ "Length", "xtp.aseg.alen",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_adomain,
 			{ "Domain", "xtp.aseg.alen",
-			FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_aformat,
 			{ "Format", "xtp.aseg.aformat",
-			FT_UINT8, BASE_DEC, VALS(aformat_vals), 0x0, "", HFILL }
+			FT_UINT8, BASE_DEC, VALS(aformat_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_address,
 			{ "Traffic", "xtp.aseg.address",
-			FT_UINT32, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_dsthost,
 			{ "Destination host", "xtp.aseg.dsthost",
-			FT_IPv4, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_srchost,
 			{ "Source host", "xtp.aseg.srchost",
-			FT_IPv4, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_IPv4, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_dstport,
 			{ "Destination port", "xtp.aseg.dstport",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_aseg_srcport,
 			{ "Source port", "xtp.aseg.srcport",
-			FT_UINT16, BASE_DEC, NULL, 0x0, "", HFILL }
+			FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }
 		},
 		/* others */
 		{ &hf_xtp_btag,
 			{ "Beginning tag", "xtp.data.btag",
-			FT_UINT64, BASE_HEX, NULL, 0x0, "", HFILL }
+			FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_diag_code,
 			{ "Diagnostic code", "xtp.diag.code",
-			FT_UINT32, BASE_DEC, VALS(diag_code_vals), 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, VALS(diag_code_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_diag_val,
 			{ "Diagnostic value", "xtp.diag.val",
-			FT_UINT32, BASE_DEC, VALS(diag_val_vals), 0x0, "", HFILL }
+			FT_UINT32, BASE_DEC, VALS(diag_val_vals), 0x0, NULL, HFILL }
 		},
 		{ &hf_xtp_diag_msg,
 			{ "Message", "xtp.diag.msg",
-			FT_STRING, BASE_NONE, NULL, 0x0, "", HFILL }
+			FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }
 		},
 	};
 
diff --git a/epan/dissectors/packet-xyplex.c b/epan/dissectors/packet-xyplex.c
index 46ddfbdff8..8379bf331c 100644
--- a/epan/dissectors/packet-xyplex.c
+++ b/epan/dissectors/packet-xyplex.c
@@ -188,7 +188,7 @@ proto_register_xyplex(void)
     { &hf_xyplex_reserved,
       { "Reserved field",  "xyplex.reserved",
 	FT_UINT16, BASE_DEC, NULL, 0x0,
-      	"Reserved field", HFILL }},
+      	NULL, HFILL }},
 
     { &hf_xyplex_reply,
       { "Registration Reply",  "xyplex.reply",
diff --git a/epan/dissectors/packet-yhoo.c b/epan/dissectors/packet-yhoo.c
index 16ab6bbfdb..11468b3e21 100644
--- a/epan/dissectors/packet-yhoo.c
+++ b/epan/dissectors/packet-yhoo.c
@@ -265,33 +265,33 @@ proto_register_yhoo(void)
 	static hf_register_info hf[] = {
 			{ &hf_yhoo_service, {
 				"Service Type", "yhoo.service", FT_UINT32, BASE_DEC,
-				VALS(yhoo_service_vals), 0, "Service Type", HFILL }},
+				VALS(yhoo_service_vals), 0, NULL, HFILL }},
 			{ &hf_yhoo_msgtype, {
 				"Message Type", "yhoo.msgtype", FT_UINT32, BASE_DEC,
 				VALS(yhoo_msgtype_vals), 0, "Message Type Flags", HFILL }},
 			{ &hf_yhoo_connection_id, {
 				"Connection ID", "yhoo.connection_id", FT_UINT32, BASE_HEX,
-				NULL, 0, "Connection ID", HFILL }},
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_magic_id, {
 				"Magic ID", "yhoo.magic_id", FT_UINT32, BASE_HEX,
-				NULL, 0, "Magic ID", HFILL }},
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_unknown1, {
 				"Unknown 1", "yhoo.unknown1", FT_UINT32, BASE_HEX,
-				NULL, 0, "Unknown 1", HFILL }},
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_len, {
 				"Packet Length", "yhoo.len", FT_UINT32, BASE_DEC,
-				NULL, 0, "Packet Length", HFILL }},
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_nick1, {
-				"Real Nick (nick1)", "yhoo.nick1", FT_STRING, 0,
-				NULL, 0, "Real Nick (nick1)", HFILL }},
+				"Real Nick (nick1)", "yhoo.nick1", FT_STRING, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_nick2, {
-				"Active Nick (nick2)", "yhoo.nick2", FT_STRING, 0,
-				NULL, 0, "Active Nick (nick2)", HFILL }},
+				"Active Nick (nick2)", "yhoo.nick2", FT_STRING, BASE_NONE,
+				NULL, 0, NULL, HFILL }},
 			{ &hf_yhoo_content, {
-				"Content", "yhoo.content", FT_STRING, 0,
+				"Content", "yhoo.content", FT_STRING, BASE_NONE,
 				NULL, 0, "Data portion of the packet", HFILL }},
 			{ &hf_yhoo_version, {
-				"Version", "yhoo.version", FT_STRING, 0,
+				"Version", "yhoo.version", FT_STRING, BASE_NONE,
 				NULL, 0, "Packet version identifier", HFILL }},
         };
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-ymsg.c b/epan/dissectors/packet-ymsg.c
index 3660ad9444..72bb924575 100644
--- a/epan/dissectors/packet-ymsg.c
+++ b/epan/dissectors/packet-ymsg.c
@@ -499,7 +499,7 @@ proto_register_ymsg(void)
 				NULL, 0, "Packet version identifier", HFILL }},
 			{ &hf_ymsg_len, {
 				"Packet Length", "ymsg.len", FT_UINT16, BASE_DEC,
-				NULL, 0, "Packet Length", HFILL }},
+				NULL, 0, NULL, HFILL }},
 			{ &hf_ymsg_service, {
 				"Service", "ymsg.service", FT_UINT16, BASE_DEC,
 				VALS(ymsg_service_vals), 0, "Service Type", HFILL }},
diff --git a/epan/dissectors/packet-ypbind.c b/epan/dissectors/packet-ypbind.c
index c443629d09..de90758a66 100644
--- a/epan/dissectors/packet-ypbind.c
+++ b/epan/dissectors/packet-ypbind.c
@@ -171,12 +171,12 @@ proto_register_ypbind(void)
 	static hf_register_info hf[] = {
 		{ &hf_ypbind_procedure_v1, {
 			"V1 Procedure", "ypbind.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(ypbind1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(ypbind1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_ypbind_procedure_v2, {
 			"V2 Procedure", "ypbind.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(ypbind2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(ypbind2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_ypbind_domain, {
-			"Domain", "ypbind.domain", FT_STRING, BASE_DEC,
+			"Domain", "ypbind.domain", FT_STRING, BASE_NONE,
 			NULL, 0, "Name of the NIS/YP Domain", HFILL }},
 
 		{ &hf_ypbind_resp_type, {
@@ -188,7 +188,7 @@ proto_register_ypbind(void)
 			VALS(error_vals), 0, "YPBIND Error code", HFILL }},
 
 		{ &hf_ypbind_addr, {
-			"IP Addr", "ypbind.addr", FT_IPv4, BASE_DEC,
+			"IP Addr", "ypbind.addr", FT_IPv4, BASE_NONE,
 			NULL, 0, "IP Address of server", HFILL }},
 
 		{ &hf_ypbind_port, {
diff --git a/epan/dissectors/packet-yppasswd.c b/epan/dissectors/packet-yppasswd.c
index c6aec42a6e..ad4865268a 100644
--- a/epan/dissectors/packet-yppasswd.c
+++ b/epan/dissectors/packet-yppasswd.c
@@ -108,25 +108,25 @@ proto_register_yppasswd(void)
 	static hf_register_info hf[] = {
 		{ &hf_yppasswd_procedure_v1, {
 			"V1 Procedure", "yppasswd.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(yppasswd1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(yppasswd1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_yppasswd_status, {
 			"status", "yppasswd.status", FT_UINT32, BASE_DEC,
 			NULL, 0, "YPPasswd update status", HFILL }},
 
 		{ &hf_yppasswd_oldpass, {
-			"oldpass", "yppasswd.oldpass", FT_STRING, BASE_DEC,
+			"oldpass", "yppasswd.oldpass", FT_STRING, BASE_NONE,
 			NULL, 0, "Old encrypted password", HFILL }},
 
 		{ &hf_yppasswd_newpw, {
-			"newpw", "yppasswd.newpw", FT_NONE, 0,
+			"newpw", "yppasswd.newpw", FT_NONE, BASE_NONE,
 			NULL, 0, "New passwd entry", HFILL }},
 
 		{ &hf_yppasswd_newpw_name, {
-			"name", "yppasswd.newpw.name", FT_STRING, BASE_DEC,
+			"name", "yppasswd.newpw.name", FT_STRING, BASE_NONE,
 			NULL, 0, "Username", HFILL }},
 
 		{ &hf_yppasswd_newpw_passwd, {
-			"passwd", "yppasswd.newpw.passwd", FT_STRING, BASE_DEC,
+			"passwd", "yppasswd.newpw.passwd", FT_STRING, BASE_NONE,
 			NULL, 0, "Encrypted passwd", HFILL }},
 
 		{ &hf_yppasswd_newpw_uid, {
@@ -138,15 +138,15 @@ proto_register_yppasswd(void)
 			NULL, 0, "GroupID", HFILL }},
 
 		{ &hf_yppasswd_newpw_gecos, {
-			"gecos", "yppasswd.newpw.gecos", FT_STRING, BASE_DEC,
+			"gecos", "yppasswd.newpw.gecos", FT_STRING, BASE_NONE,
 			NULL, 0, "In real life name", HFILL }},
 
 		{ &hf_yppasswd_newpw_dir, {
-			"dir", "yppasswd.newpw.dir", FT_STRING, BASE_DEC,
+			"dir", "yppasswd.newpw.dir", FT_STRING, BASE_NONE,
 			NULL, 0, "Home Directory", HFILL }},
 
 		{ &hf_yppasswd_newpw_shell, {
-			"shell", "yppasswd.newpw.shell", FT_STRING, BASE_DEC,
+			"shell", "yppasswd.newpw.shell", FT_STRING, BASE_NONE,
 			NULL, 0, "Default shell", HFILL }},
 
 	};
diff --git a/epan/dissectors/packet-ypserv.c b/epan/dissectors/packet-ypserv.c
index 166b4ca582..fd8fc483d2 100644
--- a/epan/dissectors/packet-ypserv.c
+++ b/epan/dissectors/packet-ypserv.c
@@ -614,30 +614,30 @@ proto_register_ypserv(void)
 	static hf_register_info hf[] = {
 		{ &hf_ypserv_procedure_v1, {
 			"V1 Procedure", "ypserv.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(ypserv1_proc_vals), 0, "V1 Procedure", HFILL }},
+			VALS(ypserv1_proc_vals), 0, NULL, HFILL }},
 		{ &hf_ypserv_procedure_v2, {
 			"V2 Procedure", "ypserv.procedure_v2", FT_UINT32, BASE_DEC,
-			VALS(ypserv2_proc_vals), 0, "V2 Procedure", HFILL }},
+			VALS(ypserv2_proc_vals), 0, NULL, HFILL }},
 		{ &hf_ypserv_domain, {
-			"Domain", "ypserv.domain", FT_STRING, BASE_DEC,
-			NULL, 0, "Domain", HFILL }},
+			"Domain", "ypserv.domain", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_servesdomain, {
 			"Serves Domain", "ypserv.servesdomain", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "Serves Domain", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_ypserv_map, {
-			"Map Name", "ypserv.map", FT_STRING, BASE_DEC,
-			NULL, 0, "Map Name", HFILL }},
+			"Map Name", "ypserv.map", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_peer, {
-			"Peer Name", "ypserv.peer", FT_STRING, BASE_DEC,
-			NULL, 0, "Peer Name", HFILL }},
+			"Peer Name", "ypserv.peer", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_more, {
 			"More", "ypserv.more", FT_BOOLEAN, BASE_NONE,
-			TFS(&tfs_yes_no), 0, "More", HFILL }},
+			TFS(&tfs_yes_no), 0x0, NULL, HFILL }},
 		{ &hf_ypserv_ordernum, {
 			"Order Number", "ypserv.ordernum", FT_UINT32, BASE_DEC,
 			NULL, 0, "Order Number for XFR", HFILL }},
 		{ &hf_ypserv_transid, {
-			"Host Transport ID", "ypserv.transid", FT_IPv4, BASE_DEC,
+			"Host Transport ID", "ypserv.transid", FT_IPv4, BASE_NONE,
 			NULL, 0, "Host Transport ID to use for XFR Callback", HFILL }},
 		{ &hf_ypserv_prog, {
 			"Program Number", "ypserv.prog", FT_UINT32, BASE_DEC,
@@ -646,20 +646,20 @@ proto_register_ypserv(void)
 			"Port", "ypserv.port", FT_UINT32, BASE_DEC,
 			NULL, 0, "Port to use for XFR Callback", HFILL }},
 		{ &hf_ypserv_key, {
-			"Key", "ypserv.key", FT_STRING, BASE_DEC,
-			NULL, 0, "Key", HFILL }},
+			"Key", "ypserv.key", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_value, {
-			"Value", "ypserv.value", FT_STRING, BASE_DEC,
-			NULL, 0, "Value", HFILL }},
+			"Value", "ypserv.value", FT_STRING, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_status, {
 			"Status", "ypserv.status", FT_INT32, BASE_DEC,
-			VALS(ypstat) , 0, "Status", HFILL }},
+			VALS(ypstat) , 0, NULL, HFILL }},
 		{ &hf_ypserv_map_parms, {
-			"YP Map Parameters", "ypserv.map_parms", FT_NONE, BASE_DEC,
-			NULL, 0, "YP Map Parameters", HFILL }},
+			"YP Map Parameters", "ypserv.map_parms", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
 		{ &hf_ypserv_xfrstat, {
 			"Xfrstat", "ypserv.xfrstat", FT_INT32, BASE_DEC,
-			VALS(xfrstat), 0, "Xfrstat", HFILL }},
+			VALS(xfrstat), 0, NULL, HFILL }},
 	};
 	static gint *ett[] = {
 		&ett_ypserv,
diff --git a/epan/dissectors/packet-ypxfr.c b/epan/dissectors/packet-ypxfr.c
index 8e41ee5447..c7ab2f6de7 100644
--- a/epan/dissectors/packet-ypxfr.c
+++ b/epan/dissectors/packet-ypxfr.c
@@ -58,7 +58,7 @@ proto_register_ypxfr(void)
 	static hf_register_info hf[] = {
 		{ &hf_ypxfr_procedure_v1, {
 			"V1 Procedure", "ypxfr.procedure_v1", FT_UINT32, BASE_DEC,
-			VALS(ypxfr1_proc_vals), 0, "V1 Procedure", HFILL }}
+			VALS(ypxfr1_proc_vals), 0, NULL, HFILL }}
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-zbee-aps.c b/epan/dissectors/packet-zbee-aps.c
index 5002b57361..b25a81149f 100644
--- a/epan/dissectors/packet-zbee-aps.c
+++ b/epan/dissectors/packet-zbee-aps.c
@@ -1600,15 +1600,15 @@ void proto_register_zbee_aps(void)
                 "The device whose status is being updated.", HFILL }},
 
             { &hf_zbee_aps_cmd_challenge,
-            { "Challenge",              "zbee.aps.cmd.challenge", FT_BYTES, BASE_HEX, NULL, 0x0,
+            { "Challenge",              "zbee.aps.cmd.challenge", FT_BYTES, BASE_NONE, NULL, 0x0,
                 "Random challenge value used during SKKE and authentication.", HFILL }},
 
             { &hf_zbee_aps_cmd_mac,
-            { "Message Authentication Code",    "zbee.aps.cmd.mac", FT_BYTES, BASE_HEX, NULL, 0x0,
+            { "Message Authentication Code",    "zbee.aps.cmd.mac", FT_BYTES, BASE_NONE, NULL, 0x0,
                 "Message authentication values used during SKKE and authentication.", HFILL }},
 
             { &hf_zbee_aps_cmd_key,
-            { "Key",                    "zbee.aps.cmd.key", FT_BYTES, BASE_HEX, NULL, 0x0,
+            { "Key",                    "zbee.aps.cmd.key", FT_BYTES, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_key_type,
@@ -1640,7 +1640,7 @@ void proto_register_zbee_aps(void)
                 NULL, HFILL }},
 
             { &hf_zbee_aps_cmd_ea_data,
-            { "Data",                   "zbee.aps.cmd.ea.data", FT_BYTES, BASE_HEX, NULL, 0x0,
+            { "Data",                   "zbee.aps.cmd.ea.data", FT_BYTES, BASE_NONE, NULL, 0x0,
                 "Additional data used in entity authentication. Typically this will be the outgoing frame counter associated with the key used for entity authentication.", HFILL }},
 
             { &hf_zbee_aps_fragments,
diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 12420f2f43..eb3be1bbd0 100644
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -1682,7 +1682,7 @@ void proto_register_zbee_nwk(void)
                 NULL, HFILL }},
 
             { &hf_zbee_beacon_router_capacity,
-            { "Router Capacity", "zbee.beacon.router", FT_BOOLEAN, 8, NULL, 0x0,
+            { "Router Capacity", "zbee.beacon.router", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
                 "Whether the device can accept join requests from routing capable devices.", HFILL }},
 
             { &hf_zbee_beacon_depth,
@@ -1690,7 +1690,7 @@ void proto_register_zbee_nwk(void)
                 "The tree depth of the device, 0 indicates the network coordinator.", HFILL }},
 
             { &hf_zbee_beacon_end_device_capacity,
-            { "End Device Capacity",        "zbee.beacon.end_dev", FT_BOOLEAN, 8, NULL, 0x0,
+            { "End Device Capacity",        "zbee.beacon.end_dev", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
                 "Whether the device can accept join requests from ZigBee end devices.", HFILL }},
 
             { &hf_zbee_beacon_epid,
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c
index 55e5240c61..8eb891e7d2 100644
--- a/epan/dissectors/packet-zbee-security.c
+++ b/epan/dissectors/packet-zbee-security.c
@@ -177,7 +177,7 @@ void zbee_security_register(module_t *prefs, int proto)
                 NULL, HFILL }},
 
             { &hf_zbee_sec_mic,
-            { "Message Integrity Code", "zbee.sec.mic", FT_BYTES, BASE_HEX, NULL, 0x0,
+            { "Message Integrity Code", "zbee.sec.mic", FT_BYTES, BASE_NONE, NULL, 0x0,
                 NULL, HFILL }}
     };
 
diff --git a/epan/dissectors/packet-zbee-zdp.c b/epan/dissectors/packet-zbee-zdp.c
index 65b1f8b9d8..e6969cf4fa 100644
--- a/epan/dissectors/packet-zbee-zdp.c
+++ b/epan/dissectors/packet-zbee-zdp.c
@@ -1692,11 +1692,11 @@ void proto_register_zbee_zdp(void)
             NULL, HFILL }},
 
         { &hf_zbee_zdp_leave_children,
-        { "Remove Children",            "zbee.zdp.leave.children", FT_BOOLEAN, 8, NULL, 0x0,
+        { "Remove Children",            "zbee.zdp.leave.children", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
 
         { &hf_zbee_zdp_leave_rejoin,
-        { "Rejoin",                     "zbee.zdp.leave.rejoin", FT_BOOLEAN, 8, NULL, 0x0,
+        { "Rejoin",                     "zbee.zdp.leave.rejoin", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
 
         { &hf_zbee_zdp_significance,
diff --git a/epan/dissectors/packet-zebra.c b/epan/dissectors/packet-zebra.c
index c3ca8858f3..aed4cf13f6 100644
--- a/epan/dissectors/packet-zebra.c
+++ b/epan/dissectors/packet-zebra.c
@@ -586,7 +586,7 @@ proto_register_zebra(void)
     { &hf_zebra_prefixlen,
       { "Prefix length",	"zebra.prefixlen",
 	FT_UINT32, BASE_DEC, NULL, 0x0,
-	"Prefix length", HFILL }},
+	NULL, HFILL }},
     { &hf_zebra_prefix4,
       { "Prefix",		"zebra.prefix4",
 	FT_IPv4, BASE_NONE, NULL, 0x0,
diff --git a/epan/dissectors/packet-zep.c b/epan/dissectors/packet-zep.c
index aa7fc550e9..f7805749fa 100644
--- a/epan/dissectors/packet-zep.c
+++ b/epan/dissectors/packet-zep.c
@@ -291,7 +291,7 @@ void proto_register_zep(void)
 
         { &hf_zep_type,
         { "Type",                       "zep.type", FT_UINT8, BASE_DEC, NULL, 0x0,
-            "", HFILL }},
+            NULL, HFILL }},
 
         { &hf_zep_channel_id,
         { "Channel ID",                 "zep.channel_id", FT_UINT8, BASE_DEC, NULL, 0x0,
@@ -302,7 +302,7 @@ void proto_register_zep(void)
             "The ID of the device that detected this packet.", HFILL }},
 
         { &hf_zep_lqi_mode,
-        { "LQI/CRC Mode",               "zep.lqi_mode", FT_BOOLEAN, 8, NULL, 0x0,
+        { "LQI/CRC Mode",               "zep.lqi_mode", FT_BOOLEAN, BASE_NONE, NULL, 0x0,
             "Determines what format the last two bytes of the MAC frame use.", HFILL }},
 
         { &hf_zep_lqi,
@@ -310,7 +310,7 @@ void proto_register_zep(void)
             NULL, HFILL }},
 
         { &hf_zep_timestamp,
-        { "Timestamp",                  "zep.time", FT_ABSOLUTE_TIME, BASE_DEC, NULL, 0x0,
+        { "Timestamp",                  "zep.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
             NULL, HFILL }},
 
         { &hf_zep_seqno,
diff --git a/epan/dissectors/packet-zrtp.c b/epan/dissectors/packet-zrtp.c
index 205ec2f8ed..4efbbc118a 100644
--- a/epan/dissectors/packet-zrtp.c
+++ b/epan/dissectors/packet-zrtp.c
@@ -870,7 +870,7 @@ proto_register_zrtp(void)
     {&hf_zrtp_msg_zid,
      {
        "ZID", "zrtp.zid",
-       FT_BYTES, BASE_DEC,
+       FT_BYTES, BASE_NONE,
        NULL, 0x0,
        NULL, HFILL
      }