diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index ec218d042ff..bba20a89838 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -6556,7 +6556,6 @@ void Spell::SelectMountByAreaAndSkill(Unit* target, uint32 spellId75, uint32 spe
             {
                 if (iter->second.state != PLAYERSPELL_REMOVED)
                 {
-                    bool changedSpeed = false;
                     SpellEntry const *spellInfo = sSpellStore.LookupEntry(iter->first);
                     for(int i = 0; i < MAX_EFFECT_INDEX; ++i)
                     {
@@ -6564,8 +6563,8 @@ void Spell::SelectMountByAreaAndSkill(Unit* target, uint32 spellId75, uint32 spe
                         {
                             int32 mountSpeed = spellInfo->CalculateSimpleValue(SpellEffectIndex(i));
 
-                            // speed higher than 300 replace it
-                            if (mountSpeed > 300)
+                            // speed higher than 280 replace it
+                            if (mountSpeed > 280)
                                 target->CastSpell(target, spellIdSpecial, true);
                             return;
                         }
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 0b231c84776..fc05262e859 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2291,7 +2291,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                             ((Player*)m_target)->RemoveAmmo();
                         return;
                     case 48025:                             // Headless Horseman's Mount
-                        Spell::SelectMountByAreaAndSkill(m_target, 51621, 48024, 51617, 48023, NULL);
+                        Spell::SelectMountByAreaAndSkill(m_target, 51621, 48024, 51617, 48023, 0);
                         return;
                     case 62061:                             // Festive Holiday Mount
                         if (m_target->HasAuraType(SPELL_AURA_MOUNTED))
@@ -2309,10 +2309,10 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
                             ((Player*)m_target)->removeSpell(63680);
                         return;
                     case 72286:                             // Invincible
-                        Spell::SelectMountByAreaAndSkill(m_target, 72281, 72282, 72283, 72284, NULL);
+                        Spell::SelectMountByAreaAndSkill(m_target, 72281, 72282, 72283, 72284, 0);
                         return;
                     case 74856:                             // Blazing Hippogryph
-                        Spell::SelectMountByAreaAndSkill(m_target, NULL, NULL, 74854, 74855, NULL);
+                        Spell::SelectMountByAreaAndSkill(m_target, 0, 0, 74854, 74855, 0);
                         return;
                     case 75614:                             // Celestial Steed
                         Spell::SelectMountByAreaAndSkill(m_target, 75619, 75620, 75617, 75618, 76153);
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 5b0b43acea3..5588a7a2e24 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "9883"
+ #define REVISION_NR "9884"
 #endif // __REVISION_NR_H__