Fix build after cm merge