diff --git a/FFXIVClassic Map Server/actors/chara/player/Player.cs b/FFXIVClassic Map Server/actors/chara/player/Player.cs
index e3830566..11230686 100644
--- a/FFXIVClassic Map Server/actors/chara/player/Player.cs	
+++ b/FFXIVClassic Map Server/actors/chara/player/Player.cs	
@@ -512,7 +512,7 @@ namespace FFXIVClassic_Map_Server.Actors
             
             QueuePacket(SetMapPacket.BuildPacket(actorId, zone.regionId, zone.actorId));
 
-            QueuePacket(GetSpawnPackets(this, spawnType));            
+            QueuePackets(GetSpawnPackets(this, spawnType));            
             //GetSpawnPackets(actorId, spawnType).DebugPrintPacket();
 
             #region Inventory & Equipment
@@ -558,8 +558,8 @@ namespace FFXIVClassic_Map_Server.Actors
             
             foreach (Director director in ownedDirectors)
             {
-                QueuePacket(director.GetSpawnPackets());
-                QueuePacket(director.GetInitPackets());
+                QueuePackets(director.GetSpawnPackets());
+                QueuePackets(director.GetInitPackets());
             }
 
             if (currentContentGroup != null)
@@ -594,11 +594,6 @@ namespace FFXIVClassic_Map_Server.Actors
             return actorId == otherActorId;
         }        
 
-        public void QueuePacket(List<SubPacket> packets)
-        {
-            playerSession.QueuePacket(packets);
-        }
-
         public void QueuePacket(SubPacket packet)
         {
             playerSession.QueuePacket(packet);
@@ -606,8 +601,7 @@ namespace FFXIVClassic_Map_Server.Actors
 
         public void QueuePackets(List<SubPacket> packets)
         {
-            foreach (SubPacket subpacket in packets)
-                playerSession.QueuePacket(subpacket);
+            playerSession.QueuePacket(packets);
         }
 
         public void SendPacket(string path)
@@ -1447,8 +1441,8 @@ namespace FFXIVClassic_Map_Server.Actors
 
         public void SendDirectorPackets(Director director)
         {
-            QueuePacket(director.GetSpawnPackets());
-            QueuePacket(director.GetInitPackets());        
+            QueuePackets(director.GetSpawnPackets());
+            QueuePackets(director.GetInitPackets());        
         }
 
         public void RemoveDirector(Director director)
diff --git a/FFXIVClassic Map Server/actors/director/Director.cs b/FFXIVClassic Map Server/actors/director/Director.cs
index 524762ee..f5c7bc8b 100644
--- a/FFXIVClassic Map Server/actors/director/Director.cs	
+++ b/FFXIVClassic Map Server/actors/director/Director.cs	
@@ -110,8 +110,8 @@ namespace FFXIVClassic_Map_Server.actors.director
             {
                 foreach (Player p in GetPlayerMembers())
                 {
-                    p.QueuePacket(GetSpawnPackets());
-                    p.QueuePacket(GetInitPackets());
+                    p.QueuePackets(GetSpawnPackets());
+                    p.QueuePackets(GetInitPackets());
                 }
             }
 
diff --git a/FFXIVClassic Map Server/dataobjects/Session.cs b/FFXIVClassic Map Server/dataobjects/Session.cs
index a3965832..e1b3ab49 100644
--- a/FFXIVClassic Map Server/dataobjects/Session.cs	
+++ b/FFXIVClassic Map Server/dataobjects/Session.cs	
@@ -81,7 +81,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
             playerActor.rotation = rot;
             playerActor.moveState = moveState;
 
-            GetActor().zone.UpdateActorPosition(GetActor());
+            GetActor().GetZone().UpdateActorPosition(GetActor());
 
         }
         long lastMilis = 0;
@@ -108,7 +108,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
                     if (npc.GetUniqueId().Equals("1") && milliseconds - lastMilis > 1000)
                     {
                         lastMilis = milliseconds;
-                        GetActor().QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
+                        QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
                         actorInstanceList.RemoveAt(i);
                         continue;
                     }
@@ -116,7 +116,7 @@ namespace FFXIVClassic_Map_Server.dataobjects
 
                 if (!list.Contains(actorInstanceList[i]))
                 {
-                    GetActor().QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
+                    QueuePacket(RemoveActorPacket.BuildPacket(actorInstanceList[i].actorId));
                     actorInstanceList.RemoveAt(i);
                 }
                 
diff --git a/FFXIVClassic Map Server/lua/LuaEngine.cs b/FFXIVClassic Map Server/lua/LuaEngine.cs
index c34ada7d..c0134a3e 100644
--- a/FFXIVClassic Map Server/lua/LuaEngine.cs	
+++ b/FFXIVClassic Map Server/lua/LuaEngine.cs	
@@ -605,9 +605,8 @@ namespace FFXIVClassic_Map_Server.lua
             if (player == null)
                 return;
             List<SubPacket> SendError = new List<SubPacket>();
-            SendError.Add(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName));
             player.SendMessage(SendMessagePacket.MESSAGE_TYPE_SYSTEM_ERROR, "", message);
-            player.playerSession.QueuePacket(SendError);
+            player.QueuePacket(EndEventPacket.BuildPacket(player.actorId, player.currentEventOwner, player.currentEventName));
         }
         
     }