little fixes in generators