Prepare build environment more careful