Fixed generator errors