diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
index 38b343b7e..81989857a 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
@@ -342,7 +342,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
 	@Override
 	public List<String> onTabComplete(CommandSender sender, String commandLabel, String[] args)
 	{
-		if (!(sender instanceof Player) || !_commandCenter.GetClientManager().Get((Player) sender).hasPermission(getPermission()))
+		if (!(sender instanceof Player) || !Plugin.canPlayerUseGameCmd((Player) sender))
 		{
 			return null;
 		}
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
index cf1db0fb3..e54d90276 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
@@ -245,7 +245,6 @@ public abstract class Game extends ListenerComponent implements Lifetimed
 	public boolean DeathOut = true;
 	public boolean DeathDropItems = false;
 	public boolean DeathMessages = true;
-	public boolean AutomaticRespawn = true;
 
 	public double DeathSpectateSecs = 0;
 	public boolean DeathTeleport = true;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
index afa1233f6..c7d7b7624 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
@@ -149,7 +149,6 @@ public class Evolution extends SoloGame
 				.setGiveCompass(false)
 				.register(this);
 		
-		AutomaticRespawn = false;
 		DeathSpectateSecs = 4.0;
 
 		CreatureAllow = false;
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
index aa617bac0..9bce496e9 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java
@@ -253,7 +253,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown
 
 		DeathOut = false;
 		DeathTeleport = false;
-		AutomaticRespawn = false;
 		DeathMessages = false;
 		FixSpawnFacing = false;
 
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java
index 6f137613c..3b7c9e68b 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java
@@ -37,7 +37,6 @@ public class SurvivalGamesNewTeams extends SurvivalGamesNew
 		_teamSelector = new FillToSelector(this, 2);
 
 		new NamedTeamsModule()
-				.setTeamPerSpawn(true)
 				.register(this);
 
 		new TeamRequestsModule()
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
index 9c72704e5..fc8a07c4c 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java
@@ -782,11 +782,7 @@ public class GameFlagManager implements Listener
 		// Respawn Now
 		if (respawnTime <= 0)
 		{
-			// Auto handle respawning
-			if (game.AutomaticRespawn)
-			{
-				game.RespawnPlayer(player);
-			}
+			game.RespawnPlayer(player);
 
 			Manager.runSyncLater(() ->
 			{
@@ -844,11 +840,9 @@ public class GameFlagManager implements Listener
 						{
 							Manager.addSpectator(player, game.DeathTeleport);
 						}
-						else if (game.AutomaticRespawn)
-						{
-							game.RespawnPlayer(player);
-							UtilTextBottom.display(C.cGreenB + "Respawned", player);
-						}
+
+						game.RespawnPlayer(player);
+						UtilTextBottom.display(C.cGreenB + "Respawned", player);
 					}
 					else
 					{