diff --git a/.clang-format b/.clang-format
index 01d5fac3..76585f77 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,3 +1,7 @@
+# ---
+# We'll use defaults from the LLVM style
+# BasedOnStyle: LLVM
+# IndentWidth: 2
 ---
 Language:        Cpp
 AccessModifierOffset: -2
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c783148c..c5d88bb7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,6 +9,7 @@ repos:
     -   id: check-yaml
     -   id: check-added-large-files
 
+    # TODO: keep this version, do not update!
     # Clang-format for C++
     # This brings in a portable version of clang-format.
     # See also: https://github.com/ssciwr/clang-format-wheel
@@ -20,7 +21,7 @@ repos:
 
     # CMake linting and formatting
   - repo: https://github.com/BlankSpruce/gersemi
-    rev: 0.15.1
+    rev: 0.17.1
     hooks:
     - id: gersemi
       name: CMake linting
@@ -28,7 +29,7 @@ repos:
     # Markdown linting
     # Config file: .markdownlint.yaml
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.43.0
     hooks:
     - id: markdownlint
       exclude: ^papers/
diff --git a/CMakePresets.json b/CMakePresets.json
index 42d3d6c4..11abeb13 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -158,7 +158,7 @@
     {
       "name": "clang-16",
       "inherits": "common",
-      "configurePreset": "clang-16"
+      "configurePreset": "clang-16",
       "targets": [
         "all_verify_interface_header_sets",
         "all"
diff --git a/etc/clang-flags.cmake b/etc/clang-flags.cmake
index 5b23bf7a..96138143 100644
--- a/etc/clang-flags.cmake
+++ b/etc/clang-flags.cmake
@@ -33,12 +33,22 @@ set(CMAKE_CXX_FLAGS_TSAN
     "C++ TSAN Flags"
     FORCE
 )
-set(CMAKE_CXX_FLAGS_ASAN
-    "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
-    CACHE STRING
-    "C++ ASAN Flags"
-    FORCE
-)
+if(APPLE)
+    set(CMAKE_CXX_FLAGS_ASAN
+        "-O3 -g -DNDEBUG -fsanitize=address,undefined"
+        CACHE STRING
+        "C++ ASAN Flags"
+        FORCE
+    )
+else()
+    set(CMAKE_CXX_FLAGS_ASAN
+        "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
+        CACHE STRING
+        "C++ ASAN Flags"
+        FORCE
+    )
+endif()
+
 set(CMAKE_CXX_FLAGS_GCOV
     "-O0 -fno-inline -g --coverage"
     CACHE STRING
diff --git a/etc/gcc-flags.cmake b/etc/gcc-flags.cmake
index 4747203c..6cb2f6ec 100644
--- a/etc/gcc-flags.cmake
+++ b/etc/gcc-flags.cmake
@@ -28,12 +28,21 @@ set(CMAKE_CXX_FLAGS_TSAN
     "C++ TSAN Flags"
     FORCE
 )
-set(CMAKE_CXX_FLAGS_ASAN
-    "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
-    CACHE STRING
-    "C++ ASAN Flags"
-    FORCE
-)
+if(APPLE)
+    set(CMAKE_CXX_FLAGS_ASAN
+        "-O3 -g -DNDEBUG -fsanitize=address,undefined"
+        CACHE STRING
+        "C++ ASAN Flags"
+        FORCE
+    )
+else()
+    set(CMAKE_CXX_FLAGS_ASAN
+        "-O3 -g -DNDEBUG -fsanitize=address,undefined,leak"
+        CACHE STRING
+        "C++ ASAN Flags"
+        FORCE
+    )
+endif()
 
 set(CMAKE_CXX_FLAGS_GCOV
     "-O0 -fno-inline -g --coverage -fprofile-abs-path"