Couple of MSC1 Fixes

WF upstream test suite passed on 100% with these commits embodied.