diff --git a/core/core-projects.el b/core/core-projects.el
index bdcb2cffa..6be72c2cd 100644
--- a/core/core-projects.el
+++ b/core/core-projects.el
@@ -157,7 +157,7 @@ c) are not valid projectile projects."
 
    ;; Fix breakage on windows in git projects with submodules, since Windows
    ;; doesn't have tr
-   ((not (executable-find "tr"))
+   (IS-WINDOWS
     (setq projectile-git-submodule-command nil)))
 
   (defadvice! doom--projectile-cache-timers-a ()
@@ -184,12 +184,11 @@ the command instead."
   ;; Projectile root-searching functions can cause an infinite loop on TRAMP
   ;; connections, so disable them.
   ;; TODO Is this still necessary?
-  (defadvice! doom--projectile-locate-dominating-file-a (orig-fn file name)
+  (defadvice! doom--projectile-locate-dominating-file-a (file _name)
     "Don't traverse the file system if on a remote connection."
-    :around #'projectile-locate-dominating-file
-    (when (and (stringp file)
-               (not (file-remote-p file nil t)))
-      (funcall orig-fn file name))))
+    :before-while #'projectile-locate-dominating-file
+    (and (stringp file)
+         (not (file-remote-p file nil t)))))
 
 
 ;;
diff --git a/modules/lang/emacs-lisp/config.el b/modules/lang/emacs-lisp/config.el
index d525392ee..ef11526b3 100644
--- a/modules/lang/emacs-lisp/config.el
+++ b/modules/lang/emacs-lisp/config.el
@@ -167,8 +167,8 @@ This marks a foldable marker for `outline-minor-mode' in elisp buffers.")
   (set-yas-minor-mode! 'buttercup-minor-mode)
   (when (featurep 'evil)
     (add-hook 'buttercup-minor-mode-hook #'evil-normalize-keymaps))
-  (map! :map buttercup-minor-mode-map
-        :localleader
+  (map! :localleader
+        :map buttercup-minor-mode-map
         :prefix "t"
         "t" #'+emacs-lisp/buttercup-run-file
         "a" #'+emacs-lisp/buttercup-run-project
diff --git a/modules/lang/haskell/packages.el b/modules/lang/haskell/packages.el
index 2a5329c89..a1b2f2c89 100644
--- a/modules/lang/haskell/packages.el
+++ b/modules/lang/haskell/packages.el
@@ -3,10 +3,11 @@
 
 (package! haskell-mode)
 
-(cond ((featurep! +dante)
-       (package! dante)
-       (package! attrap))
-      ((featurep! +lsp)
-       (package! lsp-haskell))
-      ((featurep! +intero)  ; DEPRECATED
-       (package! intero)))
+(when (featurep! +dante)
+  (package! dante)
+  (package! attrap))
+(when (featurep! +lsp)
+  (package! lsp-haskell))
+;; DEPRECATED
+(when (featurep! +intero)
+  (package! intero))