Made build run with Java 8