Fix currency calculations