Fixing all the git issues