Fix environment handling so it works for those who are running old versions of baselayout.
Changed paths: