Changes for i18n with the two Daves