diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java b/leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
index 1c95e51306..c1720e1cbb 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/credentials/CredentialsReader.java
@@ -19,7 +19,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.RandomAccessFile;
+import java.io.*;
 import java.security.GeneralSecurityException;
 
 /**
diff --git a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java b/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
index e1650c936e..12df354037 100644
--- a/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
+++ b/leshan-core/src/main/java/org/eclipse/leshan/core/json/jackson/JsonArrayEntrySerDes.java
@@ -18,16 +18,16 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import org.eclipse.leshan.core.json.JsonArrayEntry;
 import org.eclipse.leshan.core.model.ResourceModel.Type;
 import org.eclipse.leshan.core.util.datatype.ULong;
 import org.eclipse.leshan.core.util.json.JacksonJsonSerDes;
 import org.eclipse.leshan.core.util.json.JsonException;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
 public class JsonArrayEntrySerDes extends JacksonJsonSerDes<JsonArrayEntry> {
 
     @Override