internationalization improvements