Fixing Git problems