More subtle fixes to text positioning.