diff --git a/PlayerTags/Configuration/PluginConfigurationUI.cs b/PlayerTags/Configuration/PluginConfigurationUI.cs
index 4b10c34..3feb61f 100644
--- a/PlayerTags/Configuration/PluginConfigurationUI.cs
+++ b/PlayerTags/Configuration/PluginConfigurationUI.cs
@@ -3,6 +3,7 @@ using Dalamud.Game.ClientState.Objects.SubKinds;
 using Dalamud.Game.Text;
 using Dalamud.Game.Text.SeStringHandling;
 using Dalamud.Interface;
+using Dalamud.Interface.Utility;
 using Dalamud.Logging;
 using FFXIVClientStructs.FFXIV.Client.Game.UI;
 using FFXIVClientStructs.Havok;
diff --git a/PlayerTags/Features/NameplateTagTargetFeature.cs b/PlayerTags/Features/NameplateTagTargetFeature.cs
index 37c48ab..dc61f77 100644
--- a/PlayerTags/Features/NameplateTagTargetFeature.cs
+++ b/PlayerTags/Features/NameplateTagTargetFeature.cs
@@ -75,12 +75,12 @@ namespace PlayerTags.Features
             }
         }
 
-        private void ClientState_Login(object? sender, EventArgs e)
+        private void ClientState_Login()
         {
             Hook();
         }
 
-        private void ClientState_Logout(object? sender, EventArgs e)
+        private void ClientState_Logout()
         {
             Unhook();
         }
diff --git a/PlayerTags/PluginServices.cs b/PlayerTags/PluginServices.cs
index 7728766..2c96eee 100644
--- a/PlayerTags/PluginServices.cs
+++ b/PlayerTags/PluginServices.cs
@@ -7,20 +7,22 @@ using Dalamud.Game.Command;
 using Dalamud.Game.Gui;
 using Dalamud.IoC;
 using Dalamud.Plugin;
+using Dalamud.Plugin.Services;
 
 namespace PlayerTags
 {
     public class PluginServices
     {
-        [PluginService] public static ChatGui ChatGui { get; set; } = null!;
-        [PluginService] public static ClientState ClientState { get; set; } = null!;
-        [PluginService] public static CommandManager CommandManager { get; set; } = null!;
         [PluginService] public static DalamudPluginInterface DalamudPluginInterface { get; set; } = null!;
-        [PluginService] public static DataManager DataManager { get; set; } = null!;
-        [PluginService] public static Framework Framework { get; set; } = null!;
-        [PluginService] public static GameGui GameGui { get; set; } = null!;
-        [PluginService] public static ObjectTable ObjectTable { get; set; } = null!;
-        [PluginService] public static PartyList PartyList { get; set; } = null!;
+        [PluginService] public static IChatGui ChatGui { get; set; } = null!;
+        [PluginService] public static IClientState ClientState { get; set; } = null!;
+        [PluginService] public static ICommandManager CommandManager { get; set; } = null!;
+        [PluginService] public static IDataManager DataManager { get; set; } = null!;
+        [PluginService] public static IFramework Framework { get; set; } = null!;
+        [PluginService] public static IGameGui GameGui { get; set; } = null!;
+        [PluginService] public static IObjectTable ObjectTable { get; set; } = null!;
+        [PluginService] public static IPartyList PartyList { get; set; } = null!;
+        [PluginService] public static IGameInteropProvider GameInteropProvider { get; set; } = null;
 
         public static void Initialize(DalamudPluginInterface pluginInterface)
         {