diff --git a/build.sbt b/build.sbt
index 3358fde..afa5dc0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -7,7 +7,7 @@ ThisBuild / developers := List(
   tlGitHubDev("ybasket", "Yannick Heiber"),
 )
 
-val Scala213 = "2.13.12"
+val Scala213 = "2.13.13"
 ThisBuild / crossScalaVersions := Seq("2.12.19", Scala213, "3.3.3")
 ThisBuild / scalaVersion := Scala213
 
diff --git a/csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala b/csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala
index d94b196..f3d1043 100644
--- a/csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala
+++ b/csv/src/test/scala/org/http4s/fs2data/csv/CsvSuite.scala
@@ -74,7 +74,7 @@ class CsvSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
       csvEncoderForPipe(encodeUsingFirstHeaders())
     implicit val decoder: EntityDecoder[IO, Stream[IO, Data]] =
       csvDecoderForPipe(decodeUsingHeaders[Data]())
-    val in = List(Data("a", 2, true), Data("b", 3, false))
+    val in = List(Data("a", 2, third = true), Data("b", 3, third = false))
     Stream
       .force(Request[IO]().withEntity(Stream.emits(in).covary[IO]).as[Stream[IO, Data]])
       .compile
diff --git a/docs/index.md b/docs/index.md
index e60e5a4..485a210 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -138,7 +138,7 @@ class Csv2CborHttpEndpoint[F[_]](implicit F: Async[F]) extends Http4sDsl[F] {
   }
   
   private def toCbor(row: Row): CborValue =
-    CborValue.Array(row.values.toList.map(CborValue.TextString(_)), false)
+    CborValue.Array(row.values.toList.map(CborValue.TextString(_)), indefinite = false)
 }
 ```
 
@@ -207,4 +207,4 @@ curl -s -X "POST" "http://localhost:8080/prettyJson" \
   },
   "d": 1
 }
-```
\ No newline at end of file
+```
diff --git a/json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala b/json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala
index efd13d9..74197ea 100644
--- a/json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala
+++ b/json/src/test/scala/org/http4s/fs2data/json/JsonEventSuite.scala
@@ -43,7 +43,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
       .withEntity(in)
       .as[Stream[IO, Token]]
       .map(Request[IO]().withEntity(_))
-      .flatMap(EntityDecoder.text[IO].decode(_, false).value)
+      .flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
       .assertEquals(Right(in))
   }
 
@@ -65,7 +65,7 @@ class JsonEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
       .withEntity(in)
       .as[Stream[IO, Token]]
       .map(Request[IO]().withEntity(_)(jsonTokensEncoder[IO](prettyPrint = true)))
-      .flatMap(EntityDecoder.text[IO].decode(_, false).value)
+      .flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
       .assertEquals(Right(in))
   }
 }
diff --git a/xml-scala/src/test/scala/org/http4s/fs2data/xml/scalaxml/generators.scala b/xml-scala/src/test/scala/org/http4s/fs2data/xml/scalaxml/generators.scala
index 57cb21c..3fec27f 100644
--- a/xml-scala/src/test/scala/org/http4s/fs2data/xml/scalaxml/generators.scala
+++ b/xml-scala/src/test/scala/org/http4s/fs2data/xml/scalaxml/generators.scala
@@ -474,6 +474,6 @@ object generators {
     label <- genNcName
     attributes <- genAttributes
     children <- genContent
-    elem = Elem(prefix, label, attributes, TopScope, true, children: _*)
+    elem = Elem(prefix, label, attributes, TopScope, minimizeEmpty = true, child = children: _*)
   } yield Utility.trim(elem).asInstanceOf[Elem]
 }
diff --git a/xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala b/xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala
index 62067c9..8bdd06f 100644
--- a/xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala
+++ b/xml/src/test/scala/org/http4s/fs2data/xml/XmlEventSuite.scala
@@ -44,7 +44,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
       .withEntity(in)
       .as[Stream[IO, XmlEvent]]
       .map(Request[IO]().withEntity(_))
-      .flatMap(EntityDecoder.text[IO].decode(_, false).value)
+      .flatMap(EntityDecoder.text[IO].decode(_, strict = false).value)
       .assertEquals(Right(in))
   }
 
@@ -64,7 +64,7 @@ class XmlEventSuite extends CatsEffectSuite with ScalaCheckEffectSuite {
       .force(
         Request[IO]()
           .withEntity(in.lift[IO])
-          .as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(false))
+          .as[Stream[IO, XmlEvent]](implicitly, xmlEventsDecoder(includeComments = false))
       )
       .compile
       .toList