Fix #643, fix few locales