Bug Fixes

* Fixes some issues with the exchanger