CalDAV fixes. Refs. #354