Added a few more changes to support jxtreetable better