diff --git a/kernel-src/wolfcrypt_glue.c b/kernel-src/wolfcrypt_glue.c
index a3778e5..7761f1c 100644
--- a/kernel-src/wolfcrypt_glue.c
+++ b/kernel-src/wolfcrypt_glue.c
@@ -312,7 +312,7 @@ static __always_inline bool wc_AesGcm_crypt_sg_inplace(struct scatterlist *src,
     if (miter_needs_stop)
         sg_miter_stop(&miter);
 
-    free(aes);
+    XFREE(aes, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
     WC_DEBUG_PR_IF_NEG(ret);
 
@@ -447,7 +447,7 @@ static __always_inline bool wc_AesGcm_crypt_sg_inplace(struct scatterlist *src,
             else
                 wc_ForceZero(buf, src_len + WC_AES_BLOCK_SIZE);
         }
-        free(buf);
+        XFREE(buf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
     }
 
   out:
@@ -456,7 +456,7 @@ static __always_inline bool wc_AesGcm_crypt_sg_inplace(struct scatterlist *src,
 
   out_aes_uninited:
 
-    free(aes);
+    XFREE(aes, NULL, DYNAMIC_TYPE_TMP_BUFFER);
 
     wc_ForceZero(full_nonce, sizeof full_nonce);
 
diff --git a/kernel-src/wolfcrypt_glue.h b/kernel-src/wolfcrypt_glue.h
index 9b737e6..b65e71f 100644
--- a/kernel-src/wolfcrypt_glue.h
+++ b/kernel-src/wolfcrypt_glue.h
@@ -145,7 +145,7 @@ static inline int wc_sha256_oneshot2(byte *out, const byte *message1, const size
 static inline u64 wc_u64_keyed_hash(const byte *key, const size_t key_len, const byte *message, const size_t message_len) {
     u64 ret[WC_SHA256_DIGEST_SIZE / sizeof(u64)];
     if (wc_sha256_oneshot2((byte *)ret, key, key_len, message, message_len) < 0)
-        return ~0UL;
+        return ~(u64)0;
     else
         return ret[0];
 }