More git settings fixes