diff --git a/src/api/PlayerMinimal.cpp b/src/api/PlayerMinimal.cpp
index 12402b23..81e64e31 100644
--- a/src/api/PlayerMinimal.cpp
+++ b/src/api/PlayerMinimal.cpp
@@ -189,7 +189,7 @@ void PlayerMinimal::saveAsNew()
   std::vector< uint8_t > howTo( 33 );
   std::vector< uint8_t > aetherytes( 16 );
   std::vector< uint8_t > discovery( 421 );
-  std::vector< uint8_t > questComplete( 350 );
+  std::vector< uint8_t > questComplete( 342 );
   std::vector< uint8_t > unlocks( 64 );
   std::vector< uint8_t > mountGuide( 15 );
   std::vector< uint8_t > orchestrion( 40 );
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index ed0228a8..a393fb0d 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -31,7 +31,7 @@ namespace Sapphire::Entity
     using HowToList = std::array< uint8_t, 34 >;
     using MinionList = std::array< uint8_t, 40 >;
     using MountList = std::array< uint8_t, 22 >;
-    using QuestComplete = std::array< uint8_t, 350 >;
+    using QuestComplete = std::array< uint8_t, 342 >;
     using Discovery = std::array< uint8_t, 400 >;
     using AetheryteList = std::array< uint8_t, 21 >;
     using UnlockList = std::array< uint8_t, 64 >;
diff --git a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
index a647a006..353fd1e2 100644
--- a/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -87,7 +87,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       m_data.PermissionInvisibility = 0;
 
       m_data.GrandCompany = player.getGc();
-      m_data.GrandCompanyRank = player.getGcRankArray()[ player.getGc() - 1 ];
+      if( m_data.GrandCompany > 0 )
+        m_data.GrandCompanyRank = player.getGcRankArray()[ player.getGc() - 1 ];
 
       //m_data.u23 = 0x04;
       //m_data.u24 = 256;