Improve build environment