Fix for roslyn changes - part 1