Changes to get git working with 2.4