diff --git a/CalendarFXWeather/src/main/java/module-info.java b/CalendarFXWeather/src/main/java/module-info.java
index 7e3739ea..fc4071ff 100644
--- a/CalendarFXWeather/src/main/java/module-info.java
+++ b/CalendarFXWeather/src/main/java/module-info.java
@@ -3,4 +3,6 @@
     requires com.calendarfx.view;
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.ikonli.weathericons;
+
+    exports com.calendarfx.app;
 }
\ No newline at end of file
diff --git a/CalendarFXiCal/pom.xml b/CalendarFXiCal/pom.xml
index 77cc4e91..8a298f43 100644
--- a/CalendarFXiCal/pom.xml
+++ b/CalendarFXiCal/pom.xml
@@ -46,12 +46,6 @@
             <version>11.6.4</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.controlsfx</groupId>
-            <artifactId>openjfx-dialogs</artifactId>
-            <version>1.0.3</version>
-        </dependency>
-
         <dependency>
             <groupId>org.mnode.ical4j</groupId>
             <artifactId>ical4j</artifactId>
diff --git a/CalendarFXiCal/src/main/java/com/calendarfx/ical/ICalCalendarApp.java b/CalendarFXiCal/src/main/java/com/calendarfx/ical/ICalCalendarApp.java
index 564a24dc..8fa390dd 100644
--- a/CalendarFXiCal/src/main/java/com/calendarfx/ical/ICalCalendarApp.java
+++ b/CalendarFXiCal/src/main/java/com/calendarfx/ical/ICalCalendarApp.java
@@ -31,6 +31,7 @@
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
+import net.fortuna.ical4j.util.MapTimeZoneCache;
 import org.controlsfx.dialog.ProgressDialog;
 
 import java.time.LocalDate;
@@ -54,6 +55,7 @@ public void start(Stage primaryStage) {
 
         System.setProperty("ical4j.unfolding.relaxed", "true");
         System.setProperty("ical4j.parsing.relaxed", "true");
+        System.setProperty("net.fortuna.ical4j.timezone.cache.impl", MapTimeZoneCache.class.getName());
 
         CalendarView calendarView = new CalendarView();
         calendarView.setToday(LocalDate.now());
diff --git a/CalendarFXiCal/src/main/java/module-info.java b/CalendarFXiCal/src/main/java/module-info.java
index c8a9a85f..8be0eac5 100644
--- a/CalendarFXiCal/src/main/java/module-info.java
+++ b/CalendarFXiCal/src/main/java/module-info.java
@@ -2,4 +2,8 @@
     requires java.logging;
     requires com.calendarfx.view;
     requires org.mnode.ical4j.core;
+
+    exports com.calendarfx.ical;
+    exports com.calendarfx.ical.model;
+    exports com.calendarfx.ical.view;
 }
\ No newline at end of file