Fix some i18n bugs