diff --git a/components/esp32/Kconfig b/components/esp32/Kconfig
index 9e141529be..3b50dbd2c3 100644
--- a/components/esp32/Kconfig
+++ b/components/esp32/Kconfig
@@ -157,7 +157,7 @@ config ULP_COPROC_RESERVE_MEM
 
 choice ESP32_PANIC
     prompt "Panic handler behaviour"
-    default FREERTOS_PANIC_PRINT_REBOOT
+    default ESP32_PANIC_PRINT_REBOOT
     help
         If FreeRTOS detects unexpected behaviour or an unhandled exception, the panic handler is 
         invoked. Configure the panic handlers action here.
diff --git a/components/esp32/int_wdt.c b/components/esp32/int_wdt.c
index 93a4d9fe62..11de8f20d2 100644
--- a/components/esp32/int_wdt.c
+++ b/components/esp32/int_wdt.c
@@ -24,6 +24,7 @@
 #include <esp_types.h>
 #include "esp_err.h"
 #include "esp_intr.h"
+#include "esp_attr.h"
 #include "soc/timer_group_struct.h"
 #include "soc/timer_group_reg.h"
 
@@ -66,7 +67,7 @@ void esp_int_wdt_init() {
 //Not static; the ISR assembly checks this.
 bool int_wdt_app_cpu_ticked=false;
 
-void vApplicationTickHook(void) {
+void IRAM_ATTR vApplicationTickHook(void) {
     if (xPortGetCoreID()!=0) {
         int_wdt_app_cpu_ticked=true;
     } else {
@@ -82,7 +83,7 @@ void vApplicationTickHook(void) {
     }
 }
 #else
-void vApplicationTickHook(void) {
+void IRAM_ATTR vApplicationTickHook(void) {
     if (xPortGetCoreID()!=0) return;
     TIMERG1.wdt_wprotect=TIMG_WDT_WKEY_VALUE;
     TIMERG1.wdt_config2=CONFIG_INT_WDT_TIMEOUT_MS*2;        //Set timeout before interrupt
diff --git a/components/freertos/FreeRTOS-openocd.c b/components/freertos/FreeRTOS-openocd.c
index 6177f02057..d74564495e 100644
--- a/components/freertos/FreeRTOS-openocd.c
+++ b/components/freertos/FreeRTOS-openocd.c
@@ -18,6 +18,6 @@
 #define USED
 #endif
 
-#ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
+#ifdef CONFIG_ESP32_DEBUG_OCDAWARE
 const int USED uxTopUsedPriority = configMAX_PRIORITIES - 1;
 #endif
\ No newline at end of file
diff --git a/components/freertos/Kconfig b/components/freertos/Kconfig
index 413c710d22..25d5581e80 100644
--- a/components/freertos/Kconfig
+++ b/components/freertos/Kconfig
@@ -121,7 +121,7 @@ endchoice
 
 config FREERTOS_BREAK_ON_SCHEDULER_START_JTAG
     bool "Stop program on scheduler start when JTAG/OCD is detected"
-    depends on FREERTOS_DEBUG_OCDAWARE
+    depends on ESP32_DEBUG_OCDAWARE
     default y
     help
         If JTAG/OCD is connected, stop execution when the scheduler is started and the first