Deal with warnings related to RepoModel

re #6175