Fixing issues with currency and locale

Fixing issues with currency and locale