diff --git a/apps/wolfsshd/configuration.c b/apps/wolfsshd/configuration.c
index e1bb48d0..71d2d5de 100644
--- a/apps/wolfsshd/configuration.c
+++ b/apps/wolfsshd/configuration.c
@@ -811,7 +811,7 @@ static int AddRestrictedCase(WOLFSSHD_CONFIG* config, const char* mtch,
     int ret = WS_SUCCESS;
     char* pt;
 
-    pt = XSTRSTR(value, mtch);
+    pt = (char*)XSTRSTR(value, mtch);
     if (pt != NULL) {
         int sz, i;
 
diff --git a/src/internal.c b/src/internal.c
index be2c5d83..b8582916 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -3206,7 +3206,7 @@ static int DoKexInit(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
 
     if (ret == WS_SUCCESS) {
         wc_HashAlg* hash = &ssh->handshake->kexHash;
-        enum wc_HashType hashId = ssh->handshake->kexHashId;
+        enum wc_HashType hashId = (enum wc_HashType)ssh->handshake->kexHashId;
         byte scratchLen[LENGTH_SZ];
         word32 strSz;
 
@@ -3917,7 +3917,7 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
     }
 
     hash = &ssh->handshake->kexHash;
-    hashId = ssh->handshake->kexHashId;
+    hashId = (enum wc_HashType)ssh->handshake->kexHashId;
 
     if (ret == WS_SUCCESS) {
         /* Hash in the raw public key blob from the server including its
@@ -5277,7 +5277,7 @@ static int DoUserAuthRequestRsaCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
         if (ret == 0) {
             ret = wc_GetPubKeyDerFromCert(&cert, NULL, &pubSz);
             if (ret == LENGTH_ONLY_E) {
-                pub = WMALLOC(pubSz, ssh->ctx->heap, DYNTYPE_PUBKEY);
+                pub = (byte*)WMALLOC(pubSz, ssh->ctx->heap, DYNTYPE_PUBKEY);
                 if (pub == NULL) {
                     ret = WS_MEMORY_E;
                 }
@@ -5610,7 +5610,7 @@ static int DoUserAuthRequestEccCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
         if (ret == 0) {
             ret = wc_GetPubKeyDerFromCert(&cert, NULL, &pubSz);
             if (ret == LENGTH_ONLY_E) {
-                pub = WMALLOC(pubSz, ssh->ctx->heap, DYNTYPE_PUBKEY);
+                pub = (byte*)WMALLOC(pubSz, ssh->ctx->heap, DYNTYPE_PUBKEY);
                 if (pub == NULL) {
                     ret = WS_MEMORY_E;
                 }