diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index f23c1abb3..8c263b536 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -61,6 +61,7 @@ struct MemArea
 void cliPrompt()
 {
   serialPutc('>');
+  serialPutc(' ');
 }
 
 int toLongLongInt(const char ** argv, int index, long long int * val)
diff --git a/radio/src/main.cpp b/radio/src/main.cpp
index 3f5c303c1..21c42abff 100644
--- a/radio/src/main.cpp
+++ b/radio/src/main.cpp
@@ -72,7 +72,7 @@ void openUsbMenu()
     TRACE("USB mass storage");
     setSelectedUsbMode(USB_MASS_STORAGE_MODE);
   });
-#if defined(DEBUG) || defined(CLI)
+#if defined(USB_SERIAL)
   _usbMenu->addLine(STR_USB_SERIAL, [] {
     TRACE("USB serial");
     setSelectedUsbMode(USB_SERIAL_MODE);
diff --git a/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp b/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
index 4ded4726c..2a30e843d 100644
--- a/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
+++ b/radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
@@ -212,9 +212,11 @@ extern "C" void AUX_SERIAL_USART_IRQHandler(void)
       uint8_t data = AUX_SERIAL_USART->DR;
       if (!(status & USART_FLAG_ERRORS)) {
         switch (auxSerialMode) {
-          case UART_MODE_DEBUG:
-            cliRxFifo.push(data);
-            break;
+          case UART_MODE_DEBUG: {
+            BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+            xStreamBufferSendFromISR(cliRxBuffer, &data, 1,
+                                     &xHigherPriorityTaskWoken);
+          } break;
         }
       }
       status = AUX_SERIAL_USART->SR;
@@ -403,9 +405,11 @@ extern "C" void AUX2_SERIAL_USART_IRQHandler(void)
       uint8_t data = AUX2_SERIAL_USART->DR;
       if (!(status & USART_FLAG_ERRORS)) {
         switch (aux2SerialMode) {
-          case UART_MODE_DEBUG:
-            cliRxFifo.push(data);
-            break;
+          case UART_MODE_DEBUG: {
+            BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+            xStreamBufferSendFromISR(cliRxBuffer, &data, 1,
+                                     &xHigherPriorityTaskWoken);
+          } break;
         }
       }
       status = AUX2_SERIAL_USART->SR;