Fix JavaDOCs for Java8