Fix build of CM packages