WIP fix GenTree