diff --git a/pom.xml b/pom.xml
index 3fe3a28..0a42d59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,9 +242,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <release>9</release>
-                    <source>9</source>
-                    <target>9</target>
+                    <release>8</release>
+                    <source>8</source>
+                    <target>8</target>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/spotify/dns/AbstractChangeNotifier.java b/src/main/java/com/spotify/dns/AbstractChangeNotifier.java
index 0403982..3050f1f 100644
--- a/src/main/java/com/spotify/dns/AbstractChangeNotifier.java
+++ b/src/main/java/com/spotify/dns/AbstractChangeNotifier.java
@@ -19,6 +19,7 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -52,7 +53,7 @@ public void setListener(final Listener<T> listener, final boolean fire) {
       }
 
       if (fire) {
-        notifyListener(newChangeNotification(current(), Set.of()), true);
+        notifyListener(newChangeNotification(current(), Sets.newHashSet()), true);
       }
     } finally {
       lock.unlock();
diff --git a/src/main/java/com/spotify/dns/ChangeNotifiers.java b/src/main/java/com/spotify/dns/ChangeNotifiers.java
index f17cd68..af23b57 100644
--- a/src/main/java/com/spotify/dns/ChangeNotifiers.java
+++ b/src/main/java/com/spotify/dns/ChangeNotifiers.java
@@ -16,6 +16,8 @@
 
 package com.spotify.dns;
 
+import com.google.common.collect.Sets;
+
 import static com.spotify.dns.ChangeNotifierFactory.RunnableChangeNotifier;
 import static java.util.Objects.requireNonNull;
 
@@ -91,7 +93,7 @@ public static <T> ChangeNotifier<T> aggregate(Iterable<ChangeNotifier<T>> notifi
    * @return A notifier with a static set of records
    */
   public static <T> ChangeNotifier<T> staticRecords(T... records) {
-    return staticRecords(Set.of(records));
+    return staticRecords(Sets.newHashSet(records));
   }
 
   public static <T> ChangeNotifier<T> staticRecords(Set<T> records) {
@@ -118,8 +120,8 @@ public static <T> RunnableChangeNotifier<T> direct(Supplier<Set<T>> recordsSuppl
 
   /**
    * @deprecated Use {@link #direct(java.util.function.Supplier)}
+   * deprecated since version 3.2.0
    */
-  @Deprecated(since = "3.2.0")
   public static <T> RunnableChangeNotifier<T> direct(com.google.common.base.Supplier<Set<T>> recordsSupplier) {
     return new DirectChangeNotifier<>(recordsSupplier);
   }
diff --git a/src/main/java/com/spotify/dns/DnsSrvWatchers.java b/src/main/java/com/spotify/dns/DnsSrvWatchers.java
index c96bc41..6de65a2 100644
--- a/src/main/java/com/spotify/dns/DnsSrvWatchers.java
+++ b/src/main/java/com/spotify/dns/DnsSrvWatchers.java
@@ -76,8 +76,8 @@ public static <T> DnsSrvWatcherBuilder<T> newBuilder(
 
   /**
    * @deprecated Use {@link #newBuilder(DnsSrvResolver, java.util.function.Function)}
+   * deprecated since version 3.2.0
    */
-  @Deprecated(since = "3.2.0")
   public static <T> DnsSrvWatcherBuilder<T> newBuilder(
       DnsSrvResolver resolver,
       com.google.common.base.Function<LookupResult, T> resultTransformer) {
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
deleted file mode 100644
index 8a9eabd..0000000
--- a/src/main/java/module-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-module com.spotify.dns {
-
-  requires org.dnsjava;
-  requires com.google.common;
-  requires org.slf4j;
-
-  exports com.spotify.dns;
-  exports com.spotify.dns.statistics;
-}