Fixtests

Fix some recent regressions on TC.