Fixes to treeview