diff --git a/examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c b/examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c
index d4e22bd1..380906bb 100644
--- a/examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c
+++ b/examples/protocols/aws_iot/subscribe_publish/main/subscribe_publish_sample.c
@@ -37,8 +37,11 @@
 #include "esp_wifi.h"
 #include "esp_event_loop.h"
 #include "esp_log.h"
+
+#ifdef CONFIG_EXAMPLE_FILESYSTEM_CERTS
 #include "esp_vfs_fat.h"
 #include "driver/sdmmc_host.h"
+#endif
 
 #include "nvs.h"
 #include "nvs_flash.h"
@@ -65,7 +68,7 @@ static EventGroupHandle_t wifi_event_group;
 /* The event group allows multiple bits for each event,
    but we only care about one event - are we connected
    to the AP with an IP? */
-const int CONNECTED_BIT = BIT0;
+const int CONNECTED_BIT = 1 << 0;
 
 
 /* CA Root certificate, device ("Thing") certificate and device
@@ -328,5 +331,5 @@ void app_main()
     ESP_ERROR_CHECK( err );
 
     initialise_wifi();
-    xTaskCreatePinnedToCore(&aws_iot_task, "aws_iot_task", 9216, NULL, 5, NULL, 1);
+    xTaskCreate(&aws_iot_task, "aws_iot_task", 9216, NULL, 5, NULL);
 }
diff --git a/examples/protocols/aws_iot/subscribe_publish/sdkconfig.defaults b/examples/protocols/aws_iot/subscribe_publish/sdkconfig.defaults
index 8bb40678..963758aa 100644
--- a/examples/protocols/aws_iot/subscribe_publish/sdkconfig.defaults
+++ b/examples/protocols/aws_iot/subscribe_publish/sdkconfig.defaults
@@ -1,6 +1,8 @@
 # Enable AWS IoT SDK support
 CONFIG_AWS_IOT_SDK=y
 
+CONFIG_MBEDTLS_SSL_ALPN=y
+
 # Enable FATFS read only with long filename support
 # for loading Cert/CA/etc from filesystem
 # (if enabled in config)
diff --git a/examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c b/examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c
index 2b489d57..9720e3b3 100644
--- a/examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c
+++ b/examples/protocols/aws_iot/thing_shadow/main/thing_shadow_sample.c
@@ -34,8 +34,11 @@
 #include "esp_wifi.h"
 #include "esp_event_loop.h"
 #include "esp_log.h"
+
+#ifdef CONFIG_EXAMPLE_FILESYSTEM_CERTS
 #include "esp_vfs_fat.h"
 #include "driver/sdmmc_host.h"
+#endif
 
 #include "nvs.h"
 #include "nvs_flash.h"
@@ -92,7 +95,7 @@ static EventGroupHandle_t wifi_event_group;
 /* The event group allows multiple bits for each event,
    but we only care about one event - are we connected
    to the AP with an IP? */
-const int CONNECTED_BIT = BIT0;
+const int CONNECTED_BIT = 1 << 0;
 
 
 /* CA Root certificate, device ("Thing") certificate and device
@@ -364,5 +367,5 @@ void app_main()
 
     initialise_wifi();
     /* Temporarily pin task to core, due to FPU uncertainty */
-    xTaskCreatePinnedToCore(&aws_iot_task, "aws_iot_task", 9216, NULL, 5, NULL, 1);
+    xTaskCreate(&aws_iot_task, "aws_iot_task", 9216, NULL, 5, NULL);
 }
diff --git a/examples/protocols/aws_iot/thing_shadow/sdkconfig.defaults b/examples/protocols/aws_iot/thing_shadow/sdkconfig.defaults
index 5874f30f..c8afc6dd 100644
--- a/examples/protocols/aws_iot/thing_shadow/sdkconfig.defaults
+++ b/examples/protocols/aws_iot/thing_shadow/sdkconfig.defaults
@@ -1,6 +1,8 @@
 # Enable AWS IoT SDK support
 CONFIG_AWS_IOT_SDK=y
 
+CONFIG_MBEDTLS_SSL_ALPN=y
+
 # Enable FATFS read only with long filename support
 # for loading Cert/CA/etc from filesystem
 # (if enabled in config)