Merge "More small javadoc fixes" into main