Fixes in currency_change