Fixed: i18n bugs