Fixing more Git errors