Client java improvments