i18n legacy declarations fixed