Fixes for incorrect tc generation