Locale bugs fix