diff --git a/question/type/calculated/questiontype.php b/question/type/calculated/questiontype.php
index 4cf8596c7e1..cb4a73d719a 100644
--- a/question/type/calculated/questiontype.php
+++ b/question/type/calculated/questiontype.php
@@ -779,6 +779,7 @@ class question_calculated_qtype extends default_questiontype {
     }
 
     function custom_generator_tools($datasetdef) {
+        global $OUTPUT;
         if (preg_match('~^(uniform|loguniform):([^:]*):([^:]*):([0-9]*)$~',
                 $datasetdef->options, $regs)) {
             $defid = "$datasetdef->type-$datasetdef->category-$datasetdef->name";
@@ -787,20 +788,22 @@ class question_calculated_qtype extends default_questiontype {
                                                 ? 'decimals'
                                                 : 'significantfigures'), 'quiz', $i);
             }
+            $select1 = html_select::make($lengthoptions, 'calclength[]', $regs[4], false);
+            $select1->nothingvalue = '';
+            $menu1 = $OUTPUT->select($select1);
+            
+            $select2 = html_select::make(array('uniform' => get_string('uniform', 'quiz'),
+                                             'loguniform' => get_string('loguniform', 'quiz')), 'calcdistribution[]', $regs[1], false);
+            $select2->nothingvalue = '';
+            $menu2 = $OUTPUT->select($select2);
             return '<input type="submit" onclick="'
                     . "getElementById('addform').regenerateddefid.value='$defid'; return true;"
                     .'" value="'. get_string('generatevalue', 'quiz') . '"/><br/>'
                     . '<input type="text" size="3" name="calcmin[]" '
                     . " value=\"$regs[2]\"/> &amp; <input name=\"calcmax[]\" "
                     . ' type="text" size="3" value="' . $regs[3] .'"/> '
-                    . choose_from_menu($lengthoptions, 'calclength[]',
-                                       $regs[4], // Selected
-                                       '', '', '', true) . '<br/>'
-                    . choose_from_menu(array('uniform' => get_string('uniform', 'quiz'),
-                                             'loguniform' => get_string('loguniform', 'quiz')),
-                                       'calcdistribution[]',
-                                       $regs[1], // Selected
-                                       '', '', '', true);
+                    . $menu1 . '<br/>'
+                    . $menu2;
         } else {
             return '';
         }
@@ -1138,22 +1141,21 @@ class question_calculated_qtype extends default_questiontype {
 
     function construct_dataset_menus($form, $mandatorydatasets,
                                      $optionaldatasets) {
+        global $OUTPUT;
         $datasetmenus = array();
         foreach ($mandatorydatasets as $datasetname) {
             if (!isset($datasetmenus[$datasetname])) {
                 list($options, $selected) =
                         $this->dataset_options($form, $datasetname);
                 unset($options['0']); // Mandatory...
-                $datasetmenus[$datasetname] = choose_from_menu ($options,
-                        'dataset[]', $selected, '', '', "0", true);
+                $datasetmenus[$datasetname] = $OUTPUT->select(html_select::make($options, 'dataset[]', $selected, false));
             }
         }
         foreach ($optionaldatasets as $datasetname) {
             if (!isset($datasetmenus[$datasetname])) {
                 list($options, $selected) =
                         $this->dataset_options($form, $datasetname);
-                $datasetmenus[$datasetname] = choose_from_menu ($options,
-                        'dataset[]', $selected, '', '', "0", true);
+                $datasetmenus[$datasetname] = $OUTPUT->select(html_select::make($options, 'dataset[]', $selected, false));
             }
         }
         return $datasetmenus;
diff --git a/question/type/match/questiontype.php b/question/type/match/questiontype.php
index 34a163fb71a..73957b50c80 100644
--- a/question/type/match/questiontype.php
+++ b/question/type/match/questiontype.php
@@ -227,7 +227,7 @@ class question_match_qtype extends default_questiontype {
     }
 
     function print_question_formulation_and_controls(&$question, &$state, $cmoptions, $options) {
-        global $CFG;
+        global $CFG, $OUTPUT;
         $subquestions   = $state->options->subquestions;
         $correctanswers = $this->get_correct_responses($question, $state);
         $nameprefix     = $question->name_prefix;
@@ -294,9 +294,10 @@ class question_match_qtype extends default_questiontype {
                         $a->feedbackimg = question_get_feedback_image($correctresponse);
                     }
                 }
-
-                $a->control = choose_from_menu($answers, $menuname, $response, 'choose',
-                                               '', 0, true, $options->readonly);
+                
+                $select = html_select::make($answers, $menuname, $response);
+                $select->disabled = $options->readonly;
+                $a->control = $OUTPUT->select($select);
 
                 // Neither the editing interface or the database allow to provide
                 // fedback for this question type.