diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
index 3429247bf0..bc1588aa03 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 apply from: "$rootProject.projectDir/gradle/distributableGhidraModule.gradle"
+apply from: "$rootProject.projectDir/gradle/nativeProject.gradle"
 apply from: "$rootProject.projectDir/gradle/hasPythonPackage.gradle"
 
 apply plugin: 'eclipse'
diff --git a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc
index d9d999d06e..73ce97c0c2 100644
--- a/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc
+++ b/Ghidra/Features/Decompiler/src/decompile/cpp/heritage.cc
@@ -1892,10 +1892,11 @@ TaskList::iterator Heritage::refinement(TaskList::iterator memiter,const vector<
   int4 size = (*memiter).size;
   if (size > 1024) return disjoint.end();
   Address addr = (*memiter).addr;
-  vector<int4> refine(size+1,0);
+  vector<int4> refine(size+1,0);		// Add "fencepost" for size position
   buildRefinement(refine,addr,readvars);
   buildRefinement(refine,addr,writevars);
   buildRefinement(refine,addr,inputvars);
+  refine.pop_back();				// Remove the fencepost
   int4 lastpos = 0;
   for(int4 curpos=1;curpos < size;++curpos) { // Convert boundary points to partition sizes
     if (refine[curpos] != 0) {