Changes as per David Black for i18n