diff --git a/src/main/java/biomesoplenty/asm/ASMUtil.java b/src/main/java/biomesoplenty/asm/ASMUtil.java
index 7bb32edbf..e73f417a8 100644
--- a/src/main/java/biomesoplenty/asm/ASMUtil.java
+++ b/src/main/java/biomesoplenty/asm/ASMUtil.java
@@ -26,7 +26,7 @@ public class ASMUtil
 	
 	public static byte[] getBytes(ClassNode classNode)
 	{
-		ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+		ClassWriter writer = new ClassWriter(0);
 		classNode.accept(writer);
 		
 		return writer.toByteArray();
diff --git a/src/main/java/biomesoplenty/asm/BOPLoadingPlugin.java b/src/main/java/biomesoplenty/asm/BOPLoadingPlugin.java
index 4c1943303..76daf080f 100644
--- a/src/main/java/biomesoplenty/asm/BOPLoadingPlugin.java
+++ b/src/main/java/biomesoplenty/asm/BOPLoadingPlugin.java
@@ -11,8 +11,10 @@ package biomesoplenty.asm;
 import java.util.Map;
 
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
 
 //TODO: Remove this or the BOPTransformer. It shouldn't be needed.
+@TransformerExclusions("biomesoplenty.asm")
 public class BOPLoadingPlugin implements IFMLLoadingPlugin
 {
     @Override
diff --git a/src/main/java/biomesoplenty/asm/BOPTransformer.java b/src/main/java/biomesoplenty/asm/BOPTransformer.java
index 34498f799..efa4e0756 100644
--- a/src/main/java/biomesoplenty/asm/BOPTransformer.java
+++ b/src/main/java/biomesoplenty/asm/BOPTransformer.java
@@ -52,10 +52,8 @@ public class BOPTransformer implements IClassTransformer
     @Override
     public byte[] transform(String name, String transformedName, byte[] basicClass)
     {
-	    if (name.equals("net.minecraft.client.resources.model.ModelBakery") || name.equals("cxh"))
+	    if (name.equals(modelBakeryName.replace("/", ".")))
 	    {
-	    	System.out.println("Tweaking ModelBakery...");
-	    	
 	    	ClassNode classNode = ASMUtil.getClassNode(basicClass);
 	    	MethodNode variantsMethodNode = ASMUtil.getMethodNode(classNode, registerVariantNamesName, "()V");