fixing bugs in .NET client -- work in progress