More fixes for text positioning, in particular "box" text.