diff --git a/package.json b/package.json
index 177c9508..1dc114a9 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
         "c9.ide.language.javascript.tern": "#7aab8b0b6a",
         "c9.ide.language.javascript.infer": "#cfec494a3c",
         "c9.ide.language.jsonalyzer": "#dab3edfca5",
-        "c9.ide.collab": "#da4d09ae6a",
+        "c9.ide.collab": "#e9dd74e31e",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#6cc6d3379d",
         "c9.ide.find.infiles": "#72582de3cd",
@@ -83,7 +83,7 @@
         "c9.ide.help.support": "#60e88f5680",
         "c9.ide.imgeditor": "#ed89162aa7",
         "c9.ide.immediate": "#6845a93705",
-        "c9.ide.installer": "#46b08af446",
+        "c9.ide.installer": "#19b25fc787",
         "c9.ide.mount": "#896ebf836e",
         "c9.ide.navigate": "#64156c7f4a",
         "c9.ide.newresource": "#f1f0624768",
diff --git a/settings/standalone.js b/settings/standalone.js
index 4fd9ac74..eb413831 100644
--- a/settings/standalone.js
+++ b/settings/standalone.js
@@ -12,9 +12,12 @@ module.exports = function(manifest, installPath) {
     
     var workspaceDir = path.resolve(__dirname + "/../");
     var sdk = !manifest.sdk;
+    var win32 = process.platform == "win32";
     
-    if (process.platform == "win32" && process.env.HOME === undefined) {
+    if (win32 && process.env.HOME === undefined) {
         process.env.HOME = process.env.HOMEDRIVE + process.env.HOMEPATH;
+        if (!/msys\/bin|Git\/bin/.test(process.PATH))
+            process.PATH = path.join(process.env.HOME, ".c9", "msys/bin") + ";" + process.PATH;
     }
     
     var home = process.env.HOME;
@@ -49,7 +52,7 @@ module.exports = function(manifest, installPath) {
         tmux: path.join(installPath, "bin/tmux"),
         nakBin: path.join(__dirname, "../node_modules/nak/bin/nak"),
         bashBin: "bash",
-        nodeBin: [process.execPath],
+        nodeBin: [path.join(installPath, win32 ? "node.exe" : "node/bin/node"), process.execPath],
         installPath: installPath,
         correctedInstallPath: correctedInstallPath,
         staticPrefix: "/static",