diff --git a/tools/run.js b/tools/run.js
index f9f5d96d12..92afcaf0d8 100644
--- a/tools/run.js
+++ b/tools/run.js
@@ -246,6 +246,7 @@ var startServer = function (options) {
   var nodeOptions = _.clone(options.nodeOptions);
   nodeOptions.push(path.join(options.bundlePath, 'main.js'));
   nodeOptions.push('--keepalive');
+  nodeOptions.push('program.json');
 
   var child_process = require('child_process');
   var proc = child_process.spawn(process.execPath, nodeOptions,
diff --git a/tools/server/boot.js b/tools/server/boot.js
index 65d9b81b06..2d572280ff 100644
--- a/tools/server/boot.js
+++ b/tools/server/boot.js
@@ -9,7 +9,7 @@ var url = require("url");
 
 var connect = require('connect');
 var gzippo = require('gzippo');
-var argv = require('optimist').argv;
+var argv = require('optimist').boolean('keepalive').argv;
 var useragent = require('useragent');
 
 var _ = require('underscore');
@@ -144,7 +144,7 @@ var run = function () {
 
   // read our control files
   var serverJson =
-    JSON.parse(fs.readFileSync(path.join(serverDir, process.argv[2]), 'utf8'));
+    JSON.parse(fs.readFileSync(path.join(serverDir, argv._[0]), 'utf8'));
 
   var configJson =
     JSON.parse(fs.readFileSync(path.join(serverDir, 'config.json'), 'utf8'));