Fixes for integrations.