Fixing TBB implementations