Fix environment variables again