More updates of Java files