diff --git a/flight/targets/boards/nucleof303re/bootloader/Makefile b/flight/targets/boards/nucleof303re/bootloader/Makefile
index d9f8aa112..6a2fec638 100644
--- a/flight/targets/boards/nucleof303re/bootloader/Makefile
+++ b/flight/targets/boards/nucleof303re/bootloader/Makefile
@@ -26,4 +26,4 @@ include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
 include $(FLIGHT_ROOT_DIR)/make/boot-defs.mk
 include $(FLIGHT_ROOT_DIR)/make/common-defs.mk
 
-$(info Making bootloader for SPRacingF3_EVO, board revision $(BOARD_REVISION))
+$(info Making bootloader for Nucleo F303RE, board revision $(BOARD_REVISION))
diff --git a/flight/targets/boards/nucleof303re/bootloader/main.c b/flight/targets/boards/nucleof303re/bootloader/main.c
index 62ca101c1..820acffb1 100644
--- a/flight/targets/boards/nucleof303re/bootloader/main.c
+++ b/flight/targets/boards/nucleof303re/bootloader/main.c
@@ -34,6 +34,7 @@
 #include <fifo_buffer.h>
 #include <pios_com_msg.h>
 #include <pios_board_init.h>
+#include <pios_board_io.h>
 
 extern void FLASH_Download();
 #define BSL_HOLD_STATE ((PIOS_USB_DETECT_GPIO_PORT->IDR & PIOS_USB_DETECT_GPIO_PIN) ? 0 : 1)
@@ -198,6 +199,7 @@ void jump_to_app()
         Jump_To_Application();
     } else {
         DeviceState = failed_jump;
+        JumpToApp   = FALSE;
         return;
     }
 }
diff --git a/flight/targets/boards/nucleof303re/firmware/inc/pios_config.h b/flight/targets/boards/nucleof303re/firmware/inc/pios_config.h
index 3e0309041..a560c9e5c 100644
--- a/flight/targets/boards/nucleof303re/firmware/inc/pios_config.h
+++ b/flight/targets/boards/nucleof303re/firmware/inc/pios_config.h
@@ -37,7 +37,7 @@
  * details.
  */
 
-#define PIOS_INCLUDE_DEBUG_CONSOLE
+/* #define PIOS_INCLUDE_DEBUG_CONSOLE */
 /* #define DEBUG_LEVEL 0 */
 /* #define PIOS_ENABLE_DEBUG_PINS */
 
diff --git a/flight/targets/boards/nucleof303re/pios_board.h b/flight/targets/boards/nucleof303re/pios_board.h
index ef8496461..f20542c1a 100644
--- a/flight/targets/boards/nucleof303re/pios_board.h
+++ b/flight/targets/boards/nucleof303re/pios_board.h
@@ -90,6 +90,7 @@
 // System Settings
 // -------------------------
 #define PIOS_MASTER_CLOCK         72000000
+#define PIOS_RCC_HSE_BYPASS
 
 // -------------------------
 // Interrupt Priorities
@@ -132,43 +133,6 @@ extern uint32_t pios_i2c_id;
 // -------------------------
 #define PIOS_COM_MAX_DEVS  3
 
-extern uint32_t pios_com_telem_rf_id;
-#define PIOS_COM_TELEM_RF  (pios_com_telem_rf_id)
-
-#if defined(PIOS_INCLUDE_GPS)
-extern uint32_t pios_com_gps_id;
-#define PIOS_COM_GPS       (pios_com_gps_id)
-#endif /* PIOS_INCLUDE_GPS */
-
-extern uint32_t pios_com_bridge_id;
-#define PIOS_COM_BRIDGE    (pios_com_bridge_id)
-
-extern uint32_t pios_com_vcp_id;
-#define PIOS_COM_VCP       (pios_com_vcp_id)
-
-extern uint32_t pios_com_telem_usb_id;
-#define PIOS_COM_TELEM_USB (pios_com_telem_usb_id)
-
-#if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
-extern uint32_t pios_com_debug_id;
-#define PIOS_COM_DEBUG     (pios_com_debug_id)
-#endif /* PIOS_INCLUDE_DEBUG_CONSOLE */
-
-extern uint32_t pios_com_hkosd_id;
-#define PIOS_COM_OSDHK     (pios_com_hkosd_id)
-
-extern uint32_t pios_com_msp_id;
-#define PIOS_COM_MSP       (pios_com_msp_id)
-
-extern uint32_t pios_com_mavlink_id;
-#define PIOS_COM_MAVLINK   (pios_com_mavlink_id)
-
-
-#ifdef PIOS_INCLUDE_WS2811
-extern uint32_t pios_ws2811_id;
-#define PIOS_WS2811_DEVICE (pios_ws2811_id)
-#endif
-
 // -------------------------
 // ADC
 // PIOS_ADC_PinGet(0) = Current sensor