Fixing generator issues.