Cleanups (and fixes a failure to spawn bug)