Fixed generator issues.