v0.96 Fixes for Bukkit 1.7.9-R0.2