Integrations improvements and bugfixes