diff --git a/Source/ZPM3/Build.cmd b/Source/ZPM3/Build.cmd
index 93ad5eb5..5430167b 100644
--- a/Source/ZPM3/Build.cmd
+++ b/Source/ZPM3/Build.cmd
@@ -43,6 +43,11 @@ copy genbnk.dat gencpm.dat
 zx gencpm -auto -display
 rem pause
 
+rem ZPM3 Tools
+zx Z80ASM -clrhist/F
+zx Z80ASM -setz3/F
+zx Z80ASM -autotog/F
+
 rem Loader
 
 tasm -t80 -g3 -fFF loader.asm loader.bin loader.lst
diff --git a/Source/ZPM3/Clean.cmd b/Source/ZPM3/Clean.cmd
index c2471144..3c953899 100644
--- a/Source/ZPM3/Clean.cmd
+++ b/Source/ZPM3/Clean.cmd
@@ -16,6 +16,9 @@ if exist zpmldr.com del zpmldr.com
 if exist cpmldr.com del cpmldr.com
 if exist startzpm.com del startzpm.com
 if exist gencpm.com del gencpm.com
+if exist clrhist.com del clrhist.com
+if exist setz3.com del setz3.com
+if exist autotog.com del autotog.com
 if exist *.dat del *.dat
 if exist biosldr?.rel del biosldr?.rel
 if exist *.bin del *.bin
diff --git a/Source/ZPM3/Makefile b/Source/ZPM3/Makefile
index db2c13dc..69d1458f 100644
--- a/Source/ZPM3/Makefile
+++ b/Source/ZPM3/Makefile
@@ -1,9 +1,6 @@
 OBJECTS = zpmldr.com zpmldr.sys cpm3.sys startzpm.com zccp.com
-#ifdef REBUILD_ZPM_TOOLS
+NODELETE = makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
 OBJECTS += setz3.com clrhist.com autotog.com
-#else
-NODELETE = setz3.com clrhist.com autotog.com makedos.com zinstal.zpm bnkbdos3.spr resbdos3.spr
-#endif
 OBJECTS += cpmldr.com cpmldr.sys zinstal.zpm makedos.com gencpm.dat bnkbios3.spr bnkbdos3.spr resbdos3.spr
 OTHERS = zpmldr.bin loader.bin biosldrd.rel biosldrc.rel util.rel gencpm.com
 DEST = ../../Binary/ZPM3/
@@ -53,7 +50,9 @@ startzpm.com: ../ZCCP/startzpm.com
 	cp $< $@
 
 cpmldr.com: ../CPM3/cpmldr.com
+	rm -f /tmp/casefn.cache
 	cp $< $@
 
 cpmldr.sys: ../CPM3/cpmldr.sys
+	rm -f /tmp/casefn.cache
 	cp $< $@
diff --git a/Source/ZPM3/autotog.com b/Source/ZPM3/autotog.com
deleted file mode 100644
index 3c7a5980..00000000
Binary files a/Source/ZPM3/autotog.com and /dev/null differ
diff --git a/Source/ZPM3/autotog.z80 b/Source/ZPM3/autotog.z80
index b59a6663..9862af58 100644
--- a/Source/ZPM3/autotog.z80
+++ b/Source/ZPM3/autotog.z80
@@ -45,13 +45,13 @@ ACPoff	equ	85h	; Offset in SCB base page of Auto Command Prompting bit
 HELPmsg:
 	db	' SYNTAX:'
 	db	10,13
-	db	'  AUTOTOG	Toggles the state of the Auto Command Prompting'
+	db	'  AUTOTOG      Toggles the state of the Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG ON	Enables Auto Command Prompting'
+	db	'  AUTOTOG ON   Enables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG OFF	Disables Auto Command Prompting'
+	db	'  AUTOTOG OFF  Disables Auto Command Prompting'
 	db	10,13
-	db	'  AUTOTOG //	Displays a brief help message'
+	db	'  AUTOTOG //   Displays a brief help message'
 	db	'$'
 ONmsg:
 	db	'ZPM3 Auto Command Prompting is now enabled. Toggle with ^Q.'
diff --git a/Source/ZPM3/clrhist.com b/Source/ZPM3/clrhist.com
deleted file mode 100644
index 02a39c83..00000000
Binary files a/Source/ZPM3/clrhist.com and /dev/null differ
diff --git a/Source/ZPM3/setz3.com b/Source/ZPM3/setz3.com
deleted file mode 100644
index 4ddb374f..00000000
Binary files a/Source/ZPM3/setz3.com and /dev/null differ
diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc
index f0018217..26cf36e2 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -66,6 +66,7 @@ CPM=$(TOOLS)/cpm/bin
 
 %.com: %.z80
 	$(ZXCC) $(CPM)/Z80ASM -$(basename $<)/F ; \
+	rm -f /tmp/casefn.cache ; \
 	mv $$($(CASEFN) $@) tmp.com ; mv tmp.com $@
 
 %.bin: %.asm