Further Javadoc corrections