Bunch of error fixes - tree and table.

Chris H., Chris D., Tushar N.