diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
index bc8d3c05d..790b921f5 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
@@ -230,12 +230,13 @@ public abstract class Stanza implements TopLevelStreamElement, Packet {
     }
 
     /**
-     * Returns a copy of the packet extensions attached to the packet.
+     * Returns a list of all extension elements of this stanza.
      *
-     * @return the packet extensions.
+     * @return a list of all extension elements of this stanza.
      */
     public List<PacketExtension> getExtensions() {
         synchronized (packetExtensions) {
+            // No need to create a new list, values() will already create a new one for us
             return packetExtensions.values();
         }
     }
diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
index de5af242c..88868a0f8 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/util/MultiMap.java
@@ -184,6 +184,11 @@ public class MultiMap<K,V> {
         return map.keySet();
     }
 
+    /**
+     * Returns a new list containing all values of this multi map.
+     *
+     * @return a new list with all values.
+     */
     public List<V> values() {
         List<V> values = new ArrayList<>(size());
         for (Set<V> set : map.values()) {