More text rendering improvements