diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch
index 925847ce6..e21c3895d 100644
--- a/Spigot-Server-Patches/POM-Changes.patch
+++ b/Spigot-Server-Patches/POM-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index d677e79df..78395669f 100644
+index d677e79df..b2aa10ff7 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -124,6 +124,19 @@ index d677e79df..78395669f 100644
                                  <relocation>
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
+                                 </relocation>
+-                                <relocation>
+-                                    <pattern>it.unimi</pattern>
+-                                    <shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>
+-                                </relocation>
++                                <!-- Paper - Don't relocate fastutil in order to prevent api breakage -->
++                                <!--<relocation>-->
++                                    <!--<pattern>it.unimi</pattern>-->
++                                    <!--<shadedPattern>org.bukkit.craftbukkit.libs.it.unimi</shadedPattern>-->
++                                <!--</relocation>-->
+                                 <relocation>
+                                     <pattern>org.bukkit.craftbukkit</pattern>
+                                     <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
 @@ -0,0 +0,0 @@
                  <artifactId>maven-compiler-plugin</artifactId>
                  <!-- versions after this appear to be broken -->
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 5bd2476a7..23fe82255 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -4,23 +4,6 @@ Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
-diff --git a/pom.xml b/pom.xml
-index 78395669f..39ca6aede 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -0,0 +0,0 @@
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-+            <groupId>co.aikar</groupId>
-+            <artifactId>fastutil-lite</artifactId>
-+            <version>1.0</version>
-+            <scope>compile</scope>
-+        </dependency>
-+        <dependency>
-             <groupId>net.sf.trove4j</groupId>
-             <artifactId>trove4j</artifactId>
-             <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
 index 000000000..1b33390de