More JSGC_FJGENERATIONAL fixes