ICal fixes