diff --git a/core/core-editor.el b/core/core-editor.el
index a60720328..13c140d6c 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -104,9 +104,9 @@ possible."
 ;;
 ;;; Clipboard / kill-ring
 
- ;; Eliminate duplicates in the kill ring. That is, if you kill the
- ;; same thing twice, you won't have to use M-y twice to get past it
- ;; to older entries in the kill ring.
+;; Eliminate duplicates in the kill ring. That is, if you kill the same thing
+;; twice, you won't have to use M-y twice to get past it to older entries in the
+;; kill ring.
 (setq kill-do-not-save-duplicates t)
 
 ;;
diff --git a/core/core.el b/core/core.el
index 8cd6dccfc..9cc1cfc25 100644
--- a/core/core.el
+++ b/core/core.el
@@ -1,5 +1,9 @@
 ;;; core.el --- the heart of the beast -*- lexical-binding: t; -*-
 
+(when (version< emacs-version "25.3")
+  (error "Detected Emacs %s. Doom only supports Emacs 25.3 and higher"
+         emacs-version))
+
 ;; Ensure `doom-core-dir' is in `load-path'
 (add-to-list 'load-path (file-name-directory load-file-name))
 
diff --git a/docs/api.org b/docs/api.org
index 0e08525c1..77d8320b5 100644
--- a/docs/api.org
+++ b/docs/api.org
@@ -366,7 +366,7 @@ It is integrated into Helpful, in Doom.
 ** Persist Emacs' initial frame position, dimensions and/or full-screen state across sessions
 #+BEGIN_SRC elisp
 ;; add to ~/.doom.d/config.el
-(when-let* ((dims (doom-cache-get 'last-frame-size)))
+(when-let (dims (doom-cache-get 'last-frame-size))
   (cl-destructuring-bind ((left . top) width height fullscreen) dims
     (setq initial-frame-alist
           (append initial-frame-alist
diff --git a/init.el b/init.el
index 80e73ced1..147686d67 100644
--- a/init.el
+++ b/init.el
@@ -39,10 +39,6 @@
 (setq load-prefer-newer noninteractive)
 
 (let (file-name-handler-alist)
-  (when (version< emacs-version "25.3")
-    (error "Detected Emacs %s. Doom only supports Emacs 25.3 and higher"
-           emacs-version))
-
   ;; Ensure Doom is running out of this file's directory
   (setq user-emacs-directory (file-name-directory load-file-name)))
 
diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index 81c559d01..d7b52108f 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -129,7 +129,7 @@ immediately runs it on the current candidate (ending the ivy session)."
         (setq +ivy--origin nil))))
 
   (after! yasnippet
-    (add-to-list 'yas-prompt-functions #'+ivy-yas-prompt nil #'eq))
+    (add-hook 'yas-prompt-functions #'+ivy-yas-prompt))
 
   (defadvice! +ivy--inhibit-in-evil-ex-a (orig-fn &rest args)
     "`ivy-completion-in-region' struggles with completing certain
diff --git a/modules/lang/rust/doctor.el b/modules/lang/rust/doctor.el
index 3cd9d6330..8cc8af442 100644
--- a/modules/lang/rust/doctor.el
+++ b/modules/lang/rust/doctor.el
@@ -28,4 +28,4 @@
       (warn! "Couldn't find the racer binary at `racer-cmd'"))
     ;; rust source code (rustup component add rust-src)
     (unless (file-directory-p racer-rust-src-path)
-      (warn! "Couldn't find Rust's source code at RUST_SRC_PATH or `racer-rust-src-path'."))))
+      (warn! "Couldn't find Rust's source code at RUST_SRC_PATH or `racer-rust-src-path'"))))
diff --git a/modules/lang/web/+css.el b/modules/lang/web/+css.el
index 0dc02f0a6..b0cae2ed1 100644
--- a/modules/lang/web/+css.el
+++ b/modules/lang/web/+css.el
@@ -34,7 +34,7 @@
   (add-hook 'css-mode-hook #'rainbow-delimiters-mode)
   (set-company-backend! '(css-mode scss-mode)
     (if EMACS26+
-        ;; css-mode's built in completion is superior in 26+
+        ;; DEPRECATED css-mode's built in completion is superior in 26+
         'company-capf
       'company-css))
   (map! :map scss-mode-map :localleader "b" #'+css/scss-build))
diff --git a/modules/term/vterm/doctor.el b/modules/term/vterm/doctor.el
index 0dd49b516..337b694a4 100644
--- a/modules/term/vterm/doctor.el
+++ b/modules/term/vterm/doctor.el
@@ -10,4 +10,4 @@
   (warn! "Couldn't find cmake command. Vterm module won't compile"))
 
 (unless (fboundp 'module-load)
-  (warn! "Your emacs doesn't have MODULES support. Vterm module won't work"))
+  (warn! "Your emacs wasn't built with dynamic modules support. The vterm module won't build"))
diff --git a/modules/ui/doom-dashboard/config.el b/modules/ui/doom-dashboard/config.el
index 718f1d749..9b5f591aa 100644
--- a/modules/ui/doom-dashboard/config.el
+++ b/modules/ui/doom-dashboard/config.el
@@ -129,7 +129,8 @@ PLIST can have the following properties:
     (add-hook 'persp-before-switch-functions #'+doom-dashboard--persp-record-project-h)))
 
 (add-hook 'doom-init-ui-hook #'+doom-dashboard-init-h)
-(remove-hook 'window-setup-hook #'doom-display-benchmark-h)
+(unless doom-debug-mode
+  (remove-hook 'window-setup-hook #'doom-display-benchmark-h))
 
 
 ;;