diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro
index 1d34549..7b65aae 100644
--- a/qtBuildSystem/Mu/Mu.pro
+++ b/qtBuildSystem/Mu/Mu.pro
@@ -69,7 +69,6 @@ android{
 CONFIG(debug, debug|release){
     # debug build, be accurate, fail hard, and add logging
     DEFINES += EMU_DEBUG EMU_CUSTOM_DEBUG_LOG_HANDLER
-    CONFIG += no_dynarec # easier to debug with
     macx|linux-g++{
         # also check for any buffer overflows and memory leaks
         # -fsanitize=undefined,leak
@@ -79,6 +78,10 @@ CONFIG(debug, debug|release){
     }
 }else{
     # release build, go fast
+    CONFIG += EMU_NO_SAFETY
+}
+
+EMU_NO_SAFETY{
     DEFINES += EMU_NO_SAFETY
 }
 
@@ -86,7 +89,7 @@ support_palm_os5{
     DEFINES += EMU_SUPPORT_PALM_OS5 # the Qt build will not be supporting anything too slow to run OS 5
     DEFINES += SUPPORT_LINUX # forces the dynarec to use accurate mode and disable Nspire OS hacks
 
-    !no_dynarec{
+    EMU_NO_SAFETY{
         # Windows is only supported in 32 bit mode right now(this is a limitation of the dynarec)
         # iOS needs IS_IOS_BUILD set, but the Qt port does not support iOS currently
 
@@ -122,7 +125,10 @@ support_palm_os5{
     else{
         # use platform independant C with no dynarec
         SOURCES += \
-            ../../src/armv5te/asmcode.c
+            ../../src/armv5te/asmcode.c \
+            ../../src/armv5te/uArm/CPU_2.c \
+            ../../src/armv5te/uArm/icache.c \
+            ../../src/armv5te/uArm/uArmGlue.cpp
         DEFINES += NO_TRANSLATION
     }
 
@@ -152,9 +158,6 @@ support_palm_os5{
         ../../src/pxa260/pxa260Ssp.c \
         ../../src/pxa260/pxa260Udc.c \
         ../../src/pxa260/pxa260.c \
-        ../../src/armv5te/uArm/CPU_2.c \
-        ../../src/armv5te/uArm/icache.c \
-        ../../src/armv5te/uArm/uArmGlue.cpp \
         ../../src/armv5te/arm_interpreter.cpp \
         ../../src/armv5te/cpu.cpp \
         ../../src/armv5te/coproc.cpp \
diff --git a/src/ads7846.c b/src/ads7846.c
index cdef20d..46e99a8 100644
--- a/src/ads7846.c
+++ b/src/ads7846.c
@@ -33,7 +33,7 @@ void ads7846Reset(void){
    ads7846OutputValue = 0x0000;
    ads7846ChipSelect = true;
 #if !defined(EMU_NO_SAFETY)
-   m515RefreshTouchState();
+   m5XXRefreshTouchState();
 #endif
 }
 
@@ -84,7 +84,7 @@ void ads7846SetChipSelect(bool value){
       ads7846PenIrqEnabled = true;
       ads7846OutputValue = 0x0000;
 #if !defined(EMU_NO_SAFETY)
-      m515RefreshTouchState();
+      m5XXRefreshTouchState();
 #endif
    }
    ads7846ChipSelect = value;
@@ -273,7 +273,7 @@ bool ads7846ExchangeBit(bool bitIn){
 
       ads7846PenIrqEnabled = !(powerSave & 0x01);
 #if !defined(EMU_NO_SAFETY)
-      m515RefreshTouchState();
+      m5XXRefreshTouchState();
 #endif
    }
 
diff --git a/src/dbvz.c b/src/dbvz.c
index 0475f1f..f0dc467 100644
--- a/src/dbvz.c
+++ b/src/dbvz.c
@@ -170,13 +170,13 @@ void ads7846OverridePenState(bool value){
    }
 }
 
-void m515RefreshTouchState(void){
+void m5XXRefreshTouchState(void){
    //called when ads7846PenIrqEnabled is changed
    updateTouchState();
    checkInterrupts();
 }
 
-void m515RefreshInputState(void){
+void m5XXRefreshInputState(void){
    //update power button LED state incase palmMisc.batteryCharging changed
    updatePowerButtonLedStatus();
 
@@ -1662,7 +1662,7 @@ void dbvzExecute(void){
    uint32_t samples;
 
    //I/O
-   m515RefreshInputState();
+   m5XXRefreshInputState();
 
    //CPU
    dbvzFrameClk32s = 0;
diff --git a/src/dbvz.h b/src/dbvz.h
index c752727..bf4908c 100644
--- a/src/dbvz.h
+++ b/src/dbvz.h
@@ -77,8 +77,8 @@ bool m515BacklightAmplifierState(void);
 bool dbvzAreRegistersXXFFMapped(void);
 bool sed1376ClockConnected(void);
 void ads7846OverridePenState(bool value);
-void m515RefreshTouchState(void);//just refreshes the touchscreen
-void m515RefreshInputState(void);//refreshes touchscreen, buttons and docked status
+void m5XXRefreshTouchState(void);//just refreshes the touchscreen
+void m5XXRefreshInputState(void);//refreshes touchscreen, buttons and docked status
 //int32_t interruptAcknowledge(int32_t intLevel);//this is in m68kexternal.h
 
 //memory errors