diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java
index c4f85ecef66..15e4ff057bc 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/AbstractDStoreService.java
@@ -149,6 +149,7 @@ public abstract class AbstractDStoreService implements IDStoreService
 			}
 			catch (Exception e)
 			{				
+				e.printStackTrace();
 			}			
 		}
 		return new DataElement[0];
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
index 7a4e7af24b6..ae11c3162fa 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
+++ b/rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/files/DStoreHostFile.java
@@ -53,6 +53,10 @@ public class DStoreHostFile implements IHostFile
 	public static String getNameFromPath(String path)
 	{
 		int lastSlash = path.lastIndexOf('/');
+		if (lastSlash == -1) // account for windows
+		{
+			lastSlash = path.lastIndexOf('\\');
+		}
 		if (lastSlash > 0 && lastSlash != path.length() - 1)
 		{
 			return path.substring(lastSlash);
@@ -63,6 +67,10 @@ public class DStoreHostFile implements IHostFile
 	public static String getParentPathFromPath(String path)
 	{
 		int lastSlash = path.lastIndexOf('/');
+		if (lastSlash == -1) // acount for windows
+		{
+			lastSlash = path.lastIndexOf('\\');
+		}
 		if (lastSlash > 0 && lastSlash != path.length() - 1)
 		{
 			return path.substring(0, lastSlash);
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
index e9f1148ff94..e995c4498ef 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java
@@ -699,17 +699,18 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS
     	if (filter.isPromptable() || !doesFilterTypeMatch(filter, remoteObjectAbsoluteName))
     	  return false;
     	boolean would = false;
-    	ISystemFilterString[] strings = filter.getSystemFilterStrings();
+
+    	String[] strings = filter.getFilterStrings();
     	if (strings != null)
     	{
     	  for (int idx=0; !would && (idx<strings.length); idx++)
     	  {
-    	  	 if (strings[idx].getString().equals("*"))
+    	  	 if (strings[idx].equals("*"))
     	  	   would = true;
-    	  	 else if (strings[idx].getString().equals("./*"))
+    	  	 else if (strings[idx].equals("./*"))
     	  	   would = true;
     	  	 else
-    	       would = doesFilterStringMatch(strings[idx].getString(), remoteObjectAbsoluteName, strings[idx].getParentSystemFilter().areStringsCaseSensitive());
+    	       would = doesFilterStringMatch(strings[idx], remoteObjectAbsoluteName, filter.areStringsCaseSensitive());
     	  }
     	}
     	return would;