Locale generation fixes