Some cm10.1 to cm10 changes