diff --git a/lib/auth/auth.lisp b/lib/auth/auth.lisp
index a0274f8..5383d94 100644
--- a/lib/auth/auth.lisp
+++ b/lib/auth/auth.lisp
@@ -22,7 +22,8 @@
 
 (defun setup (cfg)
   (let* ((auth (make-instance 'simple-authenticator))
-         (ctx (core:default-setup cfg 'context :authenticator auth))
+         (ctx (funcall (core:make-setup 
+                         :class 'context :args '(:authenticator auth)) cfg))
          (cred (setup-credentials (admin-credentials cfg)))
          (admin (make-principal :system cred)))
     (setf (gethash (list :system (name cred)) (principals auth)) admin)
diff --git a/web/response.lisp b/web/response.lisp
index 6656b50..4fd84ed 100644
--- a/web/response.lisp
+++ b/web/response.lisp
@@ -99,7 +99,7 @@
 
 (defun finish (resp)
   (funcall (writer resp) nil :close t)
-  (actor:stop resp))
+  (actor:stop (core:mailbox resp)))
 
 (defun render (resp)
   #'(lambda (responder)