diff --git a/Source/HBIOS/ez80uart.asm b/Source/HBIOS/ez80uart.asm
index 9f9e8465..c91873aa 100644
--- a/Source/HBIOS/ez80uart.asm
+++ b/Source/HBIOS/ez80uart.asm
@@ -156,7 +156,7 @@ NOT_RESET:
 	;; convert E:HL{15:0} to HL{23:0}
 	LD	A, 0
 	LD	B, 1			; UTIL - LD HL, E:HL
-	EZ80_FN				;
+	EZ80_FN
 
 	POP	DE			; RESTORE REQUESTED LINE CHARACTERISTICS
 	LD	A, E
diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index bacf8616..3d19bfa1 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -5049,7 +5049,7 @@ SYS_GETFN:
 SYS_GETTIMER:
 #IF (CPUFAM == CPU_EZ80)
 	LD	A, 2
-	LD	B, 0	; GET TIMER TICK
+	LD	B, 0			; GET TIMER TICK
 	EZ80_FN
 	RET
 
@@ -5072,7 +5072,7 @@ SYS_GETTIMER:
 SYS_GETSECS:
 #IF (CPUFAM == CPU_EZ80)
 	LD	A, 2
-	LD	B, 1	; GET SECOND TICK
+	LD	B, 1			; GET SECOND TICK
 	EZ80_FN
 	RET
 
@@ -5082,7 +5082,7 @@ SYS_GETSECS:
 	CALL	LD32
 	LD	A,(HB_SECTCK)
 	HB_EI
-	NEG			; CONVERT DOWNCOUNTER TO UPCOUNTER
+	NEG				; CONVERT DOWNCOUNTER TO UPCOUNTER
 	ADD	A,TICKFREQ
 	LD	C,A
 	XOR	A
@@ -5296,8 +5296,13 @@ SYS_SETBOOTINFO:
 ;
 SYS_SETTIMER:
 #IF (CPUFAM == CPU_EZ80)
-	LD	A, 2
-	LD	B, 2	; SET TICKS
+	;; convert E:HL{15:0} to HL{23:0}
+	LD	A, 0
+	LD	B, 1			; UTIL - LD HL, E:HL
+	EZ80_FN
+
+	LD	A, 2		
+	LD	B, 2			; SET TICKS
 	EZ80_FN
 	RET
 #ELSE
@@ -5315,8 +5320,12 @@ SYS_SETTIMER:
 ;
 SYS_SETSECS:
 #IF (CPUFAM == CPU_EZ80)
+	LD	A, 0
+	LD	B, 1			; UTIL - LD HL, E:HL
+	EZ80_FN
+
 	LD	A, 2
-	LD	B, 3	; SET SECS
+	LD	B, 3			; SET SECS
 	EZ80_FN
 	RET
 #ELSE