diff --git a/jOOQ-scala_2.13/pom.xml b/jOOQ-scala_2.13/pom.xml
index b418e7a91e..6830d8b47d 100644
--- a/jOOQ-scala_2.13/pom.xml
+++ b/jOOQ-scala_2.13/pom.xml
@@ -14,7 +14,7 @@
     <name>jOOQ Scala 2.13</name>
 
     <properties>
-        <scala.version>2.13.2</scala.version>
+        <scala.version>2.13.5</scala.version>
         <jooq-testdata-dir>${project.basedir}/../.data</jooq-testdata-dir>
     </properties>
 
diff --git a/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala
index fbec2870c7..dc8c97419b 100644
--- a/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala
+++ b/jOOQ-scala_2.13/src/main/scala/org/jooq/scalaextensions/Conversions.scala
@@ -44,7 +44,7 @@ import org.jooq.impl._
 
 // Avoid ambiguity with the internal org.jooq.impl.Array type.
 import scala.Array
-import scala.collection.JavaConverters
+import scala.jdk.CollectionConverters
 
 /**
  * jOOQ type conversions used to enhance the jOOQ Java API with Scala Traits
@@ -121,7 +121,7 @@ object Conversions {
         i = i + 1;
       }
 
-      sb.result
+      sb.result()
     }
   }
 
@@ -172,7 +172,7 @@ object Conversions {
     def fetchAnyOptionArray            ()                                                         : Option[Array[AnyRef]]       = Option(query.fetchAnyArray)
     def fetchAnyOptionInto[E]          (newType : Class[_ <: E])                                  : Option[E]                   = Option(query.fetchAnyInto(newType))
     def fetchAnyOptionInto[Z <: Record](table : Table[Z])                                         : Option[Z]                   = Option(query.fetchAnyInto(table))
-    def fetchAnyOptionMap              ()                                                         : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m))
+    def fetchAnyOptionMap              ()                                                         : Option[Map[String, AnyRef]] = Option(query.fetchAnyMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala)
 
     def fetchOneOption                 ()                                                         : Option[R]                   = Option(query.fetchOne)
     def fetchOneOption[E]              (mapper : RecordMapper[_ >: R, E])                         : Option[E]                   = Option(query.fetchOne(mapper))
@@ -188,7 +188,7 @@ object Conversions {
     def fetchOneOptionArray            ()                                                         : Option[Array[AnyRef]]       = Option(query.fetchOneArray)
     def fetchOneOptionInto[E]          (newType : Class[_ <: E])                                  : Option[E]                   = Option(query.fetchOneInto(newType))
     def fetchOneOptionInto[Z <: Record](table : Table[Z])                                         : Option[Z]                   = Option(query.fetchOneInto(table))
-    def fetchOneOptionMap              ()                                                         : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => JavaConverters.asScala(m))
+    def fetchOneOptionMap              ()                                                         : Option[Map[String, AnyRef]] = Option(query.fetchOneMap).map((m: java.util.Map[String, AnyRef]) => CollectionConverters.MapHasAsScala(m).asScala)
   }
 
   // -------------------------------------------------------------------------
@@ -314,6 +314,8 @@ object Conversions {
   // Conversions from jOOQ Record[N] types to Scala Tuple[N] types
   // --------------------------------------------------------------------------
 
+  import scala.language.implicitConversions
+
 // [jooq-tools] START [tuples]
 
   /**