mc: multple fixes (#2367)