Get rid of javadoc warnings
Minor changes to Javadoc