diff --git a/scripts/include.am b/scripts/include.am
index 3a3d7995a..268e3ec00 100644
--- a/scripts/include.am
+++ b/scripts/include.am
@@ -84,7 +84,7 @@ endif
 endif
 
 EXTRA_DIST +=  scripts/testsuite.pcap \
-			   scripts/sniffer-ipv6.pcap \
+               scripts/sniffer-ipv6.pcap \
                scripts/ping.test
 
 # leave openssl.test as extra until non bash works
diff --git a/src/sniffer.c b/src/sniffer.c
index 5cc51802d..2754dcade 100644
--- a/src/sniffer.c
+++ b/src/sniffer.c
@@ -3758,7 +3758,7 @@ static int CheckPreRecord(IpInfo* ipInfo, TcpInfo* tcpInfo,
         word32 i, offset, headerSz, qty, remainder;
 
         Trace(CHAIN_INPUT_STR);
-        headerSz = (word32)*sslFrame - (word32)chain[0].iov_base;
+        headerSz = (word64)*sslFrame - (word64)chain[0].iov_base;
         remainder = *sslBytes;
 
         if ( (*sslBytes + length) > ssl->buffers.inputBuffer.bufferSize) {
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index 6438d7ced..f6e6866ca 100644
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -26,6 +26,10 @@
 
 #include <wolfssl/wolfcrypt/settings.h>
 
+#ifdef WOLFSSL_SNIFFER_STORE_DATA_CB
+    #include <wolfssl/wolfcrypt/memory.h>
+#endif
+
 #ifdef _WIN32
     #define WOLFSSL_SNIFFER
 #endif
@@ -269,9 +273,10 @@ static int myStoreDataCb(const unsigned char* decryptBuf,
 
     if (*data == NULL) {
         byte* tmpData;
-        tmpData = (byte*)realloc(*data, decryptBufSz + 1);
+        tmpData = (byte*)XREALLOC(*data, decryptBufSz + 1,
+                NULL, DYNAMIC_TYPE_TMP_BUFFER);
         if (tmpData == NULL) {
-            free(*data);
+            XFREE(*data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
             *data = NULL;
             return -1;
         }