minor integration tweaks