Add TBB support (broken again)