diff --git a/Apple2/AT28C64B.bin b/Apple2/AT28C64B.bin
index 395270e..00bf3da 100644
Binary files a/Apple2/AT28C64B.bin and b/Apple2/AT28C64B.bin differ
diff --git a/Apple2/CommandFirmware.lst b/Apple2/CommandFirmware.lst
index acc44a8..dcf61eb 100644
--- a/Apple2/CommandFirmware.lst
+++ b/Apple2/CommandFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : CommandFirmware.asm
 Current file: CommandFirmware.asm
 
diff --git a/Apple2/DriveFirmware.asm b/Apple2/DriveFirmware.asm
index 9e1bbe7..3032c88 100644
--- a/Apple2/DriveFirmware.asm
+++ b/Apple2/DriveFirmware.asm
@@ -195,6 +195,6 @@ end:
 .endrepeat
 
 .byte      0,0     ;0000 blocks = check status
-.byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
+.byte      23       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
 .byte     DriverEntry&$00FF ;low byte of entry
 
diff --git a/Apple2/DriveFirmware.lst b/Apple2/DriveFirmware.lst
index 580ed1a..6991f1f 100644
--- a/Apple2/DriveFirmware.lst
+++ b/Apple2/DriveFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : DriveFirmware.asm
 Current file: DriveFirmware.asm
 
@@ -199,7 +199,7 @@ Current file: DriveFirmware.asm
 00C7FC  1               .endrepeat
 00C7FC  1               
 00C7FC  1  00 00        .byte      0,0     ;0000 blocks = check status
-00C7FE  1  07           .byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
+00C7FE  1  17           .byte      23       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
 00C7FF  1  14           .byte     DriverEntry&$00FF ;low byte of entry
 00C800  1               
 00C800  1               
diff --git a/Apple2/FileAccessFirmware.lst b/Apple2/FileAccessFirmware.lst
index 454a42b..9b31632 100644
--- a/Apple2/FileAccessFirmware.lst
+++ b/Apple2/FileAccessFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : FileAccessFirmware.asm
 Current file: FileAccessFirmware.asm
 
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index a14f558..db8acab 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -1,4 +1,4 @@
-ca65 V2.18 - N/A
+ca65 V2.17 - Raspbian 2.17-1
 Main file   : MenuFirmware.asm
 Current file: MenuFirmware.asm
 
diff --git a/RaspberryPi/Apple2-IO-RPi.hdv b/RaspberryPi/Apple2-IO-RPi.hdv
index 8bf17c3..8cbca78 100755
Binary files a/RaspberryPi/Apple2-IO-RPi.hdv and b/RaspberryPi/Apple2-IO-RPi.hdv differ
diff --git a/RaspberryPi/apple2driver/handlers/readBlock.go b/RaspberryPi/apple2driver/handlers/readBlock.go
index 8d0fa80..c6399a2 100644
--- a/RaspberryPi/apple2driver/handlers/readBlock.go
+++ b/RaspberryPi/apple2driver/handlers/readBlock.go
@@ -17,6 +17,7 @@ func ReadBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	if !oldFirmware {
 		driveUnit, err = a2io.ReadByte()
+		fmt.Printf("Drive unit: %0X\n", driveUnit)
 
 		if err != nil {
 			fmt.Printf("Drive unit not sent, assuming older firmware")
@@ -26,7 +27,7 @@ func ReadBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	file := drive1
 
-	if driveUnit >= 8 {
+	if driveUnit >= 128 {
 		file = drive2
 	}
 
diff --git a/RaspberryPi/apple2driver/handlers/writeBlock.go b/RaspberryPi/apple2driver/handlers/writeBlock.go
index 175bb2a..c5b60ba 100644
--- a/RaspberryPi/apple2driver/handlers/writeBlock.go
+++ b/RaspberryPi/apple2driver/handlers/writeBlock.go
@@ -24,7 +24,7 @@ func WriteBlockCommand(drive1 *os.File, drive2 *os.File) {
 
 	file := drive1
 
-	if driveUnit >= 8 {
+	if driveUnit >= 128 {
 		file = drive2
 	}