diff --git a/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java b/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java
index c0f60918f..a389421d7 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/ModClassLoader.java
@@ -67,7 +67,7 @@ public class ModClassLoader extends URLClassLoader
             for(URL url : mainClassLoader.getSources())
             {
                 URI uri = url.toURI();
-                if(uri.getScheme() == "file")
+                if(uri.getScheme().equals("file"))
                 {
                     files.add(new File(uri));
                 }
diff --git a/fml/src/main/java/net/minecraftforge/fml/common/asm/ASMTransformerWrapper.java b/fml/src/main/java/net/minecraftforge/fml/common/asm/ASMTransformerWrapper.java
index 4e14e6e4c..dd9d76c79 100644
--- a/fml/src/main/java/net/minecraftforge/fml/common/asm/ASMTransformerWrapper.java
+++ b/fml/src/main/java/net/minecraftforge/fml/common/asm/ASMTransformerWrapper.java
@@ -103,14 +103,7 @@ public class ASMTransformerWrapper
         @Override
         public InputStream getInputStream()
         {
-            try
-            {
-                return new ByteArrayInputStream(wrapperCache.get(file));
-            }
-            catch (ExecutionException e)
-            {
-                throw new RuntimeException(e);
-            }
+            return new ByteArrayInputStream(wrapperCache.getUnchecked(file));
         }
 
         @Override
@@ -182,7 +175,7 @@ public class ASMTransformerWrapper
 
     private static String getWrapperName(String parentClass)
     {
-        return parentClass + "_$Wrapper";
+        return "$wrapper." + parentClass;
     }
 
     private static class WrapperVisitor extends ClassVisitor