Fix issues with client spawning