cm-10.1: fix a few c&ps