diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoder.java
index a86046b824..55c6810dc5 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoder.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeDecoder.java
@@ -32,7 +32,8 @@
  * <ul>
  * <li>a {@link LwM2mNode}</li>
  * <li>a time-stamped {@link LwM2mNode} (e.g. for historical representations)</li>
- * <li>a list of {@link LwM2mNode} (e.g. for composite operation)</li>
+ * <li>a map of {@link LwM2mNode} (e.g. for composite operation)</li>
+ * <li>a list of {@link LwM2mPath} (e.g. for composite operation)</li>
  * </ul>
  */
 public interface LwM2mNodeDecoder {
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoder.java
index 2ed5aa67f6..6cfd9db273 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoder.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/LwM2mNodeEncoder.java
@@ -30,7 +30,8 @@
  * <ul>
  * <li>a {@link LwM2mNode}</li>
  * <li>a time-stamped {@link LwM2mNode} (e.g. for historical representations)</li>
- * <li>a list of {@link LwM2mNode} (e.g. for composite operation)</li>
+ * <li>a map of {@link LwM2mNode} (e.g. for composite operation)</li>
+ * <li>a list of {@link LwM2mPath} (e.g. for composite operation)</li>
  * </ul>
  */
 public interface LwM2mNodeEncoder {
diff --git a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java
index aec3a44954..3cb503dd6a 100644
--- a/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java
+++ b/leshan-server-cf/src/main/java/org/eclipse/leshan/server/californium/LeshanServerBuilder.java
@@ -207,9 +207,7 @@ public LeshanServerBuilder setAuthorizer(Authorizer authorizer) {
      * <p>
      * Set your {@link LwM2mModelProvider} implementation.
      * </p>
-     * By default the {@link StandardModelProvider} implementation is used which support all core objects for all
-     * devices.
-     * 
+     * By default the {@link StandardModelProvider}.
      */
     public LeshanServerBuilder setObjectModelProvider(LwM2mModelProvider objectModelProvider) {
         this.modelProvider = objectModelProvider;