diff --git a/Projects/Android/jni/Doom3Quest/Doom3Quest_SurfaceView.c b/Projects/Android/jni/Doom3Quest/Doom3Quest_SurfaceView.c
index e3d6f0b..4d28099 100644
--- a/Projects/Android/jni/Doom3Quest/Doom3Quest_SurfaceView.c
+++ b/Projects/Android/jni/Doom3Quest/Doom3Quest_SurfaceView.c
@@ -1617,7 +1617,7 @@ void * AppThreadFunction(void * parm ) {
 		questType = 2;
 		if (SS_MULTIPLIER == -1.0f)
 		{
-			SS_MULTIPLIER = 1.2f;
+			SS_MULTIPLIER = 1.1f;
 		}
 
 		if (NUM_MULTI_SAMPLES == -1)
diff --git a/Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp b/Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp
index ec40d9a..b0f4257 100644
--- a/Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp
+++ b/Projects/Android/jni/d3es-multithread-master/neo/game/Player.cpp
@@ -5741,13 +5741,6 @@ void idPlayerHand::NextWeapon( int dir )
 			vr_weaponHand.SetInteger( 1 - whichHand );
 		}
 
-		if (currentWeapon == WEAPON_CHAINSAW)
-		{
-			//Stop all chainsaw haptics immediately
-			common->HapticStopEvent("chainsaw_idle");
-			common->HapticStopEvent("chainsaw_fire");
-		}
-
     	idealWeapon = w;
         weaponSwitchTime = gameLocal.time + WEAPON_SWITCH_DELAY;
         owner->UpdateHudWeapon( whichHand );
@@ -5761,6 +5754,12 @@ void idPlayerHand::NextWeapon( int dir )
         }
         else
 		{
+            if (currentWeapon == WEAPON_CHAINSAW)
+            {
+                //Stop all chainsaw haptics immediately
+                common->HapticStopEvent("chainsaw_idle");
+                common->HapticStopEvent("chainsaw_fire");
+            }
 
 			common->HapticEvent("weapon_switch", 0, 0, 100, 0, 0);
 		}
diff --git a/assets/quest2_default.cfg b/assets/quest2_default.cfg
index 1a955f6..5234d56 100644
--- a/assets/quest2_default.cfg
+++ b/assets/quest2_default.cfg
@@ -106,7 +106,7 @@ seta com_product_lang_ext "1"
 seta com_showFPS "0"
 seta com_purgeAll "1"
 seta vr_msaa "2"
-seta vr_supersampling "1.2"
+seta vr_supersampling "1.1"
 seta vr_refresh "60"
 seta r_scaleMenusTo43 "1"
 seta r_debugArrowStep "120"