Fixed/fixing issues with content connection integration & migration