Fix compil in 1.7
Java8
Pass to Java 1.8, fix some minor issues