Merge "Fix two TTS bugs."