diff --git a/deps-packaging/leech2/darwin/build b/deps-packaging/leech2/darwin/build
index 6e49dd12a..9a0221706 100755
--- a/deps-packaging/leech2/darwin/build
+++ b/deps-packaging/leech2/darwin/build
@@ -21,6 +21,9 @@ TTD=${BUILD_ROOT}/cfbuild-leech2-devel${PREFIX}
 export RUSTUP_HOME="$HOME/.cache/cfengine/buildscripts"/rust
 export PATH="$HOME/.cache/cfengine/buildscripts"/rust/bin:$PATH
 
+# Use the protoc installed in $HOME/.cache
+export PATH="$HOME/.cache/cfengine/buildscripts/protobuf/bin:$PATH"
+
 # Embed an rpath of ${PREFIX}/lib in libleech2.dylib so it resolves
 # co-bundled CFEngine libraries at runtime, matching every other bundled dep
 # (enterprise's rpath_test.sh requires every /var/cfengine/lib/lib*.dylib to
diff --git a/deps-packaging/openldap/darwin/build b/deps-packaging/openldap/darwin/build
index 7182e5629..0bc8cc675 100755
--- a/deps-packaging/openldap/darwin/build
+++ b/deps-packaging/openldap/darwin/build
@@ -14,7 +14,6 @@ TTD=${TTD_ROOT}${PREFIX}
 # Patch
 
 $PATCH -p0 <no_Sockaddr_redefine.patch
-$PATCH -p1 <gcc-8.5.patch
 
 # Configure