diff --git a/include/core.h b/include/core.h
index 92150e5..423ce7f 100644
--- a/include/core.h
+++ b/include/core.h
@@ -1431,11 +1431,6 @@ public:
       m_deathMsgSent = sent;
    }
 
-   inline bool GetDeathMsgState (void)
-   {
-      return m_deathMsgSent;
-   }
-
    // grenades
    void UpdateActiveGrenades (void);
    const Array <entity_t> &GetActiveGrenades (void);
diff --git a/source/combat.cpp b/source/combat.cpp
index 1317eec..efcd2f7 100644
--- a/source/combat.cpp
+++ b/source/combat.cpp
@@ -1002,11 +1002,11 @@ void Bot::FocusEnemy (void)
    {
       if (m_currentWeapon == WEAPON_KNIFE)
       {
-         if (distance <= 80.0f)
+         if (distance < 80.0f)
             m_wantsToFire = true;
       }
       else
-         m_wantsToFire = GetShootingConeDeviation (GetEntity (), &m_enemyOrigin) > 0.8f;
+         m_wantsToFire = true;
    }
    else
    {
diff --git a/source/manager.cpp b/source/manager.cpp
index 9c1a2cf..9217d97 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -1423,16 +1423,16 @@ void BotManager::SendPingDataOffsets (edict_t *to)
          {
             // start a new message
             MESSAGE_BEGIN (MSG_ONE_UNRELIABLE, SVC_PINGS, NULL, to);
-            WRITE_BYTE ((m_bots[i]->m_pingOffset[sending] * 64) + (1 + 2 * i));
-            WRITE_SHORT (m_bots[i]->m_ping[sending]);
+            WRITE_BYTE ((bot->m_pingOffset[sending] * 64) + (1 + 2 * i));
+            WRITE_SHORT (bot->m_ping[sending]);
 
             sending++;
          }
       case 1:
          {
             // append additional data
-            WRITE_BYTE ((m_bots[i]->m_pingOffset[sending] * 128) + (2 + 4 * i));
-            WRITE_SHORT (m_bots[i]->m_ping[sending]);
+            WRITE_BYTE ((bot->m_pingOffset[sending] * 128) + (2 + 4 * i));
+            WRITE_SHORT (bot->m_ping[sending]);
 
             sending++;
          }
@@ -1440,7 +1440,7 @@ void BotManager::SendPingDataOffsets (edict_t *to)
          {
             // append additional data and end message
             WRITE_BYTE (4 + 8 * i);
-            WRITE_SHORT (m_bots[i]->m_ping[sending]);
+            WRITE_SHORT (bot->m_ping[sending]);
             WRITE_BYTE (0);
             MESSAGE_END ();
 
diff --git a/source/netmsg.cpp b/source/netmsg.cpp
index a0878d8..c297313 100644
--- a/source/netmsg.cpp
+++ b/source/netmsg.cpp
@@ -312,9 +312,9 @@ void NetworkMsg::Execute (void *p)
                if (target != NULL)
                {
                   if (GetTeam (killer) == GetTeam (victim))
-					  target->m_voteKickIndex = killerIndex;
+                     target->m_voteKickIndex = killerIndex;
 
-				  target->m_notKilled = false;
+                  target->m_notKilled = false;
                }
             }
          }