Fixed missing features from .NET 4, so solution can be compiled with .NET 3.5