$ git diff --staged
diff --git a/cache/stores/mongodb/lib.php b/cache/stores/mongodb/lib.php
index 93efef0ee0c..2122b817a0a 100644
--- a/cache/stores/mongodb/lib.php
+++ b/cache/stores/mongodb/lib.php
@@ -254,9 +254,7 @@ class cachestore_mongodb extends cache_store implements cache_is_configurable {
         }

         $result = $this->collection->findOne($key);
-        if ($result === null ||
-                (is_array($result) && !array_key_exists('data', $result)) ||
-                (is_object($result) && !property_exists($result, 'data'))) {
+        if ($result === null || !array_key_exists('data', $result)) {
             return false;
         }
         $data = @unserialize($result['data']);
diff --git a/message/renderer.php b/message/renderer.php
index 775ff409b0d..272f51b057e 100644
--- a/message/renderer.php
+++ b/message/renderer.php
@@ -42,7 +42,7 @@ class core_message_renderer extends plugin_renderer_base {
      * @param  array $allprocessors  array of objects containing all message processors
      * @param  array $processors  array of objects containing active message processors
      * @param  array $providers   array of objects containing message providers
-     * @param  array $preferences array of objects containing current preferences
+     * @param  stdClass $preferences object containing current preferences
      * @return string The text to render
      */
     public function manage_messageoutput_settings($allprocessors, $processors, $providers, $preferences) {
@@ -120,7 +120,7 @@ class core_message_renderer extends plugin_renderer_base {
      *
      * @param  array $processors  array of objects containing message processors
      * @param  array $providers   array of objects containing message providers
-     * @param  array $preferences array of objects containing current preferences
+     * @param  stdClass $preferences object containing current preferences
      * @return string The text to render
      */
     public function manage_defaultmessageoutputs($processors, $providers, $preferences) {