Locale formatting fixes