diff --git a/lib/blocklib.php b/lib/blocklib.php
index e5c6359c3c9..5d1874e1762 100644
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -594,7 +594,7 @@ class block_manager {
         $ccselect = ', ' . context_helper::get_preload_record_columns_sql('ctx');
         $ccjoin = "LEFT JOIN {context} ctx ON (ctx.instanceid = bi.id AND ctx.contextlevel = :contextlevel)";
 
-        $systemcontext = \context_system::instance();
+        $systemcontext = context_system::instance();
         $params = array(
             'contextlevel' => CONTEXT_BLOCK,
             'subpage1' => $this->page->subpage,
diff --git a/my/index.php b/my/index.php
index c7602ef590e..8bad3d9a927 100644
--- a/my/index.php
+++ b/my/index.php
@@ -103,7 +103,7 @@ if (!isguestuser()) {   // Skip default home page for guests
 }
 
 // Toggle the editing state and switches
-if (!$CFG->forcedefaultmymoodle && $PAGE->user_allowed_editing()) {
+if (empty($CFG->forcedefaultmymoodle) && $PAGE->user_allowed_editing()) {
     if ($reset !== null) {
         if (!is_null($userid)) {
             require_sesskey();