cm 11.0: minor updates