MCC bug fixes and minor updates