Fixes to exchanges