Improve config var handling
Improve support for old versions of git