diff --git a/cyassl/ctaocrypt/types.h b/cyassl/ctaocrypt/types.h
index 897d941ae..72f633da4 100644
--- a/cyassl/ctaocrypt/types.h
+++ b/cyassl/ctaocrypt/types.h
@@ -82,7 +82,7 @@
 
 /* These platforms have 64-bit CPU registers.  */
 #if (defined(__alpha__) || defined(__ia64__) || defined(_ARCH_PPC64) || \
-     defined(__mips64)  || defined(__x86_64__)) 
+     defined(__mips64)  || defined(__x86_64__) || defined(_M_X64)) 
     typedef word64 word;
 #else
     typedef word32 word;
diff --git a/src/ocsp.c b/src/ocsp.c
index b64bee736..2c25136ba 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -167,7 +167,7 @@ static int decode_url(const char* url, int urlSz,
 int CyaSSL_OCSP_set_override_url(CYASSL_OCSP* ocsp, const char* url)
 {
     if (ocsp != NULL) {
-        int urlSz = strlen(url);
+        int urlSz = (int)XSTRLEN(url);
         decode_url(url, urlSz,
             ocsp->overrideName, ocsp->overridePath, &ocsp->overridePort);
         return 1;
diff --git a/src/ssl.c b/src/ssl.c
index 109c1cfff..be57bbb14 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -6649,7 +6649,7 @@ static int initGlobalRNG = 0;
             return 0;
         }
 
-        if (Base16_Decode((byte*)str, (int)strlen(str), decoded, &decSz) < 0) {
+        if (Base16_Decode((byte*)str, (int)XSTRLEN(str), decoded, &decSz) < 0) {
             CYASSL_MSG("Bad Base16_Decode error");
             return 0;
         }