diff --git a/src/main/java/org/olat/core/util/Formatter.java b/src/main/java/org/olat/core/util/Formatter.java
index 16eedd7e8dcfc68430d5d3ff4db11aa70faafc8f..c3bef62e04dd71b62e272781b5dd7e180cc1751a 100644
--- a/src/main/java/org/olat/core/util/Formatter.java
+++ b/src/main/java/org/olat/core/util/Formatter.java
@@ -60,7 +60,7 @@ import org.olat.core.helpers.Settings;
 public class Formatter {
 
 	private static final DateFormat formatterDatetimeFilesystem = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm-ss_SSS");
-	private static final DateFormat formatterDatetime = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm");
+	private static final DateFormat formatterDatetimeWithMinutes = new SimpleDateFormat("yyyy-MM-dd'T'HH-mm");
 	private static final DateFormat formatDateTime = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
 	private static final DateFormat shortFormatDateFileSystem = new SimpleDateFormat("yyyyMMdd");
 
@@ -311,9 +311,9 @@ public class Formatter {
 	 * @param d the date to be formatted
 	 * @return a String with the formatted date and time
 	 */
-	public static String formatDatetimeSave(Date d) {
-		synchronized (formatterDatetime) {
-			return formatterDatetime.format(d);
+	public static String formatDatetimeWithMinutes(Date d) {
+		synchronized (formatterDatetimeWithMinutes) {
+			return formatterDatetimeWithMinutes.format(d);
 		}
 	}
 	
diff --git a/src/main/java/org/olat/course/archiver/ArchiveResource.java b/src/main/java/org/olat/course/archiver/ArchiveResource.java
index 266157f6f17736d00de466dc6a5d9f491f4af146..603b592fcad9637f29b9aaf73be442548eb52a5c 100644
--- a/src/main/java/org/olat/course/archiver/ArchiveResource.java
+++ b/src/main/java/org/olat/course/archiver/ArchiveResource.java
@@ -95,7 +95,7 @@ public class ArchiveResource implements MediaResource {
 		}
 		
 		String label = StringHelper.transformDisplayNameToFileSystemName(courseNode.getShortName())
-				+ "_" + Formatter.formatDatetimeSave(new Date()) + ".zip";
+				+ "_" + Formatter.formatDatetimeWithMinutes(new Date()) + ".zip";
 		String urlEncodedLabel = StringHelper.urlEncodeUTF8(label);
 		hres.setHeader("Content-Disposition","attachment; filename*=UTF-8''" + urlEncodedLabel);			
 		hres.setHeader("Content-Description", urlEncodedLabel);
diff --git a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
index 76e43c2bcb2886be7aa08490ce1660426777e622..eec126a8eaa81c02cc68adeeaf9bf5a5603218ff 100644
--- a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
+++ b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
@@ -266,7 +266,7 @@ public class HighScoreEditController extends FormBasicController {
 					|| showPodium.isSelected(0) || showPosition.isSelected(0);
 		} 
 		if (dateStart.getDate() != null && new Date().after(dateStart.getDate())) {
-			dateStart.setErrorKey("dateElement.toearly", null);
+			dateStart.setErrorKey("datestart.toearly", null);
 			allOK &= false;
 		}		
 		return allOK & super.validateFormLogic(ureq);
diff --git a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java
index 4c279200707c92b31dc9ac4986730c3d7f5c9a8d..f6e21f8fccf60c464ce438a4cb3a581f226e700a 100644
--- a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java
+++ b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java
@@ -195,7 +195,7 @@ public class QTI21ArchiveFormat {
 		ICourse course = CourseFactory.loadCourse(searchParams.getCourseEntry());
 		CourseNode courseNode = course.getRunStructure().getNode(searchParams.getNodeIdent());
 		String label = StringHelper.transformDisplayNameToFileSystemName(courseNode.getShortName())
-				+ "_" + Formatter.formatDatetimeSave(new Date())
+				+ "_" + Formatter.formatDatetimeWithMinutes(new Date())
 				+ ".xlsx";
 		
 		if("iqself".equals(courseNode.getType())) {
diff --git a/src/main/java/org/olat/user/DisplayPortraitController.java b/src/main/java/org/olat/user/DisplayPortraitController.java
index a54f668b4d77c9bf660e5fead8be76a6c20b99d6..cb31ecaab9aab1ed446bc9f9cb1d6ac6451bb59d 100644
--- a/src/main/java/org/olat/user/DisplayPortraitController.java
+++ b/src/main/java/org/olat/user/DisplayPortraitController.java
@@ -69,7 +69,7 @@ public class DisplayPortraitController extends BasicController implements Generi
 	private final boolean isAnonymous;
 	private final boolean displayPortraitImage;
 	
-	private boolean anonymous;	
+	private boolean forceAnonymous;	
 
 	
 	/**
@@ -91,7 +91,7 @@ public class DisplayPortraitController extends BasicController implements Generi
 	public DisplayPortraitController(UserRequest ureq, WindowControl wControl, Identity portraitIdent,
 			boolean useLarge, boolean canLinkToHomePage, boolean setAnonymous) { 
 		this(ureq, wControl, portraitIdent, useLarge, canLinkToHomePage, false, true);
-		this.anonymous = setAnonymous;
+		this.forceAnonymous = setAnonymous;
 		loadPortrait();
 	}
 
@@ -177,9 +177,9 @@ public class DisplayPortraitController extends BasicController implements Generi
 			
 			if (useLarge) {
 				image = DisplayPortraitManager.getInstance().getBigPortrait(portraitIdent.getName());
-				if (image != null && !anonymous) {
+				if (image != null && !forceAnonymous) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_BIG_CSS_CLASS);
-				} else if (isAnonymous || anonymous) {
+				} else if (isAnonymous || forceAnonymous) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.ANONYMOUS_BIG_CSS_CLASS);
 				} else if (gender.equals("-")) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_BIG_CSS_CLASS);
@@ -190,9 +190,9 @@ public class DisplayPortraitController extends BasicController implements Generi
 				}
 			} else {
 				image = DisplayPortraitManager.getInstance().getSmallPortrait(portraitIdent.getName());
-				if (image != null && !anonymous) {
+				if (image != null && !forceAnonymous) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.AVATAR_SMALL_CSS_CLASS);					
-				} else if (isAnonymous || anonymous) {
+				} else if (isAnonymous || forceAnonymous) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.ANONYMOUS_SMALL_CSS_CLASS);
 				} else if (gender.equals("-")) {
 					myContent.contextPut("portraitCssClass", DisplayPortraitManager.DUMMY_SMALL_CSS_CLASS);
@@ -212,7 +212,7 @@ public class DisplayPortraitController extends BasicController implements Generi
 			myContent.contextRemove("mapperUrl");
 		}
 
-		myContent.contextPut("hasPortrait", (image != null && !anonymous) ? Boolean.TRUE : Boolean.FALSE);
+		myContent.contextPut("hasPortrait", (image != null && !forceAnonymous) ? Boolean.TRUE : Boolean.FALSE);
 	}
 
 	@Override