Fix bad bug in ygen, mostly...