Bugfixes for currencies