Fix Eclipse errors with Java 8/Scala