More updates for cm-10.2