TreeTable fixes