Even more internationalization fixes