Small improvement to the build process