micro fixes in the generator