Locale tweaks to prepare for translation changes