mc: Minor fixes