diff --git a/examples/common/m5stack-tft/repo b/examples/common/m5stack-tft/repo
index a6299b6c7c0b2e..d99f5ef8df180a 160000
--- a/examples/common/m5stack-tft/repo
+++ b/examples/common/m5stack-tft/repo
@@ -1 +1 @@
-Subproject commit a6299b6c7c0b2e3eb62fa08ee4bf7155c39bad1f
+Subproject commit d99f5ef8df180ab34b3d9fff6888d5bede7665c5
diff --git a/examples/lighting-app/esp32/sdkconfig_rpc.defaults b/examples/lighting-app/esp32/sdkconfig_rpc.defaults
index 57ac2d6b027c56..71c4cebfc89242 100644
--- a/examples/lighting-app/esp32/sdkconfig_rpc.defaults
+++ b/examples/lighting-app/esp32/sdkconfig_rpc.defaults
@@ -55,3 +55,7 @@ CONFIG_ENABLE_PW_RPC=y
 CONFIG_MBEDTLS_HKDF_C=y
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
+
+CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH=y
diff --git a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
index 5991b9c6e27674..8d3b1c230a29d0 100644
--- a/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
+++ b/examples/platform/esp32/pw_sys_io/sys_io_esp32.cc
@@ -36,7 +36,7 @@
 #define ECHO_TEST_RTS (UART_PIN_NO_CHANGE)
 #define ECHO_TEST_CTS (UART_PIN_NO_CHANGE)
 
-#define ECHO_UART_PORT_NUM (CONFIG_EXAMPLE_UART_PORT_NUM)
+#define ECHO_UART_PORT_NUM (static_cast<uart_port_t>(CONFIG_EXAMPLE_UART_PORT_NUM))
 #define ECHO_UART_BAUD_RATE (CONFIG_EXAMPLE_UART_BAUD_RATE)
 
 int console_getchar(uint8_t * chr)