diff --git a/.gitignore b/.gitignore
index e25fce7..c169161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,13 @@
 
 # Ignore Gradle build output directory
 build
-.idea
\ No newline at end of file
+.idea
+
+#eclipse
+**/bin
+.settings
+.classpath
+*.project
+
+#Tests
+/repo/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5c65dd9..ec8443a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,14 @@
 import net.minecraftforge.gradleutils.PomUtils
 
 plugins {
-    id 'net.minecraftforge.gradleutils'
     id 'java-library'
     id 'maven-publish'
-    id 'org.cadixdev.licenser' version '0.6.1'
+    id 'net.minecraftforge.licenser' version '1.0.1'
+    id 'net.minecraftforge.gradleutils' version '[2.3,2.4)'
 }
 
 group = 'net.minecraftforge'
-version = gradleutils.getTagOffsetVersion()
+version = gradleutils.tagOffsetVersion
 println "Version: $version"
 
 subprojects { Project subproject ->
@@ -16,7 +16,7 @@ subprojects { Project subproject ->
     subproject.apply {
         plugin 'java-library'
         plugin 'maven-publish'
-        plugin 'org.cadixdev.licenser'
+        plugin 'net.minecraftforge.licenser'
     }
 
     subproject.group = 'net.minecraftforge'
@@ -100,12 +100,12 @@ subprojects { Project subproject ->
         }
 
         repositories {
-            maven gradleutils.getPublishingForgeMaven()
+            maven gradleutils.publishingForgeMaven
         }
     }
 
 }
 
 changelog {
-    fromTag '0.3'
+    from '0.3'
 }
diff --git a/filesystems/src/main/java/net/minecraftforge/jarjar/nio/pathfs/PathFileSystemProvider.java b/filesystems/src/main/java/net/minecraftforge/jarjar/nio/pathfs/PathFileSystemProvider.java
index d5041a8..43d2125 100644
--- a/filesystems/src/main/java/net/minecraftforge/jarjar/nio/pathfs/PathFileSystemProvider.java
+++ b/filesystems/src/main/java/net/minecraftforge/jarjar/nio/pathfs/PathFileSystemProvider.java
@@ -96,11 +96,7 @@ private PathFileSystem newFileSystemInternal(final String key, final Path path)
     }
 
     private String makeKey(URI uri) {
-        final String keyValue = uri.getRawSchemeSpecificPart();
-        if (keyValue.startsWith("//"))
-            return keyValue.substring(2);
-
-        return keyValue;
+        return uri.normalize().getRawSchemeSpecificPart();
     }
 
     private String makeKey(Path path) {
diff --git a/settings.gradle b/settings.gradle
index 8679069..5b3aac9 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,17 +1,3 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven {
-            name = 'MinecraftForge'
-            url = 'https://maven.minecraftforge.net/'
-        }
-    }
-
-    plugins {
-        id 'net.minecraftforge.gradleutils' version '2.+'
-    }
-}
-
 plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
 }