Further improve the build scripts.