more environment variable tweaks