Fixes & improvements to custom currencies