diff --git a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
index cd650e0ca..e8cbfc39c 100644
--- a/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
+++ b/Dalamud/Game/Addon/Lifecycle/AddonLifecycle.cs
@@ -43,6 +43,9 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
     [ServiceManager.ServiceConstructor]
     private AddonLifecycle(TargetSigScanner sigScanner)
     {
+        // TODO: Service is currently non-functional pending DT changes. NOP'd.
+        return;
+        
         this.address = new AddonLifecycleAddressResolver();
         this.address.Setup(sigScanner);
 
@@ -82,13 +85,14 @@ internal unsafe class AddonLifecycle : IInternalDisposableService
     /// <inheritdoc/>
     void IInternalDisposableService.DisposeService()
     {
-        this.onAddonSetupHook.Dispose();
-        this.onAddonSetup2Hook.Dispose();
-        this.onAddonFinalizeHook.Dispose();
-        this.onAddonDrawHook.Dispose();
-        this.onAddonUpdateHook.Dispose();
-        this.onAddonRefreshHook.Dispose();
-        this.onAddonRequestedUpdateHook.Dispose();
+        // TODO: Service is currently non-functional pending DT changes. 
+        // this.onAddonSetupHook.Dispose();
+        // this.onAddonSetup2Hook.Dispose();
+        // this.onAddonFinalizeHook.Dispose();
+        // this.onAddonDrawHook.Dispose();
+        // this.onAddonUpdateHook.Dispose();
+        // this.onAddonRefreshHook.Dispose();
+        // this.onAddonRequestedUpdateHook.Dispose();
 
         foreach (var receiveEventListener in this.ReceiveEventListeners)
         {
diff --git a/Dalamud/Game/Network/Internal/NetworkHandlersAddressResolver.cs b/Dalamud/Game/Network/Internal/NetworkHandlersAddressResolver.cs
index 809287691..166b4d67a 100644
--- a/Dalamud/Game/Network/Internal/NetworkHandlersAddressResolver.cs
+++ b/Dalamud/Game/Network/Internal/NetworkHandlersAddressResolver.cs
@@ -51,7 +51,7 @@ internal class NetworkHandlersAddressResolver : BaseAddressResolver
         
         // TODO: I know this is a CC. I want things working for now. (KW)
         this.MarketBoardHistoryPacketHandler = scanner.ScanText(
-            "40 53 48 83 EC 20 48 8B 0D ?? ?? ?? ?? 48 8B DA E8 ?? ?? ?? ?? 48 85 C0 74 2F 4C 8B 00 48 8B C8 41 FF 90 18 01 00 00 48 8B C8 BA 0B 00 00 00 E8 ?? ?? ?? ?? 48 85 C0 74 10 48 8B D3 48 8B C8 48 83 C4 20 5B E9 ?? ?? ?? ?? 48 83 C4 20 5B C3 CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC 40 54");
+            "40 53 48 83 EC 20 48 8B 0D ?? ?? ?? ?? 48 8B DA E8 ?? ?? ?? ?? 48 85 C0 74 2F 4C 8B 00 48 8B C8 41 FF 90 18 01 00 00 48 8B C8 BA 0B 00 00 00 E8 ?? ?? ?? ?? 48 85 C0 74 10 48 8B D3 48 8B C8 48 83 C4 20 5B E9 ?? ?? ?? ?? 48 83 C4 20 5B C3 CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC CC 40 53");
         this.MarketBoardPurchasePacketHandler =
             scanner.ScanText("40 55 56 41 56 48 8B EC 48 83 EC ?? 48 8B 05 ?? ?? ?? ?? 48 33 C4 48 89 45 ?? 48 8B 0D ?? ?? ?? ?? 4C 8B F2");
         this.CustomTalkEventResponsePacketHandler =
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index 430c77b17..e17c1df66 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit 430c77b1703e2f55f38157afb5e050fa573a9a07
+Subproject commit e17c1df66b08d92a247007fd1ca83ba3a1cc6c30