Follow up to #398 - Make locales setup/fix always OS compatible.