Small generator based tweaks