misc: improve building alignment with the foundation