diff --git a/Ghidra/Features/Base/.launch/Ghidra.launch b/Ghidra/Features/Base/.launch/Ghidra.launch
index ff35716420..fdb4e215d2 100644
--- a/Ghidra/Features/Base/.launch/Ghidra.launch
+++ b/Ghidra/Features/Base/.launch/Ghidra.launch
@@ -24,5 +24,5 @@
     <listAttribute key="org.eclipse.jdt.launching.MODULEPATH"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="ghidra.GhidraRun"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Framework Utility"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:+IgnoreUnrecognizedVMOptions -Djava.system.class.loader=ghidra.GhidraClassLoader -Dfile.encoding=UTF8 -Duser.country=US -Duser.language=en -Dsun.java2d.pmoffscreen=false -Dsun.java2d.xrender=false -Dsun.java2d.uiScale=1 -Dsun.java2d.d3d=false -Xdock:name=&quot;Ghidra&quot; -Dvisualvm.display.name=Ghidra"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:+IgnoreUnrecognizedVMOptions -Djava.system.class.loader=ghidra.GhidraClassLoader -Dfile.encoding=UTF8 -Duser.country=US -Duser.language=en -Dsun.java2d.pmoffscreen=false -Dsun.java2d.xrender=true -Dsun.java2d.uiScale=1 -Dsun.java2d.d3d=false -Xdock:name=&quot;Ghidra&quot; -Dvisualvm.display.name=Ghidra"/>
 </launchConfiguration>
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorProvider.java
index 090824993d..ffc3896aec 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorProvider.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/compositeeditor/CompositeEditorProvider.java
@@ -64,6 +64,7 @@ public abstract class CompositeEditorProvider extends ComponentProviderAdapter
 		super(plugin.getTool(), "Composite Editor", plugin.getName());
 		this.plugin = plugin;
 		setIcon(EDITOR_ICON);
+		setTransient();
 		listeners = WeakDataStructureFactory.createSingleThreadAccessWeakSet();
 		initializeServices();
 	}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/OpenVersionedFileDialog.java b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/OpenVersionedFileDialog.java
index 959a38d82f..7b7befa869 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/framework/main/OpenVersionedFileDialog.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/framework/main/OpenVersionedFileDialog.java
@@ -19,6 +19,7 @@ import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
+import java.util.Collections;
 import java.util.List;
 
 import javax.swing.*;
@@ -56,7 +57,7 @@ public class OpenVersionedFileDialog extends DataTreeDialog {
 	private PluginTool tool;
 
 	private VersionHistoryPanel historyPanel;
-	private List<DockingActionIf> popupActions;
+	private List<DockingActionIf> popupActions = Collections.emptyList();
 
 	/**
 	 * Constructor
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/util/table/actions/DeleteTableRowAction.java b/Ghidra/Features/Base/src/main/java/ghidra/util/table/actions/DeleteTableRowAction.java
index 1b5941ab88..830b4e4b1a 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/util/table/actions/DeleteTableRowAction.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/util/table/actions/DeleteTableRowAction.java
@@ -200,7 +200,6 @@ public class DeleteTableRowAction extends DockingAction {
 			// prevent this action from appearing in the toolbar, menus, etc
 			setToolBarData(null);
 			setPopupMenuData(null);
-			setKeyBindingData(null);
 
 			tool.addAction(this);
 		}
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/WrappedKeyStroke.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/WrappedKeyStroke.java
index 645be64115..dc3414089a 100644
--- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/WrappedKeyStroke.java
+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/options/WrappedKeyStroke.java
@@ -15,6 +15,8 @@
  */
 package ghidra.framework.options;
 
+import java.util.Objects;
+
 import javax.swing.KeyStroke;
 
 /**
@@ -84,4 +86,9 @@ class WrappedKeyStroke implements WrappedOption {
 	public OptionType getOptionType() {
 		return OptionType.KEYSTROKE_TYPE;
 	}
+
+	@Override
+	public String toString() {
+		return Objects.toString(keyStroke);
+	}
 }
diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionHistoryDialog.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionHistoryDialog.java
index 4dbcdfe0db..a9c1cd9f87 100644
--- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionHistoryDialog.java
+++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/main/datatree/VersionHistoryDialog.java
@@ -16,6 +16,7 @@
 package ghidra.framework.main.datatree;
 
 import java.awt.event.MouseEvent;
+import java.util.Collections;
 import java.util.List;
 
 import javax.swing.SwingUtilities;
@@ -34,7 +35,7 @@ public class VersionHistoryDialog extends DialogComponentProvider implements Pro
 
 	private VersionHistoryPanel versionPanel;
 	private MyFolderListener listener = new MyFolderListener();
-	private List<DockingActionIf> popupActions;
+	private List<DockingActionIf> popupActions = Collections.emptyList();
 
 	public VersionHistoryDialog(DomainFile domainFile) {