diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
index 96bc978d2..eaf4e9900 100644
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/main/helper.c
@@ -169,10 +169,8 @@ void app_main(void)
 {
     ESP_LOGI(TAG, "Start app_main...");
     ESP_ERROR_CHECK(nvs_flash_init());
-    
 
-    ESP_LOGI(TAG, "Start benchmark..");
-    wolf_benchmark_task( );
+#ifndef NO_CRYPT_BENCHMARK
 
     /* when using atecc608a on esp32-wroom-32se */
 #if defined(WOLFSSL_ESPWROOM32SE) && defined(HAVE_PK_CALLBACKS) \
@@ -185,8 +183,14 @@ void app_main(void)
     atmel_set_slot_allocator(my_atmel_alloc, my_atmel_free);
     #endif
 #endif
+    
+    ESP_LOGI(TAG, "Start benchmark..");
+    wolf_benchmark_task();
 
-    benchmark_test(NULL);
+#else
+    ESP_LOGI(TAG, "no crypt benchmark");
+
+#endif /* NO_CRYPT_BENCHMARK */
 
 }
 
diff --git a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
index 55d39ffd7..cff2be716 100644
--- a/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
+++ b/IDE/Espressif/ESP-IDF/examples/wolfssl_server/main/server-tls.c
@@ -48,7 +48,7 @@ static const char* const TAG = "tls_server";
 
 static void ShowCiphers(void)
 {
-    static char ciphers[4096];
+    char ciphers[4096];
 
     int ret = wolfSSL_get_ciphers(ciphers, (int)sizeof(ciphers));
 
@@ -63,8 +63,6 @@ static void ShowCiphers(void)
 
 #include "wolfssl/wolfcrypt/port/atmel/atmel.h"
 
-int atcatls_set_callbacks(struct WOLFSSL_CTX* ctx);
-
 /* when you want to use a custom slot allocation */
 /* enable the difinition CUSTOM_SLOT_ALLOCATION. */
 
diff --git a/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt b/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
index 9009c574d..5d17d6bc1 100644
--- a/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
+++ b/IDE/Espressif/ESP-IDF/libs/CMakeLists.txt
@@ -23,6 +23,10 @@ set(COMPONENT_ADD_INCLUDEDIRS
     "${WOLFSSL_ROOT}"
     )
 
+if(IS_DIRECTORY ${IDF_PATH}/components/cryptoauthlib)
+    list(APPEND COMPONENT_ADD_INCLUDEDIRS "../cryptoauthlib/lib")
+endif()
+
 set(COMPONENT_SRCEXCLUDE
     "wolfcrypt/src/aes_asm.S"
     "wolfcrypt/src/evp.c"
diff --git a/wolfcrypt/benchmark/benchmark.c b/wolfcrypt/benchmark/benchmark.c
index d45a76f6c..f6150e87b 100644
--- a/wolfcrypt/benchmark/benchmark.c
+++ b/wolfcrypt/benchmark/benchmark.c
@@ -5491,9 +5491,7 @@ int main(int argc, char** argv)
 #ifdef HAVE_STACK_SIZE
     ret = StackSizeCheck(NULL, benchmark_test);
 #else
-#ifndef WOLFSSL_ESPIDF
     ret = benchmark_test(NULL);
-#endif
 #endif
 
     return ret;