Fixing environment var issues.