Minor updates to player spawning