diff --git a/wolfcrypt/src/port/silabs/silabs_aes.c b/wolfcrypt/src/port/silabs/silabs_aes.c
index 2bcaf2258..e98b52f77 100644
--- a/wolfcrypt/src/port/silabs/silabs_aes.c
+++ b/wolfcrypt/src/port/silabs/silabs_aes.c
@@ -99,7 +99,7 @@ int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
         (uint8_t*)aes->reg,
         in,
         out);
-    return (status != SL_STATUS_OK);
+    return (status != SL_STATUS_OK) ? WC_HW_E : 0;
 }
 
 int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
@@ -112,7 +112,7 @@ int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz)
         (uint8_t*)aes->reg,
         in,
         out);
-    return (status != SL_STATUS_OK);
+    return (status != SL_STATUS_OK) ? WC_HW_E : 0;
 }
 
 #ifdef HAVE_AESGCM
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index e32019090..3d0d39661 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -1463,8 +1463,9 @@ extern void uITRON4_free(void *p) ;
                                           (void *)(pmem_2),     \
                      (CPU_SIZE_T)(size))) ? DEF_NO : DEF_YES)
     #else
-       // Work aroud for Micrium OS version 5.8 change in behavior
-       // that returns DEF_NO for 0 size compare
+      /* Work around for Micrium OS version 5.8 change in behavior
+       * that returns DEF_NO for 0 size compare
+       */
         #define XMEMCMP(pmem_1, pmem_2, size)                           \
             (( (size < 1 ) ||                                           \
                ((CPU_BOOLEAN)Mem_Cmp((void *)(pmem_1),                  \