diff --git a/src/p_setup.c b/src/p_setup.c
index f3c52ff38..1f0a09b8d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -8203,8 +8203,7 @@ static void P_InitLevelSettings(boolean reloadinggamestate)
 		comeback = (boolean)cv_kartcomeback.value;
 	}
 
-	for (i = 0; i < 4; i++)
-		battlewanted[i] = -1;
+	memset(battlewanted, -1, sizeof (battlewanted));
 
 	mostwanted = -1;
 
diff --git a/src/p_tick.c b/src/p_tick.c
index 46d682c43..92c6f1623 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -887,7 +887,7 @@ void P_Ticker(boolean run)
 
 		K_BossInfoTicker();
 
-		if ((gametyperules & GTR_BUMPERS))
+		if (gametyperules & GTR_WANTED)
 		{
 			if (wantedcalcdelay && --wantedcalcdelay <= 0)
 				K_CalculateBattleWanted();