compatibility tweaks in integration code