diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1e918c02..582a3ef3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,8 @@ set(BINDIFF_SOURCE_DIR "${PROJECT_SOURCE_DIR}" CACHE INTERNAL "" FORCE)
 set(BINDIFF_BINEXPORT_DIR "${PROJECT_SOURCE_DIR}/../binexport" CACHE
     PATH "Path to a BinExport source tree")
 
-# Import BinExport targets
+# Import targets shared with BinExport
+set(BINEXPORT_ENABLE_BINARYNINJA OFF CACHE INTERNAL "" FORCE)
 add_subdirectory("${BINDIFF_BINEXPORT_DIR}" "_deps/binexport-build" EXCLUDE_FROM_ALL)
 
 # CMake settings
diff --git a/kokoro/deb/build.sh b/kokoro/deb/build.sh
index 7c5cb2d8..8cfd7661 100755
--- a/kokoro/deb/build.sh
+++ b/kokoro/deb/build.sh
@@ -94,9 +94,11 @@ popd
 [ "$1" != "release" ] && exit 0
 
 # Release build, code sign the artifacts
-echo "Code signing artifacts..."
+# TODO(cblichmann): Re-enable code signing using a separate job.
+# echo "Code signing artifacts..."
+#
+# chmod 777 "${build_dir}"
+# chmod 666 "${build_dir}"/*.deb
+# /escalated_sign/escalated_sign.py -j /escalated_sign_jobs -t linux_gpg_sign \
+#   "${build_dir}/"bindiff_*.deb
 
-chmod 777 "${build_dir}"
-chmod 666 "${build_dir}"/*.deb
-/escalated_sign/escalated_sign.py -j /escalated_sign_jobs -t linux_gpg_sign \
-  "${build_dir}/"bindiff_*.deb
diff --git a/kokoro/macos/build.sh b/kokoro/macos/build.sh
index e3af005b..6a5a81fe 100755
--- a/kokoro/macos/build.sh
+++ b/kokoro/macos/build.sh
@@ -20,11 +20,11 @@ mkdir -p "${build_dir}"
 # Verify/extract dependencies
 pushd "${KOKORO_GFILE_DIR}"
 cat << 'EOF' | shasum -c
-81db032983a33dbd8da0315df4488e19999ffb63c5a900fb1c0741b14a7b78ef  cmake-3.29.3-macos-universal.tar.gz
+3be85f5b999e327b1ac7d804cbc9acd767059e9f603c42ec2765f6ab68fbd367  cmake-4.1.2-macos-universal.tar.gz
 EOF
 popd
 tar --strip-components=3 -C "${build_dir}" -xzf \
-  "${KOKORO_GFILE_DIR}/cmake-3.29.3-macos-universal.tar.gz"
+  "${KOKORO_GFILE_DIR}/cmake-4.1.2-macos-universal.tar.gz"
 export PATH=${build_dir}/bin:${PATH}
 
 # Build BinDiff