further MCC fixes