Fixes for Currency