Javadoc changes to help fix #1322