Incorporate API changes part 4: tb_*