Fixes after Tree yieldable