diff --git a/.github/workflows/abismal_build_macos.yml b/.github/workflows/abismal_build_macos.yml
index 358a4fc..116a2e6 100644
--- a/.github/workflows/abismal_build_macos.yml
+++ b/.github/workflows/abismal_build_macos.yml
@@ -8,24 +8,24 @@ on:
     branches: [ "master" ]
 
 jobs:
-  build-on-x86:
-    runs-on: macos-13
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Update Homebrew
-      run: brew update
-    - name: Install automake
-      run: brew install automake
-    - name: Install dependencies
-      run: brew install htslib
-    - name: Generate configure script
-      run: ./autogen.sh
-    - name: configure with g++-14
-      run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib"
-    - name: Build with g++-14
-      run: make -j4
+  # build-on-x86:
+  #   runs-on: macos-13
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #     with:
+  #       submodules: recursive
+  #   - name: Update Homebrew
+  #     run: brew update
+  #   - name: Install automake
+  #     run: brew install automake
+  #   - name: Install dependencies
+  #     run: brew install htslib
+  #   - name: Generate configure script
+  #     run: ./autogen.sh
+  #   - name: configure with g++-14
+  #     run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib"
+  #   - name: Build with g++-14
+  #     run: make -j4
   build-on-arm64:
     runs-on: macos-15
     steps:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 056925a..14ba1e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,18 @@ configure_file(data/config.h.in config.h)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
+add_compile_options(
+  -Wall
+  -Wextra
+  -Wpedantic
+  -Werror
+  -Wfatal-errors
+)
+
+if(NOT PROJECT_IS_TOP_LEVEL)
+  set(STATIC_ANALYSIS OFF)
+endif()
+
 if(STATIC_ANALYSIS)
   include(cmake/static_analysis.cmake)
 endif()
diff --git a/iwyu.json b/iwyu.json
index 0d4f101..f074532 100644
--- a/iwyu.json
+++ b/iwyu.json
@@ -1,2 +1,4 @@
 [
+    { "include": ["@[\"<]htslib/kstring.h[\">]", "private", "<htslib/sam.h>", "public"] },
+    { "include": ["@[\"<]htslib/hts.h[\">]", "private", "<htslib/sam.h>", "public"] },
 ]
diff --git a/src/bamxx b/src/bamxx
index 101ef72..684f4cd 160000
--- a/src/bamxx
+++ b/src/bamxx
@@ -1 +1 @@
-Subproject commit 101ef72c3609e7ab6da2191590192c04705b80f4
+Subproject commit 684f4cd6956b384632a4b4778ffc57d256c46a9a
diff --git a/src/smithlab_cpp b/src/smithlab_cpp
index 15cdbcb..1318c79 160000
--- a/src/smithlab_cpp
+++ b/src/smithlab_cpp
@@ -1 +1 @@
-Subproject commit 15cdbcb07480ed36b5f2f511043aecae972ad0bf
+Subproject commit 1318c796b96402823a60636eb0f8135b65527de6