diff --git a/src/main/java/org/olat/ims/qti/editor/AssessmentController.java b/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
index 14e36cc53965ebfd980f73c1ec6d686e18f1c6b9..3e7f6a8cbc5d3cdd5c175c4a5ef6c948b8c40ac1 100644
--- a/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
+++ b/src/main/java/org/olat/ims/qti/editor/AssessmentController.java
@@ -37,6 +37,7 @@ import org.olat.ims.qti.editor.beecom.objects.Assessment;
 import org.olat.ims.qti.editor.beecom.objects.Control;
 import org.olat.ims.qti.editor.beecom.objects.Duration;
 import org.olat.ims.qti.editor.beecom.objects.OutcomesProcessing;
+import org.olat.ims.qti.editor.beecom.objects.SelectionOrdering;
 
 /**
  * Initial Date: Oct 21, 2004 <br>
@@ -68,6 +69,10 @@ public class AssessmentController extends TabbableDefaultController implements C
 				
 		main = this.createVelocityContainer("tab_assess");
 		main.contextPut("assessment", assessment);
+		// fix missing selection ordering, new feature introduced in 9.3.3
+		if (assessment.getSelection_ordering() == null) {
+			assessment.setSelection_ordering(new SelectionOrdering());
+		}
 		main.contextPut("order_type", assessment.getSelection_ordering().getOrderType());
 		main.contextPut("selection_number", String.valueOf(assessment.getSelection_ordering().getSelectionNumber()));
 		main.contextPut("mediaBaseURL", qtiPackage.getMediaBaseURL());
diff --git a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
index 79439e7475fc94145095d2664db320f634184dc1..a248c69b77e4a4647a1d5f112c4e59b26b437e23 100644
--- a/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
+++ b/src/main/java/org/olat/ims/qti/editor/QTIEditorMainController.java
@@ -265,9 +265,6 @@ public class QTIEditorMainController extends MainLayoutBasicController implement
 				break;
 			}
 		}
-		if(CoordinatorManager.getInstance().getCoordinator().getLocker().isLocked(fileResource, null)) {
-			restrictedEdit = true;
-		}
 		this.referencees = referencees;
 		
 
diff --git a/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java b/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
index 37dc15fd27b4d5b4afa8a7a24e3ae3e641690bea..522075515e4e0e844998433196535f8be18dbc15 100644
--- a/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
+++ b/src/main/java/org/olat/ims/qti/editor/beecom/objects/Assessment.java
@@ -65,6 +65,7 @@ public class Assessment implements QTIObject {
 		setIdent(String.valueOf(CodeHelper.getRAMUniqueID()));
 		setTitle("New QTI Document");
 		getAssessmentcontrols().add(new Control());
+		setSelection_ordering(new SelectionOrdering());
 	}
 	
 	public void addToElement(Element root) {