diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java
index 0d38c09664..8c97bfb32e 100644
--- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java
+++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/disassembler/AutoTableDisassemblerTest.java
@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -630,7 +630,7 @@ public class AutoTableDisassemblerTest extends AbstractGhidraHeadedIntegrationTe
 	}
 
 	private JButton getActionButton(String actionName) {
-		Map<?, ?> actionMap = (Map<?, ?>) getInstanceField("actionMap", dialog);
+		Map<?, ?> actionMap = (Map<?, ?>) getInstanceField("toolbarButtonsByAction", dialog);
 		Set<?> entrySet = actionMap.entrySet();
 		for (Object entry : entrySet) {
 			Map.Entry<?, ?> mapEntry = (Map.Entry<?, ?>) entry;
diff --git a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/protorules/MultiSlotAssign.java b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/protorules/MultiSlotAssign.java
index 88646c605a..61bc2fce31 100644
--- a/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/protorules/MultiSlotAssign.java
+++ b/Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/lang/protorules/MultiSlotAssign.java
@@ -258,6 +258,7 @@ public class MultiSlotAssign extends AssignAction {
 			encoder.writeString(ATTRIB_STORAGE, resourceType.toString());
 		}
 		encoder.writeBool(ATTRIB_ALIGN, enforceAlignment);
+		encoder.writeBool(ATTRIB_STACKSPILL, consumeFromStack);
 		encoder.closeElement(ELEM_JOIN);
 	}