diff --git a/src/p_inter.c b/src/p_inter.c
index 5553bfbd3..c5035022b 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2162,7 +2162,8 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
 				}
 			}
 
-			player->sneakertimer = 0;
+			if (!(type == DMG_NORMAL || type == DMG_WIPEOUT))
+				player->sneakertimer = 0;
 			player->driftboost = 0;
 			player->ringboost = 0;
 			player->glanceDir = 0;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 2545eff2c..9ca6d196b 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -1902,8 +1902,7 @@ void P_XYMovement(mobj_t *mo)
 	if (mo->type == MT_FLINGRING || mo->type == MT_BALLHOG || mo->type == MT_BUBBLESHIELDTRAP)
 		return;
 
-	if (player && (player->spinouttimer && !player->wipeoutslow)
-		&& player->speed <= FixedDiv(20*mapobjectscale, player->offroad + FRACUNIT))
+	if (mo->player && (mo->player->spinouttimer && !mo->player->wipeoutslow) && mo->player->speed <= K_GetKartSpeed(mo->player, false, true)/2)
 		return;
 	//}