A couple of MSC 1 fixes