Corrected some issues with i18n