More work to attempt fixing Calendar. Sometimes it is something simple.