Sync and collaboration fixes