Various fixes to multiple currency selection