Fix CM build