diff --git a/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java b/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
index 1436b44cf0d4469e4ef6ff606afc1ae9fcb992a3..9373003a5e3b0326f9ff6005cdf44fe87887980f 100644
--- a/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
+++ b/src/main/java/org/olat/commons/calendar/manager/ICalFileCalendarManager.java
@@ -255,9 +255,9 @@ public class ICalFileCalendarManager implements CalendarManager, InitializingBea
 				cal.addEvent(calEvent);
 			} else if (comp instanceof VTimeZone) {
 				log.info("createKalendar: VTimeZone Component is not supported and will not be added to calender");
-				log.debug("createKalendar: VTimeZone=" + comp);
+				log.debug("createKalendar: VTimeZone={}", comp);
 			} else {
-				log.warn("createKalendar: unknown Component=" + comp);
+				log.warn("createKalendar: unknown Component={}", comp);
 			}
 		}
 		return cal;
@@ -659,7 +659,7 @@ public class ICalFileCalendarManager implements CalendarManager, InitializingBea
 		String recurenceId = kEvent.getRecurrenceID();
 		if(StringHelper.containsNonWhitespace(recurenceId)) {
 			try {
-				RecurrenceId recurId = new RecurrenceId(tz);
+				RecurrenceId recurId;
 				// VALUE=DATE recurrence id need to be specially saved
 				if(recurenceId.length() < 9) {
 					recurId = new RecurrenceId(tz);
diff --git a/src/main/java/org/olat/course/nodes/cal/CourseCalendarPeekViewController.java b/src/main/java/org/olat/course/nodes/cal/CourseCalendarPeekViewController.java
index ad4f79ec125b2ea58f21e8e14dbc176bc55a0703..da74641be73235d6eb8c46d4190a92d680629f4a 100644
--- a/src/main/java/org/olat/course/nodes/cal/CourseCalendarPeekViewController.java
+++ b/src/main/java/org/olat/course/nodes/cal/CourseCalendarPeekViewController.java
@@ -21,13 +21,14 @@
 package org.olat.course.nodes.cal;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
-import org.olat.commons.calendar.model.Kalendar;
+import org.olat.commons.calendar.CalendarManager;
 import org.olat.commons.calendar.model.KalendarEvent;
 import org.olat.commons.calendar.ui.components.KalendarRenderWrapper;
 import org.olat.core.gui.UserRequest;
@@ -42,6 +43,7 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.course.nodes.CalCourseNode;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.modules.ModuleConfiguration;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 
@@ -56,6 +58,9 @@ import org.olat.modules.ModuleConfiguration;
  */
 public class CourseCalendarPeekViewController extends BasicController {
 	private TableController tableController;
+	
+	@Autowired
+	private CalendarManager calendarManager;
 
 	public CourseCalendarPeekViewController(UserRequest ureq, WindowControl wControl, UserCourseEnvironment userCourseEnv,
 			CalCourseNode courseNode, CalSecurityCallback secCallback) {
@@ -87,11 +92,15 @@ public class CourseCalendarPeekViewController extends BasicController {
 			refDate = CalEditController.getStartDate(config);
 			if (refDate == null) refDate = new Date();
 		}
+		
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(refDate);
+		cal.add(Calendar.YEAR, 1);
 
 		List<KalendarEvent> nextEvents = new ArrayList<>();
 		for (KalendarRenderWrapper calendar : myCal.getCalendars()) {
-			Kalendar cal = calendar.getKalendar();
-			Collection<KalendarEvent> events = cal.getEvents();
+			Collection<KalendarEvent> events = calendarManager
+					.getEvents(calendar.getKalendar(), refDate, cal.getTime(), calendar.isPrivateEventsVisible());
 			for (KalendarEvent event : events) {
 				if (refDate.compareTo(event.getBegin()) <= 0) {
 					nextEvents.add(event);
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
index 0be8a1df33872b770a652a9a1c4d1a7515723348..125c03a5f2d11cf4a609897845e3c3dde838fa6f 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
@@ -677,6 +677,9 @@ public class AssessmentTestDisplayController extends BasicController implements
 			long timeLimits = assessmentTest.getTimeLimits().getMaximum().longValue();
 			return Math.min(leadingDuration, timeLimits) + extra;
 		}
+		if(leadingTimeInMilliSeconds != null) {
+			return leadingDuration + extra;
+		}
 		return null;
 	}