diff --git a/build_boot9strap_firm.py b/build_boot9strap_firm.py
index d402fb3..e1cf8b8 100644
--- a/build_boot9strap_firm.py
+++ b/build_boot9strap_firm.py
@@ -20,7 +20,7 @@ def main(argc, argv):
         b9s.write(struct.pack('<III', 0x00000000, 0x1FF80200, 0x08001000))
         b9s.write(b'\x00' * 0x2C)
         # Write version value
-        b9s.write(b'\x01')
+        b9s.write(b'\x02')
         # Write boot9strap magic value
         b9s.write(b'B9S')
         ofs = 0x200
diff --git a/stage2/arm9/source/main.c b/stage2/arm9/source/main.c
index a2a12e5..a7211c9 100644
--- a/stage2/arm9/source/main.c
+++ b/stage2/arm9/source/main.c
@@ -73,8 +73,6 @@ void main(void)
 {
     setupKeyslots();
 
-    
-
     if(mountSd())
     {
         /* I believe this is the canonical secret key combination. */
@@ -86,6 +84,7 @@ void main(void)
 
             /* Wait until buttons are not held, for compatibility. */
             while(HID_PAD & NTRBOOT_BUTTONS);
+            wait(1000ULL);
         }
 
         loadFirm(false);
@@ -94,10 +93,11 @@ void main(void)
 
     if(mountCtrNand())
     {
-        if(HID_PAD == NTRBOOT_BUTTONS && !(i2cReadRegister(I2C_DEV_MCU, 0xF) & 2))
+        /* Wait until buttons are not held, for compatibility. */
+        if(HID_PAD == NTRBOOT_BUTTONS)
         {
             while(HID_PAD & NTRBOOT_BUTTONS);
-            wait(2000ULL);
+            wait(1000ULL);
         }
         loadFirm(true);
     }