Fixing git issues...