diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index fd0cf499..38986dd3 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
+import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -307,7 +308,7 @@ public class DaemonConnector {
         final Path mvndHome = parameters.mvndHome();
         final Path workingDir = parameters.userDir();
         String command = "";
-        try {
+        try (DirectoryStream<Path> jarPaths = Files.newDirectoryStream(mvndHome.resolve("mvn/lib/ext"))) {
             List<String> args = new ArrayList<>();
             // executable
             final String java = Os.current().isUnixLike() ? "bin/java" : "bin\\java.exe";
@@ -315,7 +316,7 @@ public class DaemonConnector {
             // classpath
             String mvndCommonPath = null;
             String mvndAgentPath = null;
-            for (Path jar : Files.newDirectoryStream(mvndHome.resolve("mvn/lib/ext"))) {
+            for (Path jar : jarPaths) {
                 String s = jar.getFileName().toString();
                 if (s.endsWith(".jar")) {
                     if (s.startsWith("mvnd-common-")) {
@@ -349,11 +350,12 @@ public class DaemonConnector {
             }
             // .mvn/jvm.config
             if (Files.isRegularFile(parameters.jvmConfigPath())) {
-                Files.lines(parameters.jvmConfigPath())
-                        .flatMap(l -> Stream.of(l.split(" ")))
-                        .map(String::trim)
-                        .filter(StringUtils::isNotEmpty)
-                        .forEach(args::add);
+                try (Stream<String> lines = Files.lines(parameters.jvmConfigPath())) {
+                    lines.flatMap(l -> Stream.of(l.split(" ")))
+                            .map(String::trim)
+                            .filter(StringUtils::isNotEmpty)
+                            .forEach(args::add);
+                }
             }
             // memory
             String minHeapSize = parameters.minHeapSize();
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java b/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java
index 4b244379..9f33215c 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java
@@ -33,6 +33,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.internal.CLibrary;
 import org.jline.utils.AttributedString;
@@ -332,9 +333,8 @@ public class DefaultClient implements Client {
         List<Path> deleted = new ArrayList<>();
         List<Throwable> exceptions = new ArrayList<>();
         FileTime limit = FileTime.from(Instant.now().minus(purgeLogPeriod));
-        try {
-            Files.list(storage)
-                    .filter(p -> p.getFileName().toString().endsWith(LOG_EXTENSION))
+        try (Stream<Path> storagePath = Files.list(storage)) {
+            storagePath.filter(p -> p.getFileName().toString().endsWith(LOG_EXTENSION))
                     .filter(p -> !log.equals(p))
                     .filter(p -> {
                         try {