Add some fixes to currency