fixes after c-sharp client