RF: locale codes, minor tweaks