diff --git a/common/content/io.js b/common/content/io.js
index 1d63684d..0c10eae0 100644
--- a/common/content/io.js
+++ b/common/content/io.js
@@ -944,7 +944,7 @@ IO.expandPath = function (path, relative)
     path = expand(path);
 
     // expand ~
-    if (!relative && (WINDOWS ? /^~(?:$|\\)/ : /^~(?:$|\/)/).test(path))
+    if (!relative && (WINDOWS ? /^~(?:$|[\\\/])/ : /^~(?:$|\/)/).test(path))
     {
         // Try $HOME first, on all systems
         let home = services.get("environment").get("HOME");
@@ -961,9 +961,10 @@ IO.expandPath = function (path, relative)
     // after, but doesn't document it. Is this just a bug? --Kris
     path = expand(path);
 
-    // FIXME: Should we be doing this here? I think it should be done
-    // by the arg parser or nowhere. --Kris
-    return path.replace("\\ ", " ", "g");
+    if (WINDOWS)
+        path = path.replace("/", "\\", "g");
+
+    return path;
 };
 
 // vim: set fdm=marker sw=4 ts=4 et:
diff --git a/common/content/liberator.js b/common/content/liberator.js
index 62f150f9..113a0c58 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -1225,6 +1225,7 @@ const liberator = (function () //{{{
             try
             {
                 let infoPath = services.create("file");
+                liberator.dump("'rtp': " + IO.expandPath(IO.runtimePath.replace(/,.*/, "")));
                 infoPath.initWithPath(IO.expandPath(IO.runtimePath.replace(/,.*/, "")));
                 infoPath.append("info");
                 infoPath.append(services.get("profile").selectedProfile.name);