diff --git a/source/basecode.cpp b/source/basecode.cpp
index a7e9a57..c95c543 100644
--- a/source/basecode.cpp
+++ b/source/basecode.cpp
@@ -2910,7 +2910,7 @@ void Bot::frame (void) {
    m_numFriendsLeft = numFriendsNear (pev->origin, 99999.0f);
    m_numEnemiesLeft = numEnemiesNear (pev->origin, 99999.0f);
 
-   if (g_bombPlanted && m_team == TEAM_COUNTER) {
+   if (g_bombPlanted && m_team == TEAM_COUNTER && m_notKilled) {
       const Vector &bombPosition = waypoints.getBombPos ();
 
       if (!m_hasProgressBar && taskId () != TASK_ESCAPEFROMBOMB && (pev->origin - bombPosition).lengthSq () < cr::square (1540.0f) && m_moveSpeed < pev->maxspeed && !isBombDefusing (bombPosition)) {
diff --git a/source/manager.cpp b/source/manager.cpp
index 7897fb2..dfb2749 100644
--- a/source/manager.cpp
+++ b/source/manager.cpp
@@ -423,7 +423,7 @@ void BotManager::maintainQuota (void) {
       createRandom ();
    }
    else if (desiredBotCount < botsInGame) {
-      int ts, cts = 0;
+      int ts = 0, cts = 0;
       countTeamPlayers (ts, cts);
 
       if (ts > cts) {
diff --git a/source/navigate.cpp b/source/navigate.cpp
index db228b7..02a9877 100644
--- a/source/navigate.cpp
+++ b/source/navigate.cpp
@@ -1917,15 +1917,15 @@ int Bot::getBombPoint (void) {
 
    if (!audible.empty ()) {
       m_bombSearchOverridden = true;
-      return waypoints.getNearest (audible, 80.0f);
+      return waypoints.getNearest (audible, 240.0f);
    }
    else if (goals.empty ()) {
-      return waypoints.getNearest (bomb, 80.0f, FLAG_GOAL); // reliability check
+      return waypoints.getNearest (bomb, 240.0f, FLAG_GOAL); // reliability check
    }
 
    // take the nearest to bomb waypoints instead of goal if close enough
    else if ((pev->origin - bomb).lengthSq () < cr::square (512.0f)) {
-      int waypoint = waypoints.getNearest (bomb, 80.0f);
+      int waypoint = waypoints.getNearest (bomb, 240.0f);
       m_bombSearchOverridden = true;
 
       if (waypoint != INVALID_WAYPOINT_INDEX) {