Update for craftbukkit changes