diff --git a/src/me/ByteEdit/edit/Assembler.java b/src/me/ByteEdit/edit/Assembler.java
index 51073c1..9e0d8f7 100644
--- a/src/me/ByteEdit/edit/Assembler.java
+++ b/src/me/ByteEdit/edit/Assembler.java
@@ -1524,7 +1524,7 @@ public class Assembler {
 				return new IntInsnNode(188, ClassUtil.getArrayIDByType(split[1]));
 			}
 			case "anewarray": {
-				return new TypeInsnNode(189, split[1]);
+				return new TypeInsnNode(189, UnicodeUtils.unescape(split[1]));
 			}
 			case "arraylength": {
 				return new InsnNode(190);
@@ -1533,10 +1533,10 @@ public class Assembler {
 				return new InsnNode(191);
 			}
 			case "checkcast": {
-				return new TypeInsnNode(192, split[1]);
+				return new TypeInsnNode(192, UnicodeUtils.unescape(split[1]));
 			}
 			case "instanceof": {
-				return new TypeInsnNode(193, split[1]);
+				return new TypeInsnNode(193, UnicodeUtils.unescape(split[1]));
 			}
 			case "monitorenter": {
 				return new InsnNode(194);
diff --git a/src/me/ByteEdit/main/ByteEditTreeNode.java b/src/me/ByteEdit/main/ByteEditTreeNode.java
index 5eed6dd..be3fa1e 100644
--- a/src/me/ByteEdit/main/ByteEditTreeNode.java
+++ b/src/me/ByteEdit/main/ByteEditTreeNode.java
@@ -12,7 +12,8 @@ public class ByteEditTreeNode extends DefaultMutableTreeNode {
 
 	public ByteEditTreeNode(String name, String path) {
 		this(name);
-		this.path = path;
+		if (name.endsWith(".class"))
+			this.path = path;
 	}
 
 }
diff --git a/src/me/ByteEdit/main/Main.java b/src/me/ByteEdit/main/Main.java
index aee1240..9c75ccd 100644
--- a/src/me/ByteEdit/main/Main.java
+++ b/src/me/ByteEdit/main/Main.java
@@ -832,7 +832,7 @@ public class Main extends JFrame {
 				while (enumeration.hasMoreElements()) {
 					JarEntry next = enumeration.nextElement();
 					byte[] data = IOUtils.toByteArray(jar.getInputStream(next));
-					if (next.getName().endsWith(".class")) {
+					if (!next.getName().startsWith("META-INF") && next.getName().endsWith(".class")) {
 						if (next.getName().contains("/")
 								? (!next.getName().split("/")[next.getName().split("/").length - 1].contains("$"))
 								: (!next.getName().contains("$"))) {