Fixing git problems