[TMPL-38] More currency conversion fixes