diff --git a/extra/game-input/game-input.factor b/extra/game-input/game-input.factor
index ccf5bd635b..922906df48 100755
--- a/extra/game-input/game-input.factor
+++ b/extra/game-input/game-input.factor
@@ -55,7 +55,7 @@ ERROR: game-input-not-open ;
     game-input-opened? [
         (close-game-input) 
         reset-game-input
-    ] when ;
+    ] unless ;
 
 : with-game-input ( quot -- )
     open-game-input [ close-game-input ] [ ] cleanup ; inline
diff --git a/extra/game-input/iokit/iokit.factor b/extra/game-input/iokit/iokit.factor
index 0cc8b5d51f..de1529f8df 100755
--- a/extra/game-input/iokit/iokit.factor
+++ b/extra/game-input/iokit/iokit.factor
@@ -304,6 +304,7 @@ M: iokit-game-input-backend (close-game-input)
             f
         ] change-global
         f +keyboard-state+ set-global
+        f +mouse-state+ set-global
         f +controller-states+ set-global
     ] when ;
 
diff --git a/vm/cpu-ppc.hpp b/vm/cpu-ppc.hpp
index b256b01c8b..6ae2cce27d 100755
--- a/vm/cpu-ppc.hpp
+++ b/vm/cpu-ppc.hpp
@@ -35,7 +35,7 @@ inline static void *get_call_target(cell return_address)
 	check_call_site(return_address);
 
 	cell insn = *(cell *)return_address;
-	cell unsigned_addr = (insn & B_MASK);
+	cell unsigned_addr = (insn & b_mask);
 	fixnum signed_addr = (fixnum)(unsigned_addr << 6) >> 6;
 	return (void *)(signed_addr + return_address);
 }
@@ -48,7 +48,7 @@ inline static void set_call_target(cell return_address, void *target)
 	cell insn = *(cell *)return_address;
 
 	fixnum relative_address = ((cell)target - return_address);
-	insn = ((insn & ~B_MASK) | (relative_address & B_MASK));
+	insn = ((insn & ~b_mask) | (relative_address & b_mask));
 	*(cell *)return_address = insn;
 
 	/* Flush the cache line containing the call we just patched */