More java fixups