diff --git a/examples/configs/user_settings_all.h b/examples/configs/user_settings_all.h
index d18005f54..905989d85 100644
--- a/examples/configs/user_settings_all.h
+++ b/examples/configs/user_settings_all.h
@@ -159,6 +159,7 @@ extern "C" {
 #define HAVE_HASHDRBG
 #define HAVE_CURVE25519
 #define HAVE_ED25519
+#define CURVED25519_SMALL
 #define HAVE_CURVE448
 #define HAVE_POLY1305
 #define HAVE_CHACHA
diff --git a/src/internal.c b/src/internal.c
index 5c8ab15c8..e9a888bb1 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -10077,7 +10077,8 @@ int DoVerifyCallback(WOLFSSL_CERT_MANAGER* cm, WOLFSSL* ssl, int ret,
         store->userCtx = (ssl != NULL) ? ssl->verifyCbCtx : cm;
         store->certs = args->certs;
         store->totalCerts = args->totalCerts;
-    #if defined(HAVE_EX_DATA) || defined(FORTRESS)
+    #if (defined(HAVE_EX_DATA) || defined(FORTRESS)) && \
+        (defined(OPENSSL_EXTRA) || defined(WOLFSSL_WPAS_SMALL))
         if (wolfSSL_CRYPTO_set_ex_data(&store->ex_data, 0, ssl)
                 != WOLFSSL_SUCCESS) {
             WOLFSSL_MSG("Failed to store ssl context in WOLFSSL_X509_STORE_CTX");
diff --git a/src/ssl.c b/src/ssl.c
index 9d1f69c1d..caa2b0b15 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -19331,11 +19331,13 @@ int wolfSSL_SESSION_up_ref(WOLFSSL_SESSION* session)
     if (session == NULL)
         return WOLFSSL_FAILURE;
 
+#ifdef OPENSSL_EXTRA
     if (wc_LockMutex(&session->refMutex) != 0) {
         WOLFSSL_MSG("Failed to lock session mutex");
     }
     session->refCount++;
     wc_UnLockMutex(&session->refMutex);
+#endif
     return WOLFSSL_SUCCESS;
 }