Fixes for updates to cm