TableBase bug fixes