diff --git a/js/questionset.js b/js/questionset.js
index 04d3d27..37ffefb 100644
--- a/js/questionset.js
+++ b/js/questionset.js
@@ -109,8 +109,6 @@ H5P.QuestionSet = function (options, contentId) {
   var $myDom;
   renderSolutions = false;
 
-
-
   // Instantiate question instances
   for (var i = 0; i < params.questions.length; i++) {
     var question = params.questions[i];
@@ -120,8 +118,10 @@ H5P.QuestionSet = function (options, contentId) {
     if (params.override.overrideButtons) {
       // Extend subcontent with the overrided settings.
       $.extend(question.params, {
-        enableRetry: params.override.overrideRetry,
-        enableSolutionsButton: params.override.overrideShowSolutionButton
+        behaviour: {
+          enableRetry: params.override.overrideRetry,
+          enableSolutionsButton: params.override.overrideShowSolutionButton
+        }
       });
     }
 
diff --git a/semantics.json b/semantics.json
index 13527c1..3b1a835 100644
--- a/semantics.json
+++ b/semantics.json
@@ -101,11 +101,11 @@
       "label": "Question type",
       "description": "Library for this question.",
       "options": [
-        "H5P.MultiChoice 1.0",
-        "H5P.DragQuestion 1.0",
-        "H5P.Blanks 1.0",
-        "H5P.MarkTheWords 1.0",
-        "H5P.DragText 1.0"
+        "H5P.MultiChoice 1.1",
+        "H5P.DragQuestion 1.1",
+        "H5P.Blanks 1.1",
+        "H5P.MarkTheWords 1.1",
+        "H5P.DragText 1.1"
       ]
     }
   },