Index: packet-ieee802154.c
===================================================================
--- packet-ieee802154.c	(revision 32563)
+++ packet-ieee802154.c	(working copy)
@@ -979,8 +979,8 @@
         field_tree = proto_item_add_subtree(ti, ett_ieee802154_aux_sec_key_id);
         /* Add key source, if it exists. */
         if (packet->key_id_mode == KEY_ID_MODE_KEY_EXPLICIT_4) {
-          packet->key_source.addr32 = (guint64) tvb_get_ntohl(tvb, offset);
-          proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 4, packet->key_source.addr32);
+          packet->key_source.addr32 = tvb_get_ntohl(tvb, offset);
+          proto_tree_add_uint(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 4, packet->key_source.addr32);
           proto_item_set_len(ti, 1 + 4);
           offset += sizeof (guint32);
         }
@@ -2003,14 +2003,14 @@
     if (adata) block[i] |= (1 << 6); /* Adata */
     i++;
     /* Nonce: Source Address || Frame Counter || Security Level */
-    block[i++] = (addr >> 56) & 0xff;
-    block[i++] = (addr >> 48) & 0xff;
-    block[i++] = (addr >> 40) & 0xff;
-    block[i++] = (addr >> 32) & 0xff;
-    block[i++] = (addr >> 24) & 0xff;
-    block[i++] = (addr >> 16) & 0xff;
-    block[i++] = (addr >> 8) & 0xff;
-    block[i++] = (addr >> 0) & 0xff;
+    block[i++] = (gchar)((addr >> 56) & 0xff);
+    block[i++] = (gchar)((addr >> 48) & 0xff);
+    block[i++] = (gchar)((addr >> 40) & 0xff);
+    block[i++] = (gchar)((addr >> 32) & 0xff);
+    block[i++] = (gchar)((addr >> 24) & 0xff);
+    block[i++] = (gchar)((addr >> 16) & 0xff);
+    block[i++] = (gchar)((addr >> 8) & 0xff);
+    block[i++] = (gchar)((addr >> 0) & 0xff);
     block[i++] = (counter >> 24) & 0xff;
     block[i++] = (counter >> 16) & 0xff;
     block[i++] = (counter >> 8) & 0xff;