diff --git a/plugins/l4d2_ai_minigun.smx b/plugins/l4d2_ai_minigun.smx
index 41cc630..d2a3312 100644
Binary files a/plugins/l4d2_ai_minigun.smx and b/plugins/l4d2_ai_minigun.smx differ
diff --git a/plugins/l4d_survivor_identity_fix.smx b/plugins/l4d_survivor_identity_fix.smx
index b562adf..772c4ec 100644
Binary files a/plugins/l4d_survivor_identity_fix.smx and b/plugins/l4d_survivor_identity_fix.smx differ
diff --git a/scripting/l4d2_ai_minigun.sp b/scripting/l4d2_ai_minigun.sp
index 7788840..4c5626b 100644
--- a/scripting/l4d2_ai_minigun.sp
+++ b/scripting/l4d2_ai_minigun.sp
@@ -206,6 +206,7 @@ stock int SpawnSurvivor(const float vPos[3], const float vAng[3], const char[] m
 		return -1;
 	}
 	SetClientName(bot_client_id, spawn_minigun ? "MinigunBot" : "HoldoutBot");
+	ChangeClientTeam(bot_client_id, 4);
 	
 	SetEntProp(bot_client_id, Prop_Send, "m_fFlags", GetEntProp(bot_client_id, Prop_Send, "m_fFlags") | FL_FROZEN);
 	CreateTimer(0.1, Timer_Move, bot_user_id);
diff --git a/scripting/l4d_survivor_identity_fix.sp b/scripting/l4d_survivor_identity_fix.sp
index 0e0cdc6..506a7a6 100644
--- a/scripting/l4d_survivor_identity_fix.sp
+++ b/scripting/l4d_survivor_identity_fix.sp
@@ -278,9 +278,7 @@ public void OnClientCookiesCached(int client) {
 ///////////////////////////////////////////////////////////////////////////////
 //Prevent issues with L4D1 characters being TP'd and stuck in brain dead form
 public void OnMapStart() {
-	char output[2];
-	L4D2_GetVScriptOutput("Director.GetSurvivorSet()", output, sizeof(output));
-	isL4D1Survivors = StringToInt(output) == 1;
+	isL4D1Survivors = L4D2_GetSurvivorSetMap() == 1;
 
 	survivors = 0;