Tidy up the handling of Spawn Object and fix a off by one error with it