Some fixes to TTS support