Minor tweaks to BUILDING