diff --git a/client-test.sh b/client-test.sh
index 8787b09bd..7ff918135 100755
--- a/client-test.sh
+++ b/client-test.sh
@@ -5,12 +5,12 @@
 [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
 
 # is our desired server there?
-ping -c 3 www.google.com
+ping -c 2 -i 0.2 www.google.com
 RESULT=$?
 [ $RESULT -ne 0 ] && echo -e "\n\nCouldn't find server, skipping" && exit 0
 
 # client test against the server
-./examples/client/client -h www.google.com -p 443 -g -d -v 1
+./examples/client/client -h www.google.com -p 443 -g -d
 RESULT=$?
 [ $RESULT -ne 0 ] && echo -e "\n\nClient connection failed" && exit 1
 
diff --git a/ctaocrypt/src/coding.c b/ctaocrypt/src/coding.c
index c18c7ee05..6ccff9e9f 100644
--- a/ctaocrypt/src/coding.c
+++ b/ctaocrypt/src/coding.c
@@ -324,10 +324,20 @@ int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out, word32* outLen)
 }
 
 
+#endif  /* defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(CYASSL_KEY_GEN) || defined(CYASSL_CERT_GEN) || defined(HAVE_WEBSERVER) */
+
+
+#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(HAVE_FIPS)
+
 static
 const byte hexDecode[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
                            BAD, BAD, BAD, BAD, BAD, BAD, BAD,
-                           10, 11, 12, 13, 14, 15 
+                           10, 11, 12, 13, 14, 15,  /* upper case A-F */
+                           BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
+                           BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
+                           BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
+                           BAD, BAD,  /* G - ` */
+                           10, 11, 12, 13, 14, 15   /* lower case a-f */
                          };  /* A starts at 0x41 not 0x3A */
 
 int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
@@ -384,5 +394,6 @@ int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
 }
 
 
-#endif  /* defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(CYASSL_KEY_GEN) || defined(CYASSL_CERT_GEN) || defined(HAVE_WEBSERVER) */
+#endif /* (OPENSSL_EXTRA) || (HAVE_WEBSERVER) || (HAVE_FIPS) */
+
 #endif /* NO_CODING */
diff --git a/cyassl/ctaocrypt/aes.h b/cyassl/ctaocrypt/aes.h
index 371778b62..5c6323e08 100644
--- a/cyassl/ctaocrypt/aes.h
+++ b/cyassl/ctaocrypt/aes.h
@@ -159,7 +159,7 @@ CYASSL_API int  AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
     CYASSL_API int  AesCbcDecrypt_fips(Aes* aes, byte* out, const byte* in,
                                        word32 sz);
     #ifndef FIPS_NO_WRAPPERS
-        /* if not internal or fips.c consumer force fips calls if fips build */
+        /* if not impl or fips.c impl wrapper force fips calls if fips build */
         #define AesSetKey     AesSetKey_fips
         #define AesCbcEncrypt AesCbcEncrypt_fips
         #define AesCbcDecrypt AesCbcDecrypt_fips
diff --git a/cyassl/ctaocrypt/coding.h b/cyassl/ctaocrypt/coding.h
index 911163794..9a0f11d65 100644
--- a/cyassl/ctaocrypt/coding.h
+++ b/cyassl/ctaocrypt/coding.h
@@ -42,10 +42,14 @@ CYASSL_LOCAL int Base64_Decode(const byte* in, word32 inLen, byte* out,
     CYASSL_API
     int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out,
                                   word32* outLen);
-    CYASSL_LOCAL 
+#endif
+
+#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(HAVE_FIPS)
+    CYASSL_API
     int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen);
 #endif
 
+
 #ifdef __cplusplus
     } /* extern "C" */
 #endif
diff --git a/sslSniffer/sslSnifferTest/snifftest.c b/sslSniffer/sslSnifferTest/snifftest.c
index 2570a65bc..5e990c7a5 100755
--- a/sslSniffer/sslSnifferTest/snifftest.c
+++ b/sslSniffer/sslSnifferTest/snifftest.c
@@ -273,7 +273,7 @@ int main(int argc, char** argv)
         packetNumber++;
         if (packet) {
 
-            byte data[65535];
+            byte data[65535+16384];  /* may have a partial 16k record cached */
 
             if (header.caplen > 40)  { /* min ip(20) + min tcp(20) */
 				packet        += frame;