diff --git a/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala b/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
index 622d288c0..a1f902946 100644
--- a/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
+++ b/http4s-server-micrometer/src/main/scala/com/avast/sst/http4s/server/micrometer/MicrometerHttp4sServerMetricsModule.scala
@@ -7,7 +7,7 @@ import io.micrometer.core.instrument.MeterRegistry
 import org.http4s.HttpRoutes
 import org.http4s.server.middleware.Metrics
 
-class MicrometerHttp4sServerMetricsModule[F[_]: Sync](val serverMetrics: HttpRoutes[F] => HttpRoutes[F], val routeMetrics: RouteMetrics[F])
+class MicrometerHttp4sServerMetricsModule[F[_]](val serverMetrics: HttpRoutes[F] => HttpRoutes[F], val routeMetrics: RouteMetrics[F])
 
 object MicrometerHttp4sServerMetricsModule {
 
diff --git a/monix-catnap/src/main/scala/com/avast/sst/monix/catnap/CircuitBreakerModule.scala b/monix-catnap/src/main/scala/com/avast/sst/monix/catnap/CircuitBreakerModule.scala
index bb24d8dfc..032e7bc53 100644
--- a/monix-catnap/src/main/scala/com/avast/sst/monix/catnap/CircuitBreakerModule.scala
+++ b/monix-catnap/src/main/scala/com/avast/sst/monix/catnap/CircuitBreakerModule.scala
@@ -54,7 +54,7 @@ object CircuitBreakerModule {
   }
 
   /** Wraps [[monix.catnap.CircuitBreaker]] and adds monitoring metrics (e.g. number of rejected tasks). */
-  def withMetrics[F[_]: Sync](circuitBreakerMetrics: CircuitBreakerMetrics[F], circuitBreaker: CircuitBreaker[F]): CircuitBreaker[F] = {
+  def withMetrics[F[_]](circuitBreakerMetrics: CircuitBreakerMetrics[F], circuitBreaker: CircuitBreaker[F]): CircuitBreaker[F] = {
     circuitBreaker
       .doOnRejectedTask(circuitBreakerMetrics.increaseRejected)
       .doOnClosed(circuitBreakerMetrics.setState(Closed))
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 476941e22..b78fc79b3 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -1,5 +1,4 @@
 import com.typesafe.sbt.site.SitePlugin.autoImport._
-import com.typesafe.tools.mima.plugin.MimaKeys._
 import mdoc.MdocPlugin.autoImport._
 import microsites.CdnDirectives
 import microsites.MicrositesPlugin.autoImport._
@@ -23,7 +22,7 @@ object BuildSettings {
     description := "Functional programming toolkit for building server applications in Scala.",
     licenses := Seq("MIT" -> url("https://raw.githubusercontent.com/avast/scala-server-toolkit/master/LICENSE")),
     developers := List(Developer("jakubjanecek", "Jakub Janecek", "janecek@avast.com", url("https://www.avast.com"))),
-    scalaVersion := "2.13.3",
+    scalaVersion := "2.13.5",
     crossScalaVersions := List(scalaVersion.value, "2.12.13"),
     fork := true,
     libraryDependencies ++= Seq(
@@ -41,10 +40,10 @@ object BuildSettings {
       Dependencies.scalafixScaluzzi,
       Dependencies.scalafixOrganizeImports
     ),
-    scalacOptions ++= Seq(
+    scalacOptions ++= List(
       "-Ywarn-unused", // necessary for Scalafix RemoveUnused rule (not present in sbt-tpolecat for 2.13)
       "-P:silencer:checkUnused"
-    ),
+    ) ++ (if (scalaVersion.value.startsWith("2.13")) List("-Wmacros:after") else List.empty),
     Test / publishArtifact := false
   )
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4cb1e9fe5..aebb75cac 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -52,7 +52,7 @@ object Dependencies {
     val micrometerJmx = "1.6.4"
     val micrometerStatsD = "1.6.4"
     val monix = "3.3.0"
-    val silencer = "1.7.1"
+    val silencer = "1.7.3"
 
   }