Some fixes, locale fixes
Locale fixes