diff --git a/infra/indexer/frontend/ast_visitor.cc b/infra/indexer/frontend/ast_visitor.cc
index dca1e0206407..e413944d88a1 100644
--- a/infra/indexer/frontend/ast_visitor.cc
+++ b/infra/indexer/frontend/ast_visitor.cc
@@ -36,11 +36,11 @@
 #include "clang/AST/PrettyPrinter.h"
 #include "clang/AST/TemplateBase.h"
 #include "clang/AST/Type.h"
+#include "clang/Basic/BuiltinTraits.h"
 #include "clang/Basic/FileEntry.h"
 #include "clang/Basic/OperatorKinds.h"
 #include "clang/Basic/SourceLocation.h"
 #include "clang/Basic/Specifiers.h"
-#include "clang/Basic/TypeTraits.h"
 #include "clang/Sema/Lookup.h"
 #include "clang/Sema/Sema.h"
 #include "llvm/ADT/APSInt.h"
diff --git a/projects/envoy/Dockerfile b/projects/envoy/Dockerfile
index 124becda6a3f..39762b987b5d 100644
--- a/projects/envoy/Dockerfile
+++ b/projects/envoy/Dockerfile
@@ -30,7 +30,12 @@ RUN apt-get update && apt-get -y install  \
     golang          \
     rsync           \
     python3         \
-    libtinfo5
+    libtinfo5       \
+    libunwind-dev   \
+    libclang-dev
+
+RUN ln -s /usr/lib/x86_64-linux-gnu/libunwind.a /usr/local/lib/libunwind.a && \
+    ln -s /usr/lib/llvm-10/lib/libclang.so /usr/local/lib/libclang.so
 
 RUN git clone https://github.com/envoyproxy/envoy.git
 WORKDIR $SRC/envoy/
diff --git a/projects/envoy/build.sh b/projects/envoy/build.sh
index 00ae668fdee5..bc1cc5991823 100755
--- a/projects/envoy/build.sh
+++ b/projects/envoy/build.sh
@@ -33,6 +33,9 @@ declare -r EXTRA_BAZEL_FLAGS="$(
 # Disabling layering_check because it breaks the abseil build. See
 # https://github.com/google/oss-fuzz/blob/f0fa8b5cd3f99b5905e91b336d07a870ca1bc2e3/projects/abseil-cpp/build.sh#L17-L21.
 echo "--features=-layering_check"
+echo "--repo_env=BAZEL_LLVM_PATH=/usr/local"
+echo "--repo_env=BAZEL_USE_LIBSTDCPP=True"
+echo "--copt=-Wno-nullability-completeness"
 if [ -n "$CC" ]; then
   echo "--action_env=CC=${CC}"
 fi
@@ -40,6 +43,7 @@ if [ -n "$CXX" ]; then
   echo "--action_env=CXX=${CXX}"
 fi
 echo "--host_action_env=CC=gcc"
+echo "--host_action_env=CXX=g++"
 echo "--copt=-gz=zlib"
 echo "--linkopt=-Wl,--compress-debug-sections=zlib"
 echo "--linkopt=-Wl,--icf=all"
diff --git a/projects/jsoup/CssHtmlFuzzer.java b/projects/jsoup/CssHtmlFuzzer.java
index 04589c98d6da..48e2e18d542c 100644
--- a/projects/jsoup/CssHtmlFuzzer.java
+++ b/projects/jsoup/CssHtmlFuzzer.java
@@ -23,16 +23,15 @@
 
 public class CssHtmlFuzzer {
     public static void fuzzerTestOneInput(FuzzedDataProvider data) {
-        String css = data.consumeString(100);
-        Evaluator query;
         try {
-            query = Selector.evaluatorOf(css);
+            String css = data.consumeString(100);
+            Evaluator query = Selector.evaluatorOf(css);
+
+            String html = data.consumeRemainingAsString();
+            Document doc = Jsoup.parse(html, "https://example.com");
+            doc.select(query);
         } catch (ValidationException | Selector.SelectorParseException ignored) {
-            return;
+            // invalid or overly complex selector
         }
-
-        String html = data.consumeRemainingAsString();
-        Document doc = Jsoup.parse(html, "https://example.com");
-        doc.select(query);
     }
 }
diff --git a/projects/selinux/project.yaml b/projects/selinux/project.yaml
index fac681dee68d..2fe7499696ed 100644
--- a/projects/selinux/project.yaml
+++ b/projects/selinux/project.yaml
@@ -12,6 +12,8 @@ auto_ccs:
   - jwcart2@gmail.com
   - cgzones@googlemail.com
   - stephen.smalley.work@gmail.com
+  - paul@paul-moore.com
+  - jason@perfinion.com
 main_repo: 'https://github.com/SELinuxProject/selinux'
 
 fuzzing_engines:
diff --git a/projects/thrift-rb/project.yaml b/projects/thrift-rb/project.yaml
index 20af8d8c114f..222eec496583 100644
--- a/projects/thrift-rb/project.yaml
+++ b/projects/thrift-rb/project.yaml
@@ -9,4 +9,4 @@ fuzzing_engines:
 sanitizers:
   - address
 
-main_repo: "https://github.com/apache/thrift"
+main_repo: "https://github.com/apache/thrift.git"