More java fixes