A couple of MSC2 fixes