Java client update, minor fixes [master]