diff --git a/src/workgroups-functions.el b/src/workgroups-functions.el
index 692374818dfc541bcbcb450311d521a7af3ef93a..00f4c043f388a39f0bdc5e6580c1612a23fce59a 100644
--- a/src/workgroups-functions.el
+++ b/src/workgroups-functions.el
@@ -431,7 +431,7 @@ BUFFER or `wg-default-buffer' is visible in the only window."
 
 (defun wg-scale-w-size (w width-scale height-scale)
   "Scale W's size by WIDTH-SCALE and HEIGHT-SCALE."
-  (cl-flet
+  (cl-labels
       ((wscale (width)  (truncate (* width  width-scale)))
        (hscale (height) (truncate (* height height-scale))))
     (wg-adjust-w-size w #'wscale #'hscale)))
@@ -555,9 +555,9 @@ Otherwise, reverse WTREE vertically."
   "Return a new list by flattening WTREE.
 KEY non returns returns a list of WTREE's wins.
 KEY non-nil returns a list of the results of calling KEY on each win."
-  (cl-flet
+  (cl-labels
       ((inner (w) (if (wg-win-p w) (list (if key (funcall key w) w))
-                    (cl-mapcan 'inner (wg-wtree-wlist w)))))
+                    (cl-mapcan #'inner (wg-wtree-wlist w)))))
     (inner wtree)))
 
 (defun wg-win-list (wtree)
@@ -1204,7 +1204,7 @@ BUFFER-LIST nil defaults to `buffer-list'."
   (let ((all-buf-uids (wg-all-buf-uids)))
     (wg-asetf (wg-buf-list)
               (cl-remove-if-not (lambda (uid) (member uid all-buf-uids)) it
-                             :key 'wg-buf-uid))))
+                                :key 'wg-buf-uid))))
 
 
 ;; FIXME: Duplicate buf names probably shouldn't be allowed.  An unrelated error
diff --git a/src/workgroups-pickel.el b/src/workgroups-pickel.el
index 9efd53591df243fd51789cd1ed963711ad888b8e..fc391554071815e26aa61d8b34a3286b132259c0 100644
--- a/src/workgroups-pickel.el
+++ b/src/workgroups-pickel.el
@@ -342,7 +342,7 @@ WORKGROUP after pickeling its parameters. Otherwise return
 WORKGROUP."
     (if (not (wg-workgroup-parameters workgroup)) workgroup
       (let ((copy (wg-copy-workgroup workgroup)))
-        (wg-asetf (wg-workgroup-parameters copy) (wg-pickel copy))
+        (wg-asetf (wg-workgroup-parameters copy) (wg-pickel it))
         copy)))
 
   (defun wg-unpickel-workgroup-parameters (workgroup)
@@ -351,7 +351,7 @@ WORKGROUP after unpickeling its parameters. Otherwise return
 WORKGROUP."
     (if (not (wg-workgroup-parameters workgroup)) workgroup
       (let ((copy (wg-copy-workgroup workgroup)))
-        (wg-asetf (wg-workgroup-parameters copy) (wg-unpickel copy))
+        (wg-asetf (wg-workgroup-parameters copy) (wg-unpickel it))
         copy)))
 
   (defun wg-pickel-all-session-parameters (session)
@@ -359,7 +359,7 @@ WORKGROUP."
 parameters and the parameters of all its workgroups."
     (let ((copy (wg-copy-session session)))
       (when (wg-session-parameters copy)
-        (wg-asetf (wg-session-parameters copy) (wg-pickel copy)))
+        (wg-asetf (wg-session-parameters copy) (wg-pickel it)))
       (wg-asetf (wg-session-workgroup-list copy)
                 (cl-mapcar 'wg-pickel-workgroup-parameters it))
       copy))
@@ -369,7 +369,7 @@ parameters and the parameters of all its workgroups."
 parameters and the parameters of all its workgroups."
     (let ((copy (wg-copy-session session)))
       (when (wg-session-parameters copy)
-        (wg-asetf (wg-session-parameters copy) (wg-unpickel copy)))
+        (wg-asetf (wg-session-parameters copy) (wg-unpickel it)))
       (wg-asetf (wg-session-workgroup-list copy)
                 (cl-mapcar 'wg-unpickel-workgroup-parameters it))
       copy))
diff --git a/src/workgroups-specialbufs.el b/src/workgroups-specialbufs.el
index f4ed4ea95e1c6b1c9e88f4d3b50ef16b2ffe37d1..38fa8e88185a6cf39c567fbe93f22cd7610e4234 100644
--- a/src/workgroups-specialbufs.el
+++ b/src/workgroups-specialbufs.el
@@ -112,8 +112,8 @@ You can get these commands using `wg-get-org-agenda-view-commands'."
                                   (wg-last1 (process-command (get-buffer-process buffer)))
                                 "/bin/bash")))
               (deserialize . ,(lambda (buffer vars)
-                                (cl-flet ((term-window-width () 80)
-                                          (window-height () 24))
+                                (cl-labels ((term-window-width () 80)
+                                            (window-height () 24))
                                   (prog1 (term vars)
                                     (rename-buffer (wg-buf-name buffer) t)))))))
 
diff --git a/src/workgroups-utils-basic.el b/src/workgroups-utils-basic.el
index 2783659eb3908a6d096a985f1989178704cd6b18..64ddcb5e04a714bcc9a209d582b281e6f8de1f83 100644
--- a/src/workgroups-utils-basic.el
+++ b/src/workgroups-utils-basic.el
@@ -222,7 +222,7 @@ Cribbed from `org-id-b36-to-int-one-digit'."
 (defun wg-int-to-b36 (i &optional length)
   "Return a base 36 string from I."
   (let ((base 36) b36)
-    (cl-flet ((add-digit () (push (wg-int-to-b36-one-digit (mod i base)) b36)
+    (cl-labels ((add-digit () (push (wg-int-to-b36-one-digit (mod i base)) b36)
                          (setq i (/ i base))))
       (add-digit)
       (while (> i 0) (add-digit))
@@ -514,7 +514,7 @@ options."
   (declare (indent 2))
   (let* ((name (if (consp name-form) (car name-form) name-form))
          (prefixed-name (wg-symcat prefix "-" name)))
-    (cl-flet ((rebind (opstr)
+    (cl-labels ((rebind (opstr)
                       (let ((oldfnsym (wg-symcat opstr "-" prefix "-" name)))
                         `((fset ',(wg-symcat prefix "-" opstr "-" name)
                                 (symbol-function ',oldfnsym))
@@ -572,7 +572,7 @@ the cadr as the accessor function."
                               read hist default-value inherit-input-method)
   "PROMPT for an object that satisfies TEST, WARNING if necessary.
 ARGS are `read-from-minibuffer's args, after PROMPT."
-  (cl-flet ((read () (read-from-minibuffer
+  (cl-labels ((read () (read-from-minibuffer
                       prompt initial-contents keymap read hist
                       default-value inherit-input-method)))
     (let ((obj (read)))