Generators use SingleReadBucket
Fixing some compilations