Fix site generation & update spawn usage

This should fix #343 along with test errors on 'spawn'.