diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
index 354095931d..6a3392dcc6 100644
--- a/benchmarks/build.gradle
+++ b/benchmarks/build.gradle
@@ -45,6 +45,11 @@ dependencies {
             libraries.math
 }
 
+compileJava {
+  // The Control.Void protobuf clashes
+  options.compilerArgs += ["-Xep:JavaLangClash:OFF"]
+}
+
 compileJmhJava {
   options.compilerArgs = compileJava.options.compilerArgs
 }
diff --git a/build.gradle b/build.gradle
index cdfe623863..e2106d8abe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,7 +30,7 @@ subprojects {
       dependencies {
         // The ErrorProne plugin defaults to the latest, which would break our
         // build if error prone releases a new version with a new check
-        errorprone 'com.google.errorprone:error_prone_core:2.0.19'
+        errorprone 'com.google.errorprone:error_prone_core:2.0.21'
       }
     } else {
       // Remove per-project error-prone checker config
diff --git a/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java b/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java
index 786c7a4a4b..20eed3c3b3 100644
--- a/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java
+++ b/okhttp/third_party/okhttp/java/io/grpc/okhttp/internal/framed/Http2.java
@@ -620,7 +620,7 @@ public final class Http2 implements Variant {
 
       long read = source.read(sink, Math.min(byteCount, left));
       if (read == -1) return -1;
-      left -= read;
+      left -= (int) read;
       return read;
     }
 
diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
index 4ab1f5f280..23e798e0ee 100644
--- a/protobuf-lite/build.gradle
+++ b/protobuf-lite/build.gradle
@@ -25,7 +25,8 @@ dependencies {
 compileTestJava {
   // Protobuf-generated Lite produces quite a few warnings.
   options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough",
-        "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF"]
+        "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF",
+        "-Xep:JavaLangClash:OFF" /* The Enum protobuf clashes */]
 }
 
 protobuf {