Make things working with Java 8