diff --git a/index.js b/index.js
index 7c3c2b4..c06df9c 100644
--- a/index.js
+++ b/index.js
@@ -28,7 +28,7 @@ function promisifyAllStore(obj) {
     var p;
     if (1 === obj[key].length) {
       // wrap just in case it's synchronous (or improperly throws)
-      p = function (opts) { return PromiseA.resolve().then(function () { obj[key](opts); }) };
+      p = function (opts) { return PromiseA.resolve().then(function () { obj[key](opts); }); };
     } else {
       p = util.promisify(obj[key]);
     }
@@ -468,12 +468,15 @@ Greenlock.create = function (gl) {
           var options = results.options || results;
           if (opts !== options) {
             Object.keys(options).forEach(function (key) {
-              if ('undefined' !== typeof options[key]) {
+              if ('undefined' !== typeof options[key] && 'domain' !== key) {
                 opts[key] = options[key];
               }
             });
             options = opts;
           }
+          if (Array.isArray(options.altnames) && options.altnames.length) {
+            options.domains = options.altnames;
+          }
           // just in case we get a completely different object from the one we originally created
           if (!options.account) { options.account = {}; }
           if (!options.certificate) { options.certificate = {}; }
diff --git a/lib/core.js b/lib/core.js
index 33ed720..6b1fa74 100644
--- a/lib/core.js
+++ b/lib/core.js
@@ -402,7 +402,7 @@ module.exports.create = function (gl) {
                   Object.keys(challenge).forEach(function (key) {
                     done[key] = challenge[key];
                   });
-                  gl.challenges[challenge.type].remove(copy, challenge.altname, challenge.keyAuthorization, done);
+                  gl.challenges[challenge.type].remove(copy, challenge.altname, challenge.token, done);
                 }
               };
 
diff --git a/package-lock.json b/package-lock.json
index c2f8da3..8af3e20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "greenlock",
-  "version": "2.7.12",
+  "version": "2.7.13",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0b5ca0b..de71a13 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "greenlock",
-  "version": "2.7.12",
+  "version": "2.7.13",
   "description": "Let's Encrypt for node.js on npm",
   "main": "index.js",
   "files": [