diff --git a/mod/quiz/accessrule/accessrulebase.php b/mod/quiz/accessrule/accessrulebase.php
index a30a048a85c..a3d9fa1b14f 100644
--- a/mod/quiz/accessrule/accessrulebase.php
+++ b/mod/quiz/accessrule/accessrulebase.php
@@ -26,6 +26,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
+require_once($CFG->dirroot . '/mod/quiz/locallib.php');
+
 
 /**
  * A base class that defines the interface for the various quiz access rules.
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 8a963a4be99..fecf7dfa421 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -1178,8 +1178,10 @@ function xmldb_quiz_upgrade($oldversion) {
         switch (get_config('quiz', 'popup')) {
             case 1:
                 set_config('browsersecurity', 'securewindow', 'quiz');
+                break;
             case 2:
                 set_config('browsersecurity', 'safebrowser', 'quiz');
+                break;
             default:
                 set_config('browsersecurity', '-', 'quiz');
         }