fixup core dep and andd collabco_integration module