update for cm-based builds