More fixes to javadoc