Fix build in cm tree