Integration Fixes