Fix javadoc failures on Java 8