diff --git a/src/d_player.h b/src/d_player.h
index 993a9de4d..353b9f5bb 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -390,7 +390,7 @@ typedef struct player_s
 	fixed_t offroad;		// In Super Mario Kart, going offroad has lee-way of about 1 second before you start losing speed
 	UINT8 waterskip;		// Water skipping counter
 
-	UINT16 tiregrease;		// Reduced friction timer after hitting a horizontal spring
+	UINT16 tiregrease;		// Reduced friction timer after hitting a spring
 	UINT16 springstars;		// Spawn stars around a player when they hit a spring
 	UINT16 springcolor;		// Color of spring stars
 	UINT8 dashpadcooldown;	// Separate the vanilla SA-style dash pads from using flashing
diff --git a/src/k_kart.c b/src/k_kart.c
index 6f2f75fd7..36f65c572 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -8343,7 +8343,7 @@ void K_AdjustPlayerFriction(player_t *player)
 		return;
 	}
 
-	// Reduce friction after hitting a horizontal spring
+	// Reduce friction after hitting a spring
 	if (player->tiregrease)
 	{
 		player->mo->friction += ((FRACUNIT - prevfriction) / greasetics) * player->tiregrease;
diff --git a/src/p_map.c b/src/p_map.c
index 829393d32..ff83a22a4 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -345,28 +345,6 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 			}
 		}
 
-		if (object->player)
-		{
-			// Less friction when hitting horizontal springs
-			if (!vertispeed)
-			{
-				if (!object->player->tiregrease)
-				{
-					UINT8 i;
-					for (i = 0; i < 2; i++)
-					{
-						mobj_t *grease;
-						grease = P_SpawnMobj(object->x, object->y, object->z, MT_TIREGREASE);
-						P_SetTarget(&grease->target, object);
-						grease->angle = K_MomentumAngle(object);
-						grease->extravalue1 = i;
-					}
-				}
-
-				object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS
-			}
-		}
-
 		// Horizontal speed is used as a minimum thrust, not a direct replacement
 		finalSpeed = max(objectSpeed, finalSpeed);
 
@@ -389,6 +367,22 @@ boolean P_DoSpring(mobj_t *spring, mobj_t *object)
 
 		object->player->springstars = max(vertispeed, horizspeed) / FRACUNIT / 2;
 		object->player->springcolor = starcolor;
+
+		// Less friction when hitting springs
+		if (!object->player->tiregrease)
+		{
+			UINT8 i;
+			for (i = 0; i < 2; i++)
+			{
+				mobj_t *grease;
+				grease = P_SpawnMobj(object->x, object->y, object->z, MT_TIREGREASE);
+				P_SetTarget(&grease->target, object);
+				grease->angle = K_MomentumAngle(object);
+				grease->extravalue1 = i;
+			}
+
+			object->player->tiregrease = greasetics; //FixedMul(greasetics << FRACBITS, finalSpeed/72) >> FRACBITS
+		}
 	}
 
 	return true;
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 34b48dc9c..2204003b4 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -6889,6 +6889,9 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
 				z);
 			mobj->angle = ang;
 
+			if (!P_IsObjectOnGround(mobj->target))
+				mobj->renderflags |= RF_DONTDRAW;
+
 			if (leveltime & 1)
 				mobj->renderflags |= RF_DONTDRAW;