Bug fixes and improvements to internationalization