Fixes crashes in the lobby / game start logic
Merge branch 'master' of https://github.com/alvinlao/charm