Small fixes from lobby update