Post N9. Text fixes