diff --git a/nvim/lua/lsp-user-config.lua b/nvim/lua/lsp-user-config.lua
index c63ba27..9a3e5be 100644
--- a/nvim/lua/lsp-user-config.lua
+++ b/nvim/lua/lsp-user-config.lua
@@ -5,8 +5,8 @@ function setup()
   -- Use an on_attach function to only map the following keys
   -- after the language server attaches to the current buffer
   local on_attach = function(client, bufnr)
-    local function keymap_set(...) vim.keymap.set(bufnr, ...) end
-    local function buf_set_option(...) vim.keymap.set(bufnr, ...) end
+    local function keymap_set(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
+    local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
 
     -- Enable completion triggered by <c-x><c-o>
     buf_set_option("omnifunc", "v:lua.vim.lsp.omnifunc")
diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index 2058a78..740891c 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -264,6 +264,14 @@ return require("packer").startup(function(use)
   use { "vmchale/dhall-vim" } -- Dhall
   use { "ziglang/zig.vim" } -- Zig
 
+  -- Use Neovim even inside of browsers.
+  use {
+    "glacambre/firenvim",
+    run = function()
+      vim.fn["firenvim#install"](0)
+    end
+  }
+
   if packer_bootstrap then
     require("packer").sync()
   end