build environment fixes