Minor tweaks for building
Spike on each helper