diff --git a/Source/Game/AI/SmartScripts/SmartScript.cs b/Source/Game/AI/SmartScripts/SmartScript.cs
index ba91098d1..4a6a554db 100644
--- a/Source/Game/AI/SmartScripts/SmartScript.cs
+++ b/Source/Game/AI/SmartScripts/SmartScript.cs
@@ -1684,6 +1684,7 @@ namespace Game.AI
                     ResetBaseObject();
                     break;
                 case SmartActions.CallScriptReset:
+                    SetPhase(0);
                     OnReset();
                     break;
                 case SmartActions.SetRangedMovement:
diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs
index 868c45266..0a879c591 100644
--- a/Source/Game/Entities/GameObject/GameObject.cs
+++ b/Source/Game/Entities/GameObject/GameObject.cs
@@ -554,10 +554,8 @@ namespace Game.Entities
                                     // Hunter trap: Search units which are unfriendly to the trap's owner
                                     var checker = new NearestUnfriendlyNoTotemUnitInObjectRangeCheck(this, owner, radius);
                                     var searcher = new UnitSearcher(this, checker);
-                                    Cell.VisitGridObjects(this, searcher, radius);
+                                    Cell.VisitAllObjects(this, searcher, radius);
                                     target = searcher.GetTarget();
-                                    if (target == null)
-                                        Cell.VisitWorldObjects(this, searcher, radius);
                                 }
                                 else
                                 {
diff --git a/Source/Game/Entities/Player/Player.DB.cs b/Source/Game/Entities/Player/Player.DB.cs
index de5a821c6..5a58e5172 100644
--- a/Source/Game/Entities/Player/Player.DB.cs
+++ b/Source/Game/Entities/Player/Player.DB.cs
@@ -2950,7 +2950,7 @@ namespace Game.Entities
                 uint runeCooldown = GetRuneBaseCooldown();
                 while (runes < maxRunes)
                 {
-                    SetRuneCooldown((byte)runes, runeCooldown, false);
+                    SetRuneCooldown((byte)runes, runeCooldown);
                     ++runes;
                 }
             }
diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs
index be6e6e94b..cae30621c 100644
--- a/Source/Game/Entities/Player/Player.Spells.cs
+++ b/Source/Game/Entities/Player/Player.Spells.cs
@@ -2850,7 +2850,7 @@ namespace Game.Entities
         /**********************************/
         /*************Runes****************/
         /**********************************/
-        public void SetRuneCooldown(byte index, uint cooldown, bool casted = false)
+        public void SetRuneCooldown(byte index, uint cooldown)
         {
             m_runes.Cooldown[index] = cooldown;
             m_runes.SetRuneState(index, (cooldown == 0) ? true : false);
@@ -2890,7 +2890,7 @@ namespace Game.Entities
         {
             int maxRunes = GetMaxPower(PowerType.Runes);
 
-            ResyncRunes data = new ResyncRunes(maxRunes);
+            ResyncRunes data = new ResyncRunes();
             data.Runes.Start = (byte)((1 << maxRunes) - 1);
             data.Runes.Count = GetRunesState();
 
diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs
index 1e127f9f7..1413333a2 100644
--- a/Source/Game/Entities/Unit/Unit.Spells.cs
+++ b/Source/Game/Entities/Unit/Unit.Spells.cs
@@ -2262,7 +2262,7 @@ namespace Game.Entities
             SpellHealLog spellHealLog = new SpellHealLog();
 
             spellHealLog.TargetGUID = healInfo.GetTarget().GetGUID();
-            spellHealLog.CasterGUID = GetGUID();
+            spellHealLog.CasterGUID = healInfo.GetHealer().GetGUID();
 
             spellHealLog.SpellID = healInfo.GetSpellInfo().Id;
             spellHealLog.Health = healInfo.GetHeal();
diff --git a/Source/Game/Spells/Spell.cs b/Source/Game/Spells/Spell.cs
index 726c35119..233670940 100644
--- a/Source/Game/Spells/Spell.cs
+++ b/Source/Game/Spells/Spell.cs
@@ -4183,7 +4183,7 @@ namespace Game.Spells
             {
                 if (player.GetRuneCooldown(i) == 0 && runeCost > 0)
                 {
-                    player.SetRuneCooldown(i, didHit ? player.GetRuneBaseCooldown() : RuneCooldowns.Miss, true);
+                    player.SetRuneCooldown(i, didHit ? player.GetRuneBaseCooldown() : RuneCooldowns.Miss);
                     --runeCost;
                 }
             }