Fix adjustment made to targets and improve walk tree.