diff --git a/modules/editor/multiple-cursors/config.el b/modules/editor/multiple-cursors/config.el
index 425916126..8f70046f3 100644
--- a/modules/editor/multiple-cursors/config.el
+++ b/modules/editor/multiple-cursors/config.el
@@ -56,9 +56,7 @@
                                :evil-mc t))
 
 
-(def-package! multiple-cursors
-  :defer t
-  :config
+(after! multiple-cursors
   (setq mc/list-file (concat doom-etc-dir "mc-lists.el"))
 
   ;; TODO multiple-cursors config for Emacs users?
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 0060dd2fb..5550cf5d2 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -76,8 +76,8 @@
     "%"  #'magit-gitflow-popup)
   (after! git-rebase
     (dolist (key '(("M-k" . "gk") ("M-j" . "gj")))
-      (setcar (assoc (car key) evil-magit-rebase-commands-w-descriptions)
-              (cdr key)))
+      (when-let* ((desc (assoc (car key) evil-magit-rebase-commands-w-descriptions)))
+        (setcar desc (cdr key))))
     (evil-define-key* evil-magit-state git-rebase-mode-map
       "gj" #'git-rebase-move-line-down
       "gk" #'git-rebase-move-line-up)))