Finished fixes to improve handling in non-English locales.