diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index f2ca66d..25f013d 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -14,6 +14,10 @@
 
 (advice-add 'risky-local-variable-p :override #'ignore)
 
+;; Increase buffers and whatnot for lsp-mode
+(setq read-process-output-max (* 1024 1024)) ;; 1mb
+(setq gc-cons-threshold 100000000)
+
 (require 'jg-package)
 
 ;; Explicitly import the PATH from the shell on MacOS
diff --git a/emacs/.emacs.d/modules/jg-dev.el b/emacs/.emacs.d/modules/jg-dev.el
index 9acb4c1..da01611 100644
--- a/emacs/.emacs.d/modules/jg-dev.el
+++ b/emacs/.emacs.d/modules/jg-dev.el
@@ -23,7 +23,7 @@
   :commands (lsp lsp-deferred)
   :init
   (setq lsp-diagnostic-package :none)
-  (setq lsp-keymap-prefix "C-c l")  ;; Or 'C-l', 's-l'
+  (setq lsp-keymap-prefix "C-c l")  ;; Or 'C-l', 's-l
   :config
   (lsp-enable-which-key-integration t)
   )
@@ -42,13 +42,17 @@
 (use-package lsp-ui
   :hook (lsp-mode . lsp-ui-mode)
   :custom
-  (lsp-ui-doc-position 'bottom))
+  (lsp-ui-doc-position 'bottom)
+  :commands lsp-ui-mode)
 
 (use-package lsp-treemacs
-  :after lsp)
+  :after lsp
+  :commands lsp-treemacs-errors-list
+  )
 
 (use-package lsp-ivy
-  :after lsp)
+  :after lsp
+  :commands lsp-ivy-workspace-symbol)
 
 (use-package cmake-mode)
 
@@ -65,7 +69,9 @@
 ;;  (dap-python-setup) ;; Automatically installs Node debug adapter if needed
   )
 
-(use-package typescript-mode)
+(use-package typescript-mode
+  :hook (typescript-mode . lsp-deferred)
+ )
 
 (use-package python-mode
   :ensure nil