diff --git a/Source/Forth/Build.cmd b/Source/Forth/Build.cmd
index 08fb735b..026b4ba5 100644
--- a/Source/Forth/Build.cmd
+++ b/Source/Forth/Build.cmd
@@ -11,7 +11,7 @@ set ZXBINDIR=%TOOLS%/cpm/bin/
 set ZXLIBDIR=%TOOLS%/cpm/lib/
 set ZXINCDIR=%TOOLS%/cpm/include/
 
-zx zsm =camel80.azm
+zx zsm =camel80.azm -/l
 zx link -CAMEL80.BIN=CAMEL80
 
 
diff --git a/Source/HBIOS/uart.asm b/Source/HBIOS/uart.asm
index b4c43101..af00cebe 100644
--- a/Source/HBIOS/uart.asm
+++ b/Source/HBIOS/uart.asm
@@ -646,15 +646,15 @@ UART_CFG:
 	; UARTRC SERIAL PORT A
 	.DB	0				; DEVICE NUMBER (UPDATED DURING INIT)
 	.DB	0				; UART TYPE
-	.DB	$A8				; IO PORT BASE (RBR, THR)
-	.DB	$A8 + UART_LSR			; LINE STATUS PORT (LSR)
+	.DB	$A0				; IO PORT BASE (RBR, THR)
+	.DB	$A0 + UART_LSR			; LINE STATUS PORT (LSR)
 	.DW	UARTCFG				; LINE CONFIGURATION
 	.FILL	2,$FF				; FILLER
 	; UARTRC SERIAL PORT B
 	.DB	0				; DEVICE NUMBER (UPDATED DURING INIT)
 	.DB	0				; UART TYPE
-	.DB	$A0				; IO PORT BASE (RBR, THR)
-	.DB	$A0 + UART_LSR			; LINE STATUS PORT (LSR)
+	.DB	$A8				; IO PORT BASE (RBR, THR)
+	.DB	$A8 + UART_LSR			; LINE STATUS PORT (LSR)
 	.DW	UARTCFG				; LINE CONFIGURATION
 	.FILL	2,$FF				; FILLER
 #ENDIF
diff --git a/Tools/Makefile.inc b/Tools/Makefile.inc
index d410246d..f0018217 100644
--- a/Tools/Makefile.inc
+++ b/Tools/Makefile.inc
@@ -81,7 +81,7 @@ CPM=$(TOOLS)/cpm/bin
 	$(ZXCC) $(CPM)/SLR180 -$(basename $<)/HF
 
 %.rel: %.azm
-	$(ZXCC) $(CPM)/ZSM =$<
+	$(ZXCC) $(CPM)/ZSM =$< -/L
 
 %.bin: %.rel
 	$(ZXCC) $(CPM)/LINK -$@=$<