diff --git a/core/core-editor.el b/core/core-editor.el
index f12d7f9ae..e71dd4d4f 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -70,9 +70,9 @@ possible."
              (progn (make-directory parent-directory 'parents)
                     t))))))
 
-;; Don't autosave files or create lock/history/backup files. The
-;; editor doesn't need to hold our hands so much. We'll rely on git
-;; and our own good fortune instead. Fingers crossed!
+;; Don't autosave files or create lock/history/backup files. We don't want
+;; copies of potentially sensitive material floating around, and we'll rely on
+;; git and our own good fortune instead. Fingers crossed!
 (setq auto-save-default nil
       create-lockfiles nil
       make-backup-files nil
diff --git a/modules/editor/rotate-text/autoload.el b/modules/editor/rotate-text/autoload.el
index 30ede3ab1..809de9c47 100644
--- a/modules/editor/rotate-text/autoload.el
+++ b/modules/editor/rotate-text/autoload.el
@@ -1,7 +1,7 @@
 ;;; editor/rotate-text/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autoload
-(after! rotate-text
+(with-eval-after-load 'rotate-text
   (add-to-list 'rotate-text-words '("true" "false")))
 
 ;;;###autodef
diff --git a/modules/lang/org/autoload/org-capture.el b/modules/lang/org/autoload/org-capture.el
index 9cbdeb4f0..4707fab75 100644
--- a/modules/lang/org/autoload/org-capture.el
+++ b/modules/lang/org/autoload/org-capture.el
@@ -57,9 +57,8 @@ you're done. This can be called from an external shell script."
                   (org-capture)
                 (unwind-protect
                     (counsel-org-capture)
-                  (if-let* ((buf (cl-loop for buf in (buffer-list)
-                                          if (buffer-local-value 'org-capture-mode buf)
-                                          return buf)))
+                  (if-let (buf (cl-find-if (doom-partial #'buffer-local-value 'org-capture-mode)
+                                           (buffer-list)))
                       (with-current-buffer buf
                         (add-hook 'kill-buffer-hook #'+org-capture-cleanup-frame-h nil t))
                     (delete-frame frame))))))
diff --git a/modules/lang/org/packages.el b/modules/lang/org/packages.el
index 6e9c65c37..6e04f10b8 100644
--- a/modules/lang/org/packages.el
+++ b/modules/lang/org/packages.el
@@ -53,10 +53,8 @@
     :recipe (:host github :repo "anler/centered-window-mode"))
   (package! org-tree-slide)
   (package! org-re-reveal))
-
 (when (featurep! +journal)
   (package! org-journal))
-
 (when (featurep! +hugo)
   (package! ox-hugo
     :recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)))
diff --git a/modules/ui/nav-flash/autoload.el b/modules/ui/nav-flash/autoload.el
index f22601056..d129f25da 100644
--- a/modules/ui/nav-flash/autoload.el
+++ b/modules/ui/nav-flash/autoload.el
@@ -18,8 +18,7 @@ jumping to another part of the file)."
 or triggered from one of `+nav-flash-exclude-commands'."
   (unless (or (memq this-command +nav-flash-exclude-commands)
               (bound-and-true-p so-long-minor-mode)
-              (eq major-mode 'so-long-mode)
-              (derived-mode-p 'special-mode 'term-mode)
+              (derived-mode-p 'so-long-mode 'special-mode 'term-mode)
               (and (equal (point-marker) (car +nav-flash--last-point))
                    (equal (selected-window) (cdr +nav-flash--last-point))))
     (+nav-flash-blink-cursor)