Fixed type and generation of javadoc.