some fixes to arbitrage