Made i18n changes requested in #987