diff --git a/src/common/Common.h b/src/common/Common.h
index 5d61a408..bc8fc621 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -636,7 +636,7 @@ namespace Sapphire::Common
     StartActionCombo = 27, // shifted one up from 5.18
     ComboSucceed = 28, // shifted one up from 5.18, on retail this is not seen anymore, still working though.
     Knockback = 33,
-    Mount = 39,
+    Mount = 40, // shifted one down from 5.18
     VFX = 59, // links to VFX sheet
   };
 
diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index c5a9db0f..958427ad 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -142,7 +142,7 @@ namespace Sapphire::Network::Packets
 
     ActorSetPos = 0x00CF, // updated 5.2
 
-    ActorCast = 0x03B1, // updated 5.18
+    ActorCast = 0x00F6, // updated 5.2
     SomeCustomiseChangePacketProbably = 0x00CD, // added 5.18
 
     PartyList = 0x0287, // updated 5.18
@@ -205,7 +205,7 @@ namespace Sapphire::Network::Packets
 
     QuestTracker = 0x0306, // updated 5.2
 
-    Mount = 0x038F, // updated 5.18
+    Mount = 0x023C, // updated 5.2
 
     DirectorVars = 0x00E6, // updated 5.18
     SomeDirectorUnk1 = 0x0084, // updated 5.18
@@ -338,8 +338,8 @@ namespace Sapphire::Network::Packets
 
     PlaceFieldMarker = 0x013C, // updated 5.0
     SkillHandler = 0x0225, // updated 5.2
-    GMCommand1 = 0x014D, // updated 5.18
-    GMCommand2 = 0x03C2, // updated 5.18
+    GMCommand1 = 0x0393, // updated 5.2
+    GMCommand2 = 0x020B, // updated 5.2
     AoESkillHandler = 0x0072, // updated 5.18
 
     UpdatePositionHandler = 0x0270, // updated 5.2
@@ -352,7 +352,7 @@ namespace Sapphire::Network::Packets
     BuildPresetHandler = 0x0150, // updated 5.0
 
     TalkEventHandler = 0x0340, // updated 5.2
-    EmoteEventHandler = 0x0183, // updated 5.18
+    EmoteEventHandler = 0x01E1, // updated 5.2
     WithinRangeEventHandler = 0x010E, // updated 5.2
     OutOfRangeEventHandler = 0x00AE, // updated 5.2
     EnterTeriEventHandler = 0x00C1, // updated 5.2