Fix Cm errors