Fix a few issues with .git configuration