Fix some TTS bugs