Improvements in the build system