Use correct generator versions