diff --git a/src/PlayerbotAI.cpp b/src/PlayerbotAI.cpp
index 0c4ce732..7bda537c 100644
--- a/src/PlayerbotAI.cpp
+++ b/src/PlayerbotAI.cpp
@@ -1388,7 +1388,7 @@ bool PlayerbotAI::IsCombo(Player* player)
 {
     int tab = AiFactory::GetPlayerSpecTab(player);
     return player->getClass() == CLASS_ROGUE ||
-        (player->getClass() == CLASS_DRUID && tab == DRUID_TAB_FERAL && !IsTank(bot));
+        (player->getClass() == CLASS_DRUID && player->HasAura(768)); // cat druid
 }
 
 bool PlayerbotAI::IsRangedDps(Player* player)
diff --git a/src/strategy/actions/MovementActions.cpp b/src/strategy/actions/MovementActions.cpp
index 6d0ba2dd..926dcb3f 100644
--- a/src/strategy/actions/MovementActions.cpp
+++ b/src/strategy/actions/MovementActions.cpp
@@ -151,7 +151,7 @@ bool MovementAction::MoveTo(uint32 mapId, float x, float y, float z, bool idle,
     // }
     bool generatePath = !bot->HasAuraType(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED) &&
             !bot->IsFlying() && !bot->HasUnitMovementFlag(MOVEMENTFLAG_SWIMMING) && !bot->IsInWater();
-    float modifiedZ = SearchBestGroundZForPath(x, y, z, generatePath, 20.0f, normal_only);
+    float modifiedZ = SearchBestGroundZForPath(x, y, z, generatePath, 20.0f, normal_only, 8.0f);
     if (modifiedZ == INVALID_HEIGHT) {
         return false;
     }
diff --git a/src/strategy/actions/MovementActions.h b/src/strategy/actions/MovementActions.h
index 722a941c..bff7ff3a 100644
--- a/src/strategy/actions/MovementActions.h
+++ b/src/strategy/actions/MovementActions.h
@@ -42,7 +42,7 @@ class MovementAction : public Action
         bool MoveInside(uint32 mapId, float x, float y, float z, float distance = sPlayerbotAIConfig->followDistance);
         void CreateWp(Player* wpOwner, float x, float y, float z, float o, uint32 entry, bool important = false);
     private:
-        float SearchBestGroundZForPath(float x, float y, float z, bool generatePath, float range = 15.0f, bool normal_only = false, float step = 3.0f);
+        float SearchBestGroundZForPath(float x, float y, float z, bool generatePath, float range = 20.0f, bool normal_only = false, float step = 8.0f);
 };
 
 class FleeAction : public MovementAction
diff --git a/src/strategy/values/EnemyPlayerValue.h b/src/strategy/values/EnemyPlayerValue.h
index 058d7db8..d3be32f0 100644
--- a/src/strategy/values/EnemyPlayerValue.h
+++ b/src/strategy/values/EnemyPlayerValue.h
@@ -5,6 +5,7 @@
 #ifndef _PLAYERBOT_ENEMYPLAYERVALUE_H
 #define _PLAYERBOT_ENEMYPLAYERVALUE_H
 
+#include "PlayerbotAIConfig.h"
 #include "TargetValue.h"
 #include "PossibleTargetsValue.h"
 
@@ -14,7 +15,7 @@ class Unit;
 class NearestEnemyPlayersValue : public PossibleTargetsValue
 {
     public:
-        NearestEnemyPlayersValue(PlayerbotAI* botAI, float range = 120.0f) :
+        NearestEnemyPlayersValue(PlayerbotAI* botAI, float range = sPlayerbotAIConfig->grindDistance) :
             PossibleTargetsValue(botAI, "nearest enemy players", range) { }
 
     public: