diff --git a/lib/tinyusb b/lib/tinyusb
index 0848c462b3..ed6fa460e9 160000
--- a/lib/tinyusb
+++ b/lib/tinyusb
@@ -1 +1 @@
-Subproject commit 0848c462b3e431a9da42e96537d2b597a4579636
+Subproject commit ed6fa460e9a885bb84a6f1588763ea5fb3f4df49
diff --git a/ports/stm32f4/peripherals/stm32f4/pins.h b/ports/stm32f4/peripherals/stm32f4/pins.h
index 0a8a0c3dc4..8a7401c96c 100644
--- a/ports/stm32f4/peripherals/stm32f4/pins.h
+++ b/ports/stm32f4/peripherals/stm32f4/pins.h
@@ -65,8 +65,8 @@ extern const mp_obj_type_t mcu_pin_type;
 #define NO_PIN 0xff
 
 // Choose based on chip
-//#ifdef STM32F412ZG
+#ifdef STM32F412Zx
 #include "stm32f412zg/pins.h"
-//#endif
+#endif
 
 #endif // __MICROPY_INCLUDED_STM32F4_PERIPHERALS_PINS_H__
diff --git a/ports/stm32f4/supervisor/port.c b/ports/stm32f4/supervisor/port.c
index 0a0e08fdf7..04c98ab904 100644
--- a/ports/stm32f4/supervisor/port.c
+++ b/ports/stm32f4/supervisor/port.c
@@ -184,8 +184,6 @@
 #define LED2_Pin GPIO_PIN_1
 #define LED2_GPIO_Port GPIOE
 
-UART_HandleTypeDef huart2;
-
 /*
 #include "shared-module/gamepad/__init__.h"
 #include "common-hal/microcontroller/Pin.h"