diff --git a/Penumbra.GameData b/Penumbra.GameData
index 58a3e794..ed37f834 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 58a3e7947c207452f5fa0d328c47c5ed6bdd9a0f
+Subproject commit ed37f83424c11a5a601e74f4660cd52ebd68a7b3
diff --git a/Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs b/Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs
index f2059253..0ab1e0e3 100644
--- a/Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs
+++ b/Penumbra/Interop/ResourceTree/ResolveContext.PathResolution.cs
@@ -1,4 +1,3 @@
-using Dalamud.Game.ClientState.Objects.Enums;
 using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
 using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
 using Penumbra.GameData.Data;
@@ -239,8 +238,8 @@ internal partial record ResolveContext
                 return (characterRaceCode, "base", 1);
             case 1:
                 var faceId    = human->FaceId;
-                var tribe     = human->Customize[(int)CustomizeIndex.Tribe];
-                var modelType = human->Customize[(int)CustomizeIndex.ModelType];
+                var tribe     = human->Customize[(int)Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex.Tribe];
+                var modelType = human->Customize[(int)Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex.ModelType];
                 if (faceId < 201)
                 {
                     faceId -= tribe switch
diff --git a/Penumbra/Interop/ResourceTree/ResourceTree.cs b/Penumbra/Interop/ResourceTree/ResourceTree.cs
index bd994242..24112a9f 100644
--- a/Penumbra/Interop/ResourceTree/ResourceTree.cs
+++ b/Penumbra/Interop/ResourceTree/ResourceTree.cs
@@ -6,9 +6,9 @@ using FFXIVClientStructs.FFXIV.Client.System.Resource.Handle;
 using Penumbra.GameData.Data;
 using Penumbra.GameData.Enums;
 using Penumbra.GameData.Structs;
-using Penumbra.String.Classes;
 using Penumbra.UI;
 using CustomizeData = FFXIVClientStructs.FFXIV.Client.Game.Character.CustomizeData;
+using CustomizeIndex = Dalamud.Game.ClientState.Objects.Enums.CustomizeIndex;
 
 namespace Penumbra.Interop.ResourceTree;
 
diff --git a/Penumbra/UI/Tabs/Debug/DebugTab.cs b/Penumbra/UI/Tabs/Debug/DebugTab.cs
index 599832f4..66b93b04 100644
--- a/Penumbra/UI/Tabs/Debug/DebugTab.cs
+++ b/Penumbra/UI/Tabs/Debug/DebugTab.cs
@@ -88,7 +88,7 @@ public class DebugTab : Window, ITab
     private readonly TextureManager            _textureManager;
     private readonly SkinFixer                 _skinFixer;
     private readonly RedrawService             _redraws;
-    private readonly DictEmotes                _emotes;
+    private readonly DictEmote                _emotes;
     private readonly Diagnostics               _diagnostics;
     private readonly IObjectTable              _objects;
     private readonly IClientState              _clientState;
@@ -99,7 +99,7 @@ public class DebugTab : Window, ITab
         ResourceManagerService resourceManager, PenumbraIpcProviders ipc, CollectionResolver collectionResolver,
         DrawObjectState drawObjectState, PathState pathState, SubfileHelper subfileHelper, IdentifiedCollectionCache identifiedCollectionCache,
         CutsceneService cutsceneService, ModImportManager modImporter, ImportPopup importPopup, FrameworkManager framework,
-        TextureManager textureManager, SkinFixer skinFixer, RedrawService redraws, DictEmotes emotes, Diagnostics diagnostics, IpcTester ipcTester)
+        TextureManager textureManager, SkinFixer skinFixer, RedrawService redraws, DictEmote emotes, Diagnostics diagnostics, IpcTester ipcTester)
         : base("Penumbra Debug Window", ImGuiWindowFlags.NoCollapse)
     {
         IsOpen = true;