Improve ccl getenv patch