diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h
index 00321039b..5d6bf1474 100644
--- a/src/game/Chat/Chat.h
+++ b/src/game/Chat/Chat.h
@@ -79,6 +79,14 @@ enum ChatCommandSearchResult
     CHAT_COMMAND_UNKNOWN_SUBCOMMAND,                        // command found but some level subcommand not find in subcommand list
 };
 
+enum PlayerChatTag
+{
+    CHAT_TAG_NONE               = 0,
+    CHAT_TAG_AFK                = 1,
+    CHAT_TAG_DND                = 2,
+    CHAT_TAG_GM                 = 3,
+};
+
 class MANGOS_DLL_SPEC ChatHandler
 {
     public:
diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp
index cedbd0b2a..d34f29281 100644
--- a/src/game/Objects/Player.cpp
+++ b/src/game/Objects/Player.cpp
@@ -1777,21 +1777,16 @@ bool Player::ToggleDND()
 
 uint8 Player::GetChatTag() const
 {
-    // it's bitmask
-    // 0x3 - gm
-    // 0x2 - dnd
-    // 0x1 - afk
     if (IsGMChat())
-        return 3;
+        return CHAT_TAG_GM;
     if (IsDND())
-        return 2;
+        return CHAT_TAG_DND;
     if (IsAFK())
-        return 1;
+        return CHAT_TAG_AFK;
     
-    return 0;
+    return CHAT_TAG_NONE;
 }
 
-
 bool Player::SwitchInstance(uint32 newInstanceId)
 {
     if (!IsInWorld())
diff --git a/src/game/Spells/SpellEffects.cpp b/src/game/Spells/SpellEffects.cpp
index 3983ed884..9456db0ba 100644
--- a/src/game/Spells/SpellEffects.cpp
+++ b/src/game/Spells/SpellEffects.cpp
@@ -1619,7 +1619,7 @@ void Spell::EffectDummy(SpellEffectIndex eff_idx)
                         return;
 
                     // increase reflection chance (effect 1) of Frost Ward, removed in aura boosts
-                    SpellModifier* mod = new SpellModifier(SPELLMOD_RESIST_MISS_CHANCE, SPELLMOD_FLAT, damage, m_spellInfo->Id, uint64(0x0000000000000100));
+                    SpellModifier* mod = new SpellModifier(SPELLMOD_RESIST_MISS_CHANCE, SPELLMOD_FLAT, damage, m_spellInfo->Id, UI64LIT(0x0000000000000100));
                     ((Player*)unitTarget)->AddSpellMod(mod, true);
                     break;
                 }