diff --git a/Source/HBIOS/hbios.asm b/Source/HBIOS/hbios.asm
index bd82c8e3..ec572f60 100644
--- a/Source/HBIOS/hbios.asm
+++ b/Source/HBIOS/hbios.asm
@@ -2149,32 +2149,32 @@ CB_IDS:	LD	(HL),A				; POPULATE CB_BIDCOM
 ; DISABLED AT THIS POINT.
 ;
 #IF (CPUFAM != CPU_EZ80)
-#IF ((INTMODE == 2) | ((INTMODE == 1) & (CPUFAM == CPU_Z180)))
+  #IF ((INTMODE == 2) | ((INTMODE == 1) & (CPUFAM == CPU_Z180)))
 	; SETUP Z80 IVT AND INT MODE 2
 	LD	A,HBX_IVT >> 8		; SETUP HI BYTE OF IVT ADDRESS
 	LD	I,A			; ... AND PLACE IT IN I REGISTER
 
-  #IF (CPUFAM == CPU_Z180)
+    #IF (CPUFAM == CPU_Z180)
 	; SETUP Z180 IVT
 	XOR	A			; SETUP LO BYTE OF IVT ADDRESS
 	OUT0	(Z180_IL),A		; ... AND PLACE IN Z180 IL REGISTER
-  #ENDIF
+    #ENDIF
 
-  #IF (INTMODE == 2)
+    #IF (INTMODE == 2)
 	IM	2			; SWITCH TO INT MODE 2
+    #ENDIF
   #ENDIF
-#ENDIF
 ;
-#IF (MEMMGR == MM_Z280)
+  #IF (MEMMGR == MM_Z280)
 	; NOW POINT TO RAM COPY OF Z280 INT/TRAP TABLE
 	; HL IS TOP 16 BITS OF PHYSICAL ADDRESS OF IVT
 	; IVT *MUST* BE ON A 4K BOUNDARY
 	LD	C,Z280_VPR
 	LD	HL,0 + (((PBANK(BID_BIOS) << 15) + Z280_IVT) >> 8)
 	LDCTL	(C),HL
-#ENDIF
+  #ENDIF
 ;
-#IF (INTMODE == 3)
+  #IF (INTMODE == 3)
 ;
 	; SETUP Z280 INT A FOR VECTORED INTERRUPTS
 	LD	HL,%0010000000000000
@@ -2184,7 +2184,7 @@ CB_IDS:	LD	(HL),A				; POPULATE CB_BIDCOM
 	; TRANSITION TO INTERRUPT MODE 3
 	IM	3
 ;
-#ENDIF
+  #ENDIF
 #ENDIF
 ;
 ;--------------------------------------------------------------------------------------------------
@@ -8396,7 +8396,7 @@ FNT_SELECT1:
 	CALL	DLZSA2			; DECOMPRESS
 	LD	A,BID_BIOS		; BANK OF DECOMP BUF
 	LD	(FNT_BID),A		; UPDATE FNT_BID
-	LD	HL,$E000		; DEOMP BUF ADR TO HL
+	LD	HL,$E000		; DECOMP BUF ADR TO HL
   #ELSE
 	LD	DE,$E000		; DECOMP BUF ADR TO DE
 	CALL	DLZSA2			; DECOMPRESS
@@ -8442,8 +8442,9 @@ FNT_NEXT:
 ;
 FNT_BYTE:
 #IF (MEMMGR == MM_Z280)
-	; HBX_PEEK FOR Z280 DOES NOT WORK WHEN INVOKED WHILE IN
-	; SYSTEM MODE.  THIS SHOULD BE REVISITED.
+	; THERE IS A DEFICIENCY IN HBX_PEEK FOR Z280 W/ MM_Z280.
+	; IT WILL NOT WORK WHEN CALLED FROM Z280 SYSTEM MODE.
+	; THIS SHOULD BE REVISITED.
 	;
 	; NOTE: WHEN WE GO TO RESTORE THE USER SPACE BANK, WE DON'T
 	; REALLY HAVE A GOOD SOURCE OF WHAT BANK ID TO RESTORE IT TO.
@@ -8475,9 +8476,7 @@ FNT_BYTE:
 	PUSH	DE
 	LD	A,(FNT_BID)
 	LD	D,A
-	HB_DI
-	CALL	HBX_PEEK
-	HB_EI
+	CALL	SYS_PEEK
 	LD	A,E
 	POP	DE
 	RET
diff --git a/Source/ver.inc b/Source/ver.inc
index 5f0965a5..2be79253 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,7 +2,7 @@
 #DEFINE	RMN	6
 #DEFINE	RUP	0
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.6.0-dev.8"
+#DEFINE BIOSVER	"3.6.0-dev.9"
 #define rmj	RMJ
 #define rmn	RMN
 #define rup	RUP
diff --git a/Source/ver.lib b/Source/ver.lib
index 01b5171a..0aa4be7f 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	6
 rup	equ	0
 rtp	equ	0
 biosver	macro
-	db	"3.6.0-dev.8"
+	db	"3.6.0-dev.9"
 	endm