Currency conversion function fixes