Fixed problems in envsetup.