Some tweaks and other Spigot optimizations