More fixes for tc generation