diff --git a/absl/strings/string_view.h b/absl/strings/string_view.h
index 9a1933b6..00769b5f 100644
--- a/absl/strings/string_view.h
+++ b/absl/strings/string_view.h
@@ -376,7 +376,7 @@ class ABSL_ATTRIBUTE_VIEW string_view {
   //
   // Copies the contents of the `string_view` at offset `pos` and length `n`
   // into `buf`.
-  size_type copy(char* buf, size_type n, size_type pos = 0) const {
+  size_type copy(char* absl_nonnull buf, size_type n, size_type pos = 0) const {
     if (ABSL_PREDICT_FALSE(pos > length_)) {
       base_internal::ThrowStdOutOfRange("absl::string_view::copy");
     }
@@ -624,7 +624,7 @@ class ABSL_ATTRIBUTE_VIEW string_view {
 
   // Overload of `string_view::starts_with()` that returns true if the
   // `string_view` starts with the C-style prefix `s`.
-  constexpr bool starts_with(const char* s) const {
+  constexpr bool starts_with(const char* absl_nonnull s) const {
     return starts_with(string_view(s));
   }
 
@@ -649,7 +649,7 @@ class ABSL_ATTRIBUTE_VIEW string_view {
 
   // Overload of `string_view::ends_with()` that returns true if the
   // `string_view` ends with the C-style suffix `s`.
-  constexpr bool ends_with(const char* s) const {
+  constexpr bool ends_with(const char* absl_nonnull s) const {
     return ends_with(string_view(s));
   }
 #endif  // ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
diff --git a/ci/macos_xcode_bazel.sh b/ci/macos_xcode_bazel.sh
index aaedb355..f19cd505 100755
--- a/ci/macos_xcode_bazel.sh
+++ b/ci/macos_xcode_bazel.sh
@@ -54,9 +54,6 @@ if [[ -n "${ALTERNATE_OPTIONS:-}" ]]; then
   cp ${ALTERNATE_OPTIONS:-} absl/base/options.h || exit 1
 fi
 
-# Avoid using the system version of google-benchmark.
-brew uninstall google-benchmark
-
 ${BAZEL_BIN} test ... \
   --copt="-DGTEST_REMOVE_LEGACY_TEST_CASEAPI_=1" \
   --copt="-Werror" \
diff --git a/ci/macos_xcode_cmake.sh b/ci/macos_xcode_cmake.sh
index 84a746b5..5b11b895 100755
--- a/ci/macos_xcode_cmake.sh
+++ b/ci/macos_xcode_cmake.sh
@@ -19,6 +19,8 @@ set -euox pipefail
 # Use Xcode 16.3
 sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
 
+brew install cmake
+
 export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.ncpu)
 export CTEST_PARALLEL_LEVEL=$(sysctl -n hw.ncpu)