fixes for cm-11.0