diff --git a/tools/builder.js b/tools/builder.js
index ff4a93e33c..6669f41d01 100644
--- a/tools/builder.js
+++ b/tools/builder.js
@@ -50,6 +50,7 @@ var Builder = function (options) {
   self.buildPath = path.join(path.dirname(self.outputPath),
                              '.build' + nonce + "." +
                              path.basename(self.outputPath));
+  console.log(self.buildPath);
   files.rm_recursive(self.buildPath);
   files.mkdir_p(self.buildPath, 0755);
 
diff --git a/tools/bundler.js b/tools/bundler.js
index c30acd07b3..59c11a39b6 100644
--- a/tools/bundler.js
+++ b/tools/bundler.js
@@ -1786,9 +1786,8 @@ exports.bundle = function (options) {
       });
 
       // Server
-
-      var server = options.cachedServerTarget ||
-                   makeServerTarget(app, clientTargets);
+      var server = options.cachedServerTarget || makeServerTarget(app, client);
+      server.clientTarget = client;
       targets.server = server;
     }