A couple of MSC 1.x fixes