Pass through constraints correctly
Handle multi-currency instruments
Bug fix