Switch to 'spawn' where possible to allow easier debugging