More work on player disconnects