diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c
index 2e6504e61..4b1daed13 100644
--- a/wolfcrypt/src/aes.c
+++ b/wolfcrypt/src/aes.c
@@ -3032,20 +3032,20 @@ static void GMULT(word64* X, word64* Y)
         word64 y = Y[i];
         for (j = 0; j < 64; j++)
         {
-            if (y & 0x8000000000000000) {
+            if (y & 0x8000000000000000ULL) {
                 Z[0] ^= V[0];
                 Z[1] ^= V[1];
             }
 
             if (V[1] & 0x0000000000000001) {
                 V[1] >>= 1;
-                V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000 : 0);
+                V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000ULL : 0);
                 V[0] >>= 1;
-                V[0] ^= 0xE100000000000000;
+                V[0] ^= 0xE100000000000000ULL;
             }
             else {
                 V[1] >>= 1;
-                V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000 : 0);
+                V[1] |= ((V[0] & 0x0000000000000001) ? 0x8000000000000000ULL : 0);
                 V[0] >>= 1;
             }
             y <<= 1;
diff --git a/wolfssl/sniffer.h b/wolfssl/sniffer.h
index b55264658..a14f883ff 100644
--- a/wolfssl/sniffer.h
+++ b/wolfssl/sniffer.h
@@ -40,16 +40,18 @@
     extern "C" {
 #endif
 
-
+/* @param typeK: (formerly keyType) was shadowing a global declaration in 
+ *                wolfssl/wolfcrypt/asn.h line 175
+ */
 WOLFSSL_API 
 SSL_SNIFFER_API int ssl_SetPrivateKey(const char* address, int port,
-                                      const char* keyFile, int keyType,
+                                      const char* keyFile, int typeK,
                                       const char* password, char* error);
 
 WOLFSSL_API
 SSL_SNIFFER_API int ssl_SetNamedPrivateKey(const char* name,
                                            const char* address, int port,
-                                           const char* keyFile, int keyType,
+                                           const char* keyFile, int typeK,
                                            const char* password, char* error);
 
 WOLFSSL_API 
@@ -65,7 +67,7 @@ WOLFSSL_API void ssl_InitSniffer(void);
 WOLFSSL_API void ssl_FreeSniffer(void);
 
         
-/* ssl_SetPrivateKey keyTypes */
+/* ssl_SetPrivateKey typeKs */
 enum {
     FILETYPE_PEM = 1,
     FILETYPE_DER = 2,