Fix CM stuff