diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index 18418fd91..d682e2f15 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -616,7 +616,7 @@
           :desc "Git revert file"             "R"   #'vc-revert)
         (:when (featurep! :tools magit)
           :desc "Magit blame"                 "b"   #'magit-blame-addition
-          :desc "Magit commit"                "c"   #'magit-commit
+          :desc "Magit commit"                "c"   #'magit-commit-create
           :desc "Magit clone"                 "C"   #'+magit/clone
           :desc "Magit dispatch"              "d"   #'magit-dispatch-popup
           :desc "Magit find-file"             "f"   #'magit-find-file
diff --git a/modules/editor/format/autoload/format.el b/modules/editor/format/autoload/format.el
index 67c5b05e5..8152cdcd6 100644
--- a/modules/editor/format/autoload/format.el
+++ b/modules/editor/format/autoload/format.el
@@ -201,7 +201,7 @@ snippets or single lines."
   (save-restriction
     (narrow-to-region beg end)
     (let ((+format-region-p t))
-      (call-interactively #'+format/buffer))))
+      (+format/buffer arg))))
 
 ;;;###autoload
 (defun +format/region-or-buffer (beg end &optional arg)
diff --git a/modules/feature/snippets/autoload/snippets.el b/modules/feature/snippets/autoload/snippets.el
index 9745e0ea9..35f3b8ee9 100644
--- a/modules/feature/snippets/autoload/snippets.el
+++ b/modules/feature/snippets/autoload/snippets.el
@@ -107,7 +107,7 @@ buggy behavior when <delete> is pressed in an empty field."
 ;; Commands
 
 ;;;###autoload
-(defun +snippets/browse (arg)
+(defun +snippets/browse (_arg)
   "TODO"
   (interactive "P")
   (doom-project-browse +snippets-dir))
diff --git a/modules/tools/editorconfig/config.el b/modules/tools/editorconfig/config.el
index cafa04c5a..6c74a7a1d 100644
--- a/modules/tools/editorconfig/config.el
+++ b/modules/tools/editorconfig/config.el
@@ -49,7 +49,7 @@ extension, try to guess one."
     (when (and (equal (gethash 'trim_trailing_whitespace props) "true")
                (bound-and-true-p ws-butler-mode))
       (ws-butler-mode -1)))
-  (add-hook 'editorconfig-custom-hooks #'+editorconfig|disable-ws-butler-maybe)
+  (add-hook 'editorconfig-after-apply-functions #'+editorconfig|disable-ws-butler-maybe)
 
   (defun +editorconfig|disable-indent-detection (props)
     "Inhibit `dtrt-indent' if an explicit indent_style and indent_size is
@@ -57,7 +57,7 @@ specified by editorconfig."
     (when (or (gethash 'indent_style props)
               (gethash 'indent_size props))
       (setq doom-inhibit-indent-detection t)))
-  (add-hook 'editorconfig-custom-hooks #'+editorconfig|disable-indent-detection)
+  (add-hook 'editorconfig-after-apply-functions #'+editorconfig|disable-indent-detection)
 
   ;; Editorconfig makes indentation too rigid in Lisp modes, so tell
   ;; editorconfig to ignore indentation there. The dynamic indentation support