diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 2f883670..b9237342 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -938,7 +938,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
     uint64_t Crest;
     uint32_t EntityId;
     uint32_t RestPoint;
-    uint16_t Expansion;
+    uint8_t Expansion;
+    uint8_t Unknown8;
     uint8_t Race;
     uint8_t Tribe;
     uint8_t Sex;
@@ -947,9 +948,9 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
     uint8_t GuardianDeity;
     uint8_t BirthMonth;
     uint8_t Birthday;
-    uint8_t GrandCompany;
-    uint8_t HomePoint;
     uint8_t StartTown;
+    uint8_t HomePoint;
+    uint8_t GrandCompany;
     uint8_t Anima;
     uint8_t Pet;
     uint8_t BuddyRank;
diff --git a/src/world/Network/PacketWrappers/PlayerSetupPacket.h b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
index fed9bbf3..4a2f9c30 100644
--- a/src/world/Network/PacketWrappers/PlayerSetupPacket.h
+++ b/src/world/Network/PacketWrappers/PlayerSetupPacket.h
@@ -40,10 +40,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       m_data.GuardianDeity = static_cast< uint8_t >( player.getGuardianDeity() );
       m_data.BirthMonth = player.getBirthMonth();
       m_data.Birthday = player.getBirthDay();
-      // TODO: Support grand company status.
       m_data.StartTown = player.getStartTown();
-      //m_data.gcRank = GCRank::None;
-
       m_data.HomePoint = player.getHomepoint();
       //m_data.pose = player.getPose();
 
@@ -53,7 +50,7 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
       memcpy( m_data.Aetheryte, player.getAetheryteArray().data(), sizeof( m_data.Aetheryte ) );
 
       // Set the class levels and exp.
-      for( uint8_t i = 0; i < 20; i++ )
+      for( uint8_t i = 0; i < 23; i++ )
       {
         m_data.Lv[ i ] = player.getClassArray()[ i ];
         m_data.Exp[ i ] = player.getExpArray()[ i ];
@@ -69,9 +66,6 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
 
       memcpy( m_data.HowTo, player.getHowToArray().data(), sizeof( m_data.HowTo ) );
 
-      m_data.Anima = 0;
-      m_data.Pet = 0;
-
       // possibly max level or current level
    //   m_data.maxLevel = Common::MAX_PLAYER_LEVEL;
    //   m_data.expansion = Common::CURRENT_EXPANSION_ID;