diff --git a/games/mist/graphics_title/Makefile b/games/mist/graphics_title/Makefile
index 747ea160..8838013c 100644
--- a/games/mist/graphics_title/Makefile
+++ b/games/mist/graphics_title/Makefile
@@ -1,7 +1,7 @@
 #include ../Makefile.inc
 
-B2D = ../../bmp2dhr/b2d
-PNG2GR = ../../gr-utils/png2gr
+B2D = ../../../utils/bmp2dhr/b2d
+PNG2GR = ../../../utils/gr-utils/png2gr
 LZSA = ~/research/lzsa/lzsa/lzsa
 
 
diff --git a/games/space_bars/Makefile b/games/space_bars/Makefile
index d4a58c59..0f089577 100644
--- a/games/space_bars/Makefile
+++ b/games/space_bars/Makefile
@@ -29,7 +29,7 @@ space_bars.o:	space_bars.s instructions.s \
 ####
 
 HELLO:	hello.bas
-	../asoft_basic-utils/tokenize_asoft < hello.bas > HELLO
+	$(TOKENIZE) < hello.bas > HELLO
 
 ####
 
diff --git a/games/tfv/graphics_map/Makefile b/games/tfv/graphics_map/Makefile
index 4d24e887..820a9435 100644
--- a/games/tfv/graphics_map/Makefile
+++ b/games/tfv/graphics_map/Makefile
@@ -1,7 +1,7 @@
-include ../../Makefile.inc
+include ../../../Makefile.inc
 
-PNG2RLE = ../../gr-utils/png2rle
-PNG2GR = ../../gr-utils/png2gr
+PNG2RLE = ../../../utils/gr-utils/png2rle
+PNG2GR = ../../../utils/gr-utils/png2gr
 LZSA = ~/research/lzsa/lzsa/lzsa
 
 tfv_backgrounds.inc:	\
diff --git a/games/tfv/graphics_title/Makefile b/games/tfv/graphics_title/Makefile
index 6a640e3d..be6de016 100644
--- a/games/tfv/graphics_title/Makefile
+++ b/games/tfv/graphics_title/Makefile
@@ -1,7 +1,7 @@
-include ../../Makefile.inc
+include ../../../Makefile.inc
 
-PNG2RLE = ../../gr-utils/png2rle
-PNG2GR = ../../gr-utils/png2gr
+PNG2RLE = ../../../utils/gr-utils/png2rle
+PNG2GR = ../../../utils/gr-utils/png2gr
 LZSA = ~/research/lzsa/lzsa/lzsa
 
 tfv_title.inc:	\
diff --git a/games/tfv/keyboard.s b/games/tfv/keyboard.s
index 327ea221..6cf34cd6 100644
--- a/games/tfv/keyboard.s
+++ b/games/tfv/keyboard.s
@@ -39,7 +39,7 @@ check_button0:
 
 button0_clear:
 	lda     JS_BUTTON_STATE
-	and	#(~JS_BUTTON0)
+	and	#<(~JS_BUTTON0)	; hack
 	sta	JS_BUTTON_STATE
 	jmp	js_check
 
@@ -59,7 +59,7 @@ check_button1:
 
 button1_clear:
 	lda     JS_BUTTON_STATE
-	and	#(~JS_BUTTON1)
+	and	#<(~JS_BUTTON1)
 	sta	JS_BUTTON_STATE
 ;	jmp	js_check