More changes to get git working