diff --git a/tag/lib.php b/tag/lib.php
index bc14eeba4bc..9f723408ea8 100644
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -992,13 +992,11 @@ function tag_set_flag($tagids) {
 function tag_unset_flag($tagids) {
     global $CFG;
 
-    require_capability('moodle/tag:manage', get_context_instance(CONTEXT_SYSTEM));
-
     if ( is_array($tagids) ) {
         $tagids = implode(',', $tagids);
     }
     $timemodified = time();
-    return execute_sql("UPDATE {$CFG->prefix}tag tg SET tg.flag = 0, tg.timemodified = $timemodified WHERE tg.id IN ($tagids)", false);
+    return execute_sql("UPDATE {$CFG->prefix}tag SET flag = 0, timemodified = $timemodified WHERE id IN ($tagids)", false);
 }
 
 ?>
diff --git a/tag/locallib.php b/tag/locallib.php
index bef8a7e2fd0..615d189af1f 100644
--- a/tag/locallib.php
+++ b/tag/locallib.php
@@ -30,8 +30,10 @@ function tag_print_cloud($nr_of_tags=150, $return=false) {
     }
 
     $tagkeys = array_keys($tagsincloud);
-    $firsttagkey = $tagkeys[0];
-    $maxcount = $tagsincloud[$firsttagkey]->count;
+    if (!empty($tagkeys)) {
+        $firsttagkey = $tagkeys[0];
+        $maxcount = $tagsincloud[$firsttagkey]->count;
+    }
 
     $etags = array();