Few more Gen fixes.