Integrations - Small Improvements