Various MSC 1.x Fixes