Collaboration fixes