Additional changes to Net35CompatFix