Fix currency issues