diff --git a/pom.xml b/pom.xml
index f050968..b510ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,14 +52,6 @@
     <build>
         <defaultGoal>clean install</defaultGoal>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-        <!-- Resources -->
-        <resources>
-            <resource>
-                <targetPath>.</targetPath>
-                <filtering>true</filtering>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/spacehq/opennbt/NBTIO.java b/src/main/java/org/spacehq/opennbt/NBTIO.java
index 0d3bc59..8e47a3a 100644
--- a/src/main/java/org/spacehq/opennbt/NBTIO.java
+++ b/src/main/java/org/spacehq/opennbt/NBTIO.java
@@ -47,12 +47,12 @@ public class NBTIO {
 	 * @throws java.io.IOException If an I/O error occurs.
 	 */
 	public static Tag readTag(DataInputStream in) throws IOException {
-		int id = in.readByte() & 0xFF;
+		int id = in.readUnsignedByte();
 		if(id == 0) {
 			return null;
 		}
 
-		byte[] nameBytes = new byte[in.readShort() & 0xFFFF];
+		byte[] nameBytes = new byte[in.readUnsignedShort()];
 		in.readFully(nameBytes);
 		String name = new String(nameBytes, CHARSET);
 		Tag tag = null;
diff --git a/src/main/java/org/spacehq/opennbt/tag/ListTag.java b/src/main/java/org/spacehq/opennbt/tag/ListTag.java
index d9af83a..2681daf 100644
--- a/src/main/java/org/spacehq/opennbt/tag/ListTag.java
+++ b/src/main/java/org/spacehq/opennbt/tag/ListTag.java
@@ -120,7 +120,7 @@ public class ListTag<T extends Tag> extends Tag implements Iterable<T> {
 	@SuppressWarnings("unchecked")
 	@Override
 	public void read(DataInputStream in) throws IOException {
-		int id = in.readByte() & 0xFF;
+		int id = in.readUnsignedByte();
 		this.type = (Class<T>) TagRegistry.getClassFor(id);
 		this.value = new ArrayList<T>();
 		if(this.type == null) {