Minor updates in the build system