diff --git a/core/cli/packages.el b/core/cli/packages.el
index 468bba7ac..8977ce51d 100644
--- a/core/cli/packages.el
+++ b/core/cli/packages.el
@@ -222,9 +222,9 @@ list remains lean."
   "Queue async compilation for all non-doom Elisp files."
   (when (fboundp 'native-compile-async)
     (cl-loop with paths = (cl-loop for path in load-path
-                                   if (not (string-prefix-p doom-local-dir path))
+                                   unless (string-prefix-p doom-local-dir path)
                                    collect path)
-             for file in (doom-files-in paths :match "\\.el\\(\\.gz\\)?$")
+             for file in (doom-files-in paths :match "\\.el\\(?:\\.gz\\)?$")
              if (and (file-exists-p (byte-compile-dest-file file))
                      (not (doom--find-eln-file (doom--eln-file-name file)))) do
              (doom-log "Compiling %s" file)
diff --git a/modules/os/tty/config.el b/modules/os/tty/config.el
index b9b86c3db..5546166e8 100644
--- a/modules/os/tty/config.el
+++ b/modules/os/tty/config.el
@@ -24,11 +24,11 @@
       (and (require 'xclip nil t)
            (xclip-mode +1)))))
 
-  (when (featurep! :editor evil)
-    ;; Fix cursor shape-changing in the terminal. Only supported in XTerm, Gnome
-    ;; Terminal, iTerm, Konsole, dumb (etc. mintty), and Apple Terminal.app. If
-    ;; using Apple Terminal.app, install
-    ;; http://www.culater.net/software/SIMBL/SIMBL.php and
-    ;; https://github.com/saitoha/mouseterm-plus/releases. That makes to support
-    ;; VT's DECSCUSR sequence.
-    (add-hook 'tty-setup-hook #'evil-terminal-cursor-changer-activate))
+(when (featurep! :editor evil)
+  ;; Fix cursor shape-changing in the terminal. Only supported in XTerm, Gnome
+  ;; Terminal, iTerm, Konsole, dumb (etc. mintty), and Apple Terminal.app. If
+  ;; using Apple Terminal.app, install
+  ;; http://www.culater.net/software/SIMBL/SIMBL.php and
+  ;; https://github.com/saitoha/mouseterm-plus/releases. That makes to support
+  ;; VT's DECSCUSR sequence.
+  (add-hook 'tty-setup-hook #'evil-terminal-cursor-changer-activate))