Updated the obvious problems due to javaclient changes