Changes for Bukkit 1.6.4