diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
index 3b698e6a8..8cc851032 100644
--- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
+++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp
@@ -83,7 +83,7 @@ public:
         FSNode *node = new FSNode();
         node->parent = NULL;
         node->parentIndex = 0;
-        node->file.filename = "/";
+        node->file.filename = homeDir.isEmpty() ? "" : "/";
         node->file.flags = PathProperty::Directory;
         roots.push_back(node);
 
diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp
index d825cd237..737de0bdc 100644
--- a/qrenderdoc/Windows/MainWindow.cpp
+++ b/qrenderdoc/Windows/MainWindow.cpp
@@ -358,7 +358,8 @@ void MainWindow::OnCaptureTrigger(const QString &exe, const QString &workingDir,
   th->wait(500);
   if(th->isRunning())
   {
-    ShowProgressDialog(this, tr("Launching %1, please wait...").arg(exe),
+    QString filename = QFileInfo(exe).fileName();
+    ShowProgressDialog(this, tr("Launching %1, please wait...").arg(filename),
                        [th]() { return !th->isRunning(); });
   }
   th->deleteLater();
diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp
index 672ada3f6..9e7e88e17 100644
--- a/renderdoc/core/remote_server.cpp
+++ b/renderdoc/core/remote_server.cpp
@@ -1079,7 +1079,7 @@ public:
   rdcstr GetHomeFolder()
   {
     if(Android::IsHostADB(m_hostname.c_str()))
-      return "/";
+      return "";
 
     {
       WRITE_DATA_SCOPE();