Track some externals from cm