diff --git a/meteor/client/lib/boot2docker.js b/meteor/client/lib/boot2docker.js
index 71f842296a..a98369e0fc 100644
--- a/meteor/client/lib/boot2docker.js
+++ b/meteor/client/lib/boot2docker.js
@@ -7,7 +7,7 @@ Boot2Docker = {};
 Boot2Docker.REQUIRED_IP = '192.168.60.103';
 
 Boot2Docker.command = function () {
-  return path.join(Util.getBinDir().replace(' ', '\\ '), 'boot2docker-1.2.0') + ' --vm="kitematic-vm"';
+  return path.join(Util.getBinDir(), 'boot2docker-1.2.0') + ' --vm="kitematic-vm"';
 };
 
 Boot2Docker.exec = function (command, callback) {
diff --git a/meteor/client/lib/util.js b/meteor/client/lib/util.js
index f215ce5640..0f1da75816 100755
--- a/meteor/client/lib/util.js
+++ b/meteor/client/lib/util.js
@@ -11,7 +11,7 @@ Util = {};
 
 Util.refreshDNS = function (app, callback) {
   // Use dig to refresh the DNS
-  exec('/usr/bin/dig +time=2 +tries=1 ' + app.name + '.kite @172.17.42.1', function (err, stdout, stderr) {
+  exec('/usr/bin/dig ' + app.name + '.kite @172.17.42.1', function (err, stdout, stderr) {
     console.log(err);
     console.log(stdout);
     console.log(stderr);
diff --git a/meteor/client/views/dashboard/settings/dashboard-settings.js b/meteor/client/views/dashboard/settings/dashboard-settings.js
index dc811bc175..beee5528e4 100644
--- a/meteor/client/views/dashboard/settings/dashboard-settings.js
+++ b/meteor/client/views/dashboard/settings/dashboard-settings.js
@@ -56,13 +56,11 @@ Template.dashboard_settings.events({
 Template.dashboard_settings.helpers({
   settings: function () {
     return Settings.findOne({});
+  },
+  memory: function () {
+    return Session.get('boot2dockerMemoryUsage');
+  },
+  disk: function () {
+    return Session.get('boot2dockerDiskUsage');
   }
 });
-
-Template.dashboard_settings.memory = function () {
-  return Session.get('boot2dockerMemoryUsage');
-};
-
-Template.dashboard_settings.disk = function () {
-  return Session.get('boot2dockerDiskUsage');
-};
diff --git a/meteor/client/views/dashboard/setup/setup-install.js b/meteor/client/views/dashboard/setup/setup-install.js
index 59ac37286c..3919a89425 100644
--- a/meteor/client/views/dashboard/setup/setup-install.js
+++ b/meteor/client/views/dashboard/setup/setup-install.js
@@ -1,9 +1,11 @@
-Template.setup_install.steps = function () {
-  return Installer.steps.map(function (step, index) {
-    step.index = index;
-    return step;
-  });
-};
+Template.setup_install.helpers({
+  steps: function () {
+    return Installer.steps.map(function (step, index) {
+      step.index = index;
+      return step;
+    });
+  }
+});
 
 Template.setup_install.helpers({
   currentInstallStep: function () {