Initial set of fixes for cm-11.0