diff --git a/lib/Basic/Spam.php b/lib/Basic/Spam.php
index f3aeeaa..48b50f6 100644
--- a/lib/Basic/Spam.php
+++ b/lib/Basic/Spam.php
@@ -87,7 +87,7 @@ protected function _init()
         $form->setCustomButtons($spam->disable);
 
         /* Set default values. */
-        $form->folder_var->type->setFolder($spam->mailbox);
+        $form->folder_var->setFolder($spam->mailbox);
         if (!$form->isSubmitted()) {
             $this->vars->level = $spam->level;
             $this->vars->folder = $spam->mailbox;
diff --git a/lib/Form/Spam.php b/lib/Form/Spam.php
index 9d72b93..28f1987 100644
--- a/lib/Form/Spam.php
+++ b/lib/Form/Spam.php
@@ -91,7 +91,7 @@ public function validate($vars = null, $canAutoFill = false)
             $vars = $this->_vars;
         }
         if (strlen($vars->get('folder_new'))) {
-            $this->folder_var->type->newFolderSet = true;
+            $this->folder_var->newFolderSet = true;
         }
         return parent::validate($vars, $canAutoFill);
     }
diff --git a/lib/Form/Vacation.php b/lib/Form/Vacation.php
index dca53c5..de2b678 100644
--- a/lib/Form/Vacation.php
+++ b/lib/Form/Vacation.php
@@ -102,8 +102,8 @@ public function validate($vars = null, $canAutoFill = false)
         }
 
         if ($this->hasFeature('period')) {
-            $start = $this->_start->getInfo($vars, []);
-            $end = $this->_end->getInfo($vars, []);
+            $start = $this->_start->getInfo($vars);
+            $end = $this->_end->getInfo($vars);
             if ($start && $end && $end < $start) {
                 $valid = false;
                 $this->_errors['end'] = _("Vacation end date is prior to start.");