tweaks to code generators