Various MSC 1.x Fixes

Incorporates [MSC-127] & [MSC-128] fixes