Updated building construction / repair logic