Fix up javadoc generation