Last Minor MSC tweaks