Some refinements to envsetup.sh