More polishing for bindings C# and Java