Improve some building construction procedures