Fix some i18n issues