comps updates for upcoming changes
Merge pull request #2737 from jlsherrill/comps_update

comps updates for upcoming changes