building block deployment tweaks