diff --git a/Dalamud/Game/SigScanner.cs b/Dalamud/Game/SigScanner.cs
index 67f4f563e..c8a371aee 100644
--- a/Dalamud/Game/SigScanner.cs
+++ b/Dalamud/Game/SigScanner.cs
@@ -326,7 +326,7 @@ public class SigScanner : IDisposable, ISigScanner
     }
 
     /// <inheritdoc/>
-    public nint[] ScanAllText(string signature) => this.ScanAllText(signature, default).ToArray();
+    public nint[] ScanAllText(string signature) => this.ScanAllText(signature, CancellationToken.None).ToArray();
 
     /// <inheritdoc/>
     public IEnumerable<nint> ScanAllText(string signature, CancellationToken cancellationToken)
@@ -338,7 +338,7 @@ public class SigScanner : IDisposable, ISigScanner
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var index = IndexOf(mBase, this.TextSectionSize, needle, mask, badShift);
+            var index = IndexOf(mBase, this.TextSectionSize - (int)(mBase - this.TextSectionBase), needle, mask, badShift);
             if (index < 0)
                 break;
 
diff --git a/lib/FFXIVClientStructs b/lib/FFXIVClientStructs
index c25482543..e279b05e9 160000
--- a/lib/FFXIVClientStructs
+++ b/lib/FFXIVClientStructs
@@ -1 +1 @@
-Subproject commit c25482543246de695146c55ad7d571deca650919
+Subproject commit e279b05e9a6d3a0eff85e7bcaec0fe523358afba
diff --git a/lib/Lumina.Excel b/lib/Lumina.Excel
index fae331428..a37961c45 160000
--- a/lib/Lumina.Excel
+++ b/lib/Lumina.Excel
@@ -1 +1 @@
-Subproject commit fae3314282b38efc2ce1edf0255d4357d924ced1
+Subproject commit a37961c453463f0f60a96f27aa278ef139841857