Modify to mirror Bukkit changes