Updated more Java files.