Small fixes (i18n issues)