Fixing java8 build