Various Spigot fixes and etc.