diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java
index e258c25d416..a956e1e9843 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.dstore/src/org/eclipse/rse/subsystems/files/dstore/subsystem/RemoteFilePropertyChangeListener.java
@@ -60,7 +60,7 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
 
     protected boolean _networkDown = false;
 
-    protected class FindShell implements Runnable
+    protected static class FindShell implements Runnable
     {
 
         private Shell shell;
@@ -237,9 +237,6 @@ public class RemoteFilePropertyChangeListener implements IDomainListener,
 
     }
 
-    /**
-     * @see IDomainListener#getShell()
-     */
     public Shell getShell()
     {
         // dy: DomainNotifier (which calls this method) requires the shell not
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java
index c9de99cdbbf..4c057ecc6c3 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/view/SystemViewSubSystemAdapter.java
@@ -18,7 +18,6 @@ package org.eclipse.rse.ui.view;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.rse.core.ISystemUserIdConstants;
 import org.eclipse.rse.core.SystemBasePlugin;
@@ -274,13 +273,13 @@ public class SystemViewSubSystemAdapter extends AbstractSystemViewAdapter
 	    if (subsys.isConnected()) 
 	    {
 	    	String connectedId = subsys.getConnectorService().getUserId();
-	    	boolean connectedIdIsNull = (connectedId == null); // caused crash! Happens on Local subsystems. Phil.
-	    	if (data.getIsLocal() && !connectedIdIsNull && !connectedId.equals(localUserId)) 
+	    	//On Local subsystems, connectedId==null. Phil.
+	    	if (data.getIsLocal() && connectedId!=null && !connectedId.equals(localUserId)) 
 	    	{
     			data.setLocalValue(connectedId);
     			data.setIsLocal(true);
 	    	}
-	    	else if (!connectedIdIsNull && !connectedId.equals(parentUserId)) 
+	    	else if (connectedId!=null && !connectedId.equals(parentUserId)) 
 	    	{
 				data.setLocalValue(connectedId);
 				data.setIsLocal(true);