Couple cleanups for tc integration