(TTA) Fix some issues probabling comming from wild TCE optimizations