Make some corrections to javadoc