diff --git a/src/k_kart.c b/src/k_kart.c
index 8842cf1b6..78aeabf17 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -13923,9 +13923,9 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 
 	if ((player->cmd.buttons & BT_VOTE) && ((player->itemtype && player->itemamount) || (player->rings > 0) || player->superring > 0 || player->pickuprings > 0 || player->itemRoulette.active))
 	{
-		boolean onground = P_IsObjectOnGround(player->mo);
+		boolean grounded = P_IsObjectOnGround(player->mo);
 		onground && player->tumbleBounces == 0 ?  player->bailcharge += 2 : player->bailcharge++; // charge twice as fast on the ground
-		if (P_PlayerInPain(player) && player->bailcharge == 1 || onground && P_PlayerInPain(player) && player->bailcharge == 2) // this is brittle ..
+		if ((P_PlayerInPain(player) && player->bailcharge == 1) || (grounded && P_PlayerInPain(player) && player->bailcharge == 2)) // this is brittle ..
 		{
 			mobj_t *bail = P_SpawnMobj(player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, MT_BAILCHARGE);
 			P_SetTarget(&bail->target, player->mo);
diff --git a/src/objects/bail.c b/src/objects/bail.c
index 885574b06..2ebd1a359 100644
--- a/src/objects/bail.c
+++ b/src/objects/bail.c
@@ -30,7 +30,7 @@ void Obj_BailThink (mobj_t *aura)
     else
     {
         mobj_t *mo = aura->target;
-        player_t *player = mo->player;
+        ATTRUNUSED player_t *player = mo->player;
 
         // Follow player
         aura->flags &= ~(MF_NOCLIPTHING);