diff --git a/core/core-cli.el b/core/core-cli.el
index 12f23ac6d..a0fcba9d8 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -20,7 +20,7 @@
 ;; Don't generate superfluous files when writing temp buffers
 (setq make-backup-files nil)
 
-;; Stop user configuration from interfering with Doom
+;; Stop user configuration from interfering with package management
 (setq enable-dir-local-variables nil)
 
 
diff --git a/core/core-editor.el b/core/core-editor.el
index 4f5c62e69..fd339ea71 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -573,11 +573,11 @@ on."
               highlight-indent-guides-mode
               hl-fill-column-mode))
   (defun doom-buffer-has-long-lines-p ()
-    ;; HACK Fix #2183: `so-long-detected-long-line-p' tries to parse comment
-    ;;      syntax, but in some buffers comment state isn't initialized, leading
-    ;;      to a wrong-type-argument: stringp error.
     (unless (bound-and-true-p visual-line-mode)
       (let ((so-long-skip-leading-comments
+             ;; HACK Fix #2183: `so-long-detected-long-line-p' tries to parse
+             ;;      comment syntax, but comment state may not be initialized,
+             ;;      leading to a wrong-type-argument: stringp error.
              (bound-and-true-p comment-use-syntax)))
         (so-long-detected-long-line-p))))
   (setq so-long-predicate #'doom-buffer-has-long-lines-p))
diff --git a/modules/editor/evil/config.el b/modules/editor/evil/config.el
index ef7e38a93..1b4c97b88 100644
--- a/modules/editor/evil/config.el
+++ b/modules/editor/evil/config.el
@@ -20,7 +20,7 @@ directives. By default, this only recognizes C directives.")
 ;; Set these defaults before `evil'; use `defvar' so they can be changed prior
 ;; to loading.
 (defvar evil-want-C-g-bindings t)
-(defvar evil-want-C-i-jump nil)
+(defvar evil-want-C-i-jump nil)  ; we do this ourselves
 (defvar evil-want-C-u-scroll t)  ; moved the universal arg to <leader> u
 (defvar evil-want-C-u-delete t)
 (defvar evil-want-C-w-scroll t)
diff --git a/modules/ui/popup/config.el b/modules/ui/popup/config.el
index e2b183f43..3e85e1525 100644
--- a/modules/ui/popup/config.el
+++ b/modules/ui/popup/config.el
@@ -174,6 +174,6 @@ prevent the popup(s) from messing up the UI (or vice versa)."
 
 
 ;;
-;; Hacks
+;;; Hacks
 
 (load! "+hacks")