diff --git a/dotfiles/emacs.d/init.el b/dotfiles/emacs.d/init.el
index 424f4f54..611d49c5 100644
--- a/dotfiles/emacs.d/init.el
+++ b/dotfiles/emacs.d/init.el
@@ -11,7 +11,7 @@
       (eval-print-last-sexp)))
   (load bootstrap-file nil 'nomessage))
 
-(setq native-comp-deferred-compilation-deny-list nil)
+(setq native-comp-deferred-compilation-deny-list '("magit"))
 (setq native-comp-always-compile t)
 (setq load-no-native t)
 (setq no-native-compile t)
@@ -55,6 +55,9 @@
   (setq mac-option-modifier 'meta)
   (setq mac-command-modifier 'super))
 
+(use-package magit
+  :demand t)
+
 ;; This seems to fix issues with helm not explicitly declaring its dependency on async
 (use-package async :demand t)
 
diff --git a/dotfiles/emacs.d/org-config.org b/dotfiles/emacs.d/org-config.org
index ede31175..745e6a2c 100644
--- a/dotfiles/emacs.d/org-config.org
+++ b/dotfiles/emacs.d/org-config.org
@@ -750,6 +750,7 @@ alphanumeric characters only."
 
 (use-package org-ehtml
   :after web-server
+  :disabled t
   :config
   (progn
     (setq org-ehtml-allow-agenda t)