Minor fixes to formatting and MC messages