diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 3be7a7f..3e47bd9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,7 +30,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: stevearc/nvim-typecheck-action@v1
+      - uses: stevearc/nvim-typecheck-action@v2
         with:
           path: lua
 
diff --git a/lua/aerial/keymap_util.lua b/lua/aerial/keymap_util.lua
index 38a2af9..e46ece8 100644
--- a/lua/aerial/keymap_util.lua
+++ b/lua/aerial/keymap_util.lua
@@ -87,8 +87,8 @@ M.show_help = function(action_module, keymaps)
   end
   vim.keymap.set("n", "q", "<cmd>close<CR>", { buffer = bufnr, nowait = true })
   vim.keymap.set("n", "<c-c>", "<cmd>close<CR>", { buffer = bufnr })
-  vim.api.nvim_buf_set_option(bufnr, "modifiable", false)
-  vim.api.nvim_buf_set_option(bufnr, "bufhidden", "wipe")
+  vim.bo[bufnr].modifiable = false
+  vim.bo[bufnr].bufhidden = "wipe"
 
   local editor_width = vim.o.columns
   local editor_height = vim.o.lines - vim.o.cmdheight
diff --git a/lua/aerial/render.lua b/lua/aerial/render.lua
index 901de35..0661915 100644
--- a/lua/aerial/render.lua
+++ b/lua/aerial/render.lua
@@ -8,9 +8,9 @@ local util = require("aerial.util")
 local M = {}
 
 M.clear_buffer = function(bufnr)
-  vim.api.nvim_buf_set_option(bufnr, "modifiable", true)
+  vim.bo[bufnr].modifiable = true
   vim.api.nvim_buf_set_lines(bufnr, 0, -1, false, {})
-  vim.api.nvim_buf_set_option(bufnr, "modifiable", false)
+  vim.bo[bufnr].modifiable = false
 end
 
 -- Resize all windows displaying this aerial buffer
@@ -177,9 +177,9 @@ M.update_aerial_buffer = function(buf)
   resize_all_wins(aer_bufnr, max_len, #lines)
 
   -- Insert lines into buffer
-  vim.api.nvim_buf_set_option(aer_bufnr, "modifiable", true)
+  vim.bo[aer_bufnr].modifiable = true
   vim.api.nvim_buf_set_lines(aer_bufnr, 0, -1, false, lines)
-  vim.api.nvim_buf_set_option(aer_bufnr, "modifiable", false)
+  vim.bo[aer_bufnr].modifiable = false
 
   local ns = vim.api.nvim_create_namespace("aerial")
   vim.api.nvim_buf_clear_namespace(aer_bufnr, ns, 0, -1)
diff --git a/lua/aerial/window.lua b/lua/aerial/window.lua
index dc5ddb5..414b407 100644
--- a/lua/aerial/window.lua
+++ b/lua/aerial/window.lua
@@ -19,11 +19,11 @@ local function create_aerial_buffer(bufnr)
   vim.api.nvim_buf_set_var(bufnr, "aerial_buffer", aer_bufnr)
   -- Set buffer options
   vim.api.nvim_buf_set_var(aer_bufnr, "source_buffer", bufnr)
-  vim.api.nvim_buf_set_option(aer_bufnr, "buftype", "nofile")
-  vim.api.nvim_buf_set_option(aer_bufnr, "bufhidden", "wipe")
-  vim.api.nvim_buf_set_option(aer_bufnr, "buflisted", false)
-  vim.api.nvim_buf_set_option(aer_bufnr, "swapfile", false)
-  vim.api.nvim_buf_set_option(aer_bufnr, "modifiable", false)
+  vim.bo[aer_bufnr].buftype = "nofile"
+  vim.bo[aer_bufnr].bufhidden = "wipe"
+  vim.bo[aer_bufnr].buflisted = false
+  vim.bo[aer_bufnr].swapfile = false
+  vim.bo[aer_bufnr].modifiable = false
 
   if config.highlight_on_hover or config.autojump then
     vim.api.nvim_create_autocmd("CursorMoved", {
@@ -106,7 +106,7 @@ local function setup_aerial_win(src_winid, aer_winid, aer_bufnr)
   vim.api.nvim_win_set_var(aer_winid, "source_win", src_winid)
   vim.api.nvim_win_set_var(src_winid, "aerial_win", aer_winid)
   -- Set the filetype only after we enter the buffer so that ftplugins behave properly
-  vim.api.nvim_buf_set_option(aer_bufnr, "filetype", "aerial")
+  vim.bo[aer_bufnr].filetype = "aerial"
   local width = vim.b[aer_bufnr].aerial_width
   if width and (not vim.w[aer_winid].aerial_set_width or config.layout.resize_to_content) then
     vim.api.nvim_win_set_width(aer_winid, width)