Minor fixes to Mbo.