diff --git a/Source/Game/AI/SmartScripts/SmartAI.cs b/Source/Game/AI/SmartScripts/SmartAI.cs
index a2d481f5e..ee27dea51 100644
--- a/Source/Game/AI/SmartScripts/SmartAI.cs
+++ b/Source/Game/AI/SmartScripts/SmartAI.cs
@@ -113,8 +113,8 @@ namespace Game.AI
 
             if (invoker && invoker.IsPlayer())
             {
-                _escortNPCFlags = me.m_unitData.NpcFlags[0];
-                me.ReplaceAllNpcFlags(0);
+                _escortNPCFlags = me.GetNpcFlags();
+                me.ReplaceAllNpcFlags(NPCFlags.None);
             }
 
             me.GetMotionMaster().MovePath(_path, _repeatWaypointPath);
diff --git a/Source/Game/Groups/GroupManager.cs b/Source/Game/Groups/GroupManager.cs
index 80566ac7a..8a885a142 100644
--- a/Source/Game/Groups/GroupManager.cs
+++ b/Source/Game/Groups/GroupManager.cs
@@ -191,7 +191,7 @@ namespace Game.Groups
                 //                                                 0       1       2            3            4             5            6
                 SQLResult result = DB.Characters.Query("SELECT gi.guid, i.map, gi.instance, gi.permanent, i.difficulty, i.resettime, i.entranceId, " +
                     //           7
-                    "(SELECT COUNT(1) FROM character_instance ci LEFT JOIN groups g ON ci.guid = g.leaderGuid WHERE ci.instance = gi.instance AND ci.permanent = 1 LIMIT 1) " +
+                    "(SELECT COUNT(1) FROM character_instance ci LEFT JOIN `groups` g ON ci.guid = g.leaderGuid WHERE ci.instance = gi.instance AND ci.permanent = 1 LIMIT 1) " +
                     "FROM group_instance gi LEFT JOIN instance i ON gi.instance = i.id ORDER BY guid");
 
                 if (result.IsEmpty())