Some changes for Spigot 1.8. (Not fully working yet)