Bug fixes for tree_row