Fix site generation & update spawn usage