Fix Git issues (again).