Minor changes because of CMR API change.