diff --git a/project/yapb.vcxproj b/project/yapb.vcxproj
index ac716f6..1b089e6 100644
--- a/project/yapb.vcxproj
+++ b/project/yapb.vcxproj
@@ -224,7 +224,7 @@
       <OutputFile>.\release\yapb.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DelayLoadDLLs>user32.dll;ws2_32.dll;%(DelayLoadDLLs)</DelayLoadDLLs>
-      <GenerateDebugInformation>Debug</GenerateDebugInformation>
+      <GenerateDebugInformation>No</GenerateDebugInformation>
       <GenerateMapFile>false</GenerateMapFile>
       <SubSystem>Windows</SubSystem>
       <OptimizeReferences>false</OptimizeReferences>
diff --git a/source/manager.cpp b/source/manager.cpp
index 6bb28b1..22ab50b 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -1267,8 +1267,6 @@ void Bot::Kick (void)
    ServerCommand ("kick \"%s\"", STRING (pev->netname));
    CenterPrint ("Bot '%s' kicked", STRING (pev->netname));
 
-   pev->flags |= FL_KILLME;
-
    int newBotsNum = bots.GetBotsNum () - 1;
 
    // keep quota number up to date
diff --git a/source/support.cpp b/source/support.cpp
index 13ea68f..e78b831 100644
--- a/source/support.cpp
+++ b/source/support.cpp
@@ -1050,6 +1050,15 @@ void DetectCSVersion (void)
    if (g_gameVersion == CSV_OLD || g_gameVersion == CSV_CZERO)
       return;
 
+   // detect xash engine
+   if (g_engfuncs.pfnCVarGetPointer ("build") != NULL)
+   {
+      AddLogEntry (true, LL_DEFAULT, "Detected Xash3D Engine. Setting game version to old.");
+      g_gameVersion = CSV_OLD;
+
+      return;
+   }
+
    // counter-strike 1.6 or higher (plus detects for non-steam versions of 1.5)
    byte *detection = (*g_engfuncs.pfnLoadFileForMe) ("events/galil.sc", NULL);