Fix some inconsistencies + ccy not case sensitive