diff --git a/datasafe-directory/datasafe-directory-impl/src/main/java/de/adorsys/datasafe/business/impl/profile/serde/GsonSerde.java b/datasafe-directory/datasafe-directory-impl/src/main/java/de/adorsys/datasafe/business/impl/profile/serde/GsonSerde.java
index 9fe838289..b7af5d6e7 100644
--- a/datasafe-directory/datasafe-directory-impl/src/main/java/de/adorsys/datasafe/business/impl/profile/serde/GsonSerde.java
+++ b/datasafe-directory/datasafe-directory-impl/src/main/java/de/adorsys/datasafe/business/impl/profile/serde/GsonSerde.java
@@ -67,17 +67,18 @@ public GsonSerde() {
     @SneakyThrows
     private JsonPrimitive writePubKey(PublicKey publicKey) {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        ObjectOutputStream os = new ObjectOutputStream(bos);
-        os.writeObject(publicKey);
-
-        return new JsonPrimitive(new String(Base64.getEncoder().encode(bos.toByteArray())));
+        try (ObjectOutputStream os = new ObjectOutputStream(bos);) {
+            os.writeObject(publicKey);
+            return new JsonPrimitive(new String(Base64.getEncoder().encode(bos.toByteArray())));
+        }
     }
 
     @SneakyThrows
     private PublicKey readPubKey(JsonElement in) {
         byte[] bytes = Base64.getDecoder().decode(in.getAsString());
         ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-        ObjectInputStream is = new ObjectInputStream(bis);
-        return (PublicKey) is.readObject();
+        try (ObjectInputStream is = new ObjectInputStream(bis)) {
+            return (PublicKey) is.readObject();
+        }
     }
 }
diff --git a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/business/impl/encryption/keystore/KeyStoreGenerator.java b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/business/impl/encryption/keystore/KeyStoreGenerator.java
index a5c93ccc2..7ed5ac8e7 100644
--- a/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/business/impl/encryption/keystore/KeyStoreGenerator.java
+++ b/datasafe-encryption/datasafe-encryption-impl/src/main/java/de/adorsys/datasafe/business/impl/encryption/keystore/KeyStoreGenerator.java
@@ -39,7 +39,7 @@ public class KeyStoreGenerator {
     private final Map<KeyID, Optional<SecretKeyEntry>> secretKeys;
 
     @Builder
-    private KeyStoreGenerator(
+    protected KeyStoreGenerator(
             KeyStoreCreationConfig config,
             KeyStoreType keyStoreType,
             String serverKeyPairAliasPrefix,
diff --git a/datasafe-storage/datasafe-storage-impl-fs/src/main/java/de/adorsys/datasafe/business/impl/storage/FileSystemStorageService.java b/datasafe-storage/datasafe-storage-impl-fs/src/main/java/de/adorsys/datasafe/business/impl/storage/FileSystemStorageService.java
index eda413602..8afec38df 100644
--- a/datasafe-storage/datasafe-storage-impl-fs/src/main/java/de/adorsys/datasafe/business/impl/storage/FileSystemStorageService.java
+++ b/datasafe-storage/datasafe-storage-impl-fs/src/main/java/de/adorsys/datasafe/business/impl/storage/FileSystemStorageService.java
@@ -2,7 +2,10 @@
 
 import com.google.common.io.MoreFiles;
 import de.adorsys.datasafe.business.api.storage.StorageService;
-import de.adorsys.datasafe.business.api.types.resource.*;
+import de.adorsys.datasafe.business.api.types.resource.AbsoluteLocation;
+import de.adorsys.datasafe.business.api.types.resource.BasePrivateResource;
+import de.adorsys.datasafe.business.api.types.resource.BaseResolvedResource;
+import de.adorsys.datasafe.business.api.types.resource.ResolvedResource;
 import de.adorsys.datasafe.business.api.types.utils.Log;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;