Cm 10.1 fixes and updates