Working on bugs related to persisting Rooms