diff --git a/src/app-layer-dcerpc-common.h b/src/app-layer-dcerpc-common.h
index 4fd98bbe5b..e5bcc0dc23 100644
--- a/src/app-layer-dcerpc-common.h
+++ b/src/app-layer-dcerpc-common.h
@@ -88,7 +88,7 @@ typedef struct dcerpc_hdr_ {
     uint32_t call_id;      /* 12:04 call identifier */
 }DCERPCHdr;
 
-#define DCERPC_HDR_LEN 16
+#define DCERPC_HDR_LEN 16U
 
 struct uuid_entry {
     uint16_t ctxid;
diff --git a/src/app-layer-nbss.h b/src/app-layer-nbss.h
index 42a8ff1c89..0cb24fe62f 100644
--- a/src/app-layer-nbss.h
+++ b/src/app-layer-nbss.h
@@ -41,6 +41,6 @@ typedef struct nbss_hdr_ {
 	uint8_t flags;
 	uint32_t length;
 }NBSSHdr;
-#define NBSS_HDR_LEN 4
+#define NBSS_HDR_LEN 4U
 
 #endif /* APPLAYERNBSS_H_ */
diff --git a/src/app-layer-smb.c b/src/app-layer-smb.c
index 742b6786fa..1f82074486 100644
--- a/src/app-layer-smb.c
+++ b/src/app-layer-smb.c
@@ -508,17 +508,17 @@ static uint32_t PaddingParser(void *smb_state, AppLayerParserState *pstate,
     SMBState *sstate = (SMBState *) smb_state;
     uint8_t *p = input;
     /* Check for validity of dataoffset */
-    if ((uint16_t)(sstate->bytesprocessed - NBSS_HDR_LEN) > sstate->andx.dataoffset) {
+    if ((sstate->bytesprocessed - NBSS_HDR_LEN) > sstate->andx.dataoffset) {
         sstate->andx.paddingparsed = 1;
         SCReturnUInt((uint32_t)(p - input));
     }
-    while ((uint32_t) ((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
+    while (((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
             < sstate->andx.dataoffset && sstate->bytecount.bytecountleft--
             && input_len--) {
 	SCLogDebug("0x%02x ", *p);
         p++;
     }
-    if ((uint32_t) ((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
+    if (((sstate->bytesprocessed - NBSS_HDR_LEN) + (p - input))
             == sstate->andx.dataoffset) {
         sstate->andx.paddingparsed = 1;
     }
diff --git a/src/app-layer-smb.h b/src/app-layer-smb.h
index df624b9462..4737e55fc1 100644
--- a/src/app-layer-smb.h
+++ b/src/app-layer-smb.h
@@ -29,9 +29,9 @@ typedef struct smb_hdr_ {
     uint16_t uid;
     uint16_t mid;
 }SMBHdr;
-#define SMB_HDR_LEN 32
-#define MINIMUM_SMB_LEN 35
-#define NBSS_SMB_HDRS_LEN 36
+#define SMB_HDR_LEN 32U
+#define MINIMUM_SMB_LEN 35U
+#define NBSS_SMB_HDRS_LEN 36U
 
 typedef struct wordcount_ {
     uint8_t wordcount;