Fix environment variable references.