diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eff312763..685aefa5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
     - name: Test (release)
       run: cd build && ctest
   build_osx:
-    runs-on: macos-11
+    runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
       with:
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt
index 184c4795d..1137a18aa 100644
--- a/benchmark/CMakeLists.txt
+++ b/benchmark/CMakeLists.txt
@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
     benchmark
     GIT_REPOSITORY https://github.com/google/benchmark.git
-    GIT_TAG        v1.5.3
+    GIT_TAG        v1.8.3
 )
 FetchContent_GetProperties(benchmark)
 if(NOT benchmark_POPULATED)
diff --git a/benchmark/bench_string_utils.cpp b/benchmark/bench_string_utils.cpp
index 102bb31d5..0a0d5bbc4 100644
--- a/benchmark/bench_string_utils.cpp
+++ b/benchmark/bench_string_utils.cpp
@@ -27,7 +27,7 @@ static void BMStringSplit(benchmark::State& state)
   std::string const kInputString = "Hello, world";
   for (auto _ : state)
   {
-    const auto v = rigel::strings::split(kInputString, ',');
+    auto v = rigel::strings::split(kInputString, ',');
     benchmark::DoNotOptimize(v);
     benchmark::ClobberMemory();
   }
diff --git a/cmake/rigel.cmake b/cmake/rigel.cmake
index 0e7fa0b77..e863b48f6 100644
--- a/cmake/rigel.cmake
+++ b/cmake/rigel.cmake
@@ -29,7 +29,8 @@ function(rigel_enable_warnings target)
         endif()
     elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         target_compile_options(${target} PRIVATE
-            -Weverything
+            -Wall
+            -Wextra
             -Wno-unknown-warning-option
             -Wno-c++98-compat
             -Wno-c++98-compat-pedantic