Fixed some issues with TTS