Temporarily fix CommitComment errors