Tweaks to getting env variables