Fix java parts also.