Last changes for .NET 4.0