diff --git a/src/game/joybus.c b/src/game/joybus.c
index db51d13c6..1858708a7 100644
--- a/src/game/joybus.c
+++ b/src/game/joybus.c
@@ -212,7 +212,7 @@ static const __OSContReadFormat sN64WriteFormat = {
     .size.tx            = sizeof(((__OSContReadFormat*)0)->send),
     .size.rx            = sizeof(((__OSContReadFormat*)0)->recv),
     .send.cmdID         = CONT_CMD_READ_BUTTON,
-    .recv.input.raw     = -1, // 0xFFFF
+    .recv.input.raw.u8  = { -1 }, // 4 bytes of 0xFF.
 };
 
 // Default GCN Controller Input Short Poll command:
@@ -222,7 +222,7 @@ static const __OSContGCNShortPollFormat sGCNWriteFormatShort = {
     .send.cmdID         = CONT_CMD_READ_BUTTON,
     .send.analog_mode   = GCN_MODE_3_220,
     .send.rumble        = MOTOR_STOP,
-    .recv.input.raw     = -1, // 0xFFFFFFFF
+    .recv.input.raw.u8  = { -1 }, // 8 bytes of 0xFF.
 };
 
 /**
diff --git a/src/game/joybus.h b/src/game/joybus.h
index 7fe13c294..1ee0c4753 100644
--- a/src/game/joybus.h
+++ b/src/game/joybus.h
@@ -256,7 +256,7 @@ typedef struct PACKED {
 typedef struct PACKED {
     /*0x01*/ OSContCmdSize size;    // The TX/RX sizes.
     /*0x02*/ struct PACKED {
-                /*0x00*/ u8 cmdID;              // The ID of the command to run (CONT_CMD_REQUEST_STATUS, CONT_CMD_RESET).
+                /*0x00*/ u8 cmdID;              // The ID of the command to run.
             } send; /*0x01*/
     /*0x04*/ struct PACKED {
             } recv; /*0x00*/