diff --git a/build.xml b/build.xml
index 00f5d601d..f3d873f6d 100644
--- a/build.xml
+++ b/build.xml
@@ -16,8 +16,8 @@
 		<javac srcdir="${src}" destdir="${build}" debug="on" debuglevel="lines,vars,source" includeantruntime="false" encoding="Cp1252">
 			<classpath>
 				<pathelement path="${lib}" />
-				<pathelement location="${lib}/bukkit-1.2.2-R0-SNAPSHOT.jar" />
-				<pathelement location="${lib}/craftbukkit-1.2.2-R0-SNAPSHOT.jar" />
+				<pathelement location="${lib}/bukkit-1.2.2-R0.1-SNAPSHOT.jar" />
+				<pathelement location="${lib}/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar" />
 				<pathelement location="${lib}/CitizensAPI.jar" />
 				<pathelement location="${lib}/hamcrest.jar" />
 				<pathelement location="${lib}/junit-dep-4.10.jar" />
diff --git a/lib/bukkit-1.2.2-R0-SNAPSHOT.jar b/lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar
similarity index 88%
rename from lib/bukkit-1.2.2-R0-SNAPSHOT.jar
rename to lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar
index abfbb08d7..9b842dc14 100644
Binary files a/lib/bukkit-1.2.2-R0-SNAPSHOT.jar and b/lib/bukkit-1.2.2-R0.1-SNAPSHOT.jar differ
diff --git a/lib/craftbukkit-1.2.2-R0-SNAPSHOT.jar b/lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar
similarity index 92%
rename from lib/craftbukkit-1.2.2-R0-SNAPSHOT.jar
rename to lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar
index 469931143..2abd36fe3 100644
Binary files a/lib/craftbukkit-1.2.2-R0-SNAPSHOT.jar and b/lib/craftbukkit-1.2.2-R0.1-SNAPSHOT.jar differ
diff --git a/pom.xml b/pom.xml
index be4b722ea..28859ea1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,8 +11,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <bukkit.version>1.2.2-R0-SNAPSHOT</bukkit.version>
-        <craftbukkit.version>1.2.2-R0-SNAPSHOT</craftbukkit.version>
+        <bukkit.version>1.2.2-R0.1-SNAPSHOT</bukkit.version>
+        <craftbukkit.version>1.2.2-R0.1-SNAPSHOT</craftbukkit.version>
         <citizensapi.version>2.0-SNAPSHOT</citizensapi.version>
         <build.number>Unknown</build.number>
     </properties>
diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java
index 2f8b113b3..1f73f43dc 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensIronGolemNPC.java
@@ -6,7 +6,7 @@ import net.citizensnpcs.npc.CitizensNPCManager;
 import net.minecraft.server.EntityIronGolem;
 import net.minecraft.server.World;
 
-//import org.bukkit.entity.IronGolem;
+import org.bukkit.entity.IronGolem;
 
 public class CitizensIronGolemNPC extends CitizensMobNPC {
 
@@ -14,10 +14,10 @@ public class CitizensIronGolemNPC extends CitizensMobNPC {
         super(manager, id, name, EntityIronGolemNPC.class);
     }
 
-    /*@Override
+    @Override
     public IronGolem getBukkitEntity() {
         return (IronGolem) getHandle().getBukkitEntity();
-    }*/
+    }
 
     public static class EntityIronGolemNPC extends EntityIronGolem {
 
diff --git a/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java b/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java
index 8d7733e78..c487f6c9d 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/CitizensOcelotNPC.java
@@ -6,7 +6,7 @@ import net.citizensnpcs.npc.CitizensNPCManager;
 import net.minecraft.server.EntityOcelot;
 import net.minecraft.server.World;
 
-//import org.bukkit.entity.Ocelot;
+import org.bukkit.entity.Ocelot;
 
 public class CitizensOcelotNPC extends CitizensMobNPC {
 
@@ -14,10 +14,10 @@ public class CitizensOcelotNPC extends CitizensMobNPC {
         super(manager, id, name, EntityOcelotNPC.class);
     }
 
-    /*@Override
+    @Override
     public Ocelot getBukkitEntity() {
         return (Ocelot) getHandle().getBukkitEntity();
-    }*/
+    }
 
     public static class EntityOcelotNPC extends EntityOcelot {
 
diff --git a/src/main/java/net/citizensnpcs/util/NPCBuilder.java b/src/main/java/net/citizensnpcs/util/NPCBuilder.java
index 8d84bca1a..fbe538585 100644
--- a/src/main/java/net/citizensnpcs/util/NPCBuilder.java
+++ b/src/main/java/net/citizensnpcs/util/NPCBuilder.java
@@ -47,12 +47,13 @@ public class NPCBuilder {
         types.put(EntityType.ENDERMAN, CitizensEndermanNPC.class);
         types.put(EntityType.GHAST, CitizensGhastNPC.class);
         types.put(EntityType.GIANT, CitizensGiantNPC.class);
-        // types.put(EntityType.IRON_GOLEM, CitizensIronGolemNPC.class);
+        types.put(EntityType.IRON_GOLEM, CitizensIronGolemNPC.class);
         types.put(EntityType.MAGMA_CUBE, CitizensMagmaCubeNPC.class);
         types.put(EntityType.MUSHROOM_COW, CitizensMushroomCowNPC.class);
-        // types.put(EntityType.OCELOT, CitizensOcelotNPC.class);
+        types.put(EntityType.OCELOT, CitizensOcelotNPC.class);
         types.put(EntityType.PIG, CitizensPigNPC.class);
         types.put(EntityType.PIG_ZOMBIE, CitizensPigZombieNPC.class);
+        types.put(EntityType.PLAYER, CitizensHumanNPC.class);
         types.put(EntityType.SHEEP, CitizensSheepNPC.class);
         types.put(EntityType.SILVERFISH, CitizensSilverfishNPC.class);
         types.put(EntityType.SKELETON, CitizensSkeletonNPC.class);
@@ -67,8 +68,6 @@ public class NPCBuilder {
 
     public CitizensNPC getByType(EntityType type, CitizensNPCManager npcManager, int id, String name) {
         Class<? extends CitizensNPC> npcClass = types.get(type);
-        if (npcClass == null)
-            npcClass = CitizensHumanNPC.class;
         try {
             return npcClass.getConstructor(CitizensNPCManager.class, int.class, String.class).newInstance(npcManager,
                     id, name);