cm10.2 fixes