diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index a4fef3c3e..e9bdcfbde 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -61,10 +61,10 @@ ifeq   (,$(filter GCC% CLEANONLY,$(.VARIABLES)))
 
   # If this version is not in the list, default to the latest supported
   ifeq (,$(filter $(v),$(SUPPORTED_GCC_VERSIONS)))
-	define line =
+    define line =
 	Your compiler version, GCC $(version), is not supported by the Makefile.
 	The Makefile will assume GCC $(LATEST_GCC_VERSION).))
-	endef
+    endef
    $(call print,$(line))
    GCC$(subst .,,$(LATEST_GCC_VERSION))=1
   else
diff --git a/src/d_player.h b/src/d_player.h
index 3bd99cecb..ec4bb1b63 100644
--- a/src/d_player.h
+++ b/src/d_player.h
@@ -375,7 +375,7 @@ typedef struct player_s
 	UINT8 wipeoutslow;		// Timer before you slowdown when getting wiped out
 	UINT8 justbumped;		// Prevent players from endlessly bumping into each other
 	UINT8 tumbleBounces;
-	UINT16 tumbleHeight;
+	UINT16 tumbleHeight;	// In *mobjscaled* fracunits, or mfu, not raw fu
 
 	SINT8 drift;			// (-5 to 5) - Drifting Left or Right, plus a bigger counter = sharper turn
 	fixed_t driftcharge;	// Charge your drift so you can release a burst of speed
diff --git a/src/k_kart.c b/src/k_kart.c
index 7074fe42a..042efc179 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -696,7 +696,7 @@ INT32 K_KartGetItemOdds(
 			}
 			else
 			{
-				const INT32 distFromStart = max(0, secondToFirst - SPBSTARTDIST);
+				const INT32 distFromStart = max(0, (INT32)secondToFirst - SPBSTARTDIST);
 				const INT32 distRange = SPBFORCEDIST - SPBSTARTDIST;
 				const INT32 mulMax = 3;
 
@@ -3215,14 +3215,14 @@ void K_TumblePlayer(player_t *player, mobj_t *inflictor, mobj_t *source)
 
 static boolean K_LastTumbleBounceCondition(player_t *player)
 {
-	return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 40);
+	return (player->tumbleBounces > TUMBLEBOUNCES && player->tumbleHeight < 60);
 }
 
 static void K_HandleTumbleBounce(player_t *player)
 {
 	fixed_t gravityadjust;
 	player->tumbleBounces++;
-	player->tumbleHeight = (player->tumbleHeight * 4) / 5;
+	player->tumbleHeight = (player->tumbleHeight * ((player->tumbleHeight > 100) ? 3 : 4)) / 5;
 	player->pflags &= ~PF_TUMBLESOUND;
 
 	if (player->tumbleHeight < 10)
diff --git a/src/k_respawn.c b/src/k_respawn.c
index fcce1b632..f09358dcc 100644
--- a/src/k_respawn.c
+++ b/src/k_respawn.c
@@ -155,9 +155,12 @@ void K_DoIngameRespawn(player_t *player)
 	// If player was tumbling, set variables so that they don't tumble like crazy after they're done respawning
 	if (player->tumbleBounces > 0)
 	{
-		player->tumbleBounces = TUMBLEBOUNCES-1; // Max # of bounces-1 (so you still tumble once)
-		player->pflags &= ~PF_TUMBLELASTBOUNCE; // Still force them to bounce at least once for the funny
-		players->tumbleHeight = 20; // force tumble height
+		player->tumbleBounces = 0; // MAXBOUNCES-1;
+		player->pflags &= ~PF_TUMBLELASTBOUNCE;
+		//players->tumbleHeight = 20;
+		players->mo->rollangle = 0;
+		player->spinouttype = KSPIN_WIPEOUT;
+		player->spinouttimer = player->wipeoutslow = (3*TICRATE/2)+2;
 	}
 
 	P_ResetPlayer(player);