diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt
index 307db4de5..87d4cfd25 100644
--- a/radio/src/CMakeLists.txt
+++ b/radio/src/CMakeLists.txt
@@ -1025,11 +1025,11 @@ endif()
   set(CMAKE_C_FLAGS "${COMMON_FLAGS} -Wimplicit")
   set(CMAKE_C_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -Wimplicit -g")
   set(CMAKE_C_FLAGS_RELEASE "${COMMON_FLAGS} -Wimplicit")
-  set(CMAKE_C_FLAGS_DEBUG  "${COMMON_FLAGS} -Wimplicit -g")
+  set(CMAKE_C_FLAGS_DEBUG "${COMMON_FLAGS} -Wimplicit -g")
   set(CMAKE_CXX_FLAGS "${COMMON_CPP_FLAGS}")
   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_CPP_FLAGS} -g")
   set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_CPP_FLAGS}")
-  set(CMAKE_CXX_FLAGS_DEBUG  "${COMMON_CPP_FLAGS} -g")
+  set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g")
   set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections")
 
   if(PCB STREQUAL TARANIS)
diff --git a/radio/src/targets/taranis/serial2_driver.cpp b/radio/src/targets/taranis/serial2_driver.cpp
index 44514979a..4a9110f12 100644
--- a/radio/src/targets/taranis/serial2_driver.cpp
+++ b/radio/src/targets/taranis/serial2_driver.cpp
@@ -74,7 +74,7 @@ void uart3Setup(unsigned int baudrate, bool dma)
     DMA_Cmd(SERIAL_DMA_Stream_RX, ENABLE);
   }
   else {
-#if !defined(USB_SERIAL) && defined(CLI)
+#if !defined(USB_SERIAL) && (defined(CLI) || defined(DEBUG))
     USART_Cmd(SERIAL_USART, ENABLE);
     USART_ITConfig(SERIAL_USART, USART_IT_RXNE, ENABLE);
     USART_ITConfig(SERIAL_USART, USART_IT_TXE, DISABLE);
@@ -135,7 +135,6 @@ uint8_t serial2TracesEnabled()
 #endif
 }
 
-#if !defined(SIMU)
 extern "C" void SERIAL_USART_IRQHandler(void)
 {
   DEBUG_INTERRUPT(INT_SER2);
@@ -166,6 +165,4 @@ extern "C" void SERIAL_USART_IRQHandler(void)
     status = SERIAL_USART->SR;
   }
 #endif
-
 }
-#endif
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 1cb043b23..00a555727 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -71,7 +71,11 @@
 #define TR_TRNCHN              "CH1CH2CH3CH4"
 
 #define LEN_UART3MODES         "\015"
+#if defined(CLI) || defined(DEBUG)
+#define TR_UART3MODES          "Debug\0       ""S-Port Mirror""Telemetry\0   ""SBUS Trainer\0""Debug\0"
+#else
 #define TR_UART3MODES          "OFF\0         ""S-Port Mirror""Telemetry\0   ""SBUS Trainer\0""Debug\0"
+#endif
 
 #define LEN_SWTYPES            "\006"
 #define TR_SWTYPES             "None\0 ""Toggle""2POS\0 ""3POS\0"