Ned/i18n tool fixes