diff --git a/Projects/Android/AndroidManifest.xml b/Projects/Android/AndroidManifest.xml
index cf5c4fe..4045ca9 100644
--- a/Projects/Android/AndroidManifest.xml
+++ b/Projects/Android/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 		package="com.drbeef.quakequest"
-		android:versionCode="21"
-		android:versionName="1.5.2"
+		android:versionCode="22"
+		android:versionName="1.5.3"
 		android:installLocation="auto" >
 
 	<!-- Tell the system this app requires OpenGL ES 3.1. -->
diff --git a/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_OpenXR.c b/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_OpenXR.c
index e9c61f3..4a15c90 100644
--- a/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_OpenXR.c
+++ b/Projects/Android/jni/QuakeQuestSrc/QuakeQuest_OpenXR.c
@@ -310,6 +310,9 @@ void * AppThreadFunction(void * parm ) {
 	}
 
 	{
+		//Ensure all exit stuff happens
+		Host_Shutdown();
+
 		TBXR_LeaveVR();
 		//Ask Java to shut down
 		VR_Shutdown();
@@ -570,14 +573,14 @@ float nonLinearFilter(float in)
 	float val = 0.0f;
 	if (in > NLF_DEADZONE)
 	{
-		val = in;
+		val = in > 1.0f ? 1.0f : in;
 		val -= NLF_DEADZONE;
 		val /= (1.0f - NLF_DEADZONE);
 		val = powf(val, NLF_POWER);
 	}
 	else if (in < -NLF_DEADZONE)
 	{
-		val = in;
+		val = in < -1.0f ? -1.0f : in;
 		val += NLF_DEADZONE;
 		val /= (1.0f - NLF_DEADZONE);
 		val = -powf(fabsf(val), NLF_POWER);
@@ -931,8 +934,9 @@ static void HandleInput_Default(  )
 			//and we don't get movement jitter when the joystick doesn't quite center properly
 			float dist = length(leftTrackedRemoteState_new.Joystick.x, leftTrackedRemoteState_new.Joystick.y);
 			float nlf = nonLinearFilter(dist);
-			float x = nlf * leftTrackedRemoteState_new.Joystick.x;
-			float y = nlf * leftTrackedRemoteState_new.Joystick.y;
+			dist = (dist > 1.0f) ? dist : 1.0f;
+			float x = nlf * (leftTrackedRemoteState_new.Joystick.x / dist);
+			float y = nlf * (leftTrackedRemoteState_new.Joystick.y / dist);
 
             //Adjust to be off-hand controller oriented
             vec2_t v;
diff --git a/Projects/Android/jni/darkplaces/menu.c b/Projects/Android/jni/darkplaces/menu.c
index f27e60b..2442294 100644
--- a/Projects/Android/jni/darkplaces/menu.c
+++ b/Projects/Android/jni/darkplaces/menu.c
@@ -3597,7 +3597,7 @@ static void M_Credits_Draw (void)
 			"   QQQQQQQQ           QQQQQQQQ      ",
 			"     QQQ                QQQ         ",
    			"      Q                  Q          ",
-	  		"      Q                  Q   v1.5.2");
+	  		"      Q                  Q   v1.5.3");
 
 	int i, l, linelength, firstline, lastline, lines;
 	for (i = 0, linelength = 0, firstline = 9999, lastline = -1;m_credits_message[i];i++)