diff --git a/src/server/scripts/ExilesReach/exiles_reach_darkmaul_plains.cpp b/src/server/scripts/ExilesReach/exiles_reach_darkmaul_plains.cpp
index 3e948a2ba..fab070af8 100644
--- a/src/server/scripts/ExilesReach/exiles_reach_darkmaul_plains.cpp
+++ b/src/server/scripts/ExilesReach/exiles_reach_darkmaul_plains.cpp
@@ -1001,7 +1001,7 @@ public:
             if (!caster || !caster->IsInWorld())
                 return;
 
-            float radius = GetEffectInfo().CalcRadius(caster);
+            float radius = GetEffectInfo().CalcRadius(caster).Max;
             int32 damage = GetEffectValue();
 
             std::list<Creature*> targets;
@@ -1013,7 +1013,7 @@ public:
             {
                 if (!caster->IsValidAttackTarget(target))
                     continue;
-                caster->DealDamage(target, damage, nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL);
+                Unit::DealDamage(caster, target, uint32(damage), nullptr, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL);
             }
         }
 
diff --git a/src/server/scripts/ExilesReach/exiles_reach_north_sea.cpp b/src/server/scripts/ExilesReach/exiles_reach_north_sea.cpp
index 8bde9a4ac..4996097f8 100644
--- a/src/server/scripts/ExilesReach/exiles_reach_north_sea.cpp
+++ b/src/server/scripts/ExilesReach/exiles_reach_north_sea.cpp
@@ -214,25 +214,6 @@ struct npc_exiles_reach_ship_166583_160664 : public ScriptedAI
 {
     npc_exiles_reach_ship_166583_160664(Creature* creature) : ScriptedAI(creature) {}
 
-    void SetLeashPosition(Position const& pos) { _leashPosition = pos; _leashSet = true; }
-
-    void UpdateAI(uint32 diff) override
-    {
-        if (Unit* victim = me->GetVictim())
-        {
-            // Stay on the boat: if the sparring partner gets dragged past the
-            // deck edge, stop chasing and walk back on the ship's geometry
-            // (avoids the boundary-evade spline that clips through the hull).
-            if (_leashSet && me->GetDistance(_leashPosition) > 15.0f)
-            {
-                me->AttackStop();
-                me->GetMotionMaster()->MovePoint(0, _leashPosition);
-                return;
-            }
-        }
-        ScriptedAI::UpdateAI(diff);
-    }
-
     void BeFriendly()
     {
         me->AttackStop();
@@ -249,9 +230,6 @@ struct npc_exiles_reach_ship_166583_160664 : public ScriptedAI
         case QUEST_H_STAND_YOUR_GROUND:
             if (Creature* clone = me->SummonPersonalClone(me->GetPosition(), TEMPSUMMON_MANUAL_DESPAWN, 0s, 0U, 0U, player))
             {
-                if (npc_exiles_reach_ship_166583_160664* personalAI = CAST_AI(npc_exiles_reach_ship_166583_160664, clone->AI()))
-                    personalAI->SetLeashPosition(me->GetPosition());
-
                 clone->SetHealth(player->GetHealth());
                 clone->AI()->Talk(0, player);
                 // I'll take my position. Strike first, and strike hard!
@@ -327,10 +305,6 @@ struct npc_exiles_reach_ship_166583_160664 : public ScriptedAI
         else
             me->CastSpell(player, SPELL_JUMP_BEHIND, true);
     }
-
-private:
-    Position _leashPosition;
-    bool _leashSet = false;
 };
 
 void AddSC_exiles_reach_north_sea()