Fixed some git issues