diff --git a/project/yapb.vcxproj b/project/yapb.vcxproj
index e3c5f13..ac716f6 100644
--- a/project/yapb.vcxproj
+++ b/project/yapb.vcxproj
@@ -207,6 +207,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <OmitFramePointers>true</OmitFramePointers>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -239,7 +240,7 @@
       <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
       <ImageHasSafeExceptionHandlers>
       </ImageHasSafeExceptionHandlers>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
       <FullProgramDatabaseFile>true</FullProgramDatabaseFile>
     </Link>
     <PostBuildEvent>
diff --git a/source/manager.cpp b/source/manager.cpp
index 6307d17..6bb28b1 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -340,9 +340,10 @@ void BotManager::AdjustQuota (bool isPlayerConnection, edict_t *ent)
       if (yb_autovacate_smart_kick.GetBool ())
          AddPlayerToCheckTeamQueue (ent);
       else
+      {
          RemoveRandom ();
-
-      m_balanceCount--;
+         m_balanceCount--;
+      }
    }
    else if (m_balanceCount <= 0)
    {
@@ -385,7 +386,9 @@ void BotManager::VerifyPlayersHasJoinedTeam (int &desiredCount)
             if (cl.ent != m_trackedPlayers[it])
                continue;
 
+            m_balanceCount--;
             desiredCount--;
+
             m_trackedPlayers.RemoveAt (it);
 
             break;