Text problem fixes