fixes for internationalization