i18n: Minor changes according to feedback