diff --git a/kernal/dlgbox/dlgbox1b.s b/kernal/dlgbox/dlgbox1b.s
index 88b4388d..4a8ef0df 100644
--- a/kernal/dlgbox/dlgbox1b.s
+++ b/kernal/dlgbox/dlgbox1b.s
@@ -20,7 +20,7 @@
 .import DBDoVARSTR
 .import DBDoTXTSTR
 .import DBDoIcons
-.ifdef wheels
+.ifdef wheels_fixes
 .import DoESC_RULER
 .endif
 
diff --git a/kernal/dlgbox/dlgbox1e2.s b/kernal/dlgbox/dlgbox1e2.s
index 0dcbac7a..130cf263 100644
--- a/kernal/dlgbox/dlgbox1e2.s
+++ b/kernal/dlgbox/dlgbox1e2.s
@@ -28,9 +28,11 @@
 .global DBIcOPEN
 .global DBKeyVector
 
-.ifdef wheels
+.ifdef wheels_size
 .global DBKeyVector2
 .global DBStringFaultVec2
+.endif
+.ifdef wheels
 .global DoKeyboardShortcut
 .endif
 
diff --git a/kernal/dlgbox/dlgbox1g.s b/kernal/dlgbox/dlgbox1g.s
index 75d03713..86128de0 100644
--- a/kernal/dlgbox/dlgbox1g.s
+++ b/kernal/dlgbox/dlgbox1g.s
@@ -10,7 +10,7 @@
 .include "kernal.inc"
 .include "c64.inc"
 
-.ifdef wheels
+.ifdef wheels_size
 .import StringGetNext
 .import DBStringFaultVec2
 .endif
diff --git a/kernal/dlgbox/dlgbox1h.s b/kernal/dlgbox/dlgbox1h.s
index 634a41d1..926c850b 100644
--- a/kernal/dlgbox/dlgbox1h.s
+++ b/kernal/dlgbox/dlgbox1h.s
@@ -33,12 +33,14 @@
 .import GetString
 .import PutString
 
+.ifdef wheels_size
+.import DBKeyVector2
+.endif
 .ifdef wheels
 .import SetupRAMOpCall
 .import RstrKernal
 .import GetFEntries
 .import GetNewKernal
-.import DBKeyVector2
 .import FetchRAM
 .import CopyString
 .endif
@@ -49,7 +51,7 @@
 .global DBDoTXTSTR
 .global DBDoVARSTR
 
-.ifdef wheels
+.ifdef wheels_size
 .global StringGetNext
 .endif
 
diff --git a/kernal/files/files1a2a.s b/kernal/files/files1a2a.s
index 0d7a2ec6..36958a12 100644
--- a/kernal/files/files1a2a.s
+++ b/kernal/files/files1a2a.s
@@ -23,7 +23,9 @@ Add2:
         sta     r6L
         bcc     @1
         inc     r6H
-@1:	rts
+@1:
+Add2_return:
+	rts
 .else
 	AddVW 2, r6
 Add2_return:
diff --git a/kernal/process/process2.s b/kernal/process/process2.s
index fe1729bc..d40bcc7c 100644
--- a/kernal/process/process2.s
+++ b/kernal/process/process2.s
@@ -15,7 +15,7 @@
 .import TimersCMDs
 .import NumTimers
 
-.ifdef wheels
+.ifdef wheels_size
 .import EnableProcess
 .endif
 
diff --git a/kernal/process/process3a.s b/kernal/process/process3a.s
index 8affe556..7c28b2d1 100644
--- a/kernal/process/process3a.s
+++ b/kernal/process/process3a.s
@@ -22,7 +22,7 @@
 .import _DoExecDelay
 .import _RemoveDelay
 
-.ifdef wheels
+.ifdef wheels_size
 .import UnfreezeProcess
 .import UnblockProcess
 .endif