diff --git a/java/google/registry/model/index/DomainApplicationIndex.java b/java/google/registry/model/index/DomainApplicationIndex.java
index f133fbaf3..7440df66f 100644
--- a/java/google/registry/model/index/DomainApplicationIndex.java
+++ b/java/google/registry/model/index/DomainApplicationIndex.java
@@ -90,7 +90,6 @@ public class DomainApplicationIndex extends BackupGroupRoot {
    * <p>Consequently within a transaction this method will not return any applications that are not
    * yet committed to datastore, even if called on an updated DomainApplicationIndex instance
    * storing keys to those applications.
-   *
    */
   public static ImmutableSet<DomainApplication> loadActiveApplicationsByDomainName(
       String fullyQualifiedDomainName, final DateTime now) {
diff --git a/java/google/registry/reporting/billing/BillingModule.java b/java/google/registry/reporting/billing/BillingModule.java
index b57c75f09..e1bba7225 100644
--- a/java/google/registry/reporting/billing/BillingModule.java
+++ b/java/google/registry/reporting/billing/BillingModule.java
@@ -32,6 +32,7 @@ import org.joda.time.YearMonth;
 public final class BillingModule {
 
   public static final String DETAIL_REPORT_PREFIX = "invoice_details";
+  // TODO(b/119551360): This should be configurable, not hard-coded to Charleston Road Registry.
   public static final String OVERALL_INVOICE_PREFIX = "CRR-INV";
   public static final String INVOICES_DIRECTORY = "invoices";
 
diff --git a/java/google/registry/util/CidrAddressBlock.java b/java/google/registry/util/CidrAddressBlock.java
index 8323fcb97..c7e3cda1f 100644
--- a/java/google/registry/util/CidrAddressBlock.java
+++ b/java/google/registry/util/CidrAddressBlock.java
@@ -455,6 +455,8 @@ public class CidrAddressBlock implements Iterable<InetAddress>, Serializable {
     };
   }
 
+  // InetAddresses.coerceToInteger() will be deprecated in the future.
+  @SuppressWarnings("deprecation")
   @Override
   public int hashCode() {
     return InetAddresses.coerceToInteger(ip);
diff --git a/javatests/google/registry/flows/EppXxeAttackTest.java b/javatests/google/registry/flows/EppXxeAttackTest.java
index 7ec22f4ae..59be89ab1 100644
--- a/javatests/google/registry/flows/EppXxeAttackTest.java
+++ b/javatests/google/registry/flows/EppXxeAttackTest.java
@@ -21,10 +21,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Tests for XXE attacks.
- *
- */
+/** Tests for <a href="https://en.wikipedia.org/wiki/XML_external_entity_attack">XXE</a> attacks. */
 @RunWith(JUnit4.class)
 public class EppXxeAttackTest extends EppTestCase {
 
diff --git a/javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java b/javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java
index 2c7b77a60..2e4fa54bc 100644
--- a/javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java
+++ b/javatests/google/registry/reporting/billing/BillingEmailUtilsTest.java
@@ -109,10 +109,8 @@ public class BillingEmailUtilsTest {
         .isEqualTo("Attached is the 2017-10 invoice for the domain registry.");
     assertThat(contents.getBodyPart(1)).isInstanceOf(BodyPart.class);
     BodyPart attachmentPart = contents.getBodyPart(1);
-    // TODO(b/71631624): Fix content type in nomulus build to be "text/csv; charset=utf-8" once next
-    //                   version of framework is released.
     assertThat(attachmentPart.getContentType())
-        .isEqualTo("text/plain; name=CRR-INV-2017-10.csv");
+        .isEqualTo("text/csv; charset=utf-8; name=CRR-INV-2017-10.csv");
     assertThat(attachmentPart.getContent().toString()).isEqualTo("test,data\nhello,world");
   }
 
diff --git a/javatests/google/registry/tools/ComparableEntityTest.java b/javatests/google/registry/tools/ComparableEntityTest.java
index d1f71093e..47d01ef63 100644
--- a/javatests/google/registry/tools/ComparableEntityTest.java
+++ b/javatests/google/registry/tools/ComparableEntityTest.java
@@ -82,7 +82,7 @@ public final class ComparableEntityTest {
 
     EntityProto proto1 = EntityTranslator.convertToPb(entity);
 
-    entity.setProperty("moe!", 400);
+    entity.setProperty("tiger!", 400);
     EntityProto proto2 = EntityTranslator.convertToPb(entity);
 
     // Construct entity objects from the two protos.