Fixes for the 1.8 Spigot Release