diff --git a/src/common/Common.h b/src/common/Common.h
index 168155e4..3b3af244 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -857,6 +857,8 @@ namespace Sapphire::Common
     uint32_t itemId;
     uint16_t itemRotation;
     Common::FFXIVARR_POSITION3 pos;
+    uint32_t unknown;
+    uint16_t padding;
   };
 
   enum HouseSize : uint8_t
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 7845240a..b497e01b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -482,10 +482,8 @@ struct FFXIVIpcPlayerSpawn :
 {
   uint16_t title;
   uint16_t u1b;
-  uint8_t u2b;
-  uint8_t u2ab;
-  uint8_t u3a;
-  uint8_t u3b;
+  uint16_t currentWorldId;
+  uint16_t homeWorldId;
 
   uint8_t gmRank;
   uint8_t u3c;
@@ -783,8 +781,8 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
   unsigned int fishCaught;
   unsigned int useBaitCatalogId;
   unsigned int unknown28;
-  unsigned __int16 unknownPvp2C;
-  unsigned __int16 unknown3;
+  uint16_t unknownPvp2C;
+  uint16_t unknown3;
   unsigned int pvpFrontlineOverallCampaigns;
   unsigned int unknownTimestamp34;
   unsigned int unknownTimestamp38;
@@ -793,123 +791,123 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket< InitUI >
   unsigned int unknown44;
   float companionTimePassed;
   unsigned int unknown4C;
-  unsigned __int16 unknown50;
-  unsigned __int16 unknownPvp52[4];
-  unsigned __int16 playerCommendations;
-  unsigned __int16 unknown5C;
-  unsigned __int16 unknown5E;
-  unsigned __int16 pvpFrontlineWeeklyCampaigns;
-  unsigned __int16 enhancedAnimaGlassProgress;
-  unsigned __int16 unknown64[4];
-  unsigned __int16 pvpRivalWingsTotalMatches;
-  unsigned __int16 pvpRivalWingsTotalVictories;
-  unsigned __int16 pvpRivalWingsWeeklyMatches;
-  unsigned __int16 pvpRivalWingsWeeklyVictories;
-  unsigned __int8 maxLevel;
-  unsigned __int8 expansion;
-  unsigned __int8 unknown76;
-  unsigned __int8 race;
-  unsigned __int8 tribe;
-  unsigned __int8 gender;
-  unsigned __int8 currentJob;
-  unsigned __int8 currentClass;
-  unsigned __int8 deity;
-  unsigned __int8 namedayMonth;
-  unsigned __int8 namedayDay;
-  unsigned __int8 cityState;
-  unsigned __int8 homepoint;
-  unsigned __int8 unknown81;
-  unsigned __int8 petHotBar;
-  unsigned __int8 companionRank;
-  unsigned __int8 companionStars;
-  unsigned __int8 companionSp;
-  unsigned __int8 companionUnk86;
-  unsigned __int8 companionColor;
-  unsigned __int8 companionFavoFeed;
-  unsigned __int8 unknown89;
-  unsigned __int8 unknown8A[4];
-  unsigned __int8 hasRelicBook;
-  unsigned __int8 relicBookId;
-  unsigned __int8 unknown90[4];
-  unsigned __int8 craftingMasterMask;
-  unsigned __int8 unknown95[10];
-  unsigned __int8 unknown9F[2];
-  unsigned __int8 unknownA1[3];
+  uint16_t unknown50;
+  uint16_t unknownPvp52[4];
+  uint16_t playerCommendations;
+  uint16_t unknown5C;
+  uint16_t unknown5E;
+  uint16_t pvpFrontlineWeeklyCampaigns;
+  uint16_t enhancedAnimaGlassProgress;
+  uint16_t unknown64[4];
+  uint16_t pvpRivalWingsTotalMatches;
+  uint16_t pvpRivalWingsTotalVictories;
+  uint16_t pvpRivalWingsWeeklyMatches;
+  uint16_t pvpRivalWingsWeeklyVictories;
+  uint8_t maxLevel;
+  uint8_t expansion;
+  uint8_t unknown76;
+  uint8_t race;
+  uint8_t tribe;
+  uint8_t gender;
+  uint8_t currentJob;
+  uint8_t currentClass;
+  uint8_t deity;
+  uint8_t namedayMonth;
+  uint8_t namedayDay;
+  uint8_t cityState;
+  uint8_t homepoint;
+  uint8_t unknown81;
+  uint8_t petHotBar;
+  uint8_t companionRank;
+  uint8_t companionStars;
+  uint8_t companionSp;
+  uint8_t companionUnk86;
+  uint8_t companionColor;
+  uint8_t companionFavoFeed;
+  uint8_t unknown89;
+  uint8_t unknown8A[4];
+  uint8_t hasRelicBook;
+  uint8_t relicBookId;
+  uint8_t unknown90[4];
+  uint8_t craftingMasterMask;
+  uint8_t unknown95[10];
+  uint8_t unknown9F[2];
+  uint8_t unknownA1[3];
   unsigned int exp[26];
   unsigned int unknown108;
   unsigned int pvpTotalExp;
   unsigned int unknownPvp110;
   unsigned int pvpExp;
   unsigned int pvpFrontlineOverallRanks[3];
-  unsigned __int16 levels[26];
+  uint16_t levels[26];
   unsigned int exploratoryMissionNextTimestamp;
-  unsigned __int16 unknown15C[9];
-  unsigned __int16 fishingRecordsFish[26];
-  unsigned __int16 fishingRecordsFishWeight[26];
-  unsigned __int16 beastExp[11];
-  unsigned __int16 unknown1EA[5];
-  unsigned __int16 pvpFrontlineWeeklyRanks[3];
-  unsigned __int16 unknownMask1FA[3];
-  unsigned __int8 companionName[21];
-  unsigned __int8 companionDefRank;
-  unsigned __int8 companionAttRank;
-  unsigned __int8 companionHealRank;
-  unsigned __int8 mountGuideMask[17];
+  uint16_t unknown15C[9];
+  uint16_t fishingRecordsFish[26];
+  uint16_t fishingRecordsFishWeight[26];
+  uint16_t beastExp[11];
+  uint16_t unknown1EA[5];
+  uint16_t pvpFrontlineWeeklyRanks[3];
+  uint16_t unknownMask1FA[3];
+  uint8_t companionName[21];
+  uint8_t companionDefRank;
+  uint8_t companionAttRank;
+  uint8_t companionHealRank;
+  uint8_t mountGuideMask[17];
   char name[32];
-  unsigned __int8 unknownOword[15];
-  unsigned __int8 unlockBitmask[64];
-  unsigned __int8 aetheryte[17];
-  unsigned __int8 unknown258;
-  unsigned __int8 chocoboTaxiMask[8];
-  unsigned __int8 unknown11111[118];
-  unsigned __int8 companionBardingMask[9];
-  unsigned __int8 companionEquippedHead;
-  unsigned __int8 companionEquippedBody;
-  unsigned __int8 companionEquippedLegs;
-  unsigned __int8 unknown519[4];
-  unsigned __int8 unknownMask51D[11];
-  unsigned __int8 fishingGuideMask[89];
-  unsigned __int8 fishingSpotVisited[25];
-  unsigned __int8 unknown59A[15];
-  unsigned __int8 unknown5A9[2];
-  unsigned __int8 unknownPvp5AB[2];
-  unsigned __int8 beastRank[11];
-  unsigned __int8 pose;
-  unsigned __int8 weaponPose;
-  unsigned __int8 unknownMask5C4[3];
-  unsigned __int8 unknown5C9[2];
-  unsigned __int8 challengeLogComplete[9];
-  unsigned __int8 unknownMask5DD[28];
-  unsigned __int8 tripleTriadCards[30];
-  unsigned __int8 unknownMask673[10];
-  unsigned __int8 unknown5B9[11];
-  unsigned __int8 unknown5D4[11];
-  unsigned __int8 unknown694[3];
-  unsigned __int8 pvpLevel;
-  unsigned __int8 unknown67D;
-  unsigned __int8 howto[34];
-  unsigned __int8 minions[42];
-  unsigned __int8 watchedCutscenes[118];
-  unsigned __int8 discovery[421];
-  unsigned __int8 relicCompletion[12];
-  unsigned __int8 sightseeingMask[26];
-  unsigned __int8 huntingMarkMask[55];
-  unsigned __int8 aetherCurrentMask[22];
-  unsigned __int8 orchestrionMask[40];
-  unsigned __int8 hallOfNoviceCompleteMask[3];
-  unsigned __int8 animaCompletion[11];
-  unsigned __int8 unknown6CD[16];
-  unsigned __int8 unknownMask6DB[11];
-  unsigned __int8 unlockedRaids[28];
-  unsigned __int8 unlockedDungeons[18];
-  unsigned __int8 unlockedGuildhests[10];
-  unsigned __int8 unlockedTrials[8];
-  unsigned __int8 unlockedPvp[5];
-  unsigned __int8 clearedRaids[28];
-  unsigned __int8 clearedDungeons[18];
-  unsigned __int8 clearedGuildhests[10];
-  unsigned __int8 clearedTrials[8];
-  unsigned __int8 clearedPvp[5];
+  uint8_t unknownOword[15];
+  uint8_t unlockBitmask[64];
+  uint8_t aetheryte[17];
+  uint8_t unknown258;
+  uint8_t chocoboTaxiMask[8];
+  uint8_t unknown11111[118];
+  uint8_t companionBardingMask[9];
+  uint8_t companionEquippedHead;
+  uint8_t companionEquippedBody;
+  uint8_t companionEquippedLegs;
+  uint8_t unknown519[4];
+  uint8_t unknownMask51D[11];
+  uint8_t fishingGuideMask[89];
+  uint8_t fishingSpotVisited[25];
+  uint8_t unknown59A[15];
+  uint8_t unknown5A9[2];
+  uint8_t unknownPvp5AB[2];
+  uint8_t beastRank[11];
+  uint8_t pose;
+  uint8_t weaponPose;
+  uint8_t unknownMask5C4[3];
+  uint8_t unknown5C9[2];
+  uint8_t challengeLogComplete[9];
+  uint8_t unknownMask5DD[28];
+  uint8_t tripleTriadCards[30];
+  uint8_t unknownMask673[10];
+  uint8_t unknown5B9[11];
+  uint8_t unknown5D4[11];
+  uint8_t unknown694[3];
+  uint8_t pvpLevel;
+  uint8_t unknown67D;
+  uint8_t howto[34];
+  uint8_t minions[42];
+  uint8_t watchedCutscenes[118];
+  uint8_t discovery[421];
+  uint8_t relicCompletion[12];
+  uint8_t sightseeingMask[26];
+  uint8_t huntingMarkMask[55];
+  uint8_t aetherCurrentMask[22];
+  uint8_t orchestrionMask[40];
+  uint8_t hallOfNoviceCompleteMask[3];
+  uint8_t animaCompletion[11];
+  uint8_t unknown6CD[16];
+  uint8_t unknownMask6DB[11];
+  uint8_t unlockedRaids[28];
+  uint8_t unlockedDungeons[18];
+  uint8_t unlockedGuildhests[10];
+  uint8_t unlockedTrials[8];
+  uint8_t unlockedPvp[5];
+  uint8_t clearedRaids[28];
+  uint8_t clearedDungeons[18];
+  uint8_t clearedGuildhests[10];
+  uint8_t clearedTrials[8];
+  uint8_t clearedPvp[5];
 
 };