Various MSC 2.x fixes