More fixes on javadoc