Fix the environment variables