diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
index 170b67176c5..0567334d450 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/actions/SystemUploadConflictAction.java
@@ -497,7 +497,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
                     	fs = remoteFile.getParentRemoteFileSubSystem();
                         if (!remoteFile.exists())
                         {
-                            fs.createFile(remoteFile);
+                            remoteFile = fs.createFile(remoteFile);
                         }                        
                     }
                     catch (SystemMessageException e)
@@ -512,7 +512,7 @@ public class SystemUploadConflictAction extends SystemBaseAction implements Runn
                     try
                     {
                         // copy temp file to remote system
-                        fs.uploadUTF8(_tempFile, remoteFile, null);
+                        fs.uploadUTF8(_tempFile, remoteFile, new NullProgressMonitor());
                      
                         // set original time stamp to 0 so that file will be overwritten next download
                         properties.setRemoteFileTimeStamp(0);
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
index a1d430fd876..73b0fbe6f27 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SaveAsForm.java
@@ -163,7 +163,7 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
 				super.setPreSelection(parentFile);
 			}
 		
-			fileName = parentFile.getName();
+			fileName = selection.getName();//parentFile.getName();
 			initialFileName=fileName;
 		}
 	}
diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
index 92ad609a7d3..44d15e0f696 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/resources/SystemUniversalTempFileListener.java
@@ -115,7 +115,6 @@ public class SystemUniversalTempFileListener extends SystemTempFileListener
 	{
 		if (subsystem instanceof IRemoteFileSubSystem)
 		{
-			Shell shell = RSEUIPlugin.getTheSystemRegistry().getShell();
 			IRemoteFileSubSystem fs = (IRemoteFileSubSystem) subsystem;
 			
 			// first we need to get the stored timestamp property and the actual remote timestamp
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 99de8439866..884525184f3 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
@@ -59,7 +59,7 @@ public class DStoreHostFile implements IHostFile
 		}
 		if (lastSlash > 0 && lastSlash != path.length() - 1)
 		{
-			return path.substring(lastSlash);
+			return path.substring(lastSlash + 1);
 		}
 		return path;
 	}