Fixed more of git's weirdness