diff --git a/wolfcrypt/src/sha3.c b/wolfcrypt/src/sha3.c
index 824fc916f..ffa63bf57 100644
--- a/wolfcrypt/src/sha3.c
+++ b/wolfcrypt/src/sha3.c
@@ -275,21 +275,22 @@ static void BlockSha3(word64 *s)
  */
 #define ROTL64(a, n)    (((a)<<(n))|((a)>>(64-(n))))
 
+
 /* An array of values to XOR for block operation. */
 static const word64 hash_keccak_r[24] =
 {
-    0x0000000000000001UL, 0x0000000000008082UL,
-    0x800000000000808aUL, 0x8000000080008000UL,
-    0x000000000000808bUL, 0x0000000080000001UL,
-    0x8000000080008081UL, 0x8000000000008009UL,
-    0x000000000000008aUL, 0x0000000000000088UL,
-    0x0000000080008009UL, 0x000000008000000aUL,
-    0x000000008000808bUL, 0x800000000000008bUL,
-    0x8000000000008089UL, 0x8000000000008003UL,
-    0x8000000000008002UL, 0x8000000000000080UL,
-    0x000000000000800aUL, 0x800000008000000aUL,
-    0x8000000080008081UL, 0x8000000000008080UL,
-    0x0000000080000001UL, 0x8000000080008008UL
+    W64LIT(0x0000000000000001), W64LIT(0x0000000000008082),
+    W64LIT(0x800000000000808a), W64LIT(0x8000000080008000),
+    W64LIT(0x000000000000808b), W64LIT(0x0000000080000001),
+    W64LIT(0x8000000080008081), W64LIT(0x8000000000008009),
+    W64LIT(0x000000000000008a), W64LIT(0x0000000000000088),
+    W64LIT(0x0000000080008009), W64LIT(0x000000008000000a),
+    W64LIT(0x000000008000808b), W64LIT(0x800000000000008b),
+    W64LIT(0x8000000000008089), W64LIT(0x8000000000008003),
+    W64LIT(0x8000000000008002), W64LIT(0x8000000000000080),
+    W64LIT(0x000000000000800a), W64LIT(0x800000008000000a),
+    W64LIT(0x8000000080008081), W64LIT(0x8000000000008080),
+    W64LIT(0x0000000080000001), W64LIT(0x8000000080008008)
 };
 
 /* Indices used in swap and rotate operation. */
diff --git a/wolfcrypt/src/wc_port.c b/wolfcrypt/src/wc_port.c
index f9a490448..23fb898d8 100644
--- a/wolfcrypt/src/wc_port.c
+++ b/wolfcrypt/src/wc_port.c
@@ -2469,7 +2469,7 @@ time_t time(time_t * timer)
 
 #endif /* !NO_ASN_TIME */
 
-#ifndef WOLFSSL_LEANPSK
+#if !defined(WOLFSSL_LEANPSK) && !defined(STRING_USER)
 char* mystrnstr(const char* s1, const char* s2, unsigned int n)
 {
     unsigned int s2_len = (unsigned int)XSTRLEN(s2);