Fixed a few git issues