Tweak existing patches
Add some optimizations from Spigot