Merge "A few TTS bug fixes"