Fix TC env initialization to match 7.8