diff --git a/Ghidra/Processors/AARCH64/data/languages/AARCH64_win.cspec b/Ghidra/Processors/AARCH64/data/languages/AARCH64_win.cspec
index 7fdcce24ba..feb26f02e4 100644
--- a/Ghidra/Processors/AARCH64/data/languages/AARCH64_win.cspec
+++ b/Ghidra/Processors/AARCH64/data/languages/AARCH64_win.cspec
@@ -4,7 +4,7 @@
   <!-- Copied from AARCH.cspec and modified... See: https://docs.microsoft.com/en-us/cpp/build/arm64-windows-abi-conventions?view=vs-2019 -->
   <data_organization>
      <absolute_max_alignment value="0" />
-     <machine_alignment value="4" />
+     <machine_alignment value="4" />                 <!-- Not sure -->
      <default_alignment value="1" />
      <default_pointer_alignment value="4" />
      <pointer_size value="8" />
@@ -123,7 +123,7 @@
       </input>
       <output>
         <pentry minsize="1" maxsize="8" metatype="float">
-          <register name="q0"/>
+          <register name="v0"/>
         </pentry>
         <pentry minsize="1" maxsize="8" extension="zero">
           <register name="x0"/>
@@ -144,28 +144,43 @@
         <register name="x29"/>
         <register name="x30"/>
         <register name="sp"/>
+        <register name="pc"/>
+        <register name="v8"/>
+        <register name="v9"/>
+        <register name="v10"/>
+        <register name="v11"/>
+        <register name="v12"/>
+        <register name="v13"/>
+        <register name="v14"/>
+        <register name="v15"/>
       </unaffected>
       <killedbycall>
+        <register name="x0"/>
         <register name="x1"/>
-        <register name="x9"/>
-        <register name="x10"/>
-        <register name="x11"/>
-        <register name="x12"/> 
-        <register name="x13"/> 
-        <register name="x14"/> 
-        <register name="x15"/> 
-      </killedbycall>
+        <register name="x2"/>
+        <register name="x3"/>
+        <register name="x4"/>
+        <register name="x5"/>
+        <register name="x6"/>
+        <register name="x7"/>
+        <register name="x16"/>
+        <register name="x17"/>
+        <register name="x18"/>
+        <register name="x19"/>
+        <register name="v20"/>
+        <register name="v21"/>
+        <register name="v22"/>
+        <register name="v23"/>
+        <register name="v24"/>
+        <register name="v25"/>
+        <register name="v26"/>
+        <register name="v27"/>
+        <register name="v28"/>
+        <register name="v29"/>
+        <register name="v30"/>
+        <register name="v31"/>
+        </killedbycall>
     </prototype>
   </default_proto>
 
-
-  <callfixup name="PlaceHolderCallFixup">  <!-- This is here just to force call fixup and NoReturn fixup.  Will be fixed in Ghidra V6.0 -->
-    <target name="___NotARealFunctionName___"/>
-    <pcode>
-      <body><![CDATA[
-            tmpptr:4 = 0;
-      ]]></body>
-    </pcode>
-  </callfixup>
-  
 </compiler_spec>
diff --git a/Ghidra/Processors/ARM/data/languages/ARM_win.cspec b/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
index a082fe973c..aa733490d8 100644
--- a/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
+++ b/Ghidra/Processors/ARM/data/languages/ARM_win.cspec
@@ -94,49 +94,32 @@
         <register name="r9"/>
         <register name="r10"/>
         <register name="r11"/>
-        <register name="d8"/>
-        <register name="d9"/>
-        <register name="d10"/>
-        <register name="d11"/>
-        <register name="d12"/>
-        <register name="d13"/>
-        <register name="d14"/>
-        <register name="d15"/>
-        <!-- Do we need to say something about q0-q15 instead of d?... -->
+        <register name="q4"/>
+        <register name="q5"/>
+        <register name="q6"/>
+        <register name="q7"/>
         <register name="sp"/>
+        <register name="lr"/>
+        <register name="pc"/>
       </unaffected>
       <killedbycall>
-          <!-- Maybe r0, r1, r2, r3, r12... was only r1 -->
           <register name="r0"/>
           <register name="r1"/>
           <register name="r2"/>
           <register name="r3"/>
           <register name="r12"/>
-          <register name="d0"/>
-          <register name="d1"/>
-          <register name="d2"/>
-          <register name="d3"/>
-          <register name="d4"/>
-          <register name="d5"/>
-          <register name="d6"/>
-          <register name="d7"/>
-          <!-- Maybe d16-d31 -->
-          <register name="d16"/>
-          <register name="d17"/>
-          <register name="d18"/>
-          <register name="d19"/>
-          <register name="d20"/>
-          <register name="d21"/>
-          <register name="d22"/>
-          <register name="d23"/>
-          <register name="d24"/>
-          <register name="d25"/>
-          <register name="d26"/>
-          <register name="d27"/>
-          <register name="d28"/>
-          <register name="d29"/>
-          <register name="d30"/>
-          <register name="d31"/>
+          <register name="q0"/>
+          <register name="q1"/>
+          <register name="q2"/>
+          <register name="q3"/>
+          <register name="q8"/>
+          <register name="q9"/>
+          <register name="q10"/>
+          <register name="q11"/>
+          <register name="q12"/>
+          <register name="q13"/>
+          <register name="q14"/>
+          <register name="q15"/>
       </killedbycall>
     </prototype>
   </default_proto>