Fix device defs for CM build