fixes for dotnet client