Small changes in handling leaves.