diff --git a/IDE/XCODE-FIPSv6/user_settings.h b/IDE/XCODE-FIPSv6/user_settings.h
index 91511e852..e86bcd055 100644
--- a/IDE/XCODE-FIPSv6/user_settings.h
+++ b/IDE/XCODE-FIPSv6/user_settings.h
@@ -366,6 +366,12 @@ extern "C" {
     #undef WOLFSSL_AESXTS_STREAM
     #define WOLFSSL_AESXTS_STREAM
 
+    #undef WOLFSSL_AES_128
+    #define WOLFSSL_AES_128
+
+    #undef WOLFSSL_AES_256
+    #define WOLFSSL_AES_256
+
     #undef WOLFSSL_AESGCM_STREAM
     #define WOLFSSL_AESGCM_STREAM
 
@@ -887,6 +893,11 @@ extern "C" {
     #define NO_MAIN_DRIVER
     #define NO_MAIN_HARNESS_DRIVER
 
+    #ifdef BENCH_EMBEDDED
+    /* NOTE: Can not be on for operational testing */
+        #undef BENCH_EMBEDDED
+    #endif
+
     #define NO_WRITE_TEMP_FILES
 #endif