Fixed a few synchronization issues and use of the LobbyState
Fixed conflict