diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
index 8624851227..ffdcc8f2f2 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/pcode/HighFunction.java
@@ -298,6 +298,12 @@ public class HighFunction extends PcodeSyntaxTree {
 				// Do nothing with override at the moment
 				parser.discardSubTree();
 			}
+			else if (subel.getName().equals("scope")) {
+				// This must be a subscope of the local scope
+				// Currently this can only hold static variables of the function
+				// which ghidra already knows about
+				parser.discardSubTree();
+			}
 			else {
 				throw new PcodeXMLException("Unknown tag in function: " + subel.getName());
 			}
diff --git a/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec b/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
index e55ae77a5f..2191210a34 100644
--- a/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
+++ b/Ghidra/Processors/x86/data/languages/x86-64-gcc.cspec
@@ -132,7 +132,7 @@
 	      <addr offset="40" space="stack"/>
 	    </pentry>
 	  </input>
-	  <output killedbycall="true">
+	  <output>
 	    <pentry minsize="4" maxsize="8" metatype="float">
 	      <register name="XMM0_Qa"/>
 	    </pentry>
@@ -153,6 +153,10 @@
 	    <register name="R15"/>
 	    <register name="DF"/>
 	  </unaffected>
+      <killedbycall>
+        <register name="RAX"/>
+        <register name="XMM0"/>
+      </killedbycall>
 	  <localrange>
 	    <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
 	    <range space="stack" first="8" last="39"/>
diff --git a/Ghidra/Processors/x86/data/languages/x86-64-win.cspec b/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
index 5888a74950..576d70296f 100644
--- a/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
+++ b/Ghidra/Processors/x86/data/languages/x86-64-win.cspec
@@ -64,7 +64,7 @@
           <addr offset="40" space="stack"/>
         </pentry>
       </input>
-      <output killedbycall="true">
+      <output>
         <pentry minsize="4" maxsize="8" metatype="float">
           <register name="XMM0_Qa"/>
         </pentry>
@@ -85,6 +85,10 @@
         <register name="R15"/>
         <register name="DF"/>
       </unaffected>
+      <killedbycall>
+        <register name="RAX"/>
+        <register name="XMM0"/>
+      </killedbycall>
       <localrange>
         <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
         <range space="stack" first="8" last="39"/>
@@ -121,7 +125,7 @@
         <addr offset="40" space="stack"/>
       </pentry>
     </input>
-    <output killedbycall="true">
+    <output>
       <pentry minsize="4" maxsize="8" metatype="float">
         <register name="XMM0_Qa"/>
       </pentry>
@@ -142,6 +146,10 @@
         <register name="R15"/>
         <register name="DF"/>
     </unaffected>
+    <killedbycall>
+      <register name="RAX"/>
+      <register name="XMM0"/>
+    </killedbycall>
     <localrange>
       <range space="stack" first="0xfffffffffff0bdc1" last="0xffffffffffffffff"/>
       <range space="stack" first="8" last="39"/>