some integration tweaks