Fix #643, fix few locales
Merge pull request #662 from renaudJennyRBS/fix

Fix #643, fix few locales