Fixes for currency formatting