Fixed some git problems