diff --git a/Source/Framework/Constants/Language.cs b/Source/Framework/Constants/Language.cs
index bdf26bb1a..0fd83aed7 100644
--- a/Source/Framework/Constants/Language.cs
+++ b/Source/Framework/Constants/Language.cs
@@ -574,7 +574,7 @@ namespace Framework.Constants
         MovegensIdle = 527,
         MovegensRandom = 528,
         MovegensWaypoint = 529,
-        MovegensAnimalRandom = 530,
+        //                                  = 530, not used
         MovegensConfused = 531,
         MovegensChasePlayer = 532,
         MovegensChaseCreature = 533,
diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs
index 2da0b8688..47aa7114a 100644
--- a/Source/Game/Spells/Auras/AuraEffect.cs
+++ b/Source/Game/Spells/Auras/AuraEffect.cs
@@ -239,11 +239,8 @@ namespace Game.Spells
 
             foreach (var aurApp in effectApplications)
             {
-                if (aurApp.HasEffect(GetEffIndex()))
-                {
-                    aurApp.GetTarget()._RegisterAuraEffect(this, false);
-                    HandleEffect(aurApp, handleMask, false);
-                }
+                aurApp.GetTarget()._RegisterAuraEffect(this, false);
+                HandleEffect(aurApp, handleMask, false);
             }
 
             if (Convert.ToBoolean(handleMask & AuraEffectHandleModes.ChangeAmount))
@@ -257,11 +254,11 @@ namespace Game.Spells
 
             foreach (var aurApp in effectApplications)
             {
-                if (aurApp.HasEffect(GetEffIndex()))
-                {
-                    aurApp.GetTarget()._RegisterAuraEffect(this, true);
-                    HandleEffect(aurApp, handleMask, true);
-                }
+                if (aurApp.GetRemoveMode() != AuraRemoveMode.None)
+                    continue;
+
+                aurApp.GetTarget()._RegisterAuraEffect(this, true);
+                HandleEffect(aurApp, handleMask, true);
             }
 
             if (GetSpellInfo().HasAttribute(SpellAttr8.AuraSendAmount))
diff --git a/Source/Game/Spells/SpellManager.cs b/Source/Game/Spells/SpellManager.cs
index d556f08fd..3acdccf0f 100644
--- a/Source/Game/Spells/SpellManager.cs
+++ b/Source/Game/Spells/SpellManager.cs
@@ -2912,11 +2912,13 @@ namespace Game.Entities
                         spellInfo.MaxAffectedTargets = 3;
                         break;
                     case 71809: // Jump
-                        spellInfo.RangeEntry = CliDB.SpellRangeStorage.LookupByKey(3); // 20yd
-                        spellInfo.GetEffect(0).RadiusEntry = CliDB.SpellRadiusStorage.LookupByKey(EffectRadiusIndex.Yards25); // 25yd
+                        spellInfo.RangeEntry = CliDB.SpellRangeStorage.LookupByKey(5); // 40yd
+                        spellInfo.GetEffect(0).RadiusEntry = CliDB.SpellRadiusStorage.LookupByKey(EffectRadiusIndex.Yards10); // 10yd
+                        spellInfo.GetEffect(0).MiscValue = 190;
                         break;
                     case 72405: // Broken Frostmourne
-                        spellInfo.GetEffect(1).RadiusEntry = CliDB.SpellRadiusStorage.LookupByKey(EffectRadiusIndex.Yards200); // 200yd
+                        spellInfo.GetEffect(1).RadiusEntry = CliDB.SpellRadiusStorage.LookupByKey(EffectRadiusIndex.Yards20); // 20yd
+                        spellInfo.AttributesEx |= SpellAttr1.NoThreat;
                         break;
                     // ENDOF ICECROWN CITADEL SPELLS
                     //