More tts fixes