Text fixes from merge