diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index c12d13366..f3cefe432 100644
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1439,7 +1439,10 @@ _g_local_file_info_get (const char             *basename,
 
   /* Avoid stat in trivial case */
   if (attribute_matcher == NULL)
-    return info;
+    {
+      g_file_info_unset_attribute_mask (info);
+      return info;
+    }
 
 #ifndef G_OS_WIN32
   res = g_lstat (path, &statbuf);
diff --git a/glib/gvariant.c b/glib/gvariant.c
index 379933c0c..c6932fdf7 100644
--- a/glib/gvariant.c
+++ b/glib/gvariant.c
@@ -4778,7 +4778,7 @@ g_variant_iter_next (GVariantIter *iter,
  * @iter: a #GVariantIter
  * @format_string: a GVariant format string
  * @...: the arguments to unpack the value into
- * @returns: %TRUE if a value was unpacked, or %FALSE if there as no
+ * @returns: %TRUE if a value was unpacked, or %FALSE if there was no
  *           value
  *
  * Gets the next item in the container and unpacks it into the variable
@@ -4799,7 +4799,7 @@ g_variant_iter_next (GVariantIter *iter,
  * function with a string constant for the format string and the same
  * string constant must be used each time.  Mixing calls to this
  * function and g_variant_iter_next() or g_variant_iter_next_value() on
- * the same iterator is not recommended.
+ * the same iterator causes undefined behavior.
  *
  * See the section on <link linkend='gvariant-format-strings'>GVariant
  * Format Strings</link>.