Fix calendar integration

Changes for icalendar 2.0