Fix spigot building