Skip to content

Fix Java 8 issues

Fix Java 8 issues #692