some more stub generator tweaks