diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 83a31aaf..491b6f34 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/BIN/IRC.S.txt b/BIN/IRC.S.txt
index 679406ed..75894ab9 100644
--- a/BIN/IRC.S.txt
+++ b/BIN/IRC.S.txt
@@ -273,17 +273,9 @@ CS.RUN.LOOP		>SLEEP
 				tay
 				bne .2
 
-				lda #"I"
-				sta $427
-				>PUSHWI MSGSIZE
-				>PUSHW ZPMsgPtr
-				lda hFile
-				>SYSCALL fgets
+				jsr CS.RUN.GetMsg
 				bcs .9
 
-				lda #"O"
-				sta $427
-
 				jsr CS.RUN.REQ
 				bcs .9
 				
@@ -458,13 +450,10 @@ CS.RUN.NICK		>LDYA L.MSG.NICK
 
 .1				>SLEEP
 
-				>PUSHWI MSGSIZE
-				>PUSHW ZPMsgPtr
-				lda hFile
-				>SYSCALL fgets
+				jsr CS.RUN.GetMsg
 				bcs .9
 
-				jsr CS.RUN.SPLITMSG
+				jsr CS.RUN.SplitMsg
 				jsr CS.RUN.DUMPMSG
 
 				ldy #$ff
@@ -500,13 +489,10 @@ CS.RUN.USER		>LDYA L.MSG.USER
 
 .1				>SLEEP
 
-				>PUSHWI MSGSIZE
-				>PUSHW ZPMsgPtr
-				lda hFile
-				>SYSCALL fgets
+				jsr CS.RUN.GetMsg
 				bcs .9
 
-.2				jsr CS.RUN.SPLITMSG
+.2				jsr CS.RUN.SplitMsg
 				jsr CS.RUN.DUMPMSG
 
 				ldy #$ff
@@ -554,7 +540,7 @@ CS.RUN.JOIN		>LDYA L.MSG.JOIN
 .2				>SYSCALL FPrintF
 .9				rts
 *--------------------------------------
-CS.RUN.REQ		jsr CS.RUN.SPLITMSG
+CS.RUN.REQ		jsr CS.RUN.SplitMsg
 				bcs .8
 				
 *		jsr CS.RUN.DUMPMSG
@@ -650,7 +636,13 @@ CS.RUN.CMD.376
 				>SYSCALL PrintF
 				rts
 *--------------------------------------
-CS.RUN.SPLITMSG	>LDYA pData
+CS.RUN.GetMsg	>PUSHWI MSGSIZE
+				>PUSHW ZPMsgPtr
+				lda hFile
+				>SYSCALL fgets
+				rts
+*--------------------------------------
+CS.RUN.SplitMsg	>LDYA pData
 				>STYA ZPMsgPfxPtr
 				>STYA ZPMsgCmdPtr
 				>STYA ZPMsgArgPtr
diff --git a/SYS/KERNEL.S.STDIO.txt b/SYS/KERNEL.S.STDIO.txt
index 9594fc23..d837d580 100644
--- a/SYS/KERNEL.S.STDIO.txt
+++ b/SYS/KERNEL.S.STDIO.txt
@@ -214,8 +214,8 @@ K.FGetS			jsr PFT.CheckNodeA
 				rts
 
 .2				lda K.IOBuf
-				cmp #C.LF				Discard any leading LF
-				beq .1
+				cmp #C.LF				Discard any leading LF from a previous CR/LF
+				beq .8					returns as empty string
 
 				cmp #C.CR
 				beq .8					empty string