Adopt new build environment.
Some minor fixes to the build environment.