diff --git a/maps/biter_battles_v2/pregenerate_chunks.lua b/maps/biter_battles_v2/pregenerate_chunks.lua
index 55527ee1..6c84395b 100644
--- a/maps/biter_battles_v2/pregenerate_chunks.lua
+++ b/maps/biter_battles_v2/pregenerate_chunks.lua
@@ -64,7 +64,7 @@ local function process_chunk(surface)
 	local surface = game.surfaces["biter_battles"]
 	if not surface then return end
 	
-	local force_chunk_requests = 3
+	local force_chunk_requests = 2
 	if bb_config.fast_pregen then force_chunk_requests = 16 end
 	
 	for i = #global.chunk_gen_coords, 1, -1 do
diff --git a/maps/biter_battles_v2/team_manager.lua b/maps/biter_battles_v2/team_manager.lua
index 63e02683..87e84dc3 100644
--- a/maps/biter_battles_v2/team_manager.lua
+++ b/maps/biter_battles_v2/team_manager.lua
@@ -261,6 +261,7 @@ local function team_manager_gui_click(event)
 	local name = event.element.name
 	
 	if game.forces[name] then
+		if not player.admin then player.print("Only admins can change team names.", {r = 175, g = 0, b = 0}) return end
 		custom_team_name_gui(player, name)
 		player.gui.center["team_manager_gui"].destroy()
 		return
@@ -350,6 +351,7 @@ local function on_gui_click(event)
 			set_custom_team_name(force_name, custom_name)
 			player.gui.center["custom_team_name_gui"].destroy()
 			draw_manager_gui(player)
+			return
 		end
 		if name == "custom_team_name_gui_close" then
 			player.gui.center["custom_team_name_gui"].destroy()