diff --git a/.sbtopts b/.sbtopts
new file mode 100644
index 00000000..730aff99
--- /dev/null
+++ b/.sbtopts
@@ -0,0 +1,3 @@
+-J-Xmx6G
+-J-Xss2M
+-Duser.timezone=GMT
diff --git a/build.sbt b/build.sbt
index 238c2ed7..2b352cad 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 import sbt.librarymanagement.ConflictWarning
 
 val scala_2_12             = "2.12.18"
-val scala_2_13             = "2.13.11"
+val scala_2_13             = "2.13.12"
 val scala_3                = "3.3.1"
 val mainScalaVersion       = scala_3
 val supportedScalaVersions = Seq(scala_2_12, scala_2_13, scala_3)
diff --git a/scalacheck/src/main/scala-2/pl/iterators/kebs/scalacheck/Generators.scala b/scalacheck/src/main/scala-2/pl/iterators/kebs/scalacheck/Generators.scala
index 9645a3f7..79f66bb8 100644
--- a/scalacheck/src/main/scala-2/pl/iterators/kebs/scalacheck/Generators.scala
+++ b/scalacheck/src/main/scala-2/pl/iterators/kebs/scalacheck/Generators.scala
@@ -1,7 +1,6 @@
 package pl.iterators.kebs.scalacheck
 
 import org.scalacheck.Arbitrary
-import pl.iterators.kebs.scalacheck.CommonArbitrarySupport
 
 trait Generator[T] extends CommonArbitrarySupport {
   def ArbT: Arbitrary[T]
diff --git a/scalacheck/src/main/scala/pl/iterators/kebs/scalacheck/ArbitrarySupport.scala b/scalacheck/src/main/scala/pl/iterators/kebs/scalacheck/ArbitrarySupport.scala
index 4de5395c..d00c6ce4 100644
--- a/scalacheck/src/main/scala/pl/iterators/kebs/scalacheck/ArbitrarySupport.scala
+++ b/scalacheck/src/main/scala/pl/iterators/kebs/scalacheck/ArbitrarySupport.scala
@@ -91,15 +91,15 @@ trait KebsArbitraryPredefs {
       }
   })
 
-  implicit val arbUrl: Arbitrary[URL] = Arbitrary {
+  implicit val arbUri: Arbitrary[URI] = Arbitrary {
     for {
-      protocol  <- Gen.oneOf("http", "https", "ftp", "file")
-      domain    <- Gen.alphaNumStr
+      protocol <- Gen.oneOf("http", "https", "ftp", "file")
+      domain <- Gen.alphaNumStr
       subdomain <- Gen.alphaNumStr
-      path      <- Gen.alphaNumStr
-    } yield new URL(s"$protocol://$subdomain.$domain.test/$path")
+      path <- Gen.alphaNumStr
+    } yield new URI(s"$protocol://$subdomain.$domain.test/$path")
   }
 
-  implicit val arbUri: Arbitrary[URI] = Arbitrary(arbUrl.arbitrary.map(_.toURI))
+  implicit val arbUrl: Arbitrary[URL] = Arbitrary(arbUri.arbitrary.map(_.toURL))
 
 }
diff --git a/tagged-meta/src/main/scala/pl/iterators/kebs/tag/meta/tagged.scala b/tagged-meta/src/main/scala/pl/iterators/kebs/tag/meta/tagged.scala
index fa2a0b0e..44745d3c 100644
--- a/tagged-meta/src/main/scala/pl/iterators/kebs/tag/meta/tagged.scala
+++ b/tagged-meta/src/main/scala/pl/iterators/kebs/tag/meta/tagged.scala
@@ -121,9 +121,9 @@ final class macroImpl(val c: whitebox.Context) {
       val implicitName = TermName(name.decodedName.toString + "CaseClass1Rep")
 
       if (typeParams.isEmpty)
-        q"implicit val $implicitName = $caseClass1RepInstanceTree"
+        q"implicit val $implicitName: _root_.pl.iterators.kebs.macros.CaseClass1Rep[$selfType, $baseTypeName[..$baseParams]] = $caseClass1RepInstanceTree"
       else
-        q"implicit def $implicitName[..$typeParams] = $caseClass1RepInstanceTree"
+        q"implicit def $implicitName[..$typeParams]: _root_.pl.iterators.kebs.macros.CaseClass1Rep[$selfType, $baseTypeName[..$baseParams]] = $caseClass1RepInstanceTree"
     }
 
     private def containsApply(trees: List[Tree]): Boolean = {