diff --git a/csv/src/main/scala/org/apache/pekko/stream/connectors/csv/impl/CsvParser.scala b/csv/src/main/scala/org/apache/pekko/stream/connectors/csv/impl/CsvParser.scala
index ee58472f5..2c229af33 100644
--- a/csv/src/main/scala/org/apache/pekko/stream/connectors/csv/impl/CsvParser.scala
+++ b/csv/src/main/scala/org/apache/pekko/stream/connectors/csv/impl/CsvParser.scala
@@ -102,9 +102,9 @@ import scala.collection.mutable
   /**
    * Reset after each row.
    */
-  private[this] var columns = mutable.ListBuffer[ByteString]()
+  private[this] val columns = mutable.ListBuffer[ByteString]()
   private[this] var state: State = LineStart
-  private[this] var fieldBuilder = new FieldBuilder
+  private[this] val fieldBuilder = new FieldBuilder
 
   /**
    * Current iterator being parsed.
diff --git a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/SourceSettingsBase.scala b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/SourceSettingsBase.scala
index 8834f9914..d74ccb06a 100644
--- a/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/SourceSettingsBase.scala
+++ b/elasticsearch/src/main/scala/org/apache/pekko/stream/connectors/elasticsearch/SourceSettingsBase.scala
@@ -17,8 +17,6 @@ import org.apache.pekko
 import pekko.util.JavaDurationConverters._
 import java.util.concurrent.TimeUnit
 
-import pekko.stream.connectors.elasticsearch.ElasticsearchConnectionSettings
-
 import scala.concurrent.duration.FiniteDuration
 
 /**