Small fixes
Merge pull request #203 from aRn0D/currency/fix

Small fixes