building block deployment fixes