More tree improvements.