diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
index 682c5b6..0d184d0 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
@@ -345,7 +345,7 @@ local transitionanims = {
 	hangheaveup = "runfwd",
 	dodgejumpleft = "stand",
 	walkbalancefalloffleft = "jumpair",
-	vaultover = "runfwd",
+	vaultover = "jumpair",
 	meleeairhit = "jumpair",
 	dodgejumpright = "stand",
 	meleeair = "jumpair",
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
index 11c7968..900081b 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
@@ -657,7 +657,7 @@ local function ClimbingCheck(ply, mv, cmd)
 	local lastvel = mv:GetVelocity()
 
 	mv:SetVelocity(vector_origin)
-	ply:SetMoveType(MOVETYPE_NOCLIP)
+	-- ply:SetMoveType(MOVETYPE_NOCLIP)
 	ply:ViewPunch(Angle(5, 0, 0.5))
 
 	local wallangc = Angle(wallang)
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Ladder.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Ladder.lua
index 123c365..1048d9c 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Ladder.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Ladder.lua
@@ -75,6 +75,8 @@ local function LadderCheck(ply, mv, cmd, ladder)
 	else
 		ply:SetLadderDelay(CurTime() + 0.25)
 	end
+
+	ply:SetMoveType(MOVETYPE_WALK)
 end
 
 local function LadderThink(ply, mv, cmd, ladder)