diff --git a/modules/feature/lookup/autoload/lookup.el b/modules/feature/lookup/autoload/lookup.el
index 03b19fe12..f219d00fb 100644
--- a/modules/feature/lookup/autoload/lookup.el
+++ b/modules/feature/lookup/autoload/lookup.el
@@ -180,6 +180,8 @@ Goes down a list of possible backends:
     (unless (string-empty-p pattern)
       (cl-pushnew pattern devdocs-search-history))))
 
+(defvar counsel-dash-docsets)
+(defvar helm-dash-docsets)
 ;;;###autoload
 (defun +lookup/in-docsets (&optional query docsets)
   "TODO"
diff --git a/modules/feature/lookup/config.el b/modules/feature/lookup/config.el
index 6ab555868..1b3f6a263 100644
--- a/modules/feature/lookup/config.el
+++ b/modules/feature/lookup/config.el
@@ -140,9 +140,9 @@ Used by `+lookup/in-docsets' and `+lookup/documentation'."
              collect
              `(defun ,hook-sym ()
                 (make-variable-buffer-local ',var-sym)
-                (cond ((eq (car docsets) :add)
+                (cond ((eq ',(car docsets) :add)
                        `(setq ,var-sym (append ,var-sym (list ,@(cdr docsets)))))
-                      ((eq (car docsets) :remove)
+                      ((eq ',(car docsets) :remove)
                        `(setq ,var-sym
                               (cl-loop with to-delete = (list ,@(cdr docsets))
                                        for docset in ,var-sym
diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index 745dbaf7b..50eca0535 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -315,9 +315,6 @@ with the :popup setting."
 prevent the popup(s) from messing up the UI (or vice versa)."
   `(let* ((in-popup-p (+popup-p))
           (popups (+popup-windows))
-          (popup-states
-           (cl-loop for p in popups
-                    collect (cons (window-buffer p) (window-state-get p))))
           +popup--last)
      (dolist (p popups)
        (+popup/close p 'force))
diff --git a/modules/feature/popup/config.el b/modules/feature/popup/config.el
index 7e693a65d..a21b49770 100644
--- a/modules/feature/popup/config.el
+++ b/modules/feature/popup/config.el
@@ -143,7 +143,7 @@ ALIST supports one custom parameter: `size', which will resolve to
 (defun doom*ignore-window-parameters (orig-fn &rest args)
   "Allow *interactive* window moving commands to traverse popups."
   (cl-letf (((symbol-function #'windmove-find-other-window)
-             (lambda (direction &optional window ignore sign wrap mini)
+             (lambda (dir &optional arg window)
                (window-in-direction
                 (pcase dir (`up 'above) (`down 'below) (_ dir))
                 window (bound-and-true-p +popup-mode) arg windmove-wrap-around t))))
diff --git a/modules/feature/workspaces/autoload/workspaces.el b/modules/feature/workspaces/autoload/workspaces.el
index 410757a9c..d978d6981 100644
--- a/modules/feature/workspaces/autoload/workspaces.el
+++ b/modules/feature/workspaces/autoload/workspaces.el
@@ -507,7 +507,7 @@ the workspace and move to the next."
         (+workspace/delete frame-persp)))))
 
 ;;;###autoload
-(defun +workspaces|per-project (&optional root)
+(defun +workspaces|per-project ()
   "Open a new workspace when switching to another project.
 
 Ensures the scratch (or dashboard) buffers are CDed into the project's root."