diff --git a/core/core-lib.el b/core/core-lib.el
index d812d2b3e..5fbe58daf 100644
--- a/core/core-lib.el
+++ b/core/core-lib.el
@@ -301,12 +301,11 @@ Do not use this for configuring Doom core."
   (declare (indent defun))
   (unless values
     (error "Empty set! for %s" keyword))
-  (let ((fn (cdr (assq keyword doom-settings))))
-    (if fn
-        (apply fn values)
-      (when doom-debug-mode
-        (message "No setting found for %s" keyword)
-        nil))))
+  (if-let* ((fn (cdr (assq keyword doom-settings))))
+      (apply fn values)
+    (when doom-debug-mode
+      (message "No setting found for %s" keyword)
+      nil)))
 
 (provide 'core-lib)
 ;;; core-lib.el ends here
diff --git a/modules/feature/popup/autoload.el b/modules/feature/popup/autoload.el
index a4d942321..afee7594e 100644
--- a/modules/feature/popup/autoload.el
+++ b/modules/feature/popup/autoload.el
@@ -226,8 +226,8 @@ disabled."
 (defun +popup/close (&optional window force-p)
   "Close WINDOW, if it's a popup window.
 
-This will do nothing if the popup's `escape-quit' window parameter is either nil
-or 'other. This window parameter is ignored if FORCE-P is non-nil."
+This will do nothing if the popup's `quit' window parameter is either nil or
+'other. This window parameter is ignored if FORCE-P is non-nil."
   (interactive
    (list (selected-window)
          current-prefix-arg))
diff --git a/modules/feature/workspaces/config.el b/modules/feature/workspaces/config.el
index 5cd106696..871c9ca12 100644
--- a/modules/feature/workspaces/config.el
+++ b/modules/feature/workspaces/config.el
@@ -72,7 +72,8 @@ renamed.")
       (when (and (equal (safe-persp-name (get-current-persp)) persp-nil-name)
                  (= persp-auto-resume-time -1))
         (persp-frame-switch +workspaces-main (or frame (selected-frame))))
-      ;; Make sure warnings are visible (fix #319)
+      ;; The warnings buffer gets swallowed by creating `+workspaces-main', so
+      ;; we display it manually, if it exists (fix #319).
       (when-let* ((warnings (get-buffer "*Warnings*")))
         (display-buffer-in-side-window
          warnings '((window-height . shrink-window-if-larger-than-buffer))))))
diff --git a/modules/lang/org/autoload/org-babel.el b/modules/lang/org/autoload/org-babel.el
deleted file mode 100644
index 8bf723f4e..000000000
--- a/modules/lang/org/autoload/org-babel.el
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; lang/org/autoload/org-babel.el -*- lexical-binding: t; -*-
-;;;###if (featurep! +babel)
-
-;;;###autoload
-(defun +org-babel/edit (arg)
-  "Edit the source block at point in a popup.
-
-If ARG is non-nil (universal argument), use the current window."
-  (interactive "P")
-  (if arg
-      (call-interactively #'org-edit-special)
-    (with-popup-rules! (("^\\*Org Src" :regexp t :select t :noesc t :same t))
-      (call-interactively #'org-edit-special))))