diff --git a/repository/lib.php b/repository/lib.php
index 46485b9f47ee5..70b8fad640670 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1006,7 +1006,7 @@ public static function display_instances_list($context, $typename = null) {
         $instancesnumber = count($instances);
         $alreadyplugins = array();
 
-        $table = new StdClass;
+        $table = new html_table();
         $table->head = array($namestr, $pluginstr, $deletestr, $settingsstr);
         $table->align = array('left', 'left', 'center','center');
         $table->data = array();
@@ -1035,7 +1035,7 @@ public static function display_instances_list($context, $typename = null) {
                 $alreadyplugins[] = $i->name;
             }
         }
-        $output .= print_table($table, true);
+        $output .= $OUTPUT->table($table);
         $instancehtml = '<div>';
         $addable = 0;
 
diff --git a/repository/manage_instances.php b/repository/manage_instances.php
index 49f345fbed8e5..ead21d17cd31d 100644
--- a/repository/manage_instances.php
+++ b/repository/manage_instances.php
@@ -179,7 +179,9 @@
             }
             exit;
         }
-        notice_yesno(get_string('confirmdelete', 'repository', $instance->name), $baseurl . '&amp;delete=' . $delete . '&amp;sure=yes', $baseurl);
+        $formcontinue = html_form::make_button($baseurl, array('delete' => $delete, 'sure' => 'yes'), get_string('yes'));
+        $formcancel = html_form::make_button($baseurl, array(), get_string('no'));
+        echo $OUTPUT->confirm(get_string('confirmdelete', 'repository', $instance->name), $formcontinue, $formcancel);
         $return = false;
     } else {
         repository::display_instances_list($context);