Lobby + train fix