More fixes to text2speech