diff --git a/config/schema/recurring_events.schema.yml b/config/schema/recurring_events.schema.yml
index 998d10e8a81ed9c3a78ef0df473c4deb18a4a5f9..668621c663303207fbea51bcf10f85188587f359 100644
--- a/config/schema/recurring_events.schema.yml
+++ b/config/schema/recurring_events.schema.yml
@@ -1,4 +1,4 @@
-recurring_events.config
+recurring_events.config:
   type: config_object
   label: 'Recurring Events'
   mapping:
diff --git a/recurring_events.routing.yml b/recurring_events.routing.yml
index 27494745fe8e1bb3c1cbff0c051353f57b0cb8a2..56ccd4e277b3aec611a74b61f081cbd0904f0748 100644
--- a/recurring_events.routing.yml
+++ b/recurring_events.routing.yml
@@ -1,8 +1,7 @@
 # Add an EventSeries.
 entity.eventseries.add_form:
-  path: '/events/series/add'
+  path: '/events/add'
   defaults:
-  # Calls the form.add controller, defined in the event entity.
     _entity_form: eventseries.add
     _title: 'Add Event'
   requirements:
diff --git a/src/Entity/EventSeries.php b/src/Entity/EventSeries.php
index a10970d6e94737c3a08e98d830e055418dcf321d..1ece4c63ed3fdd48ea6593525c48d4696f3617db 100644
--- a/src/Entity/EventSeries.php
+++ b/src/Entity/EventSeries.php
@@ -268,7 +268,7 @@ class EventSeries extends EditorialContentEntityBase implements EventSeriesInter
    * {@inheritdoc}
    */
   public function setOwner(UserInterface $account) {
-    $this->set('user_id', $account->id());
+    $this->setOwnerId($account->id());
     return $this;
   }
 
@@ -285,13 +285,12 @@ class EventSeries extends EditorialContentEntityBase implements EventSeriesInter
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = parent::baseFieldDefinitions($entity_type);
 
-    // Standard field, used as unique if primary index.
     $fields['id'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('ID'))
-      ->setDescription(t('The ID of the event entity.'))
+      ->setDescription(t('The ID of the eventseries entity.'))
       ->setReadOnly(TRUE);
 
-    $fields['user_id'] = BaseFieldDefinition::create('entity_reference')
+    $fields['uid'] = BaseFieldDefinition::create('entity_reference')
       ->setLabel(t('Authored by'))
       ->setDescription(t('The username of the content author.'))
       ->setRevisionable(TRUE)
diff --git a/src/Plugin/Field/FieldWidget/MonthlyRecurringDateWidget.php b/src/Plugin/Field/FieldWidget/MonthlyRecurringDateWidget.php
index 5c71f46bb4d447e289006e9d2ebea33099663613..f70fc38bf95d9fba5448f5575e03892a72fe7c91 100644
--- a/src/Plugin/Field/FieldWidget/MonthlyRecurringDateWidget.php
+++ b/src/Plugin/Field/FieldWidget/MonthlyRecurringDateWidget.php
@@ -53,7 +53,7 @@ class MonthlyRecurringDateWidget extends WeeklyRecurringDateWidget {
         'fourth' => t('Fourth'),
         'last' => t('Last'),
       ],
-      '#default_value' => $items[$delta]->day_occurrence ?: '',
+      '#default_value' => $items[$delta]->day_occurrence ? explode(',', $items[$delta]->day_occurrence) : '',
       '#states' => [
         'visible' => [
           ':input[name="monthly_recurring_date[0][type]"]' => ['value' => 'weekday'],
@@ -67,7 +67,7 @@ class MonthlyRecurringDateWidget extends WeeklyRecurringDateWidget {
       '#type' => 'checkboxes',
       '#title' => t('Days of the Week'),
       '#options' => $days,
-      '#default_value' => $items[$delta]->days ?: '',
+      '#default_value' => $items[$delta]->days ? explode(',', $items[$delta]->days) : '',
       '#states' => [
         'visible' => [
           ':input[name="monthly_recurring_date[0][type]"]' => ['value' => 'weekday'],
diff --git a/src/Plugin/Field/FieldWidget/WeeklyRecurringDateWidget.php b/src/Plugin/Field/FieldWidget/WeeklyRecurringDateWidget.php
index 1d15457b93290cb24b146eafac4445f0b7ba9097..cb9b2c244970d1388b37d4296959664f7ce7887d 100644
--- a/src/Plugin/Field/FieldWidget/WeeklyRecurringDateWidget.php
+++ b/src/Plugin/Field/FieldWidget/WeeklyRecurringDateWidget.php
@@ -69,7 +69,7 @@ class WeeklyRecurringDateWidget extends DateRangeDefaultWidget {
       '#type' => 'checkboxes',
       '#title' => t('Days of the Week'),
       '#options' => $days,
-      '#default_value' => $items[$delta]->days ?: '',
+      '#default_value' => $items[$delta]->days ? explode(',', $items[$delta]->days): '',
       '#weight' => 5,
     ];