Fix CraftBukkit diffs