diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/content/SolrContentStore.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/content/SolrContentStore.java
index a11f3f4ba..bacb1d183 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/content/SolrContentStore.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/content/SolrContentStore.java
@@ -49,6 +49,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.function.Predicate;
+import java.util.stream.Stream;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
@@ -234,10 +235,9 @@ public final class SolrContentStore implements Closeable, AccessMode
         @Override
         public long getLastCommittedVersion()
         {
-            try
+            try(Stream<String> fileStream = Files.lines(Paths.get(root, ".version")) )
             {
-                return Files.lines(Paths.get(root, ".version"))
-                        .map(Long::parseLong)
+                return fileStream.map(Long::parseLong)
                         .findFirst()
                         .orElse(NO_VERSION_AVAILABLE);
             }
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
index 66d676867..e9546a2b0 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoIndexFetcher.java
@@ -467,6 +467,8 @@ class AlfrescoIndexFetcher
             Map<String, List<Map<String, Object>>> contentStoreMap = (Map<String, List<Map<String, Object>>>) response
                     .get(CONTENT_STORE_FILES);
 
+            fullContentStoreReplication = false;
+
             if (contentStoreMap != null)
             {
                 contentStoreFilesToDownload = Collections.synchronizedList(contentStoreMap.get(SolrContentStore.ADDS));
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
index be01b48b4..b382314e9 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/handler/AlfrescoReplicationHandler.java
@@ -2122,6 +2122,7 @@ public class AlfrescoReplicationHandler extends RequestHandlerBase implements So
                             e.printStackTrace();
                         }
                     }
+
                 }
             }
             catch (Exception e)
@@ -2169,6 +2170,7 @@ public class AlfrescoReplicationHandler extends RequestHandlerBase implements So
                         if (bytesRead <= 0)
                         {
                             writeNothingAndFlush();
+                            inputStream.close();
                             break;
                         }
 
@@ -2185,6 +2187,7 @@ public class AlfrescoReplicationHandler extends RequestHandlerBase implements So
                         fos.flush();
                     }
                 }
+
             }
         }
     }