Fixed several issues. Upgraded java client