diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/board.c b/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
index 019e4615653c..b0b21a53d90a 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
+++ b/ports/atmel-samd/boards/bdmicro_vina_d21/board.c
@@ -7,16 +7,4 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 
-void board_init(void) {
-    // struct port_config pin_conf;
-    // port_get_config_defaults(&pin_conf);
-    //
-    // pin_conf.direction  = PORT_PIN_DIR_OUTPUT;
-    // port_pin_set_config(MICROPY_HW_LED_TX, &pin_conf);
-    // port_pin_set_output_level(MICROPY_HW_LED_TX, true);
-    //
-    // port_pin_set_config(MICROPY_HW_LED_RX, &pin_conf);
-    // port_pin_set_output_level(MICROPY_HW_LED_RX, true);
-}
-
 // Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
diff --git a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
index 1a8cddfda7dc..496a65512bb7 100644
--- a/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/bdmicro_vina_d21/mpconfigboard.mk
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICES = "MX25L51245G","GD25S512MD"
 LONGINT_IMPL = MPZ
+
+CIRCUITPY_RAINBOWIO = 0
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
index d091528d9e2d..89ee8ba04b7c 100644
--- a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -10,7 +10,6 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
 
 # Turn off to make fit.
-CIRCUTPY_PIXELBUF = 0
 CIRCUITPY_AESIO = 0
 CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOCORE = 0
@@ -25,6 +24,7 @@ CIRCUITPY_PIXELMAP = 0
 CIRCUITPY_GETPASS = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
+CIRCUTPY_PIXELBUF = 0
 CIRCUITPY_PS2IO = 0
 CIRCUITPY_RGBMATRIX = 0
 CIRCUITPY_RAINBOWIO = 0
@@ -32,6 +32,7 @@ CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_TOUCHIO = 0
 CIRCUITPY_USB_HID = 0
 CIRCUITPY_USB_MIDI = 0
+CIRCUITPY_WARNINGS = 0
 
 CIRCUITPY_ULAB = 0
 
diff --git a/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c b/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c
index 6024f2d0ee69..aa3a6f7b7f57 100644
--- a/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c
+++ b/ports/espressif/boards/seeed_xiao_esp32_s3_sense/pins.c
@@ -29,7 +29,7 @@ static const mp_rom_obj_tuple_t camera_data_tuple = {
     }
 };
 
-STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
+static const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO1) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO2) },
diff --git a/ports/nordic/boards/bluemicro833/mpconfigboard.mk b/ports/nordic/boards/bluemicro833/mpconfigboard.mk
index e513a3d90e65..3fcb7cdbb07a 100644
--- a/ports/nordic/boards/bluemicro833/mpconfigboard.mk
+++ b/ports/nordic/boards/bluemicro833/mpconfigboard.mk
@@ -12,6 +12,7 @@ CIRCUITPY_AUDIOBUSIO = 0
 CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_AUDIOMIXER = 0
 CIRCUITPY_KEYPAD = 1
+CIRCUITPY_KEYPAD_DEMUX = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_ONEWIREIO = 0
 CIRCUITPY_PIXELBUF = 1