Javadoc fixes

- Some fixes for java 8