Small changes to the build system