calendar hotfixes
Merge pull request #729 from YaleSTC/calendar_hotfixes_330

calendar hotfixes