diff --git a/src/k_battle.c b/src/k_battle.c
index b3939dad8..461799f74 100644
--- a/src/k_battle.c
+++ b/src/k_battle.c
@@ -501,7 +501,7 @@ void K_RunBattleOvertime(void)
 	if (battleovertime.radius > 0)
 	{
 		const fixed_t pi = (22 * FRACUNIT) / 7; // loose approximation, this doesn't need to be incredibly precise
-		const UINT32 orbs = 32;
+		const INT32 orbs = 32;
 		const angle_t angoff = ANGLE_MAX / orbs;
 		const UINT8 spriteSpacing = 128;
 
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 7d5d04bdc..e40885875 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -9945,7 +9945,7 @@ mobjtype_t P_GetMobjtype(UINT16 mthingtype)
 void P_RespawnSpecials(void)
 {
 	UINT8 p, pcount = 0;
-	tic_t time = 30*TICRATE; // Respawn things in empty dedicated servers
+	INT32 time = 30*TICRATE; // Respawn things in empty dedicated servers
 	mapthing_t *mthing = NULL;
 
 	if (!(gametyperules & GTR_CIRCUIT) && numgotboxes >= (4*nummapboxes/5)) // Battle Mode respawns all boxes in a different way
@@ -9993,7 +9993,7 @@ void P_RespawnSpecials(void)
 		return;
 
 	// the first item in the queue is the first to respawn
-	if (leveltime - itemrespawntime[iquetail] < time)
+	if (leveltime - itemrespawntime[iquetail] < (tic_t)time)
 		return;
 
 	mthing = itemrespawnque[iquetail];
diff --git a/src/p_user.c b/src/p_user.c
index 1a222da1d..0edb0b52f 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -1786,6 +1786,8 @@ static void P_CheckInvincibilityTimer(player_t *player)
 			player->mo->color = player->skincolor;
 			G_GhostAddColor((INT32) (player - players), GHC_NORMAL);
 		}
+
+		P_RestoreMusic(player);
 	}
 }