diff --git a/dav/common/calendar.fnk.php b/dav/common/calendar.fnk.php
index b03ed7be..1bfe97e2 100644
--- a/dav/common/calendar.fnk.php
+++ b/dav/common/calendar.fnk.php
@@ -347,7 +347,7 @@ function dav_get_current_user_calendar_by_id(&$server, $id, $with_privilege = ""
 
 /**
  * @param string $uid
- * @return Sabre_VObject_Component_VEvent $vObject
+ * @return Sabre_VObject_Component_VCalendar $vObject
  */
 function dav_create_empty_vevent($uid = "")
 {
@@ -359,8 +359,8 @@ function dav_create_empty_vevent($uid = "")
 
 
 /**
- * @param Sabre_VObject_Component_VEvent $vObject
- * @return Sabre_VObject_Component|null
+ * @param Sabre_VObject_Component_VCalendar $vObject
+ * @return Sabre_VObject_Component_VEvent|null
  */
 function dav_get_eventComponent(&$vObject)
 {
diff --git a/dav/common/wdcal_edit.inc.php b/dav/common/wdcal_edit.inc.php
index 261e7866..dac49368 100644
--- a/dav/common/wdcal_edit.inc.php
+++ b/dav/common/wdcal_edit.inc.php
@@ -261,7 +261,8 @@ function wdcal_getEditPage_str(&$localization, $baseurl, $calendar_id, $uri)
 	if ($recurrence && $recurrence->byDay) {
 		$byday = $recurrence->byDay;
 	} else {
-		$byday = array("MO", "TU", "WE", "TH", "FR", "SA", "SU");
+		$days = array("MO", "TU", "WE", "TH", "FR", "SA", "SU");
+		$byday = array($days[date("N", $event["StartTime"]) - 1]);
 	}
 	if ($localization->getFirstDayOfWeek() == 0) {
 		$out .= "<label class='plain'><input class='rec_weekly_byday' type='checkbox' name='rec_weekly_byday[]' value='SU' ";
@@ -671,6 +672,7 @@ function wdcal_set_component_alerts(&$component, &$localization, $summary, $dtst
 
 	foreach ($prev_alarms as $al) {
 		/** @var Sabre_VObject_Component_VAlarm $al */
+		// @TODO Parse notifications that have been there before; e.g. from Lightning
 	}
 
 	foreach (array_keys($_REQUEST["noti_type"]) as $key) if (is_numeric($key) || ($key == "new" && $_REQUEST["new_alarm"] == 1)) {