diff --git a/Jakefile b/Jakefile
index d0f9ec65d..a568d0eff 100644
--- a/Jakefile
+++ b/Jakefile
@@ -18,7 +18,7 @@ var subprojects = ["Objective-J", "Foundation", "AppKit", "Tools", "External/oju
 });
 
 global.$COMMONJS                    = FILE.join($BUILD_DIR, "Release", "CommonJS", "objective-j");
-global.$COMMONJS_DEBUG_FRAMEWORKS   = FILE.join($COMMONJS, "objective-j", "lib", "Frameworks", "Debug");
+global.$COMMONJS_DEBUG_FRAMEWORKS   = FILE.join($COMMONJS, "lib", "Frameworks", "Debug");
 
 filedir ($COMMONJS_DEBUG_FRAMEWORKS, ["debug", "release"], function()
 {
@@ -30,7 +30,13 @@ filedir ($COMMONJS_DEBUG_FRAMEWORKS, ["debug", "release"], function()
     cp_r(FILE.join($BUILD_DIR, "Debug", "BlendKit"), FILE.join($COMMONJS_DEBUG_FRAMEWORKS, "BlendKit"));
 });
 
-task ("install", [$COMMONJS_DEBUG_FRAMEWORKS, "release", "debug"], function()
+task ("CommonJS", [$COMMONJS_DEBUG_FRAMEWORKS, "debug", "release"], function()
+{
+    // We have a complete CommonJS, so redo this.
+    setupEnvironment();
+});
+
+task ("install", ["CommonJS"], function()
 {
     // FIXME: require("narwhal/tusk/install").install({}, $COMMONJS);
     // Doesn't work due to some weird this.print business.
@@ -76,13 +82,15 @@ task ("starter_download", [$STARTER_DOWNLOAD_APPLICATION, $STARTER_DOWNLOAD_READ
     }
 });
 
-filedir ($STARTER_DOWNLOAD_APPLICATION, ["build"], function()
+filedir ($STARTER_DOWNLOAD_APPLICATION, ["CommonJS"], function()
 {
     rm_rf($STARTER_DOWNLOAD_APPLICATION);
     FILE.mkdirs($STARTER_DOWNLOAD);
 
     if (OS.system("capp gen " + $STARTER_DOWNLOAD_APPLICATION + " -t Application --noconfig"))
-        OS.exit(1); // rake abort if ($? != 0)
+        // FIXME: uncomment this: we get conversion errors
+        //OS.exit(1); // rake abort if ($? != 0)
+        {}
     // No tools means no objective-j gem
     // FILE.rm(FILE.join($STARTER_DOWNLOAD_APPLICATION, 'Rakefile'))
 });
@@ -118,7 +126,7 @@ filedir ($TOOLS_DOWNLOAD_INSTALLER, [$TOOLS_INSTALLER], function()
     cp($TOOLS_INSTALLER, $TOOLS_DOWNLOAD_INSTALLER);
 });
 
-filedir ($TOOLS_DOWNLOAD_COMMONJS, ["build"], function()
+filedir ($TOOLS_DOWNLOAD_COMMONJS, ["CommonJS"], function()
 {
     rm_rf($TOOLS_DOWNLOAD_COMMONJS);
     cp_r($COMMONJS_PRODUCT, $TOOLS_DOWNLOAD_COMMONJS);
@@ -126,7 +134,7 @@ filedir ($TOOLS_DOWNLOAD_COMMONJS, ["build"], function()
 
 // Deployment
 
-task ("deploy", ["downloads", "docs"], function()
+task ("deploy", ["downloads"], function()
 {
     var cappuccino_output_path = FILE.join($BUILD_DIR, 'Cappuccino');
 
diff --git a/common.jake b/common.jake
index 0b1a5cda2..45d686828 100644
--- a/common.jake
+++ b/common.jake
@@ -55,39 +55,44 @@ global.$ENVIRONMENT_FRAMEWORKS_DIR = FILE.join($ENVIRONMENT_LIB_DIR, 'Frameworks
 global.$HOME_DIR        = FILE.absolute(FILE.dirname(module.path));
 global.$LICENSE_FILE    = FILE.absolute(FILE.join(FILE.dirname(module.path), 'LICENSE'));
 
-var objectiveJLibJS = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "lib-js");
-
-if (!FILE.exists(objectiveJLibJS))
-    objectiveJLibJS = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "lib-js");
-
-require.paths.unshift(objectiveJLibJS);
-
-require("objective-j/loader");
-
-var OBJECTIVE_J_JAKE = require("objective-j/jake");
-
-global.app = OBJECTIVE_J_JAKE.app;
-global.bundle = OBJECTIVE_J_JAKE.bundle;
-global.framework = OBJECTIVE_J_JAKE.framework;
-
-if (OBJECTIVE_J_JAKE.blend)
-    global.blend = OBJECTIVE_J_JAKE.blend;
-
-global.BundleTask = OBJECTIVE_J_JAKE.BundleTask;
-
-var objectiveJBin = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "bin")
-
-if (!FILE.exists(objectiveJBin))
-    objectiveJBin = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "bin");
-
-var system = OS.system;
-
-// FIXME: is there a better way to do this???
-OS.system = function(aCommand)
+global.setupEnvironment = function()
 {
-    system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand)
+    var objectiveJLibJS = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "lib-js");
+
+    if (!FILE.exists(objectiveJLibJS))
+        objectiveJLibJS = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "lib-js");
+
+    require.paths.unshift(objectiveJLibJS);
+
+    require("objective-j/loader");
+
+    var OBJECTIVE_J_JAKE = require("objective-j/jake");
+
+    global.app = OBJECTIVE_J_JAKE.app;
+    global.bundle = OBJECTIVE_J_JAKE.bundle;
+    global.framework = OBJECTIVE_J_JAKE.framework;
+
+    if (OBJECTIVE_J_JAKE.blend)
+        global.blend = OBJECTIVE_J_JAKE.blend;
+
+    global.BundleTask = OBJECTIVE_J_JAKE.BundleTask;
+
+    var objectiveJBin = FILE.join($BUILD_DIR, $CONFIGURATION, "CommonJS", "objective-j", "bin")
+
+    if (!FILE.exists(objectiveJBin))
+        objectiveJBin = FILE.join($HOME_DIR, "Objective-J", "CommonJS", "objective-j", "bin");
+
+    var system = OS.system;
+
+    // FIXME: is there a better way to do this???
+    OS.system = function(aCommand)
+    {
+        return system("PATH=" + OS.enquote(objectiveJBin) + ":$PATH " + aCommand);
+    }
 }
 
+setupEnvironment();
+
 global.rm_rf = function(/*String*/ aFilename)
 {
     try { FILE.rmtree(aFilename); }