Java client fixes

@hmuhl-sugarinc