Address TPL faults for .NET 4