More text related fixes
Merge branch 'compositor' of https://github.com/mbebenita/shumway into compositor