diff --git a/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk b/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk
index 8ba3ae94c3..a85a17890c 100644
--- a/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/blm_badge/mpconfigboard.mk
@@ -14,6 +14,7 @@ CIRCUITPY_AUDIOIO = 1
 CIRCUITPY_AUDIOBUSIO = 1
 # Pins for I2SOut are not available.
 CIRCUITPY_AUDIOBUSIO_I2SOUT = 0
+CIRCUITPY_BUSIO_SPI = 0
 CIRCUITPY_PWMIO = 0
 CIRCUITPY_ROTARYIO = 0
 CIRCUITPY_RTC = 0
diff --git a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
index 94a255529f..4687ce32a0 100644
--- a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.mk
@@ -10,4 +10,6 @@ INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0
 
-CIRCUITPY_GETPASS = 0
+# There are many pin definitions on this board; it doesn't quite fit on very large translations.
+# So remove what might be least likely module to be used.
+CIRCUITPY_RAINBOWIO = 0
diff --git a/shared-module/usb_hid/Device.h b/shared-module/usb_hid/Device.h
index 4bdd51d104..a3c523acd5 100644
--- a/shared-module/usb_hid/Device.h
+++ b/shared-module/usb_hid/Device.h
@@ -41,12 +41,12 @@ typedef struct  {
     mp_obj_base_t base;
     // Python buffer object whose contents are the descriptor.
     const uint8_t *report_descriptor;
-    uint8_t report_ids[MAX_REPORT_IDS_PER_DESCRIPTOR];
-    uint8_t in_report_lengths[MAX_REPORT_IDS_PER_DESCRIPTOR];
-    uint8_t out_report_lengths[MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint8_t *in_report_buffers[MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint8_t *out_report_buffers[MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint16_t report_descriptor_length;
+    uint8_t report_ids[MAX_REPORT_IDS_PER_DESCRIPTOR];
+    uint8_t in_report_lengths[MAX_REPORT_IDS_PER_DESCRIPTOR];
+    uint8_t out_report_lengths[MAX_REPORT_IDS_PER_DESCRIPTOR];
     uint8_t usage_page;
     uint8_t usage;
     uint8_t num_report_ids;