PLT-362 - Currency and Money fixup from PR