Fixed some remaining CM components

Change-Id: Id377a147d650ac244f479666afddb22cfaca9525