Small changes to the Room system