More internationalization fixes