diff -u -r -x *.[^ch]|nmake|am ethereal-orig/packet-dcerpc-samr.c ethereal/packet-dcerpc-samr.c
--- ethereal-orig/packet-dcerpc-samr.c	Fri Feb  8 22:41:30 2002
+++ ethereal/packet-dcerpc-samr.c	Fri Feb  8 23:04:10 2002
@@ -115,7 +115,6 @@
 int hf_nt_string_length = -1;
 int hf_nt_string_size = -1;
 
-
 static gint ett_dcerpc_samr = -1;
 gint ett_nt_unicode_string = -1;	/* used by packet-dcerpc-nt.c*/
 static gint ett_samr_user_dispinfo_1 = -1;
@@ -128,6 +127,8 @@
 static guint16 ver_dcerpc_samr = 1;
 
 
+
+
 /* functions to dissect a UNICODE_STRING structure, common to many 
    NT services
    struct {
@@ -3536,7 +3537,7 @@
 		NULL, 0x0, "Index", HFILL }},
 
 	{ &hf_samr_acct_ctrl,
-		{ "Acct Ctrl", "samr.acct_ctrl", FT_UINT32, BASE_DEC, 
+		{ "Acct Ctrl", "samr.acct_ctrl", FT_UINT32, BASE_HEX, 
 		NULL, 0x0, "Acct CTRL", HFILL }},
 
         { &hf_samr_count,
diff -u -r -x *.[^ch]|nmake|am ethereal-orig/packet-smb-mailslot.c ethereal/packet-smb-mailslot.c
--- ethereal-orig/packet-smb-mailslot.c	Fri Feb  8 22:27:33 2002
+++ ethereal/packet-smb-mailslot.c	Sat Feb  9 09:35:38 2002
@@ -127,19 +127,20 @@
 			if (tri != NULL)
 				tri->trans_subcmd = trans_subcmd;
 		}
-	} else
+	} else {
 		trans_subcmd = tri->trans_subcmd;
-
-	if (parent_tree) {
-		item = proto_tree_add_item(parent_tree, proto_smb_msp, mshdr_tvb,
-			0, -1, FALSE);
-		tree = proto_item_add_subtree(item, ett_smb_msp);
 	}
 
 	/* Only do these ones if we have them. For fragmented SMB Transactions
 	   we may only have the setup area for the first fragment
 	*/
 	if(mshdr_tvb && setup_tvb){
+		if (parent_tree) {
+			item = proto_tree_add_item(parent_tree, proto_smb_msp,
+						   mshdr_tvb, 0, -1, FALSE);
+			tree = proto_item_add_subtree(item, ett_smb_msp);
+		}
+
 		/* do the opcode field */
 		opcode = tvb_get_letohs(setup_tvb, offset);
 
@@ -177,8 +178,8 @@
 		len = tvb_strsize(mshdr_tvb, offset);
 		proto_tree_add_item(tree, hf_name, mshdr_tvb, offset, len, TRUE);
 		offset += len;
+		proto_item_set_len(item, offset);
 	}
-	proto_item_set_len(item, offset);
 
 	dissected = FALSE;
 	switch(trans_subcmd){