diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetFocusScope.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetFocusScope.java
index 8e1e40b46f..fa71a9ca87 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetFocusScope.java
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/main/java/agent/dbgeng/model/iface1/DbgModelTargetFocusScope.java
@@ -19,7 +19,6 @@ import java.util.concurrent.CompletableFuture;
 
 import agent.dbgeng.model.iface2.DbgModelTargetObject;
 import ghidra.async.AsyncUtils;
-import ghidra.dbg.agent.AbstractTargetObject;
 import ghidra.dbg.error.DebuggerIllegalArgumentException;
 import ghidra.dbg.target.TargetFocusScope;
 import ghidra.dbg.target.TargetObject;
@@ -65,8 +64,8 @@ public interface DbgModelTargetFocusScope extends DbgModelTargetObject, TargetFo
 				setFocus(sel);
 				return sel.select();
 			}
-			if (cur instanceof AbstractTargetObject) {
-				AbstractTargetObject<?> def = (AbstractTargetObject<?>) cur;
+			if (cur instanceof DbgModelTargetObject) {
+				DbgModelTargetObject def = (DbgModelTargetObject) cur;
 				cur = def.getParent();
 				continue;
 			}
diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
index 8838cc436c..a5bc05d8fc 100644
--- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
+++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsProvider.java
@@ -111,70 +111,70 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
 	public static final String OPTION_NAME_DEFAULT_BACKGROUND_COLOR = "Object Colors.Background";
 
 	@AutoOptionDefined( //
-		name = OPTION_NAME_DEFAULT_FOREGROUND_COLOR, //
-		description = "The default foreground color of items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_DEFAULT_FOREGROUND_COLOR, //
+			description = "The default foreground color of items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color defaultForegroundColor = Color.BLACK;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_DEFAULT_BACKGROUND_COLOR, //
-		description = "The default background color of items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_DEFAULT_BACKGROUND_COLOR, //
+			description = "The default background color of items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color defaultBackgroundColor = Color.WHITE;
 
 	@AutoOptionDefined( //
-		name = OPTION_NAME_INVISIBLE_FOREGROUND_COLOR, //
-		description = "The foreground color for items normally not visible (toggleable)", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_INVISIBLE_FOREGROUND_COLOR, //
+			description = "The foreground color for items normally not visible (toggleable)", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color invisibleForegroundColor = Color.LIGHT_GRAY;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_MODIFIED_FOREGROUND_COLOR, //
-		description = "The foreground color for modified items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_MODIFIED_FOREGROUND_COLOR, //
+			description = "The foreground color for modified items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color modifiedForegroundColor = Color.RED;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_SUBSCRIBED_FOREGROUND_COLOR, //
-		description = "The foreground color for subscribed items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_SUBSCRIBED_FOREGROUND_COLOR, //
+			description = "The foreground color for subscribed items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color subscribedForegroundColor = Color.BLACK;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_ERROR_FOREGROUND_COLOR, //
-		description = "The foreground color for items in error", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_ERROR_FOREGROUND_COLOR, //
+			description = "The foreground color for items in error", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color errorForegroundColor = Color.RED;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_INTRINSIC_FOREGROUND_COLOR, //
-		description = "The foreground color for intrinsic items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_INTRINSIC_FOREGROUND_COLOR, //
+			description = "The foreground color for intrinsic items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color intrinsicForegroundColor = Color.BLUE;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_TARGET_FOREGROUND_COLOR, //
-		description = "The foreground color for target object items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_TARGET_FOREGROUND_COLOR, //
+			description = "The foreground color for target object items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color targetForegroundColor = Color.MAGENTA;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_ACCESSOR_FOREGROUND_COLOR, //
-		description = "The foreground color for property accessor items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_ACCESSOR_FOREGROUND_COLOR, //
+			description = "The foreground color for property accessor items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color accessorForegroundColor = Color.LIGHT_GRAY;
 	@AutoOptionDefined( //
-		name = OPTION_NAME_LINK_FOREGROUND_COLOR, //
-		description = "The foreground color for links to items in the objects tree", //
-		help = @HelpInfo(anchor = "colors") //
+			name = OPTION_NAME_LINK_FOREGROUND_COLOR, //
+			description = "The foreground color for links to items in the objects tree", //
+			help = @HelpInfo(anchor = "colors") //
 	)
 	Color linkForegroundColor = Color.GREEN;
 
 	@AutoOptionDefined( //
-		name = "Default Extended Step", //
-		description = "The default string for the extended step command" //
+			name = "Default Extended Step", //
+			description = "The default string for the extended step command" //
 	//help = @HelpInfo(anchor = "colors") //
 	)
 	String extendedStep = "";
@@ -681,14 +681,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
 	}
 
 	public ObjectContainer getContainerByPath(List<String> path) {
-		String joinedPath = "";
-		for (String segment : path) {
-			joinedPath += segment + PATH_JOIN_CHAR;
-		}
-		if (joinedPath.length() > 1) {
-			joinedPath = joinedPath.substring(0, joinedPath.length() - 1);
-		}
-		return targetMap.get(joinedPath);
+		return targetMap.get(PathUtils.toString(path));
 	}
 
 	static List<ObjectContainer> getContainersFromObjects(Map<String, ?> objectMap,
@@ -1592,8 +1585,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
 	}
 
 	@Override
-	public void accessibilityChanged(TargetAccessConditioned object,
-			boolean accessible) {
+	public void accessibilityChanged(TargetAccessConditioned object, boolean accessible) {
 		//this.access = accessibility.equals(TargetAccessibility.ACCESSIBLE);
 		plugin.getTool().contextChanged(this);
 	}
@@ -1613,8 +1605,7 @@ public class DebuggerObjectsProvider extends ComponentProviderAdapter implements
 	}
 
 	@Override
-	public void executionStateChanged(TargetExecutionStateful object,
-			TargetExecutionState state) {
+	public void executionStateChanged(TargetExecutionStateful object, TargetExecutionState state) {
 		//this.state = state;
 		plugin.getTool().contextChanged(this);
 	}