More changes in build env