diff --git a/src/dns.js b/src/dns.js
index b7d0a596e..bb3146e06 100644
--- a/src/dns.js
+++ b/src/dns.js
@@ -31,7 +31,7 @@ const apps = require('./apps.js'),
     assert = require('assert'),
     BoxError = require('./boxerror.js'),
     constants = require('./constants.js'),
-    debug = require('debug')('box:domains'),
+    debug = require('debug')('box:dns'),
     dns = require('dns'),
     domains = require('./domains.js'),
     mail = require('./mail.js'),
@@ -152,7 +152,7 @@ async function upsertDnsRecords(location, domain, type, values) {
     assert.strictEqual(typeof type, 'string');
     assert(Array.isArray(values));
 
-    debug('upsertDNSRecord: %s on %s type %s values', location, domain, type, values);
+    debug(`upsertDNSRecord: location ${location} on domain ${domain} of type ${type} with values ${JSON.stringify(values)}`);
 
     const domainObject = await domains.get(domain);
     await maybePromisify(api(domainObject.provider).upsert)(domainObject, location, type, values);
diff --git a/src/domains.js b/src/domains.js
index 1ca1caeae..d6293fa81 100644
--- a/src/domains.js
+++ b/src/domains.js
@@ -16,7 +16,6 @@ const assert = require('assert'),
     BoxError = require('./boxerror.js'),
     crypto = require('crypto'),
     database = require('./database.js'),
-    debug = require('debug')('box:domains'),
     eventlog = require('./eventlog.js'),
     mail = require('./mail.js'),
     reverseProxy = require('./reverseproxy.js'),
@@ -26,8 +25,6 @@ const assert = require('assert'),
     util = require('util'),
     _ = require('underscore');
 
-const NOOP_CALLBACK = function (error) { if (error) debug(error); };
-
 const DOMAINS_FIELDS = [ 'domain', 'zoneName', 'provider', 'configJson', 'tlsConfigJson', 'wellKnownJson', 'fallbackCertificateJson' ].join(',');
 
 function postProcess(data) {
diff --git a/src/sysinfo/generic.js b/src/sysinfo/generic.js
index 2539105e9..d9b84a0be 100644
--- a/src/sysinfo/generic.js
+++ b/src/sysinfo/generic.js
@@ -19,7 +19,7 @@ async function getServerIp(config) {
 
     let attempt = 0;
 
-    await promiseRetry({ times: 10, interval: 5000 }, async () => {
+    return await promiseRetry({ times: 10, interval: 5000 }, async () => {
         if (attempt) debug(`getServerIp: getting server IP. attempt ${attempt}`);
         ++attempt;