tweaks to replacement and locales