Fixed some more git problems