Fix CM dependencies