Corrected few bits of i18n integration.