Fix funding_instrument model for reversal

Fixes #1327 and #1318