diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index 8b88ac6a05..589b764895 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -109,15 +109,15 @@ const int usb_port_enable[CONFIG_USB_PORT_POWER_SMART_PORT_COUNT] = {
 /* Keyboard scan setting */
 struct keyboard_scan_config keyscan_config = {
 	/* Extra delay when KSO2 is tied to Cr50. */
-	.output_settle_us = 60, /* TODO(aaboagye): verify this is sufficient. */
+	.output_settle_us = 60,
 	.debounce_down_us = 6 * MSEC,
 	.debounce_up_us = 30 * MSEC,
 	.scan_period_us = 1500,
 	.min_post_scan_delay_us = 1000,
 	.poll_timeout_us = SECOND,
 	.actual_key_mask = {
-		0x14, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
-		0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xc8  /* full set with lock key */
+		0x3c, 0xff, 0xff, 0xff, 0xff, 0xf5, 0xff,
+		0xa4, 0xff, 0xfe, 0x55, 0xfa, 0xca  /* full set */
 	},
 };
 
diff --git a/board/zoombini/gpio.inc b/board/zoombini/gpio.inc
index 95e87c9df6..30984da7d1 100644
--- a/board/zoombini/gpio.inc
+++ b/board/zoombini/gpio.inc
@@ -105,7 +105,7 @@ ALTERNATE(PIN_MASK(2, 0xFC), 0, MODULE_KEYBOARD_SCAN, GPIO_INPUT)
 /* KSO_00-01 */
 ALTERNATE(PIN_MASK(2, 0x03), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH)
 /* KSO_02 inverted */
-GPIO(KBD_KSO2, PIN(1, 7), GPIO_ODR_LOW)
+GPIO(KBD_KSO2, PIN(1, 7), GPIO_OUT_LOW)
 /* KSO_03-09 */
 ALTERNATE(PIN_MASK(1, 0x7F), 0, MODULE_KEYBOARD_SCAN, GPIO_ODR_HIGH)
 /* KSO_10-12 */