Properly handle room upgrades of spaces.