More spawn worker improvements