Fixed a few build errors resulting from the CalendarModule refactoring