Changes to Shared Cal and Collabtools