Fixing some git-isms