Fixes for cm10.1