diff --git a/VSLinux/guisan/guisan.vcxproj b/VSLinux/guisan/guisan.vcxproj
index 6b6c99f0..3a21fa6f 100644
--- a/VSLinux/guisan/guisan.vcxproj
+++ b/VSLinux/guisan/guisan.vcxproj
@@ -45,6 +45,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>Makefile</ConfigurationType>
+    <RemoteRootDir>~/projects/Amiberry-sdl2/src</RemoteRootDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
diff --git a/src/osdep/amiberry_gui.cpp b/src/osdep/amiberry_gui.cpp
index 8ee54e8a..88bc7fd5 100644
--- a/src/osdep/amiberry_gui.cpp
+++ b/src/osdep/amiberry_gui.cpp
@@ -512,11 +512,13 @@ void gui_display(int shortcut)
 
 void moveVertical(int value)
 {
+#ifdef PANDORA
 	changed_prefs.pandora_vertical_offset += value;
 	if(changed_prefs.pandora_vertical_offset < -16 + OFFSET_Y_ADJUST)
 		changed_prefs.pandora_vertical_offset = -16 + OFFSET_Y_ADJUST;
 	else if(changed_prefs.pandora_vertical_offset > 16 + OFFSET_Y_ADJUST)
 		changed_prefs.pandora_vertical_offset = 16 + OFFSET_Y_ADJUST;
+#endif
 }
 
 void gui_led(int led, int on)
diff --git a/src/osdep/amiberry_input.cpp b/src/osdep/amiberry_input.cpp
index 71564284..97ccaac8 100644
--- a/src/osdep/amiberry_input.cpp
+++ b/src/osdep/amiberry_input.cpp
@@ -40,14 +40,14 @@ static int get_mouse_num()
 	return 2;
 }
 
-static TCHAR* get_mouse_friendlyname(int mouse)
+static const TCHAR* get_mouse_friendlyname(int mouse)
 {
 	if (mouse == 0)
 		return "Mouse";
 	return "dPad as mouse";
 }
 
-static TCHAR* get_mouse_uniquename(int mouse)
+static const TCHAR* get_mouse_uniquename(int mouse)
 {
 	if (mouse == 0)
 		return "MOUSE0";
@@ -201,12 +201,12 @@ static int get_kb_num()
 	return 1;
 }
 
-static TCHAR* get_kb_friendlyname(int kb)
+static const TCHAR* get_kb_friendlyname(int kb)
 {
 	return strdup("Default Keyboard");
 }
 
-static TCHAR* get_kb_uniquename(int kb)
+static const TCHAR* get_kb_uniquename(int kb)
 {
 	return strdup("KEYBOARD0");
 }
@@ -325,14 +325,14 @@ static void unacquire_joystick(int num)
 {
 }
 
-static TCHAR* get_joystick_friendlyname(int joy)
+static const TCHAR* get_joystick_friendlyname(int joy)
 {
 	if (joy == 0)
 		return "Built-in joystick";
 	return JoystickName[joy - 1];
 }
 
-static TCHAR* get_joystick_uniquename(int joy)
+static const TCHAR* get_joystick_uniquename(int joy)
 {
 	if (joy == 0)
 		return "JOY0";