fixes in generators