diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php
index 4b1e1493dc5..0982014a5fd 100644
--- a/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@ -35,6 +35,9 @@ class block_glossary_random extends block_base {
      */
     protected $glossarycm = null;
 
+    /** @var stdClass course data. */
+    public $course;
+
     function init() {
         $this->title = get_string('pluginname','block_glossary_random');
     }
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 8ae2c1eff7e..33e788b935b 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -855,9 +855,6 @@ class block_tree extends block_list {
         $this->get_required_javascript();
         $this->get_content();
         $content = $output->tree_block_contents($this->content->items,array('class'=>'block_tree list'));
-        if (isset($this->id) && !is_numeric($this->id)) {
-            $content = $output->box($content, 'block_tree_box', $this->id);
-        }
         return $content;
     }
 }
diff --git a/blocks/myoverview/classes/output/main.php b/blocks/myoverview/classes/output/main.php
index f8226c276b7..90b42c1752b 100644
--- a/blocks/myoverview/classes/output/main.php
+++ b/blocks/myoverview/classes/output/main.php
@@ -152,6 +152,9 @@ class main implements renderable, templatable {
      */
     private $customfieldvalue;
 
+    /** @var bool true if grouping selector should be shown, otherwise false. */
+    protected $displaygroupingselector;
+
     /**
      * main constructor.
      * Initialize the user preferences
diff --git a/blocks/recentlyaccesseditems/tests/observer_test.php b/blocks/recentlyaccesseditems/tests/observer_test.php
index 6b1b30e56dd..774cb86d972 100644
--- a/blocks/recentlyaccesseditems/tests/observer_test.php
+++ b/blocks/recentlyaccesseditems/tests/observer_test.php
@@ -32,6 +32,33 @@ require_once($CFG->dirroot . '/mod/assign/tests/generator.php');
 class observer_test extends \advanced_testcase {
     use \mod_assign_test_generator;
 
+    /** @var string Table name. */
+    protected $table;
+
+    /** @var \stdClass course data. */
+    protected $course;
+
+    /** @var \stdClass student data. */
+    protected $student;
+
+    /** @var \stdClass teacher data. */
+    protected $teacher;
+
+    /** @var \stdClass student role. */
+    protected $studentrole;
+
+    /** @var \stdClass teacher role. */
+    protected $teacherrole;
+
+    /** @var \stdClass course forum. */
+    protected $forum;
+
+    /** @var \stdClass course glossary. */
+    protected $glossary;
+
+    /** @var \stdClass course chat. */
+    protected $chat;
+
     /**
      * Set up for every test
      */