diff --git a/core/PlayerManager.cpp b/core/PlayerManager.cpp
index d3b72bf90..afdd39911 100644
--- a/core/PlayerManager.cpp
+++ b/core/PlayerManager.cpp
@@ -1327,6 +1327,11 @@ void PlayerManager::OnSourceModMaxPlayersChanged( int newvalue )
 
 void PlayerManager::MaxPlayersChanged( int newvalue /*= -1*/ )
 {
+	if (!m_FirstPass)
+	{
+		return;
+	}
+
 	if (newvalue == -1)
 	{
 		newvalue = gpGlobals->maxClients;
diff --git a/extensions/clientprefs/cookie.h b/extensions/clientprefs/cookie.h
index 8fe2376ed..22fd26a91 100644
--- a/extensions/clientprefs/cookie.h
+++ b/extensions/clientprefs/cookie.h
@@ -139,7 +139,7 @@ public:
 
 private:
 	KTrie<Cookie *> cookieTrie;
-	SourceHook::List<CookieData *> clientData[MAXCLIENTS];
+	SourceHook::List<CookieData *> clientData[MAXCLIENTS+1];
 
 	bool connected[MAXCLIENTS+1];
 	bool statsLoaded[MAXCLIENTS+1];