diff --git a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java
index bccd17ca..dbe09ff2 100644
--- a/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java
+++ b/leshan-client-cf/src/main/java/org/eclipse/leshan/client/californium/RootResource.java
@@ -135,7 +135,7 @@ public class RootResource extends LwM2mClientCoapResource {
     }
 
     @Override
-    public void handleIPATCH(CoapExchange exchange) {
+    public void handlePATCH(CoapExchange exchange) {
         ServerIdentity identity = getServerOrRejectRequest(exchange);
         if (identity == null)
             return;
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
index 864320b7..6774fc78 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/node/codec/senml/LwM2mNodeSenMLEncoder.java
@@ -252,14 +252,15 @@ public class LwM2mNodeSenMLEncoder implements TimestampedNodeEncoder, MultiNodeE
 
             if (records.isEmpty()) {
                 if (!n.isEmpty()) {
-                    bn += "/";
+                    record.setBaseName(bn+"/");
+                } else {
+                    record.setBaseName(bn);
                 }
-                record.setBaseName(bn);
             }
             record.setName(n);
 
             // Convert value using expected type
-            LwM2mPath lwM2mResourcePath = new LwM2mPath(bn + n);
+            LwM2mPath lwM2mResourcePath = new LwM2mPath(bn + "/" + n);
             Object convertedValue = converter.convertValue(value, valueType, expectedType, lwM2mResourcePath);
             setResourceValue(convertedValue, expectedType, lwM2mResourcePath, record);