diff --git a/features/step-definitions/ein-steps.el b/features/step-definitions/ein-steps.el
index 912a1e0..8cf787e 100644
--- a/features/step-definitions/ein-steps.el
+++ b/features/step-definitions/ein-steps.el
@@ -496,6 +496,6 @@
 (When "^text property at point includes \"\\(.+\\)\"$"
       (lambda (properties)
         (should-not
-         (mapcan (lambda (prop)
-                   (not (get-text-property (point) (intern prop))))
-                 (split-string properties ",")))))
+         (cl-mapcan (lambda (prop)
+                      (not (get-text-property (point) (intern prop))))
+                    (split-string properties ",")))))
diff --git a/lisp/ein-notebook.el b/lisp/ein-notebook.el
index 9be1e6a..528dcf4 100644
--- a/lisp/ein-notebook.el
+++ b/lisp/ein-notebook.el
@@ -203,12 +203,12 @@ combo must match exactly these url/port you used format
 
 (defun ein:notebook-buffer-list (notebook)
   "Return the direct and indirect buffers."
-  (mapcan (lambda (ws)
-            (when-let ((ws-buf (ein:worksheet-buffer ws)))
-              (with-current-buffer ws-buf
-                (mapcar #'buffer-name (eieio-oref pm/polymode '-buffers)))))
-          (append (ein:$notebook-worksheets notebook)
-                  (ein:$notebook-scratchsheets notebook))))
+  (cl-mapcan (lambda (ws)
+               (when-let ((ws-buf (ein:worksheet-buffer ws)))
+                 (with-current-buffer ws-buf
+                   (mapcar #'buffer-name (eieio-oref pm/polymode '-buffers)))))
+             (append (ein:$notebook-worksheets notebook)
+                     (ein:$notebook-scratchsheets notebook))))
 
 (defun ein:notebook--get-nb-or-error ()
   (or ein:%notebook% (error "Not in notebook buffer.")))