Fixed a couple of things for MCC18.