diff --git a/build/resources/nylas b/build/resources/nylas
index 688d83807..ae4de39d2 160000
--- a/build/resources/nylas
+++ b/build/resources/nylas
@@ -1 +1 @@
-Subproject commit 688d83807a961ba5e8e79050ec2d54ba7a49a643
+Subproject commit ae4de39d22e1f0c85641a988dc21ec44846884ef
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 0d70db3ab..b33d38912 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -113,6 +113,9 @@ window.TEST_ACCOUNT_ALIAS_EMAIL = "tester+alternative@nylas.com"
 
 window.TEST_TIME_ZONE = "America/Los_Angeles"
 moment = require('moment-timezone')
+# moment-round upon require patches `moment` with new functions.
+require('moment-round')
+
 # This date was chosen because it's close to a DST boundary
 window.testNowMoment = ->
   moment.tz("2016-03-15 12:00", TEST_TIME_ZONE)
diff --git a/src/components/nylas-calendar/nylas-calendar.jsx b/src/components/nylas-calendar/nylas-calendar.jsx
index 12a32bf7f..3d8a89a02 100644
--- a/src/components/nylas-calendar/nylas-calendar.jsx
+++ b/src/components/nylas-calendar/nylas-calendar.jsx
@@ -121,3 +121,6 @@ export default class NylasCalendar extends React.Component {
     )
   }
 }
+
+
+NylasCalendar.WeekView = WeekView;
diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
index 602cff75a..2b9be507b 100644
--- a/src/window-event-handler.coffee
+++ b/src/window-event-handler.coffee
@@ -145,7 +145,10 @@ class WindowEventHandler
 
   openLink: ({href, target, currentTarget, metaKey}) ->
     if not href
-      href = target?.getAttribute('href') or currentTarget?.getAttribute('href')
+      if target instanceof Element
+        href = target.getAttribute('href')
+      else if currentTarget instanceof Element
+        href = currentTarget.getAttribute('href')
 
     return unless href