diff --git a/sites/all/modules/calendar/includes/calendar_plugin_display_attachment.inc b/sites/all/modules/calendar/includes/calendar_plugin_display_attachment.inc
index c63390d..a9557fa 100644
--- a/sites/all/modules/calendar/includes/calendar_plugin_display_attachment.inc
+++ b/sites/all/modules/calendar/includes/calendar_plugin_display_attachment.inc
@@ -200,7 +200,8 @@ class calendar_plugin_display_attachment extends views_plugin_display_attachment
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) {
+# function options_submit($form, &$form_state) {
+  function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
diff --git a/sites/all/modules/calendar/includes/calendar_plugin_display_page.inc b/sites/all/modules/calendar/includes/calendar_plugin_display_page.inc
index 3dd6b1b..4ee841a 100644
--- a/sites/all/modules/calendar/includes/calendar_plugin_display_page.inc
+++ b/sites/all/modules/calendar/includes/calendar_plugin_display_page.inc
@@ -272,7 +272,8 @@ class calendar_plugin_display_page extends views_plugin_display_page {
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) {
+# function options_submit($form, &$form_state) {
+  function options_submit(&$form, &$form_state) {
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
diff --git a/sites/all/modules/calendar/includes/calendar_plugin_style.inc b/sites/all/modules/calendar/includes/calendar_plugin_style.inc
index 3e29831..c794abb 100644
--- a/sites/all/modules/calendar/includes/calendar_plugin_style.inc
+++ b/sites/all/modules/calendar/includes/calendar_plugin_style.inc
@@ -81,6 +81,8 @@ class calendar_plugin_style extends views_plugin_style {
       $this->date_info->arg_fields = array();
     }
     else {
+      $this->date_info = new StdClass;
+      $this->date_info->arg_fields = new StdClass;
       $this->date_info->arg_fields = $arguments['date_argument']['date_fields'];
       if ($arguments['date_argument']['default_action'] != 'default' || $arguments['date_argument']['default_argument_type'] != 'date') {
         if (empty($this->view->date_info->arg_missing_default)) {