Fixing generators to generate Java8 source