diff --git a/src/Data/Replay/Events/AppearReplayEvent.cs b/src/Data/Replay/Events/AppearReplayEvent.cs
index 8aaad9c..8b2e334 100644
--- a/src/Data/Replay/Events/AppearReplayEvent.cs
+++ b/src/Data/Replay/Events/AppearReplayEvent.cs
@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -19,7 +20,7 @@ internal sealed class AppearReplayEvent : IReplayEvent<AppearReplayEvent.AppearR
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/ChatEvent.cs b/src/Data/Replay/Events/ChatEvent.cs
index 2f81b40..0bd1235 100644
--- a/src/Data/Replay/Events/ChatEvent.cs
+++ b/src/Data/Replay/Events/ChatEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -18,7 +19,7 @@ internal sealed class ChatEvent : IReplayEvent<ChatEvent.ChatReplayData, ChatEve
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/ChatNoteEvent.cs b/src/Data/Replay/Events/ChatNoteEvent.cs
index c74dd2e..cb99ebd 100644
--- a/src/Data/Replay/Events/ChatNoteEvent.cs
+++ b/src/Data/Replay/Events/ChatNoteEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -18,7 +19,7 @@ internal sealed class ChatNoteEvent : IReplayEvent<ChatNoteEvent.ChatNoteReplayD
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/MurderReplayEvent.cs b/src/Data/Replay/Events/MurderReplayEvent.cs
index 45d544e..351d005 100644
--- a/src/Data/Replay/Events/MurderReplayEvent.cs
+++ b/src/Data/Replay/Events/MurderReplayEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -15,11 +16,11 @@ internal sealed class MurderReplayEvent : IReplayEvent<MurderReplayEvent.MurderR
 
     public void Play()
     {
-        var killer = Utils.PlayerFromPlayerId(EventData.KillerId);
+        var killer = Utils.PlayerFromPlayerId((PlayerId)EventData.KillerId);
         if (killer == null)
             return;
 
-        var target = Utils.PlayerFromPlayerId(EventData.TargetId);
+        var target = Utils.PlayerFromPlayerId((PlayerId)EventData.TargetId);
         if (target == null)
             return;
 
diff --git a/src/Data/Replay/Events/ProtectReplayEvent.cs b/src/Data/Replay/Events/ProtectReplayEvent.cs
index 8bed4b4..4b59cfc 100644
--- a/src/Data/Replay/Events/ProtectReplayEvent.cs
+++ b/src/Data/Replay/Events/ProtectReplayEvent.cs
@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -19,11 +20,11 @@ internal sealed class ProtectReplayEvent : IReplayEvent<ProtectReplayEvent.Prote
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
-        var target = Utils.PlayerFromPlayerId(EventData.TargetId);
+        var target = Utils.PlayerFromPlayerId((PlayerId)EventData.TargetId);
         if (target == null)
             return;
 
diff --git a/src/Data/Replay/Events/ProtectedReplayEvent.cs b/src/Data/Replay/Events/ProtectedReplayEvent.cs
index 22634db..bf23040 100644
--- a/src/Data/Replay/Events/ProtectedReplayEvent.cs
+++ b/src/Data/Replay/Events/ProtectedReplayEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -18,7 +19,7 @@ internal sealed class ProtectedReplayEvent : IReplayEvent<ProtectedReplayEvent.P
         if (EventData == null)
             return;
 
-        var target = Utils.PlayerFromPlayerId(EventData.TargetId);
+        var target = Utils.PlayerFromPlayerId((PlayerId)EventData.TargetId);
         if (target == null)
             return;
 
diff --git a/src/Data/Replay/Events/SetRoleEvent.cs b/src/Data/Replay/Events/SetRoleEvent.cs
index 78da4db..971ad0a 100644
--- a/src/Data/Replay/Events/SetRoleEvent.cs
+++ b/src/Data/Replay/Events/SetRoleEvent.cs
@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -19,7 +20,7 @@ internal sealed class SetRoleEvent : IReplayEvent<SetRoleEvent.SetRoleReplayData
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/ShapeshiftReplayEvent.cs b/src/Data/Replay/Events/ShapeshiftReplayEvent.cs
index 4495607..39712b4 100644
--- a/src/Data/Replay/Events/ShapeshiftReplayEvent.cs
+++ b/src/Data/Replay/Events/ShapeshiftReplayEvent.cs
@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -19,11 +20,11 @@ internal sealed class ShapeshiftReplayEvent : IReplayEvent<ShapeshiftReplayEvent
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
-        var target = Utils.PlayerFromPlayerId(EventData.TargetId);
+        var target = Utils.PlayerFromPlayerId((PlayerId)EventData.TargetId);
         if (target == null)
             return;
 
diff --git a/src/Data/Replay/Events/UpdateSystemReplayEvent.cs b/src/Data/Replay/Events/UpdateSystemReplayEvent.cs
index 6fad9ef..157f7d0 100644
--- a/src/Data/Replay/Events/UpdateSystemReplayEvent.cs
+++ b/src/Data/Replay/Events/UpdateSystemReplayEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -18,7 +19,7 @@ internal sealed class UpdateSystemReplayEvent : IReplayEvent<UpdateSystemReplayE
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/VanishReplayEvent.cs b/src/Data/Replay/Events/VanishReplayEvent.cs
index f880442..4a49cc3 100644
--- a/src/Data/Replay/Events/VanishReplayEvent.cs
+++ b/src/Data/Replay/Events/VanishReplayEvent.cs
@@ -1,6 +1,7 @@
 using AmongUs.GameOptions;
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -19,7 +20,7 @@ internal sealed class VanishReplayEvent : IReplayEvent<VanishReplayEvent.VanishR
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Data/Replay/Events/VentReplayEvent.cs b/src/Data/Replay/Events/VentReplayEvent.cs
index 32108bd..0e8766b 100644
--- a/src/Data/Replay/Events/VentReplayEvent.cs
+++ b/src/Data/Replay/Events/VentReplayEvent.cs
@@ -1,5 +1,6 @@
 using BetterAmongUs.Interfaces;
 using BetterAmongUs.Utilities;
+using InnerNet;
 using System.Text.Json.Serialization;
 
 namespace BetterAmongUs.Data.Replay.Events;
@@ -18,7 +19,7 @@ internal sealed class VentReplayEvent : IReplayEvent<VentReplayEvent.VentReplayD
         if (EventData == null)
             return;
 
-        var player = Utils.PlayerFromPlayerId(EventData.PlayerId);
+        var player = Utils.PlayerFromPlayerId((PlayerId)EventData.PlayerId);
         if (player == null)
             return;
 
diff --git a/src/Modules/OptionItems/OptionPlayerItem.cs b/src/Modules/OptionItems/OptionPlayerItem.cs
index 8834ff0..2a7c126 100644
--- a/src/Modules/OptionItems/OptionPlayerItem.cs
+++ b/src/Modules/OptionItems/OptionPlayerItem.cs
@@ -1,6 +1,7 @@
 using BetterAmongUs.Generated;
 using BetterAmongUs.Utilities;
 using BetterAmongUs.Utilities.Extension;
+using InnerNet;
 using UnityEngine;
 
 namespace BetterAmongUs.Modules.OptionItems;
@@ -238,7 +239,7 @@ public sealed class OptionPlayerItem : OptionItem<int>
     {
         if (Value != -1)
         {
-            var player = Utils.PlayerFromPlayerId(Value);
+            var player = Utils.PlayerFromPlayerId((PlayerId)Value);
             if (player != null)
                 return $"{player.GetPlayerNameAndColor()}";
             else
diff --git a/src/MonoScripts/PlayerInfoDisplay.cs b/src/MonoScripts/PlayerInfoDisplay.cs
index 9c33aac..c09dbd4 100644
--- a/src/MonoScripts/PlayerInfoDisplay.cs
+++ b/src/MonoScripts/PlayerInfoDisplay.cs
@@ -10,6 +10,7 @@ using BetterAmongUs.Patches.Gameplay.UI.Settings;
 using BetterAmongUs.Structs;
 using BetterAmongUs.Utilities;
 using Il2CppInterop.Runtime.Attributes;
+using InnerNet;
 using System.Text.RegularExpressions;
 using TMPro;
 using UnityEngine;
@@ -217,7 +218,7 @@ internal class PlayerInfoDisplay : MonoBehaviour
             }
             else
             {
-                var targetData = Utils.PlayerDataFromPlayerId(_player.shapeshiftTargetPlayerId);
+                var targetData = Utils.PlayerDataFromPlayerId((PlayerId)_player.shapeshiftTargetPlayerId);
                 if (targetData == null)
                     return;
 
diff --git a/src/Utilities/Utils.cs b/src/Utilities/Utils.cs
index 7897aca..0780249 100644
--- a/src/Utilities/Utils.cs
+++ b/src/Utilities/Utils.cs
@@ -77,7 +77,7 @@ internal static class Utils
     /// </summary>
     /// <param name="clientId">The client ID to look up.</param>
     /// <returns>The ClientData if found, null otherwise.</returns>
-    internal static ClientData? ClientFromClientId(int clientId) =>
+    internal static ClientData? ClientFromClientId(ClientId clientId) =>
         AmongUsClient.Instance.allClients.FirstOrDefaultIl2Cpp(cd => cd.Id == clientId);
 
     /// <summary>
@@ -85,7 +85,7 @@ internal static class Utils
     /// </summary>
     /// <param name="playerId">The player ID to look up.</param>
     /// <returns>The NetworkedPlayerInfo if found, null otherwise.</returns>
-    internal static NetworkedPlayerInfo? PlayerDataFromPlayerId(int playerId) =>
+    internal static NetworkedPlayerInfo? PlayerDataFromPlayerId(PlayerId playerId) =>
         GameData.Instance.AllPlayers.FirstOrDefaultIl2Cpp(data => data.PlayerId == playerId);
 
     /// <summary>
@@ -93,7 +93,7 @@ internal static class Utils
     /// </summary>
     /// <param name="clientId">The client ID to look up.</param>
     /// <returns>The NetworkedPlayerInfo if found, null otherwise.</returns>
-    internal static NetworkedPlayerInfo? PlayerDataFromClientId(int clientId) =>
+    internal static NetworkedPlayerInfo? PlayerDataFromClientId(ClientId clientId) =>
         GameData.Instance.AllPlayers.FirstOrDefaultIl2Cpp(data => data.ClientId == clientId);
 
     /// <summary>
@@ -109,7 +109,7 @@ internal static class Utils
     /// </summary>
     /// <param name="playerId">The player ID to look up.</param>
     /// <returns>The PlayerControl if found, null otherwise.</returns>
-    internal static PlayerControl? PlayerFromPlayerId(int playerId) =>
+    internal static PlayerControl? PlayerFromPlayerId(PlayerId playerId) =>
         BAUPlugin.AllPlayerControls.FirstOrDefault(player => player.PlayerId == playerId);
 
     /// <summary>
@@ -117,7 +117,7 @@ internal static class Utils
     /// </summary>
     /// <param name="clientId">The client ID to look up.</param>
     /// <returns>The PlayerControl if found, null otherwise.</returns>
-    internal static PlayerControl? PlayerFromClientId(int clientId) =>
+    internal static PlayerControl? PlayerFromClientId(ClientId clientId) =>
         BAUPlugin.AllPlayerControls.FirstOrDefault(player => player.GetClientId() == clientId);
 
     /// <summary>
@@ -125,7 +125,7 @@ internal static class Utils
     /// </summary>
     /// <param name="netId">The network ID to look up.</param>
     /// <returns>The PlayerControl if found, null otherwise.</returns>
-    internal static PlayerControl? PlayerFromNetId(uint netId) =>
+    internal static PlayerControl? PlayerFromNetId(NetId netId) =>
         BAUPlugin.AllPlayerControls.FirstOrDefault(player => player.NetId == netId);
 
     // Chat functionality