diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index a3bf2242c..4f6075115 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -483,6 +483,7 @@ void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
+    cell.SetNoCreate();
 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
@@ -528,6 +529,7 @@ void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, boo
 
     Cell cell(p);
     cell.data.Part.reserved = ALL_DISTRICT;
+    cell.SetNoCreate();
 
     if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
         return;
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 806fdc259..7e820e4bb 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -172,7 +172,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
                 return SPELL_STING;
 
             // only hunter aspects have this (but not all aspects in hunter family)
-            if( spellInfo->SpellFamilyFlags & UI64LIT(0x0044000000380000) || spellInfo->SpellFamilyFlags2 & 0x00003010)
+            if( spellInfo->SpellFamilyFlags & UI64LIT(0x0044000000380000) || spellInfo->SpellFamilyFlags2 & 0x00001010)
                 return SPELL_ASPECT;
 
             if( spellInfo->SpellFamilyFlags2 & 0x00000002 )
@@ -191,12 +191,10 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             if ((spellInfo->SpellFamilyFlags & UI64LIT(0x00000820180400)) && (spellInfo->AttributesEx3 & 0x200))
                 return SPELL_JUDGEMENT;
 
-            for (int i = 0; i < 3; ++i)
-            {
-                // only paladin auras have this (for palaldin class family)
-                if (spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_RAID)
-                    return SPELL_AURA;
-            }
+            // only paladin auras have this (for palaldin class family)
+            if( spellInfo->SpellFamilyFlags2 & 0x00000020 )
+                return SPELL_AURA;
+
             break;
         }
         case SPELLFAMILY_SHAMAN:
@@ -211,7 +209,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
             return spellmgr.GetSpellElixirSpecific(spellInfo->Id);
 
         case SPELLFAMILY_DEATHKNIGHT:
-            if ((spellInfo->Attributes & 0x10) && (spellInfo->AttributesEx2 & 0x10) && (spellInfo->AttributesEx4 & 0x200000))
+            if (spellInfo->Category == 47)
                 return SPELL_PRESENCE;
             break;
     }
diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp
index 737f28631..95e93c417 100644
--- a/src/game/WorldSocket.cpp
+++ b/src/game/WorldSocket.cpp
@@ -755,7 +755,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
 
     BigNumber K;
 
-    if (recvPacket.size () < (4 + 4 + 1 + 4 + 20))
+    if (recvPacket.size () < (4 + 4 + 1 + 4 + 4 + 20))
     {
         sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size");
         return -1;
@@ -767,7 +767,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
     recvPacket >> account;
     recvPacket >> unk3;
 
-    if (recvPacket.size () < (4 + 4 + (account.size () + 1) + 4 + 20))
+    if (recvPacket.size () < (4 + 4 + (account.size () + 1) + 4 + 4 + 20))
     {
         sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size second check");
         return -1;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b320708c0..70f81a669 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 "8277"
+ #define REVISION_NR "8280"
 #endif // __REVISION_NR_H__