Small fixes on the nearly same tree both in tree_x4 and tree_x5.