more fixes in integration