diff --git a/src/PlayerbotAI.cpp b/src/PlayerbotAI.cpp
index d9d79261..aa161734 100644
--- a/src/PlayerbotAI.cpp
+++ b/src/PlayerbotAI.cpp
@@ -787,7 +787,7 @@ void PlayerbotAI::Reset(bool full)
 
 void PlayerbotAI::RemoveFromGroup()
 {
-    if (!bot || !bot->GetGroup() || bot->IsRealPlayer())
+    if (!bot || !bot->GetGroup() || IsRealPlayer())
         return;
 
     WorldPacket* packet = new WorldPacket(CMSG_GROUP_DISBAND);
diff --git a/src/PlayerbotAI.h b/src/PlayerbotAI.h
index d38f1b98..a5ac2bd8 100644
--- a/src/PlayerbotAI.h
+++ b/src/PlayerbotAI.h
@@ -415,7 +415,7 @@ public:
     void ResetStrategies(bool load = false);
     void ReInitCurrentEngine();
     void Reset(bool full = false);
-    void PlayerbotAI::RemoveFromGroup()
+    void RemoveFromGroup();
     static bool IsTank(Player* player, bool bySpec = false);
     static bool IsHeal(Player* player, bool bySpec = false);
     static bool IsDps(Player* player, bool bySpec = false);
diff --git a/src/RandomPlayerbotMgr.cpp b/src/RandomPlayerbotMgr.cpp
index 07664f86..ebab628f 100644
--- a/src/RandomPlayerbotMgr.cpp
+++ b/src/RandomPlayerbotMgr.cpp
@@ -2378,7 +2378,7 @@ void RandomPlayerbotMgr::IncreaseLevel(Player* bot)
 
 void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
 {
-    PlayerbotAI* botAI = GET_PLAYERBOT_AI(player);
+    PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
     if (botAI)
         return;
 
@@ -2473,7 +2473,7 @@ void RandomPlayerbotMgr::RandomizeFirst(Player* bot)
 
 void RandomPlayerbotMgr::RandomizeMin(Player* bot)
 {
-    PlayerbotAI* botAI = GET_PLAYERBOT_AI(player);
+    PlayerbotAI* botAI = GET_PLAYERBOT_AI(bot);
     if (botAI)
         return;
 
diff --git a/src/strategy/actions/LeaveGroupAction.cpp b/src/strategy/actions/LeaveGroupAction.cpp
index 45a95de7..172bf399 100644
--- a/src/strategy/actions/LeaveGroupAction.cpp
+++ b/src/strategy/actions/LeaveGroupAction.cpp
@@ -70,7 +70,7 @@ bool UninviteAction::Execute(Event event)
     return false;
 }
 
-static bool LeaveGroupAction::Leave(Player* player)
+bool LeaveGroupAction::Leave(Player* player)
 {
     if (player &&
         !botAI &&