Minor updates of the build system