More fixes coming from ical4j-connector