Couple more text improvements