Some small changes to get ready for adding a game lobby