Skip to content

Fix Java 9 issues

Fix Java 9 issues #682