diff --git a/flake.lock b/flake.lock
index ccecc20a..8bde7bbe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1632129256,
-        "narHash": "sha256-vCFDPsj2dcm9S7KE7L9FyrK6Qj1LzRSuSsduf14l3/U=",
+        "lastModified": 1632215126,
+        "narHash": "sha256-TAfCrVb+Otou3VN4fBXMW9FT9EvEwb+8jnilUUPqwJg=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "4542ee9f977c731683a183690658073ec66c69f0",
+        "rev": "ce690d6e577247d0bb77f2ed3956fbb7e5e5aec9",
         "type": "github"
       },
       "original": {
diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index 80b8b3d9..44cca3cc 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -82,8 +82,10 @@
 ;; Autocomplete
 (use-package company
   :diminish (company-mode)
-  :defer t
-  :config (global-company-mode)
+  :hook ((text-mode prog-mode) . company-mode)
+  :custom
+  (company-dabbrev-downcase nil "Don't downcase completions")
+  (company-dabbrev-ignore-case t "Change full casing of completion if completion has different case")
   )
 
 ;; Prescient in company
@@ -144,9 +146,8 @@
 
 ;; Linting
 (use-package flycheck
-  :defer t
+  :hook ((text-mode prog-mode) . flycheck-mode)
   :diminish (flycheck-mode)
-  :config (global-flycheck-mode)
   )
 
 ;; Annotations in selection interface
diff --git a/modules/base/nix/default.nix b/modules/base/nix/default.nix
index 38150705..acc9a74d 100644
--- a/modules/base/nix/default.nix
+++ b/modules/base/nix/default.nix
@@ -69,7 +69,6 @@ in
       ] ++ lib.optional config.chvp.base.nix.enableDirenv ''
         ;; Direnv integration in emacs.
         (use-package direnv
-          :defer t
           :config (direnv-mode)
           )
       '';
diff --git a/modules/development/default.nix b/modules/development/default.nix
index a1cfde45..bf2231a3 100644
--- a/modules/development/default.nix
+++ b/modules/development/default.nix
@@ -18,7 +18,6 @@
         ''
           ;; Editorconfig
           (use-package editorconfig
-            :defer t
             :diminish (editorconfig-mode)
             :custom (editorconfig-get-properties-function 'editorconfig-get-properties)
             :config (editorconfig-mode 1)
@@ -28,6 +27,10 @@
           (use-package lsp-mode
             :commands (lsp lsp-deferred)
             :config (lsp-enable-which-key-integration t)
+            :general
+            (lmap lsp-mode-map
+              "SPC" '(:keymap lsp-command-map)
+              )
             )
           
           ;; Markdown syntax support
diff --git a/modules/graphical/pass/default.nix b/modules/graphical/pass/default.nix
index a6546088..edcef8c6 100644
--- a/modules/graphical/pass/default.nix
+++ b/modules/graphical/pass/default.nix
@@ -17,7 +17,6 @@
       ''
         (use-package auth-source-pass
          :ensure nil
-         :defer t
          :custom
          (auth-sources '(password-store))
          (auth-source-pass-filename "${config.home-manager.users.charlotte.programs.password-store.settings.PASSWORD_STORE_DIR}")