More improvements on text rendering