Merge "Fix mc calls"