Added missing CM externals to be on the safe side