diff --git a/wolfssl/test.h b/wolfssl/test.h
index 9012959a8..f672ccc05 100644
--- a/wolfssl/test.h
+++ b/wolfssl/test.h
@@ -421,7 +421,7 @@ err_sys(const char* msg)
     if (msg)
 #endif
     {
-        XEXIT((THREAD_RETURN)EXIT_FAILURE);
+        XEXIT_T(EXIT_FAILURE);
     }
 }
 
diff --git a/wolfssl/wolfcrypt/mem_track.h b/wolfssl/wolfcrypt/mem_track.h
index 477245444..8d22209b8 100644
--- a/wolfssl/wolfcrypt/mem_track.h
+++ b/wolfssl/wolfcrypt/mem_track.h
@@ -95,7 +95,7 @@
     typedef struct memoryTrack {
         union {
             memHint hint;
-            byte    alignit[sizeof(memHint) + (16-1 & ~(16-1))]; /* make sure we have strong alignment */
+            byte    alignit[sizeof(memHint) + ((16-1) & ~(16-1))]; /* make sure we have strong alignment */
         } u;
     } memoryTrack;
 
@@ -263,6 +263,7 @@
         (void)line;
 #endif
 #endif
+        (void)sz;
 
         free(mt);
     }