Locale formatting fixes, take #2