Fixing git issues