diff --git a/src/InputMappings.h b/src/InputMappings.h
index d00714f..69977fa 100644
--- a/src/InputMappings.h
+++ b/src/InputMappings.h
@@ -121,17 +121,17 @@ public:
 #else
 	inline bool Exit()
 	{
-		return KeyboardFlag(ESC_FLAG) /*| UartFlag(ESC_FLAG) |*/ ButtonFlag(ESC_FLAG);
+		return KeyboardFlag(ESC_FLAG) | /*UartFlag(ESC_FLAG) |*/ ButtonFlag(ESC_FLAG);
 	}
 
 	inline bool NextDisk()
 	{
-		return KeyboardFlag(NEXT_FLAG) /*| UartFlag(NEXT_FLAG) |*/ ButtonFlag(NEXT_FLAG);
+		return KeyboardFlag(NEXT_FLAG) | /*UartFlag(NEXT_FLAG) |*/ ButtonFlag(NEXT_FLAG);
 	}
 
 	inline bool PrevDisk()
 	{
-		return KeyboardFlag(PREV_FLAG) /*| UartFlag(PREV_FLAG) |*/ ButtonFlag(PREV_FLAG);
+		return KeyboardFlag(PREV_FLAG) | /*UartFlag(PREV_FLAG) |*/ ButtonFlag(PREV_FLAG);
 	}
 #endif
 	inline bool AutoLoad() { return KeyboardFlag(AUTOLOAD_FLAG); }
diff --git a/src/main.cpp b/src/main.cpp
index f32312a..e925e01 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -692,6 +692,7 @@ void CheckAutoMountImage(EXIT_TYPE reset_reason , FileBrowser* fileBrowser)
 	}
 }
 
+#if defined(EXPERIMENTALZERO)
 EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
 {
 	bool oldLED = false;
@@ -842,7 +843,7 @@ EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
 	return EXIT_UNKNOWN;
 }
 
-#if not defined(EXPERIMENTALZERO)
+#else
 EXIT_TYPE Emulate1541(FileBrowser* fileBrowser)
 {
 	EXIT_TYPE exitReason = EXIT_UNKNOWN;