Room fixes