Fix TC failures