MFC CAM fixes for the 2.0 release.