New fixes for all versions of git