diff --git a/src/addons.js b/src/addons.js
index 45398ed52..c9610dfe6 100644
--- a/src/addons.js
+++ b/src/addons.js
@@ -125,7 +125,7 @@ function setupAddons(app, addons, callback) {
 
     if (!addons) return callback(null);
 
-    debugApp(app, 'setupAddons: Settings up %j', Object.keys(addons));
+    debugApp(app, 'setupAddons: Setting up %j', Object.keys(addons));
 
     async.eachSeries(Object.keys(addons), function iterator(addon, iteratorCallback) {
         if (!(addon in KNOWN_ADDONS)) return iteratorCallback(new Error('No such addon:' + addon));
diff --git a/src/apptask.js b/src/apptask.js
index 7ca527557..a17b67ac4 100644
--- a/src/apptask.js
+++ b/src/apptask.js
@@ -76,6 +76,25 @@ function debugApp(app) {
     debug(prefix + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1)));
 }
 
+// updates the app object and the database
+function updateApp(app, values, callback) {
+    assert.strictEqual(typeof app, 'object');
+    assert.strictEqual(typeof values, 'object');
+    assert.strictEqual(typeof callback, 'function');
+
+    debugApp(app, 'updating app with values: %j', values);
+
+    appdb.update(app.id, values, function (error) {
+        if (error) return callback(error);
+
+        for (var value in values) {
+            app[value] = values[value];
+        }
+
+        return callback(null);
+    });
+}
+
 function reserveHttpPort(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
@@ -359,25 +378,6 @@ function waitForAltDomainDnsPropagation(app, callback) {
     }
 }
 
-// updates the app object and the database
-function updateApp(app, values, callback) {
-    assert.strictEqual(typeof app, 'object');
-    assert.strictEqual(typeof values, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    debugApp(app, 'updating app with values: %j', values);
-
-    appdb.update(app.id, values, function (error) {
-        if (error) return callback(error);
-
-        for (var value in values) {
-            app[value] = values[value];
-        }
-
-        return callback(null);
-    });
-}
-
 // Ordering is based on the following rationale:
 //   - configure nginx, icon, oauth
 //   - register subdomain.