diff --git a/configure.ac b/configure.ac
index 6fa30f140..c45c07449 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1665,6 +1665,7 @@ then
         test "$enable_shake128" = "" && enable_shake128=yes
         test "$enable_shake256" = "" && enable_shake256=yes
     fi
+    ENABLED_CERTS=yes
 fi
 
 # XMSS
@@ -4444,6 +4445,7 @@ then
     fi
 
     AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SM2 -DWOLFSSL_BASE16"
+    ENABLED_CERTS=yes
 fi
 
 
@@ -6305,6 +6307,7 @@ then
 
     AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"
     ENABLED_FE448=yes
+    ENABLED_CERTS=yes
 fi
 
 # Ed448
@@ -9922,10 +9925,6 @@ then
     AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_ED25519"
     ENABLED_FEMATH=yes
     ENABLED_GEMATH=yes
-fi
-
-if test "$ENABLED_ED25519" != "no" || test "$ENABLED_ED448" != "no"
-then
     ENABLED_CERTS=yes
 fi
 
diff --git a/wolfssl/wolfcrypt/mem_track.h b/wolfssl/wolfcrypt/mem_track.h
index 205ec570b..aa5cea305 100644
--- a/wolfssl/wolfcrypt/mem_track.h
+++ b/wolfssl/wolfcrypt/mem_track.h
@@ -177,7 +177,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
     (void)line;
 #endif
 #endif
-#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
+#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
     if (pthread_mutex_lock(&memLock) == 0)
     {
 #endif
@@ -223,7 +223,7 @@ static WC_INLINE void* TrackMalloc(size_t sz)
         ourMemList.tail = header;      /* add to the end either way */
         ourMemList.count++;
 #endif
-#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
+#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
         pthread_mutex_unlock(&memLock);
     }
 #endif /* DO_MEM_LIST */
@@ -250,7 +250,7 @@ static WC_INLINE void TrackFree(void* ptr)
     header = &mt->u.hint;
     sz = header->thisSize;
 
-#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
+#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
     if (pthread_mutex_lock(&memLock) == 0)
     {
 #endif
@@ -284,7 +284,7 @@ static WC_INLINE void TrackFree(void* ptr)
         ourMemList.count--;
 #endif
 
-#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
+#if !defined(SINGLE_THREADED) && (defined(DO_MEM_LIST) || defined(DO_MEM_STATS))
         pthread_mutex_unlock(&memLock);
     }
 #endif