Minor fixes to MCHMS

Minor fixes to MCHMS in response to round 1 of 13.3 testing.