[Fix][Build Fail] Following TTS changes