Regeneration and spawn bug fixes