diff --git a/SYS/KERNEL.S.FS.txt b/SYS/KERNEL.S.FS.txt
index fefa0e65..c7e59c65 100644
--- a/SYS/KERNEL.S.FS.txt
+++ b/SYS/KERNEL.S.FS.txt
@@ -191,7 +191,13 @@ S.ListDirInitA	sta R.AL
 				tya
 				sta (R.BX)				remove pattern from path
 				
-.4				>PUSHWI S.LISTDIR.SIZE	get LISTDIR Struct
+.4				>LDYA R.BX
+				jsr S.NewPStrYA
+				bcs .99
+				ldy #S.LISTDIR.hPATH
+				sta (R.CX),y
+				
+				>PUSHWI S.LISTDIR.SIZE	get LISTDIR Struct
 				>PUSHBI S.MEM.F.INIT0	reset all bytes
 				jsr S.GetMem
 				bcs .99
@@ -296,11 +302,14 @@ S.ListDirInitAD
 
 				ldy #$25				get File_count LO
 				lda (ZPQuickPtr1),y
+				clc
+				adc #1					Add 1 for VOL/DIR Header
 				ldy #S.LISTDIR.FC
 				sta (R.CX),y
 
 				ldy #$26				get File_count HI
 				lda (ZPQuickPtr1),y
+				adc #0
 				ldy #S.LISTDIR.FC+1
 				sta (R.CX),y
 
@@ -535,7 +544,12 @@ S.ListDirCloseA	pha
 				beq .5
 				jsr S.FreeMemA
 				
-.5				pla
+.5				ldy #S.LISTDIR.hPATH
+				lda (ZPQuickPtr1),y
+				beq .6
+				jsr S.FreeMemA
+				
+.6				pla
 				jsr S.FreeMemA
 				clc
 				rts