Some small tweaks to the generator