Internationalization improvements