Small changes to room joining/switching