diff --git a/README.md b/README.md
index f8aa34d8ab..0d1de8fe2b 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Add the following to pom.xml:
   <dependency>
     <groupId>com.google.mug</groupId>
     <artifactId>mug</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </dependency>
 ```
 
@@ -48,7 +48,7 @@ Add `mug-errorprone` to your annotationProcessorPaths:
               <path>
                 <groupId>com.google.mug</groupId>
                 <artifactId>mug-errorprone</artifactId>
-                <version>8.3</version>
+                <version>8.4</version>
               </path>
             </annotationProcessorPaths>
           </configuration>
@@ -63,7 +63,7 @@ Protobuf utils ([javadoc](https://google.github.io/mug/apidocs/com/google/mu/pro
   <dependency>
     <groupId>com.google.mug</groupId>
     <artifactId>mug-protobuf</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </dependency>
 ```
 
@@ -72,7 +72,7 @@ Guava add-ons (with [`SafeSql`](https://google.github.io/mug/apidocs/com/google/
   <dependency>
     <groupId>com.google.mug</groupId>
     <artifactId>mug-guava</artifactId>
-    <version>8.3</version>
+    <version>8.4</version>
   </dependency>
 ```
 
@@ -80,9 +80,9 @@ Guava add-ons (with [`SafeSql`](https://google.github.io/mug/apidocs/com/google/
 
 Add to build.gradle:
 ```
-  implementation 'com.google.mug:mug:8.3'
-  implementation 'com.google.mug:mug-guava:8.3'
-  implementation 'com.google.mug:mug-protobuf:8.3'
+  implementation 'com.google.mug:mug:8.4'
+  implementation 'com.google.mug:mug-guava:8.4'
+  implementation 'com.google.mug:mug-protobuf:8.4'
 ```
 
 
diff --git a/mug-guava/pom.xml b/mug-guava/pom.xml
index 991a1a5063..05b6b96b87 100644
--- a/mug-guava/pom.xml
+++ b/mug-guava/pom.xml
@@ -24,11 +24,11 @@
                 <artifactId>error_prone_core</artifactId>
                 <version>2.23.0</version>
               </path>
-              <!--path>
+              <path>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>mug-errorprone</artifactId>
                 <version>${project.version}</version>
-              </path-->
+              </path>
             <!-- Other annotation processors go here.
             If 'annotationProcessorPaths' is set, processors will no longer be
             discovered on the regular -classpath; see also 'Using Error Prone
diff --git a/mug-guava/src/test/java/com/google/mu/safesql/SafeQueryTest.java b/mug-guava/src/test/java/com/google/mu/safesql/SafeQueryTest.java
index 0d07b98a03..ee2381d4d9 100644
--- a/mug-guava/src/test/java/com/google/mu/safesql/SafeQueryTest.java
+++ b/mug-guava/src/test/java/com/google/mu/safesql/SafeQueryTest.java
@@ -157,6 +157,7 @@ public void conditionalOperator_evaluateToFalse() {
   }
 
   @Test
+  @SuppressWarnings("StringFormatArgsCheck")
   public void conditionalOperator_nonBooleanArg_disallowed() {
     IllegalArgumentException thrown =
         assertThrows(
diff --git a/mug-guava/src/test/java/com/google/mu/safesql/SafeSqlTest.java b/mug-guava/src/test/java/com/google/mu/safesql/SafeSqlTest.java
index caa72e7a6c..ac9a59f66c 100644
--- a/mug-guava/src/test/java/com/google/mu/safesql/SafeSqlTest.java
+++ b/mug-guava/src/test/java/com/google/mu/safesql/SafeSqlTest.java
@@ -66,6 +66,7 @@ public void conditionalOperator_evaluateToFalse() {
   }
 
   @Test
+  @SuppressWarnings("StringFormatArgsCheck")
   public void conditionalOperator_nonBooleanArg_disallowed() {
     IllegalArgumentException thrown =
         assertThrows(