BuildingEdit fixes