Final fixes of environment variables.