diff --git a/setup/start.sh b/setup/start.sh
index 269c58b8c..7733b6ec7 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -164,8 +164,8 @@ if ! grep -q "^Restart=" /etc/systemd/system/multi-user.target.wants/nginx.servi
     systemctl daemon-reload
 fi
 # remove this migration after 1.10
-[[ -f /etc/nginx/host.cert ]] && cp /etc/nginx/host.cert "/etc/nginx/${arg_admin_domain}.host.cert"
-[[ -f /etc/nginx/host.key ]] && cp /etc/nginx/host.cert "/etc/nginx/${arg_admin_domain}.host.key"
+[[ -f /etc/nginx/cert/host.cert ]] && cp /etc/nginx/cert/host.cert "/etc/nginx/cert/${arg_admin_domain}.host.cert"
+[[ -f /etc/nginx/cert/host.key ]] && cp /etc/nginx/cert/host.cert "/etc/nginx/cert/${arg_admin_domain}.host.key"
 systemctl start nginx
 
 # bookkeep the version as part of data
diff --git a/src/routes/mail.js b/src/routes/mail.js
index cc0925c48..d5c742eaf 100644
--- a/src/routes/mail.js
+++ b/src/routes/mail.js
@@ -285,7 +285,7 @@ function removeList(req, res, next) {
     assert.strictEqual(typeof req.params.domain, 'string');
     assert.strictEqual(typeof req.params.groupId, 'string');
 
-    mail.removeList(req.params.domain, req.params.groupId, function (error, result) {
+    mail.removeList(req.params.domain, req.params.groupId, function (error) {
         if (error && error.reason === MailError.NOT_FOUND) return next(new HttpError(404, error.message));
         if (error) return next(new HttpError(500, error));