diff --git a/src/strategy/actions/UseMeetingStoneAction.cpp b/src/strategy/actions/UseMeetingStoneAction.cpp
index 3ef46e21..b0a68990 100644
--- a/src/strategy/actions/UseMeetingStoneAction.cpp
+++ b/src/strategy/actions/UseMeetingStoneAction.cpp
@@ -82,7 +82,7 @@ bool SummonAction::Execute(Event event)
     }
 
     if (master->GetSession()->GetSecurity() >= SEC_PLAYER) {
-        botAI->GetAiObjectContext()->GetValue<GuidVector>("prioritized targets")->Set({});
+        // botAI->GetAiObjectContext()->GetValue<GuidVector>("prioritized targets")->Set({});
         return Teleport(master, bot);
     }
 
diff --git a/src/strategy/deathknight/DKActions.h b/src/strategy/deathknight/DKActions.h
index 6106af18..e4907ac8 100644
--- a/src/strategy/deathknight/DKActions.h
+++ b/src/strategy/deathknight/DKActions.h
@@ -234,8 +234,6 @@ class CastDeathAndDecayAction : public CastSpellAction
 {
 	public:
 		CastDeathAndDecayAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "death and decay") { }
-
-		ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastHornOfWinterAction : public CastSpellAction
diff --git a/src/strategy/mage/MageActions.h b/src/strategy/mage/MageActions.h
index a2b83bf8..1303498a 100644
--- a/src/strategy/mage/MageActions.h
+++ b/src/strategy/mage/MageActions.h
@@ -203,12 +203,14 @@ class CastDragonsBreathAction : public CastSpellAction
 {
 	public:
 	    CastDragonsBreathAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "dragon's breath") { }
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastBlastWaveAction : public CastSpellAction
 {
 	public:
 	    CastBlastWaveAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "blast wave") { }
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastInvisibilityAction : public CastBuffSpellAction
diff --git a/src/strategy/priest/PriestActions.h b/src/strategy/priest/PriestActions.h
index 9aab4eb3..5e4737b9 100644
--- a/src/strategy/priest/PriestActions.h
+++ b/src/strategy/priest/PriestActions.h
@@ -161,5 +161,6 @@ class CastMindSearAction : public CastSpellAction
 {
     public:
         CastMindSearAction(PlayerbotAI* ai) : CastSpellAction(ai, "mind sear") {}
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 #endif
diff --git a/src/strategy/shaman/ShamanActions.h b/src/strategy/shaman/ShamanActions.h
index 24226b7a..c9467e49 100644
--- a/src/strategy/shaman/ShamanActions.h
+++ b/src/strategy/shaman/ShamanActions.h
@@ -323,6 +323,7 @@ class CastChainLightningAction : public CastSpellAction
 {
     public:
         CastChainLightningAction(PlayerbotAI* botAI) : CastSpellAction(botAI, "chain lightning") { }
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastLightningBoltAction : public CastSpellAction
diff --git a/src/strategy/values/PartyMemberToHeal.cpp b/src/strategy/values/PartyMemberToHeal.cpp
index 0f76b6e7..a7cba48e 100644
--- a/src/strategy/values/PartyMemberToHeal.cpp
+++ b/src/strategy/values/PartyMemberToHeal.cpp
@@ -74,7 +74,7 @@ bool PartyMemberToHeal::Check(Unit* player)
 {
     // return player && player != bot && player->GetMapId() == bot->GetMapId() && player->IsInWorld() &&
     //     sServerFacade->GetDistance2d(bot, player) < (player->IsPlayer() && botAI->IsTank((Player*)player) ? 50.0f : 40.0f);
-    return player->GetMapId() == bot->GetMapId() &&
+    return player->GetMapId() == bot->GetMapId() && !player->IsCharmed() &&
         bot->GetDistance2d(player) < sPlayerbotAIConfig->healDistance * 2 &&
         bot->IsWithinLOS(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ());
 }
diff --git a/src/strategy/warlock/WarlockActions.h b/src/strategy/warlock/WarlockActions.h
index 813374a0..28f689d3 100644
--- a/src/strategy/warlock/WarlockActions.h
+++ b/src/strategy/warlock/WarlockActions.h
@@ -70,7 +70,6 @@ class CastCorruptionAction : public CastDebuffSpellAction
         bool isUseful() override {
             return CastDebuffSpellAction::isUseful() && !botAI->HasAura("seed of corruption", GetTarget(), false, true) ;
         }
-        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastCorruptionOnAttackerAction : public CastDebuffSpellOnAttackerAction
@@ -80,7 +79,6 @@ class CastCorruptionOnAttackerAction : public CastDebuffSpellOnAttackerAction
         bool isUseful() override {
             return CastDebuffSpellOnAttackerAction::isUseful() && !botAI->HasAura("seed of corruption", GetTarget(), false, true) ;
         }
-        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastCurseOfAgonyOnAttackerAction : public CastDebuffSpellOnAttackerAction
@@ -153,6 +151,7 @@ class CastSeedOfCorruptionAction : public CastDebuffSpellAction
         bool isUseful() override {
             return CastDebuffSpellAction::isUseful() && !botAI->HasAura("corruption", GetTarget(), false, true) ;
         }
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastSeedOfCorruptionOnAttackerAction : public CastDebuffSpellOnAttackerAction
@@ -162,6 +161,7 @@ class CastSeedOfCorruptionOnAttackerAction : public CastDebuffSpellOnAttackerAct
         bool isUseful() override {
             return CastDebuffSpellOnAttackerAction::isUseful() && !botAI->HasAura("corruption", GetTarget(), false, true) ;
         }
+        ActionThreatType getThreatType() override { return ActionThreatType::Aoe; }
 };
 
 class CastRainOfFireAction : public CastSpellAction