diff --git a/components/driver/include/driver/gpio.h b/components/driver/include/driver/gpio.h
index 6c79f7b8b3..33f87bdfac 100644
--- a/components/driver/include/driver/gpio.h
+++ b/components/driver/include/driver/gpio.h
@@ -412,7 +412,7 @@ esp_err_t gpio_pulldown_dis(gpio_num_t gpio_num);
 /**
   * @brief Install the driver's GPIO ISR handler service, which allows per-pin GPIO interrupt handlers.
   *
-  * This function is incompatible with gpio_isr_register() - if that function is used, a single global ISR is registered for all GPIO interrupts. If this function is used, the ISR service provides a global GPIO ISR and individual pin handlers are registered via the gpio_isr_register() function.
+  * This function is incompatible with gpio_isr_register() - if that function is used, a single global ISR is registered for all GPIO interrupts. If this function is used, the ISR service provides a global GPIO ISR and individual pin handlers are registered via the gpio_isr_handler_add() function.
   *
   * @param intr_alloc_flags Flags used to allocate the interrupt. One or multiple (ORred)
   *            ESP_INTR_FLAG_* values. See esp_intr_alloc.h for more info.
diff --git a/components/driver/include/driver/uart.h b/components/driver/include/driver/uart.h
index 748735c5da..dee41a1714 100644
--- a/components/driver/include/driver/uart.h
+++ b/components/driver/include/driver/uart.h
@@ -129,8 +129,8 @@ typedef enum {
     UART_FRAME_ERR,         /*!< UART RX frame error event*/
     UART_PARITY_ERR,        /*!< UART RX parity event*/
     UART_DATA_BREAK,        /*!< UART TX data and break event*/
+    UART_PATTERN_DET,       /*!< UART pattern detected */
     UART_EVENT_MAX,         /*!< UART event max index*/
-    UART_PATTERN_DET,        /*!< UART pattern detected */
 } uart_event_type_t;
 
 /**
diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h
index 10fd409cef..ae78f629c3 100755
--- a/components/esp32/include/esp_wifi.h
+++ b/components/esp32/include/esp_wifi.h
@@ -311,7 +311,7 @@ esp_err_t esp_wifi_deauth_sta(uint16_t aid);
   * @brief     Scan all available APs.
   *
   * @attention If this API is called, the found APs are stored in WiFi driver dynamic allocated memory and the
-  *            will be freed in esp_wifi_get_ap_list, so generally, call esp_wifi_get_ap_list to cause
+  *            will be freed in esp_wifi_scan_get_ap_records, so generally, call esp_wifi_scan_get_ap_records to cause
   *            the memory to be freed once the scan is done
   * @attention The values of maximum active scan time and passive scan time per channel are limited to 1500 milliseconds.
   *            Values above 1500ms may cause station to disconnect from AP and are not recommended.
diff --git a/components/esp32/ld/esp32.rom.ld b/components/esp32/ld/esp32.rom.ld
index 9981e59f51..ea14e86419 100644
--- a/components/esp32/ld/esp32.rom.ld
+++ b/components/esp32/ld/esp32.rom.ld
@@ -1803,6 +1803,7 @@ PROVIDE ( ets_set_user_start = 0x4000687c );
 PROVIDE ( ets_unpack_flash_code = 0x40007018 );
 PROVIDE ( ets_unpack_flash_code_legacy = 0x4000694c );
 PROVIDE ( rom_main = 0x400076c4 );
+PROVIDE ( ets_write_char_uart = 0x40007cf8 );
 PROVIDE ( ets_install_putc1 = 0x40007d18 );
 PROVIDE ( ets_install_putc2 = 0x40007d38 );
 PROVIDE ( ets_install_uart_printf = 0x40007d28 );
diff --git a/components/esp32/panic.c b/components/esp32/panic.c
index 313a4bf28f..ff7eae1b21 100644
--- a/components/esp32/panic.c
+++ b/components/esp32/panic.c
@@ -212,7 +212,10 @@ void panicHandler(XtExcFrame *frame)
                     //debugcause if the cause is watchdog 1 and clearing it if it's watchdog 0.
                     if (debugRsn&(1<<8)) {
 #if CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK
-                        panicPutStr("Stack canary watchpoint triggered ");
+                        const char *name = pcTaskGetTaskName(xTaskGetCurrentTaskHandleForCPU(core_id));
+                        panicPutStr("Stack canary watchpoint triggered (");
+                        panicPutStr(name);
+                        panicPutStr(") ");
 #else
                         panicPutStr("Watchpoint 1 triggered ");
 #endif
diff --git a/examples/bluetooth/gatt_client/main/gattc_demo.c b/examples/bluetooth/gatt_client/main/gattc_demo.c
index 17ca741028..7c16b29f1b 100644
--- a/examples/bluetooth/gatt_client/main/gattc_demo.c
+++ b/examples/bluetooth/gatt_client/main/gattc_demo.c
@@ -404,7 +404,7 @@ void ble_client_appRegister(void)
 
     ESP_LOGI(GATTC_TAG, "register callback");
 
-    //register the scan callback function to the gap moudule
+    //register the scan callback function to the gap module
     if ((status = esp_ble_gap_register_callback(esp_gap_cb)) != ESP_OK) {
         ESP_LOGE(GATTC_TAG, "gap register error, error code = %x", status);
         return;
diff --git a/tools/idf_monitor.py b/tools/idf_monitor.py
index 46d6e32bd9..fbcadf1248 100644
--- a/tools/idf_monitor.py
+++ b/tools/idf_monitor.py
@@ -226,7 +226,7 @@ class Monitor(object):
         self.serial_reader = SerialReader(self.serial, self.event_queue)
         self.elf_file = elf_file
         self.make = make
-        self.toolchain_prefix = DEFAULT_TOOLCHAIN_PREFIX
+        self.toolchain_prefix = toolchain_prefix
         self.menu_key = CTRL_T
         self.exit_key = CTRL_RBRACKET
 
@@ -473,7 +473,7 @@ def main():
     except KeyError:
         pass  # not running a make jobserver
 
-    monitor = Monitor(serial_instance, args.elf_file.name, args.make, args.eol)
+    monitor = Monitor(serial_instance, args.elf_file.name, args.make, args.toolchain_prefix, args.eol)
 
     yellow_print('--- idf_monitor on {p.name} {p.baudrate} ---'.format(
         p=serial_instance))