more integration tweaks (master)