Update for Bukkit#171 and Update Mertics