diff --git a/Penumbra.GameData b/Penumbra.GameData
index 1e65d3fd..9eb60aa0 160000
--- a/Penumbra.GameData
+++ b/Penumbra.GameData
@@ -1 +1 @@
-Subproject commit 1e65d3fd028d3ac58090a8c886f351acbd9f3a2a
+Subproject commit 9eb60aa0fdaad4a10af2edd77b154a20c7647ce4
diff --git a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
index 6e810000..c7c09de2 100644
--- a/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
+++ b/Penumbra/UI/AdvancedWindow/ItemSwapTab.cs
@@ -152,11 +152,7 @@ public class ItemSwapTab : IDisposable, ITab
     }
 
     private readonly Dictionary<SwapType, (ItemSelector Source, ItemSelector Target, string TextFrom, string TextTo)> _selectors;
-
-    private          ItemSelector?     _weaponSource;
-    private          ItemSelector?     _weaponTarget;
-    private readonly WeaponSelector    _slotSelector = new();
-    private readonly ItemSwapContainer _swapData;
+    private readonly ItemSwapContainer                                                                                _swapData;
 
     private Mod?         _mod;
     private ModSettings? _modSettings;
diff --git a/Penumbra/UI/Tabs/DebugTab.cs b/Penumbra/UI/Tabs/DebugTab.cs
index 9d5caa0c..ee12e8a2 100644
--- a/Penumbra/UI/Tabs/DebugTab.cs
+++ b/Penumbra/UI/Tabs/DebugTab.cs
@@ -500,11 +500,13 @@ public class DebugTab : Window, ITab
 
                 if (agent->Data != null)
                 {
-                    using var table = Table("###PBannerTable", 2, ImGuiTableFlags.SizingFixedFit);
+                    // TODO fix when updated in CS.
+                    var       characterData = (AgentBannerInterface.Storage.CharacterData*)((byte*)agent->Data + 0x20);
+                    using var table         = Table("###PBannerTable", 2, ImGuiTableFlags.SizingFixedFit);
                     if (table)
                         for (var i = 0; i < 8; ++i)
                         {
-                            ref var c = ref agent->Data->CharacterArraySpan[i];
+                            ref var c = ref *(characterData + i);
                             ImGuiUtil.DrawTableColumn($"Character {i}");
                             var name = c.Name1.ToString();
                             ImGuiUtil.DrawTableColumn(name.Length == 0 ? "NULL" : $"{name} ({c.WorldId})");