minor changes for i18n support