Mark two i18n issues