Various improvements of the build