Make everthing compatible with .NET 4.0