diff --git a/build.sbt b/build.sbt
index 458067d..7075285 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,8 +5,8 @@ lazy val root = (project in file("."))
     licenses += ("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0")),
     scmInfo := Some(ScmInfo(url("https://github.com/moia-dev/scala-http-client"), "scm:git@github.com:moia-dev/scala-http-client.git")),
     homepage := Some(url("https://github.com/moia-dev/scala-http-client")),
-    scalaVersion := "2.13.1",
-    crossScalaVersions := List("2.13.1", "2.12.10"),
+    scalaVersion := "2.13.4",
+    crossScalaVersions := List("2.13.4", "2.12.13"),
     scalacOptions ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, 12)) => scalacOptions_2_12
@@ -61,7 +61,7 @@ lazy val scalaDependencies = Seq(
   "org.scala-lang.modules" %% "scala-collection-compat" % "2.4.1"
 )
 
-scapegoatVersion in ThisBuild := "1.4.4"
+scapegoatVersion in ThisBuild := "1.4.7"
 
 lazy val scalacOptions_2_12 = Seq(
   "-unchecked",
@@ -88,8 +88,9 @@ lazy val scalacOptions_2_13 = Seq(
   "-encoding",
   "UTF-8",
   "-Xfatal-warnings",
-  "-Ywarn-dead-code",
-  "-Ymacro-annotations"
+  "-Xlint:strict-unsealed-patmat",
+  "-Ymacro-annotations",
+  "-Ywarn-dead-code"
 )
 
 lazy val sonatypeSettings = {
diff --git a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala
index f4b0968..718a835 100644
--- a/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala
+++ b/src/main/scala/io/moia/scalaHttpClient/AwsRequestSigner.scala
@@ -1,9 +1,5 @@
 package io.moia.scalaHttpClient
 
-import java.io.InputStream
-import java.net.URI
-import java.util
-
 import akka.http.scaladsl.model.HttpHeader.ParsingResult
 import akka.http.scaladsl.model.{HttpHeader, HttpRequest, Uri}
 import akka.stream.Materializer
@@ -18,6 +14,9 @@ import software.amazon.awssdk.services.sts.StsClient
 import software.amazon.awssdk.services.sts.auth.StsAssumeRoleCredentialsProvider
 import software.amazon.awssdk.services.sts.model.AssumeRoleRequest
 
+import java.io.InputStream
+import java.net.URI
+import java.util
 import scala.collection.compat._
 import scala.collection.immutable._
 import scala.concurrent.{blocking, Future}
diff --git a/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala b/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala
index 8f9ba12..ec38c6e 100644
--- a/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala
+++ b/src/main/scala/io/moia/scalaHttpClient/HttpClient.scala
@@ -27,7 +27,7 @@ class HttpClient(
       httpMetrics,
       retryConfig,
       clock,
-      Logger.takingImplicit(LoggerFactory.getLogger(getClass.getName))((msg: String, _: NoLoggingContext) => msg),
+      Logger.takingImplicit(LoggerFactory.getLogger(classOf[HttpClient].getName))((msg: String, _: NoLoggingContext) => msg),
       awsRequestSigner
     ) {
   override def request(