Fixes for Bukkit