diff --git a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
index 68200756ff..d7bb7a02fc 100644
--- a/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
+++ b/osgi/src/test/scala/org/apache/pekko/osgi/PojoSRTestSupport.scala
@@ -167,7 +167,6 @@ class BundleDescriptorBuilder(name: String) {
   }
 
   def extractHeaders(file: File): HashMap[String, String] = {
-    import scala.collection.JavaConverters.iterableAsScalaIterableConverter
     val headers = new HashMap[String, String]()
     val jis = new JarInputStream(new FileInputStream(file))
     try {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 3c73227920..297e2d3b2c 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -37,7 +37,7 @@ object Dependencies {
   val jacksonDatabindVersion = jacksonCoreVersion
 
   val scala212Version = "2.12.19"
-  val scala213Version = "2.13.12"
+  val scala213Version = "2.13.13"
   val scala3Version = "3.3.1"
   val allScalaVersions = Seq(scala213Version, scala212Version, scala3Version)
 
diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala
index a94c0420fe..9f79e53bb2 100644
--- a/project/PekkoDisciplinePlugin.scala
+++ b/project/PekkoDisciplinePlugin.scala
@@ -74,16 +74,19 @@ object PekkoDisciplinePlugin extends AutoPlugin {
     "pekko-stream-tests-tck",
     "pekko-testkit")
 
-  val defaultScalaOptions = "-Wconf:cat=unused-nowarn:s,any:e"
+  lazy val defaultScalaOptions = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
+    case Some((2, 12)) => "-Wconf:cat=unused-nowarn:s,any:e"
+    case _             => "-Wconf:cat=unused-nowarn:s,cat=lint-named-booleans:s,cat=other-shadowing:s,any:e"
+  })
 
   lazy val nowarnSettings = Seq(
     Compile / scalacOptions ++= (
       if (scalaVersion.value.startsWith("3.")) Nil
-      else Seq(defaultScalaOptions)
+      else Seq(defaultScalaOptions.value)
     ),
     Test / scalacOptions ++= (
       if (scalaVersion.value.startsWith("3.")) Nil
-      else Seq(defaultScalaOptions)
+      else Seq(defaultScalaOptions.value)
     ),
     Compile / doc / scalacOptions := Seq())
 
@@ -97,13 +100,13 @@ object PekkoDisciplinePlugin extends AutoPlugin {
    */
   lazy val docs =
     Seq(
-      Compile / scalacOptions -= defaultScalaOptions,
+      Compile / scalacOptions -= defaultScalaOptions.value,
       Compile / scalacOptions ++= (
         if (scalaVersion.value.startsWith("3.")) Nil
         else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
       ),
       Test / scalacOptions --= Seq("-Xlint", "-unchecked", "-deprecation"),
-      Test / scalacOptions -= defaultScalaOptions,
+      Test / scalacOptions -= defaultScalaOptions.value,
       Test / scalacOptions ++= (
         if (scalaVersion.value.startsWith("3.")) Nil
         else Seq("-Wconf:cat=unused:s,cat=deprecation:s,cat=unchecked:s,any:e")
diff --git a/scripts/link-validator.conf b/scripts/link-validator.conf
index 70dbcba93f..7324cd3d98 100644
--- a/scripts/link-validator.conf
+++ b/scripts/link-validator.conf
@@ -61,10 +61,10 @@ site-link-validator {
     "http://pholser.github.com/jopt-simple"
     "http://pojosr.googlecode.com/"
     "http://team.ops4j.org/wiki/display/ops4j/Tinybundles"
-    "https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction1.html"
-    "https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction2.html"
-    "https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractFunction3.html"
-    "https://www.scala-lang.org/api/2.13.12/scala/runtime/AbstractPartialFunction.html"
+    "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction1.html"
+    "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction2.html"
+    "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractFunction3.html"
+    "https://www.scala-lang.org/api/2.13.13/scala/runtime/AbstractPartialFunction.html"
     # Bug, see https://github.com/scala/bug/issues/12807 and https://github.com/lampepfl/dotty/issues/17973
     "https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/nio/file/StandardOpenOption$.html"
     # Occasionally returns a 500 Internal Server Error