Fix Java tools