Fix javadoc and generated javadoc