Changes in order to reflect the latest i18n updates