diff --git a/build/Davex-default.properties b/build/Davex-default.properties
index f4ff0f0..1cd8187 100644
--- a/build/Davex-default.properties
+++ b/build/Davex-default.properties
@@ -6,5 +6,4 @@
 # support files for local builds.
 #
 # assemblerPath defines the place where the ca65 executable lives.
-# You need to have ca65 at version V2.13.9 or higher.
-assemblerPath=c:/dev/cc65/2.13.3/bin
\ No newline at end of file
+assemblerPath=c:/dev/cc65/2.18/bin
\ No newline at end of file
diff --git a/build/lib/DavexProDOSBase.dsk b/build/lib/DavexProDOSBase.dsk
index 5cb6bab..17d70fd 100644
Binary files a/build/lib/DavexProDOSBase.dsk and b/build/lib/DavexProDOSBase.dsk differ
diff --git a/build/lib/DavexProDOSBase.po b/build/lib/DavexProDOSBase.po
index dfa92a8..1cd73b8 100644
Binary files a/build/lib/DavexProDOSBase.po and b/build/lib/DavexProDOSBase.po differ
diff --git a/src/common/2/PrivateGlobals2.asm b/src/common/2/PrivateGlobals2.asm
index 987a8e5..43e5ea4 100644
--- a/src/common/2/PrivateGlobals2.asm
+++ b/src/common/2/PrivateGlobals2.asm
@@ -1,6 +1,7 @@
 .include "Common/PrivateGlobals.asm"
 
-more_space	= ASMEND	; [TODO] Does this need to be page-aligned?
+; more_space	= ASMEND	; [TODO] Does this need to be page-aligned?
+more_space = ((ASMEND-1) & $ff00)+$100 ; It does or spooling and redirection fail. (@mgcaret)
 
 buff_spool	= more_space
 buff_oredir	= buff_spool+$400
diff --git a/src/common/PrivateGlobals.asm b/src/common/PrivateGlobals.asm
index 92b174a..622f20e 100644
--- a/src/common/PrivateGlobals.asm
+++ b/src/common/PrivateGlobals.asm
@@ -2,8 +2,8 @@
 ; private globals
 ;
 myBakVer	= $00
-myversion	= $14
-AuxVersion	= 1	; = 1.41
+myversion	= $13
+AuxVersion	= 1	; = 1.31
 Proto		= 1
 
 RemoteImp	= 0
diff --git a/src/shell/2/file_execution2.asm b/src/shell/2/file_execution2.asm
index 1536d9a..b6894fe 100644
--- a/src/shell/2/file_execution2.asm
+++ b/src/shell/2/file_execution2.asm
@@ -362,9 +362,9 @@ qtprobx:
 	jmp rtn_again-myqcode+$1000
 
 qtprobmsg:
-	asc "Unable to return to Davex"
+	asc_hi "Unable to return to Davex"
 	.byte cr,cr
-	cstr "Hit a key to try again..."
+	asc_hi "Hit a key to try again..."
 	.byte 0
 
 qtone	= *-myqcode+$1000
diff --git a/src/shell/main.asm b/src/shell/main.asm
index 33518c0..489fa79 100644
--- a/src/shell/main.asm
+++ b/src/shell/main.asm
@@ -1904,6 +1904,7 @@ go_quit:
 ; quitting to S16?
 	bit s16_flag
 	bmi quit_s16
+	jsr get_quitcode
 .endif
 
 os_quit:
@@ -8517,7 +8518,7 @@ byte:	.res 1
 ; View a file
 ;
 IndexName:
-	pstr "indexed.help"
+	pstr "INDEXED.HELP"
 
 vf_fail:
 	jmp ProDOS_err
diff --git a/src/xtn/2/alias.asm b/src/xtn/2/alias.asm
index ccb3d8c..95e2cc8 100644
--- a/src/xtn/2/alias.asm
+++ b/src/xtn/2/alias.asm
@@ -288,7 +288,7 @@ CloseA:	.byte 1
 aRef3:	.byte 0
 
 AliasName:
-	asc_hi "Aliases"
+	pstr "ALIASES"
 
 strip7:	lda AliasPages
 	sta count