diff --git a/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs b/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
index e7adbbfd2..a54be132f 100644
--- a/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/BattleChara.cs
@@ -46,7 +46,7 @@ public unsafe class BattleChara : Character
     /// <summary>
     /// Gets the object ID of the target currently being cast at by the chara.
     /// </summary>
-    public ulong CastTargetObjectId => this.Struct->GetCastInfo()->CastTargetId;
+    public ulong CastTargetObjectId => this.Struct->GetCastInfo()->TargetId;
 
     /// <summary>
     /// Gets the current casting time of the spell being cast by the chara.
diff --git a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
index e0cb06789..3503ee836 100644
--- a/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/GameObject.cs
@@ -99,7 +99,7 @@ public unsafe partial class GameObject
     ///
     /// Not to be confused with <see cref="EntityId"/>.
     /// </summary>
-    public ulong GameObjectId => this.Struct->GetObjectId();
+    public ulong GameObjectId => this.Struct->GetGameObjectId();
 
     /// <summary>
     /// Gets the Entity ID for this GameObject. Entity IDs are assigned to networked GameObjects.
diff --git a/Dalamud/Game/Gui/ContextMenu/ContextMenu.cs b/Dalamud/Game/Gui/ContextMenu/ContextMenu.cs
index 1d8d3104f..bc97d62f7 100644
--- a/Dalamud/Game/Gui/ContextMenu/ContextMenu.cs
+++ b/Dalamud/Game/Gui/ContextMenu/ContextMenu.cs
@@ -17,8 +17,6 @@ using FFXIVClientStructs.FFXIV.Client.System.Memory;
 using FFXIVClientStructs.FFXIV.Client.UI;
 using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
-using FFXIVClientStructs.FFXIV.Component.GUI.AtkModuleInterface;
-using FFXIVClientStructs.Interop;
 
 using ValueType = FFXIVClientStructs.FFXIV.Component.GUI.ValueType;
 
diff --git a/Dalamud/Game/Gui/Dtr/DtrBar.cs b/Dalamud/Game/Gui/Dtr/DtrBar.cs
index adf18adfd..894025bc1 100644
--- a/Dalamud/Game/Gui/Dtr/DtrBar.cs
+++ b/Dalamud/Game/Gui/Dtr/DtrBar.cs
@@ -1,4 +1,4 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -274,7 +274,7 @@ internal sealed unsafe class DtrBar : IInternalDisposableService, IDtrBar
         foreach (var index in Enumerable.Range(0, addon->UldManager.NodeListCount))
         {
             var node = addon->UldManager.NodeList[index];
-            if (node->IsVisible)
+            if (node->IsVisible())
             {
                 var nodeId = node->NodeId;
                 var nodeType = node->Type;
@@ -289,7 +289,7 @@ internal sealed unsafe class DtrBar : IInternalDisposableService, IDtrBar
                     additionalWidth += node->Width + this.configuration.DtrSpacing;
                 }
                 else if ((nodeType == NodeType.Res || (ushort)nodeType >= 1000) &&
-                         (node->ChildNode == null || node->ChildNode->IsVisible))
+                         (node->ChildNode == null || node->ChildNode->IsVisible()))
                 {
                     // Native top-level node. These are are either res nodes or button components.
                     // Both the node and its child (if it has one) must be visible for the node to be counted.
diff --git a/Dalamud/Interface/Internal/UiDebug.cs b/Dalamud/Interface/Internal/UiDebug.cs
index 6409021de..076ed0296 100644
--- a/Dalamud/Interface/Internal/UiDebug.cs
+++ b/Dalamud/Interface/Internal/UiDebug.cs
@@ -79,7 +79,7 @@ internal unsafe class UiDebug
 
     private void DrawUnitBase(AtkUnitBase* atkUnitBase)
     {
-        var isVisible = (atkUnitBase->Flags & 0x20) == 0x20;
+        var isVisible = atkUnitBase->IsVisible;
         var addonName = atkUnitBase->NameString;
         var agent = Service<GameGui>.Get().FindAgentInterface(atkUnitBase);
 
@@ -92,7 +92,7 @@ internal unsafe class UiDebug
         ImGui.SameLine(ImGui.GetWindowContentRegionMax().X - ImGui.GetWindowContentRegionMin().X - 25);
         if (ImGui.SmallButton("V"))
         {
-            atkUnitBase->Flags ^= 0x20;
+            atkUnitBase->IsVisible = !atkUnitBase->IsVisible;
         }
 
         ImGui.Separator();
@@ -487,7 +487,7 @@ internal unsafe class UiDebug
 
                 if (headerOpen)
                 {
-                    var visible = (unitBase->Flags & 0x20) == 0x20;
+                    var visible = unitBase->IsVisible;
                     ImGui.PushStyleColor(ImGuiCol.Text, visible ? 0xFF00FF00 : 0xFF999999);
 
                     if (ImGui.Selectable($"{name}##list{i}-{(ulong)unitBase:X}_{j}", this.selectedUnitBase == unitBase))
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index d0cbe19f1..7e5e2b6ae 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit d0cbe19f145bcae573a1eb2313f1f8240f869cd7
+Subproject commit 7e5e2b6ae9513d3ab2bcc5891e6ccfdb38bf45f3