diff --git a/Firmware/MotorControl/legacy_commands.c b/Firmware/MotorControl/legacy_commands.c
index 254f9dd7..0de2acdf 100644
--- a/Firmware/MotorControl/legacy_commands.c
+++ b/Firmware/MotorControl/legacy_commands.c
@@ -232,8 +232,6 @@ void legacy_parse_cmd(const uint8_t* buffer, size_t len, size_t buffer_capacity,
             }
         }
     }
-
-    serial_printf_select = SERIAL_PRINTF_IS_UART;
 }
 
 void legacy_parse_stream(const uint8_t* buffer, size_t len) {
@@ -271,8 +269,6 @@ void legacy_parse_stream(const uint8_t* buffer, size_t len) {
 }
 
 static void print_monitoring(int limit) {
-    serial_printf_select = SERIAL_PRINTF_IS_USB;
-
     for (int i=0;i<limit;i++) {
         switch (monitoring_slots[i].type) {
         case 0:
@@ -292,6 +288,4 @@ static void print_monitoring(int limit) {
         }
     }
     printf("\n");
-
-    serial_printf_select = SERIAL_PRINTF_IS_UART;
 }
diff --git a/Firmware/Src/freertos.c b/Firmware/Src/freertos.c
index 0b3a2e7b..9e136bd6 100644
--- a/Firmware/Src/freertos.c
+++ b/Firmware/Src/freertos.c
@@ -107,7 +107,7 @@ void MX_FREERTOS_Init(void) {
   // Create a semaphore for USB RX
   osSemaphoreDef(sem_usb_rx);
   sem_usb_rx = osSemaphoreCreate(osSemaphore(sem_usb_rx), 1);
-  osSemaphoreWait(sem_usb_irq, 0);  // Remove a token.
+  osSemaphoreWait(sem_usb_rx, 0);  // Remove a token.
 
   // Create a semaphore for USB RX
   osSemaphoreDef(sem_usb_tx);