diff --git a/Ghidra/Processors/x86/certification.manifest b/Ghidra/Processors/x86/certification.manifest
index 2ae80f71f6..f3ab3a4e45 100644
--- a/Ghidra/Processors/x86/certification.manifest
+++ b/Ghidra/Processors/x86/certification.manifest
@@ -3,7 +3,6 @@
 .project||GHIDRA||||END|
 Module.manifest||GHIDRA||||END|
 build.gradle||GHIDRA||||END|
-data/build.xml||GHIDRA||||END|
 data/languages/adx.sinc||GHIDRA||||END|
 data/languages/avx.sinc||GHIDRA||||END|
 data/languages/avx2.sinc||GHIDRA||||END|
diff --git a/Ghidra/Processors/x86/data/languages/x86-64-win.cspec b/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
index 56bb83b60c..5888a74950 100644
--- a/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
+++ b/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
@@ -147,4 +147,12 @@
       <range space="stack" first="8" last="39"/>
     </localrange>
   </prototype>
+  <callfixup name="guard_dispatch_icall">
+    <target name="_guard_dispatch_icall"/>
+    <pcode>
+      <body><![CDATA[
+        call [RAX];
+      ]]></body>
+    </pcode>
+  </callfixup>
 </compiler_spec>
