diff --git a/src/ssl.c b/src/ssl.c
index d5f968b73..cfc5d70f5 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -56226,6 +56226,8 @@ static int cmdfunc_curves(WOLFSSL_CONF_CTX* cctx, const char* value)
     return ret;
 }
 #endif
+
+#ifndef NO_FILESYSTEM
 /**
  * process cert command
  * @param cctx  a pointer to WOLFSSL_CONF_CTX structure
@@ -56309,6 +56311,7 @@ static int cmdfunc_key(WOLFSSL_CONF_CTX* cctx, const char* value)
     WOLFSSL_LEAVE("cmdfunc_key", ret);
     return ret;
 }
+#endif /* NO_FILESYSTEM */
 /**
  * process DH parameter command
  * @param cctx  a pointer to WOLFSSL_CONF_CTX structure
@@ -56357,12 +56360,11 @@ static int cmdfunc_dhparam(WOLFSSL_CONF_CTX* cctx, const char* value)
         return 1;
     
     if (cctx->ctx) {
-        ret = wolfSSL_CTX_set_tmp_dh(cctx->ctx, dh);
+        ret = (int)wolfSSL_CTX_set_tmp_dh(cctx->ctx, dh);
     }
     
     if (cctx->ssl) {
-        /* wolfSSL_use_set_tmp_dh not yet implemented */
-        ret = WOLFSSL_FAILURE;
+        ret = (int)wolfSSL_CTX_set_tmp_dh(cctx->ssl->ctx, dh);
     }
     
     if (dh)
@@ -56385,15 +56387,19 @@ typedef struct conf_cmd_tbl {
 }conf_cmd_tbl;
 
 static const conf_cmd_tbl conf_cmds_tbl[] = {
+#if defined(HAVE_ECC)
     /* cmd Curves */
     {WOLFSSL_CONF_FILE_CMD1, WOLFSSL_CONF_CMDL_CMD1, 
                                     WOLFSSL_CONF_TYPE_STRING, cmdfunc_curves},
+#endif
+#if !defined(NO_FILESYSTEM)
     /* cmd Certificate */
     {WOLFSSL_CONF_FILE_CMD2, WOLFSSL_CONF_CMDL_CMD2, 
                                     WOLFSSL_CONF_TYPE_FILE, cmdfunc_cert},
     /* cmd PrivateKey */
     {WOLFSSL_CONF_FILE_CMD3, WOLFSSL_CONF_CMDL_CMD3, 
                                     WOLFSSL_CONF_TYPE_FILE, cmdfunc_key},
+#endif
     /* cmd Protocol */
     {WOLFSSL_CONF_FILE_CMD4, WOLFSSL_CONF_CMDL_CMD4, 
                                     WOLFSSL_CONF_TYPE_STRING, NULL},
@@ -56414,13 +56420,13 @@ static const conf_cmd_tbl conf_cmds_tbl[] = {
                               WOLFSSL_CONF_TYPE_STRING, cmdfunc_cipherstring},
 #if !defined(NO_DH) && !defined(NO_BIO)
     /* cmd DHParameters */
-    {WOLFSSL_CONF_FILE_CMD9, WOLFSSL_CONF_CMDL_CMD9, 
-                                    WOLFSSL_CONF_TYPE_FILE, NULL},
+    {WOLFSSL_CONF_FILE_CMD10, WOLFSSL_CONF_CMDL_CMD10, 
+                                    WOLFSSL_CONF_TYPE_FILE, cmdfunc_dhparam},
 #endif
 #ifdef HAVE_ECC
     /* cmd ECHDParameters */
-    {WOLFSSL_CONF_FILE_CMD10, WOLFSSL_CONF_CMDL_CMD10, 
-                                    WOLFSSL_CONF_TYPE_STRING, cmdfunc_dhparam},
+    {WOLFSSL_CONF_FILE_CMD11, WOLFSSL_CONF_CMDL_CMD11, 
+                                    WOLFSSL_CONF_TYPE_STRING, NULL},
 #endif
 };
 /* size of command table */
diff --git a/tests/api.c b/tests/api.c
index ab05472a3..1ab3ba7d3 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -43095,17 +43095,9 @@ static void test_CONF_CTX_CMDLINE(void)
     
     AssertNotNull(cctx = SSL_CONF_CTX_new());
     
-    #ifndef NO_OLD_TLS
-        #ifdef WOLFSSL_ALLOW_SSLV3
-            #ifdef NO_WOLFSSL_SERVER
-                AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
-            #else
-                AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
-            #endif
-            SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
-            AssertTrue(1);
-        #endif
-    #endif
+    AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
+    SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
+    AssertTrue(1);
     
     /* set flags */
     AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_CMDLINE), 
@@ -43183,18 +43175,9 @@ static void test_CONF_CTX_FILE(void)
     SSL_CONF_CTX* cctx = NULL;
     
     AssertNotNull(cctx = SSL_CONF_CTX_new());
-    
-    #ifndef NO_OLD_TLS
-        #ifdef WOLFSSL_ALLOW_SSLV3
-            #ifdef NO_WOLFSSL_SERVER
-                AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));
-            #else
-                AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
-            #endif
-            SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
-            AssertTrue(1);
-        #endif
-    #endif
+    AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_server_method()));
+    SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
+    AssertTrue(1);
     
     /* set flags */
     AssertIntEQ(SSL_CONF_CTX_set_flags(cctx, WOLFSSL_CONF_FLAG_FILE),