Generation tweaks