Fix environment variable woes.