- fixes for .NET 2.0 project