Yet another fixes to tree view manipulation...