Small patches for Spigot.