diff --git a/Source/Apps/Tune/Tune.asm b/Source/Apps/Tune/Tune.asm
index f669387b..aa28cb95 100644
--- a/Source/Apps/Tune/Tune.asm
+++ b/Source/Apps/Tune/Tune.asm
@@ -68,11 +68,9 @@ _WBW		.EQU    0
 HBIOS		.EQU    0
 #IFDEF ZX
 _ZX		.SET	1
-FAIL
 #ELSE
 #IFDEF MSX
 _MSX		.SET	1
-FAIL
 #ELSE
 _WBW		.SET	1
 
diff --git a/Source/HBIOS/cvdu.asm b/Source/HBIOS/cvdu.asm
index 4b51dfa2..1ceb847d 100644
--- a/Source/HBIOS/cvdu.asm
+++ b/Source/HBIOS/cvdu.asm
@@ -96,7 +96,7 @@ CVDU_FNTBL:
 	.DW	KBD_READ
 #IF (($ - CVDU_FNTBL) != (VDA_FNCNT * 2))
 	.ECHO	"*** INVALID CVDU FUNCTION TABLE ***\n"
-	FAIL
+	!!!!!
 #ENDIF
 
 CVDU_VDAINI:
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index 1120cebe..865e2005 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -1255,9 +1255,6 @@ HB_CPU2:
 ;
 #ENDIF
 ;
-#IF (TMSENABLE)
-	CALL	TMS_PREINIT
-#ENDIF
 ;
 ; INITIALIZE HEAP STORAGE
 ;
@@ -1658,6 +1655,9 @@ HB_PCINITTBL:
 #IF (UFENABLE)
 	.DW	UF_PREINIT
 #ENDIF
+#IF (TMSENABLE)
+	.DW	TMS_PREINIT
+#ENDIF
 HB_PCINITTBLLEN	.EQU	(($ - HB_PCINITTBL) / 2)
 
 ;==================================================================================================
diff --git a/Source/HBIOS/sn76489.asm b/Source/HBIOS/sn76489.asm
index 18f7f649..3c12acb6 100644
--- a/Source/HBIOS/sn76489.asm
+++ b/Source/HBIOS/sn76489.asm
@@ -304,7 +304,7 @@ SN7_FNTBL:
 
 #IF (($ - SN7_FNTBL) != (SND_FNCNT * 2))
 	.ECHO	"*** INVALID SND FUNCTION TABLE ***\n"
-	FAIL
+	!!!!!
 #ENDIF
 
 PENDING_PITCH
diff --git a/Source/HBIOS/tms.asm b/Source/HBIOS/tms.asm
index 14c50b3d..fb594f93 100644
--- a/Source/HBIOS/tms.asm
+++ b/Source/HBIOS/tms.asm
@@ -81,11 +81,12 @@ TERMENABLE	.SET	TRUE		; INCLUDE TERMINAL PSEUDODEVICE DRIVER
 ;======================================================================
 ;
 TMS_PREINIT:
-#IF (TMSTIMENABLE)
-	CALL	TMS_INT_DIS	; SPECIAL CASE - NEED TO STOP TMS9918 FROM FIRING INTERRUPTS
-#ENDIF				; WHEN DRIVER IS LOADED - IT WILL BE RELOADED
-
-	RET
+	; DISABLE INTERRUPT GENERATION
+	LD	A, (TMS_INIT9918_REG_1)
+        RES	TMSINTEN, A             ; RESET INTERRUPT ENABLE BIT
+	LD	(TMS_INIT9918_REG_1), A
+        LD	C, TMSCTRL1
+	JP	TMS_SET
 ;
 TMS_INIT:
 #IF (CPUFAM == CPU_Z180)
@@ -144,21 +145,10 @@ TMS_INIT1:
 	XOR	A			; SIGNAL SUCCESS
 	RET
 
-#IFDEF APPBOOT
 #IF TMSTIMENABLE
-	; SPECIAL CASE FOR APPBOOT - NEEDING TO DISABLE INTERRUPT GENERATOR
-	; ISSUE:
-	;  IF THE CURRENT ROMBOOT HAD LOADED THE TMS DRIVER
-	;  THEN THE ROMLOADER MAY START RECEIVING INTERRUPTS
-	;  FROM THE CHIP BEFORE THE TMS DRIVER HAS BEEN RE-
-	;  INITALISED, AND CAUSING BAD INT PANICS
+	; DISABLE INTERRUPT
 TMS_INT_DIS:
-	LD	A, (TMS_INIT9918_REG_1)
-        RES	TMSINTEN, A             ; RESET INTERRUPT ENABLE BIT
-	LD	(TMS_INIT9918_REG_1), A
-        LD	C, TMSCTRL1
-	JP	TMS_SET
-#ENDIF
+
 #ENDIF
 ;
 ;======================================================================
@@ -189,7 +179,7 @@ TMS_FNTBL:
 #ENDIF
 #IF (($ - TMS_FNTBL) != (VDA_FNCNT * 2))
 	.ECHO	"*** INVALID TMS FUNCTION TABLE ***\n"
-	FAIL
+	!!!!!
 #ENDIF
 
 TMS_VDAINI:
diff --git a/Source/HBIOS/vdu.asm b/Source/HBIOS/vdu.asm
index 1c2a2ca1..2c057ca2 100644
--- a/Source/HBIOS/vdu.asm
+++ b/Source/HBIOS/vdu.asm
@@ -150,7 +150,7 @@ VDU_FNTBL:
 	.DW	PPK_READ
 #IF (($ - VDU_FNTBL) != (VDA_FNCNT * 2))
 	.ECHO	"*** INVALID VDU FUNCTION TABLE ***\n"
-	FAIL
+	!!!!!
 #ENDIF
 
 VDU_VDAINI:
diff --git a/Source/HBIOS/vga.asm b/Source/HBIOS/vga.asm
index dde15dae..30bb2b4e 100644
--- a/Source/HBIOS/vga.asm
+++ b/Source/HBIOS/vga.asm
@@ -163,7 +163,7 @@ VGA_FNTBL:
 	.DW	KBD_READ
 #IF (($ - VGA_FNTBL) != (VDA_FNCNT * 2))
 	.ECHO	"*** INVALID VGA FUNCTION TABLE ***\n"
-	FAIL
+	!!!!!
 #ENDIF
 
 VGA_VDAINI: