fixes on java side