Internationalization fix - first pass.