diff --git a/kernel/fs_cmds.asm b/kernel/fs_cmds.asm
index 4b2dc7a..e9c8b61 100644
--- a/kernel/fs_cmds.asm
+++ b/kernel/fs_cmds.asm
@@ -76,7 +76,7 @@ fopnCmd:
 	jr	nz, .notfound
 	; Found!
 	; FS_PTR points to the file we want to open
-	ex	hl, de		; HL now points to the file handle.
+	ex	de, hl		; HL now points to the file handle.
 	call	fsOpen
 	jr	.end
 .notfound:
diff --git a/tools/emul/Makefile b/tools/emul/Makefile
index f92ed2a..9ba7e2c 100644
--- a/tools/emul/Makefile
+++ b/tools/emul/Makefile
@@ -7,8 +7,8 @@ ZASMBIN = zasm/zasm
 .PHONY: all
 all: $(TARGETS)
 
-shell/kernel.h: shell/shell_.asm
-	scas -o - -I $(KERNEL) $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
+shell/kernel.h: shell/shell_.asm $(ZASMBIN)
+	$(ZASMBIN) < $< | ./bin2c.sh KERNEL | tee $@ > /dev/null
 
 zasm/kernel.h: zasm/kernel.bin
 	./bin2c.sh KERNEL < $< | tee $@ > /dev/null
diff --git a/tools/emul/shell/shell_.asm b/tools/emul/shell/shell_.asm
index 4d8fc58..6afded7 100644
--- a/tools/emul/shell/shell_.asm
+++ b/tools/emul/shell/shell_.asm
@@ -1,18 +1,18 @@
 ; named shell_.asm to avoid infinite include loop.
-RAMSTART	.equ	0x4000
-RAMEND		.equ	0x5000
-STDIO_PORT	.equ	0x00
-FS_DATA_PORT	.equ	0x01
-FS_SEEKL_PORT	.equ	0x02
-FS_SEEKH_PORT	.equ	0x03
+.equ	RAMSTART	0x4000
+.equ	RAMEND		0x5000
+.equ	STDIO_PORT	0x00
+.equ	FS_DATA_PORT	0x01
+.equ	FS_SEEKL_PORT	0x02
+.equ	FS_SEEKH_PORT	0x03
 
-jp	init
+	jp	init
 
 #include "core.asm"
 #include "parse.asm"
 
-BLOCKDEV_RAMSTART	.equ	RAMSTART
-BLOCKDEV_COUNT		.equ	4
+.equ	BLOCKDEV_RAMSTART	RAMSTART
+.equ	BLOCKDEV_COUNT		4
 #include "blockdev.asm"
 ; List of devices
 .dw	emulGetC, emulPutC, 0, 0
@@ -22,7 +22,7 @@ BLOCKDEV_COUNT		.equ	4
 
 #include "blockdev_cmds.asm"
 
-STDIO_RAMSTART	.equ	BLOCKDEV_RAMEND
+.equ	STDIO_RAMSTART	BLOCKDEV_RAMEND
 #include "stdio.asm"
 
 .equ	FS_RAMSTART	STDIO_RAMEND
@@ -30,8 +30,8 @@ STDIO_RAMSTART	.equ	BLOCKDEV_RAMEND
 #include "fs.asm"
 #include "fs_cmds.asm"
 
-SHELL_RAMSTART	.equ	FS_RAMEND
-SHELL_EXTRA_CMD_COUNT .equ 7
+.equ	SHELL_RAMSTART		FS_RAMEND
+.equ	SHELL_EXTRA_CMD_COUNT	7
 #include "shell.asm"
 .dw	blkBselCmd, blkSeekCmd, fsOnCmd, flsCmd, fnewCmd, fdelCmd, fopnCmd