More tweaks to room size calculation...