Updates for CM-based builds