Fixes to Java client stack