diff --git a/www/form/app-form.less b/www/form/app-form.less
index 78d0f7665..cde12d66d 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -25,6 +25,10 @@
         }
     }
 
+    .flatpickr-calendar.open {
+        z-index: 100001 !important; // Alertify is 100000
+    }
+
     @palette0: @cp_kanban-color0; // Default bg color for header
     @form-colors: @cp_form-palette;
     .form-colors(@form-colors; @index) when (@index > 0){
diff --git a/www/whiteboard/export.js b/www/whiteboard/export.js
index 4cdca58f8..1a96cf799 100644
--- a/www/whiteboard/export.js
+++ b/www/whiteboard/export.js
@@ -1,7 +1,7 @@
 // This file is used when a user tries to export the entire CryptDrive.
 // Pads from the code app will be exported using this format instead of plain text.
 define([
-    '/bower_components/secure-fabric.js/dist/fabric.min.js',
+    '/lib/fabric.min.js',
 ], function () {
     var module = {};