cm-11.0: Some fixes