Fix even more problems with compiling java.