Patch up the .NET 4.0 build