diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 04ed6a32d..519e28ad0 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1204,14 +1204,14 @@ void Aura::HandleAddModifier(bool apply, bool Real)
         uint32 const *ptr;
         SpellAffectEntry const *spellAffect = spellmgr.GetSpellAffect(GetId(), m_effIndex);
         if (spellAffect)
-            ptr = spellAffect->SpellClassMask;
+            ptr = &spellAffect->SpellClassMask[0];
         else
         {
             switch (m_effIndex)
             {
-                case 0: ptr = m_spellProto->EffectSpellClassMaskA; break;
-                case 1: ptr = m_spellProto->EffectSpellClassMaskB; break;
-                case 2: ptr = m_spellProto->EffectSpellClassMaskC; break;
+                case 0: ptr = &m_spellProto->EffectSpellClassMaskA[0]; break;
+                case 1: ptr = &m_spellProto->EffectSpellClassMaskB[0]; break;
+                case 2: ptr = &m_spellProto->EffectSpellClassMaskC[0]; break;
                 default:
                     return;
             }
@@ -1254,14 +1254,14 @@ void Aura::HandleAddTargetTrigger(bool apply, bool Real)
         uint32 const *ptr;
         SpellAffectEntry const *spellAffect = spellmgr.GetSpellAffect(GetId(), m_effIndex);
         if (spellAffect)
-            ptr = spellAffect->SpellClassMask;
+            ptr = &spellAffect->SpellClassMask[0];
         else
         {
             switch (m_effIndex)
             {
-                case 0: ptr = m_spellProto->EffectSpellClassMaskA; break;
-                case 1: ptr = m_spellProto->EffectSpellClassMaskB; break;
-                case 2: ptr = m_spellProto->EffectSpellClassMaskC; break;
+                case 0: ptr = &m_spellProto->EffectSpellClassMaskA[0]; break;
+                case 1: ptr = &m_spellProto->EffectSpellClassMaskB[0]; break;
+                case 2: ptr = &m_spellProto->EffectSpellClassMaskC[0]; break;
                 default:
                     return;
             }
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 46bb2a3db..0054842bd 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -723,9 +723,9 @@ void SpellMgr::LoadSpellAffects()
         uint32 const *ptr = 0;
         switch (effectId)
         {
-            case 0: ptr = spellInfo->EffectSpellClassMaskA; break;
-            case 1: ptr = spellInfo->EffectSpellClassMaskB; break;
-            case 2: ptr = spellInfo->EffectSpellClassMaskC; break;
+            case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break;
+            case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break;
+            case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break;
             default: 
                 continue;
         }
@@ -763,9 +763,9 @@ void SpellMgr::LoadSpellAffects()
             uint32 const *ptr = 0;
             switch (effectId)
             {
-                case 0: ptr = spellInfo->EffectSpellClassMaskA; break;
-                case 1: ptr = spellInfo->EffectSpellClassMaskB; break;
-                case 2: ptr = spellInfo->EffectSpellClassMaskC; break;
+                case 0: ptr = &spellInfo->EffectSpellClassMaskA[0]; break;
+                case 1: ptr = &spellInfo->EffectSpellClassMaskB[0]; break;
+                case 2: ptr = &spellInfo->EffectSpellClassMaskC[0]; break;
                 default: 
                     continue;
             }
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index 9256b9162..2d112896f 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -62,7 +62,7 @@ inline float Traveller<Creature>::Speed()
     if(i_traveller.HasUnitMovementFlag(MOVEMENTFLAG_WALK_MODE))
         return i_traveller.GetSpeed(MOVE_WALK);
     else if(i_traveller.HasUnitMovementFlag(MOVEMENTFLAG_FLYING2))
-        return i_traveller.GetSpeed(MOVE_FLY);
+        return i_traveller.GetSpeed(MOVE_FLIGHT);
     else
         return i_traveller.GetSpeed(MOVE_RUN);
 }