diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index 62605f08..f2e549a7 100644
Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ
diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt
index d43852e1..2d1a93b5 100644
--- a/SYS/KERNEL.S.INIT.txt
+++ b/SYS/KERNEL.S.INIT.txt
@@ -667,7 +667,7 @@ DevMgrInit		>LDYAI MSG.DEV
 				lda #A2osX.S.SP
 				bra .7
 	
-.53				jsr DevMgrInit.BLK				Remapped BLK devices....
+.53				jsr DevMgrInit.REMAP			Remapped BLK devices....
 				bra .8							don't mark slot as busy
 	
 .6				jsr DevMgrInit.BLK
@@ -692,15 +692,13 @@ DevMgrInit.DII	ldx #2
 				bra DevMgrInit.AddBDev
 *--------------------------------------
 DevMgrInit.USR	ldx #4
-				>LDYAI DRV.BlkDevice
-				bra DevMgrInit.AddBDev			
+				.HS 2C					BIT ABS
 *--------------------------------------
-DevMgrInit.BLK	
-*				ldy #$ff
-*				lda (ZPPtr1),y
-*				sta FD.BDEV+S.FD.DEV.BUSPTR
-
-				ldx #6
+DevMgrInit.BLK	ldx #6
+				.HS 2C					BIT ABS
+*--------------------------------------
+DevMgrInit.REMAP
+				ldx #8
 				>LDYAI DRV.BlkDevice
 				bra DevMgrInit.AddBDev
 *--------------------------------------
@@ -709,7 +707,7 @@ DevMgrInit.SP	ldy #$ff
 				clc
 				adc #3					Compute smartport entry point
 				sta FD.BDEV+S.FD.DEV.BUSPTR
-				ldx #8
+				ldx #10
 				>LDYAI DRV.SmartPort
 *--------------------------------------
 DevMgrInit.AddBDev
@@ -1098,11 +1096,13 @@ MSG.BLKDEV.TBL	.DA MSG.BLKDEV.RAM
 				.DA MSG.BLKDEV.DII
 				.DA MSG.BLKDEV.USR
 				.DA MSG.BLKDEV.BLK
+				.DA MSG.BLKDEV.REMAP
 				.DA MSG.BLKDEV.SP
 MSG.BLKDEV.RAM	.AZ "/RAM Disk"
 MSG.BLKDEV.DII	.AZ "Disk ]["
 MSG.BLKDEV.USR	.AZ "User"
-MSG.BLKDEV.BLK	.AZ "Generic Block"
+MSG.BLKDEV.BLK		.AZ "Generic Block"
+MSG.BLKDEV.REMAP	.AZ "Remapped SP/BLK"
 MSG.BLKDEV.SP	.AZ "Smartport"
 MSG.IRQ			.AZ "Interrupt Manager..."
 MSG.IRQ.IIGS	.AZ "  Apple IIgs VBL IRQ Activated."