Various MSC 2 Fixes