diff --git a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/manager/cmd/AbstractFridaCommand.java b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/manager/cmd/AbstractFridaCommand.java
index f330fa7261..a8521dc780 100644
--- a/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/manager/cmd/AbstractFridaCommand.java
+++ b/Ghidra/Debug/Debugger-agent-frida/src/main/java/agent/frida/manager/cmd/AbstractFridaCommand.java
@@ -57,9 +57,7 @@ public abstract class AbstractFridaCommand<T> implements FridaCommand<T> {
 	@Override
 	public boolean handle(FridaEvent<?> evt, FridaPendingCommand<?> pending) {
 		if (evt instanceof FridaCommandDoneEvent) {
-			if (pending.getCommand().equals(((FridaCommandDoneEvent) evt).getCmd())) {
-				return true;
-			}
+			return pending.getCommand().equals(((FridaCommandDoneEvent) evt).getCmd());
 		}
 		return false;
 	}
@@ -117,8 +115,9 @@ public abstract class AbstractFridaCommand<T> implements FridaCommand<T> {
 			} else {
 				manager.getEventListeners().fire.consoleOutput(object+"\n", 0);		
 			}
-			if (res.equals("[]")) {
+			if ("[]".equals(res.toString())) {
 				Msg.error(this, "nothing returned for "+this);
+				return;
 			}
 			if (res instanceof JsonArray) {
 				JsonArray arr = (JsonArray) res;
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/FileArchive.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/FileArchive.java
index a8004dc7ca..e231a4d2bd 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/FileArchive.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/datamgr/archive/FileArchive.java
@@ -283,7 +283,7 @@ public class FileArchive implements Archive {
 			return;
 		}
 
-		if (saveAsFile.equals(getFile())) {
+		if (saveAsFile.equals(archiveFile.getFile(false))) {
 			save();
 		}
 		else {
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/DragNDropTree.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/DragNDropTree.java
index f8e19a219f..e0852ccc6a 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/DragNDropTree.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/programtree/DragNDropTree.java
@@ -195,7 +195,7 @@ public abstract class DragNDropTree extends JTree implements Draggable, Droppabl
 			}
 
 			// This is tree node transferable... 
-			if (draggedNodes.equals(root)) {
+			if (draggedNodes.length > 0 && draggedNodes[0].equals(root)) {
 				return false;
 			}
 
@@ -208,8 +208,8 @@ public abstract class DragNDropTree extends JTree implements Draggable, Droppabl
 			return false;
 		}
 
-		for (int i = 0; i < draggedNodes.length; i++) {
-			if (targetNode.equals(draggedNodes[i])) {
+		for (ProgramNode draggedNode : draggedNodes) {
+			if (targetNode.equals(draggedNode)) {
 				return true;
 			}
 		}
@@ -221,8 +221,8 @@ public abstract class DragNDropTree extends JTree implements Draggable, Droppabl
 			return false;
 		}
 
-		for (int i = 0; i < draggedNodes.length; i++) {
-			if (targetNode.isNodeAncestor(draggedNodes[i])) {
+		for (ProgramNode draggedNode : draggedNodes) {
+			if (targetNode.isNodeAncestor(draggedNode)) {
 				return true;
 			}
 		}
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditExternalReferencePanel.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditExternalReferencePanel.java
index 1e4a5ca069..c4d4db1d81 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditExternalReferencePanel.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/references/EditExternalReferencePanel.java
@@ -160,11 +160,11 @@ class EditExternalReferencePanel extends EditReferencePanel {
 		extLibName.clearModel();
 		extLibName.addItem(Library.UNKNOWN);
 		Arrays.sort(names);
-		for (int i = 0; i < names.length; i++) {
-			if (Library.UNKNOWN.equals(extLibName)) {
+		for (String name : names) {
+			if (Library.UNKNOWN.equals(name)) {
 				continue;
 			}
-			extLibName.addItem(names[i]);
+			extLibName.addItem(name);
 		}
 	}
 
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramSelection.java b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramSelection.java
index ca282a4f57..0521bb9312 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramSelection.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/program/util/ProgramSelection.java
@@ -178,7 +178,7 @@ public class ProgramSelection implements AddressSetView {
 	 */
 	@Override
 	public boolean intersects(AddressSetView addrSet) {
-		return addressSet != null ? addressSet.intersects(addrSet) : false;
+		return addressSet != null && addressSet.intersects(addrSet);
 	}
 
 	/**