More generator tweaks