ENH: Updates to environment variables