Working on dotnet/java improvements