diff --git a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
index 79be8e5..62583ca 100644
--- a/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
+++ b/Projects/Android/jni/src/Lambda1VR/L1VR_SurfaceView.c
@@ -1306,7 +1306,7 @@ static void ovrApp_HandleInput( ovrApp * app )
                 float y = offHandRemoteTracking->HeadPose.Pose.Position.y - dominantRemoteTracking->HeadPose.Pose.Position.y;
 
                 if (z != 0.0f) {
-                    weaponangles[YAW] = -degrees(atanf(x / z));
+                    weaponangles[YAW] = snapTurn - degrees(atanf(x / z));
                 }
 
                 float zxDist = sqrtf(powf(x, 2) + powf(z, 2));
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp
index ab3c0cd..a07a587 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp
+++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_helper.cpp
@@ -82,11 +82,11 @@ void VRHelper::UpdateGunPosition(struct ref_params_s* pparams)
 
 void VRHelper::SendPositionUpdateToServer()
 {
-	cl_entity_t *localPlayer = gEngfuncs.GetLocalPlayer();
 	cl_entity_t *viewent = gEngfuncs.GetViewModel();
+
 	Vector hmdOffset; // TODO
 	Vector weaponOrigin = viewent ? viewent->curstate.origin : Vector();
-	Vector weaponOffset = weaponOrigin - localPlayer->curstate.origin;
+	Vector weaponOffset = weaponOrigin - positions.vieworg;
 	Vector weaponAngles = viewent ? viewent->curstate.angles : Vector();
 	Vector weaponVelocity = viewent ? viewent->curstate.velocity : Vector();
 
diff --git a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
index b6b14cd..d5f24de 100644
--- a/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
+++ b/Projects/Android/jni/src/hlsdk-xash3d/cl_dll/vr_renderer.cpp
@@ -53,9 +53,15 @@ void VRRenderer::Frame(double time)
 {
 	// make sure these are always properly set
 	gEngfuncs.pfnClientCmd("fps_max 150");
-	gEngfuncs.pfnClientCmd("gl_vsync 0");
 	gEngfuncs.pfnClientCmd("crosshair 0");
-	gEngfuncs.pfnClientCmd("default_fov 110");
+    gEngfuncs.pfnClientCmd("default_fov 110");
+
+    //Force set these for now
+    gEngfuncs.pfnClientCmd("cl_upspeed 150");
+    gEngfuncs.pfnClientCmd("cl_forwardspeed 150");
+    gEngfuncs.pfnClientCmd("cl_backspeed 150");
+    gEngfuncs.pfnClientCmd("cl_sidespeed 150");
+    gEngfuncs.pfnClientCmd("cl_movespeedkey 3.0");
 }