diff --git a/scripts/_00E_MQ101_QuickStart.pex b/scripts/_00E_MQ101_QuickStart.pex
index a21a00b2..98cc00ff 100644
Binary files a/scripts/_00E_MQ101_QuickStart.pex and b/scripts/_00E_MQ101_QuickStart.pex differ
diff --git a/scripts/_00e_class_openclassmenuscript.pex b/scripts/_00e_class_openclassmenuscript.pex
index a97257c3..530d55ee 100644
Binary files a/scripts/_00e_class_openclassmenuscript.pex and b/scripts/_00e_class_openclassmenuscript.pex differ
diff --git a/scripts/_00e_mqp03_functions.pex b/scripts/_00e_mqp03_functions.pex
index 3ca69241..d32fb060 100644
Binary files a/scripts/_00e_mqp03_functions.pex and b/scripts/_00e_mqp03_functions.pex differ
diff --git a/source/scripts/_00E_MQ101_QuickStart.psc b/source/scripts/_00E_MQ101_QuickStart.psc
index 0c0e1009..2bbd044d 100644
--- a/source/scripts/_00E_MQ101_QuickStart.psc
+++ b/source/scripts/_00E_MQ101_QuickStart.psc
@@ -23,8 +23,8 @@ function Init()
 	Game.ShowRaceMenu()
 	(MQP02 as _00E_MQP02_Functions).AddRacialAbilites()
 
-	bool bDisableFighting = SKSE.GetVersion() > 0 && ! EnderalFunctions.IsVR()
-	Game.DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
+	Game.DisablePlayerControls(abMovement = false, abFighting = true, abCamSwitch = true, abLooking = false, abSneaking = true, abMenu = true, abActivate = false, abJournalTabs = true, aiDisablePOVType = 0)
+	Game.ForceFirstPerson()
 
 	MQP03.SetCurrentStageID(15)
 
diff --git a/source/scripts/_00e_class_openclassmenuscript.psc b/source/scripts/_00e_class_openclassmenuscript.psc
index 37a460d4..1a571cff 100644
--- a/source/scripts/_00e_class_openclassmenuscript.psc
+++ b/source/scripts/_00e_class_openclassmenuscript.psc
@@ -56,13 +56,13 @@ EndEvent
 
 Function EnterClassMenu()
 	
-	bool bDisableFighting = SKSE.GetVersion() > 0 && ! EnderalFunctions.IsVR()
-	DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
+	Game.DisablePlayerControls(abMovement = false, abFighting = true, abCamSwitch = true, abLooking = false, abSneaking = true, abMenu = true, abActivate = false, abJournalTabs = true, aiDisablePOVType = 0)
+	
 	Player.ForceRefTo(PlayerREF)
 	
 	_00E_Meditate_FirstPerson.SetValue(PlayerREF.GetAnimationVariableBool("isFirstPerson") as float)
 	
-	_00E_EquipControl.SheatheWeapon(PlayerREF)
+	_00E_EquipControl.SheatheWeapon(PlayerREF, false)
 
 	Form[] equippedTorches = New Form[2]
 	_00E_TorchControl.UnequipTorches(equippedTorches)
@@ -73,7 +73,6 @@ Function EnterClassMenu()
 	Wait(0.7)
 	PlayerREF.MoveTo(_00E_ClassMenuOrigin)
 	Game.ShowFirstPersonGeometry(False)
-	DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
 	ForceFirstPerson()
 	
 EndFunction
diff --git a/source/scripts/_00e_mqp03_functions.psc b/source/scripts/_00e_mqp03_functions.psc
index 1134af9e..c9e94b0a 100644
--- a/source/scripts/_00e_mqp03_functions.psc
+++ b/source/scripts/_00e_mqp03_functions.psc
@@ -36,8 +36,7 @@ Function MovePlayerToStart()
 	_00E_Func_AIWalk.PlayerAIWalkStop()
 	FadeToBlackHoldIMOD.Apply()
 	ForceFirstPerson()
-	bool bDisableFighting = SKSE.GetVersion() > 0 && ! EnderalFunctions.IsVR()
-	DisablePlayerControls(false, bDisableFighting, true, false, true, false, false, true)
+	Game.DisablePlayerControls(abMovement = false, abFighting = true, abCamSwitch = true, abLooking = false, abSneaking = true, abMenu = true, abActivate = false, abJournalTabs = true, aiDisablePOVType = 0)
 	PlayerREF.SetAlpha(0.0)
 	PlayerREF.MoveTo(_00E_ClassMenuOrigin)
 	SetCurrentStageID(10)