diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index b12c088e..13696db2 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -59,8 +59,9 @@ vcpkg_configure_cmake(
         -DgRPC_RE2_PROVIDER=package
         -DgRPC_PROTOBUF_PACKAGE_TYPE=CONFIG
         -DgRPC_CARES_PROVIDER=${cares_CARES_PROVIDER}
-        -DgRPC_GFLAGS_PROVIDER=none
+        -DgRPC_GFLAGS_PROVIDER=package
         -DgRPC_BENCHMARK_PROVIDER=none
+        -DgRPC_BUILD_CSHARP_EXT=OFF
         -DgRPC_INSTALL_CSHARP_EXT=OFF
         -DgRPC_INSTALL_BINDIR:STRING=bin
         -DgRPC_INSTALL_LIBDIR:STRING=lib
diff --git a/ports/grpc/vcpkg.json b/ports/grpc/vcpkg.json
index 72cf6139..dc662cba 100644
--- a/ports/grpc/vcpkg.json
+++ b/ports/grpc/vcpkg.json
@@ -10,6 +10,7 @@
       "name": "c-ares",
       "platform": "!uwp"
     },
+    "gflags",
     {
       "name": "grpc",
       "host": true,
diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
index 567c2201..df8c5648 100644
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@@ -12,9 +12,16 @@ vcpkg_from_github(
         add-all-libs-target.patch
 )
 
+if(VCPKG_USE_SANITIZER)
+    list(APPEND FEATURE_OPTIONS
+        -DUPB_ENABLE_ASAN=ON
+        )
+endif()
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/cmake
     PREFER_NINJA
+    OPTIONS ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
diff --git a/triplets/arm64-osx-asan.cmake b/triplets/arm64-osx-asan.cmake
index 60893acb..15578e92 100644
--- a/triplets/arm64-osx-asan.cmake
+++ b/triplets/arm64-osx-asan.cmake
@@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_USE_SANITIZER "Address")
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "(llvm-*)")
+if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
   set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")
diff --git a/triplets/x64-linux-asan.cmake b/triplets/x64-linux-asan.cmake
index 3a6f1dc2..45f529ec 100644
--- a/triplets/x64-linux-asan.cmake
+++ b/triplets/x64-linux-asan.cmake
@@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_USE_SANITIZER "Address")
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "(llvm-*)")
+if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
   set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")
diff --git a/triplets/x64-linux-rel-asan.cmake b/triplets/x64-linux-rel-asan.cmake
index fc92eac6..b8eda20c 100644
--- a/triplets/x64-linux-rel-asan.cmake
+++ b/triplets/x64-linux-rel-asan.cmake
@@ -7,7 +7,7 @@ set(VCPKG_LIBRARY_LINKAGE static)
 set(VCPKG_USE_SANITIZER "Address")
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "(llvm-*)")
+if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
   set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")
diff --git a/triplets/x64-osx-asan.cmake b/triplets/x64-osx-asan.cmake
index ef84fc0d..504fbdb9 100644
--- a/triplets/x64-osx-asan.cmake
+++ b/triplets/x64-osx-asan.cmake
@@ -8,7 +8,7 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "(llvm-*)")
+if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
   set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")
diff --git a/triplets/x64-osx-rel-asan.cmake b/triplets/x64-osx-rel-asan.cmake
index a2cf5e2a..985e158f 100644
--- a/triplets/x64-osx-rel-asan.cmake
+++ b/triplets/x64-osx-rel-asan.cmake
@@ -9,7 +9,7 @@ set(VCPKG_USE_SANITIZER "Address")
 
 # If the following flags cause errors during build, you might need to manually
 # ignore the PORT and check VCPKG_USE_SANITIZER
-if(NOT PORT MATCHES "(llvm-*)")
+if(NOT PORT MATCHES "^((llvm)|(llvm-[0-9]+)|(upb))$")
   set(VCPKG_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_C_FLAGS "-fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls -ffunction-sections -fdata-sections")
   set(VCPKG_LINKER_FLAGS "-fsanitize=address")