Further refinements for the build scripts.