Fixed regressions in Microsoft.Build.BuildEngine