More internationalization updates and bug fixes