Tree basic fixes.