Fixed problems with our java.