Bump some stuff to cm-11.0