A couple of MSC 1.1 fixes