diff --git a/oni-core.el b/oni-core.el
index a828539..7ff16bc 100644
--- a/oni-core.el
+++ b/oni-core.el
@@ -4,7 +4,7 @@
 
 ;; Author: Tom Willemse <tom@ryuslash.org>
 ;; Keywords: local
-;; Version: 2020.0224.220825
+;; Version: 2020.0225.095408
 ;; Package-Requires: (oni-data-dir expand-region multiple-cursors embrace helpful)
 
 ;; This program is free software; you can redistribute it and/or modify
@@ -84,6 +84,11 @@
 (setq electric-pair-skip-whitespace 'chomp)
 (setq fit-window-to-buffer-horizontally t)
 
+;; Increase the threshold for garbage collection for increased performance.
+;; Apparently there are some (lsp-mode for example) packages that generate a lot
+;; of garbage.
+(setq gc-cons-threshold 100000000)
+
 (setq auth-sources (remove "~/.authinfo" auth-sources))
 
 (setq-default indent-tabs-mode nil)
diff --git a/oni-lsp.el b/oni-lsp.el
index 312e294..6b11ea5 100644
--- a/oni-lsp.el
+++ b/oni-lsp.el
@@ -45,6 +45,7 @@
       (princ help-string))))
 
 (setq lsp-prefer-flymake nil)
+(setq lsp-prefer-capf t)
 
 (setq lsp-ui-doc-enable nil)
 (setq lsp-ui-sideline-enable nil)