diff --git a/README.md b/README.md
index 97191d87ff..be390661a4 100644
--- a/README.md
+++ b/README.md
@@ -5,14 +5,14 @@
 
 ## IPF Overview
 
-The eHealth Integration Framework (IPF) is an extension of the Apache Camel routing and mediation engine and comes with
+The eHealth Integration Framework (IPF) is an extension of the [Apache Camel](https://camel.apache.org/) routing and mediation engine and comes with
 comprehensive support for message processing and connecting information systems in the healthcare sector.
 It is available under the Apache License version 2.0.
 
 IPF focuses on a domain-specific language (DSL) to implement Enterprise Integration Patterns (EIPs) in integration solutions.
 IPF is based on the Java and Groovy programming languages for application development and for designing project-specific DSLs.
 
-IPF provides highl-level building blocks for implementing IHE profiles such as XDS, PIX, PDQ or XCPD.
+IPF provides highl-level building blocks for implementing IHE profiles such as [XDS](https://profiles.ihe.net/ITI/TF/Volume1/ch-10.html), [PIX](https://profiles.ihe.net/ITI/TF/Volume1/ch-5.html), [PDQ](https://profiles.ihe.net/ITI/TF/Volume1/ch-8.html) or [XCPD](https://profiles.ihe.net/ITI/TF/Volume1/ch-27.html).
 Other supported standards are HL7v2 and HL7v3 (CDA and CCD) for which IPF provides domain-specific languages (DSLs) for
 creation, parsing, rendering, navigation and modification.
 
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index e20c902b54..e436d66a7d 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -18,7 +18,7 @@
         <equinox-common.version>3.6.200-v20130402-1505</equinox-common.version>
         <gazelle-hl7v3-jar-version>1.3.7</gazelle-hl7v3-jar-version>
         <groovy-version>3.0.19</groovy-version>
-        <hapi-version>2.3</hapi-version>
+        <hapi-version>2.4.1</hapi-version>
         <hapi-fhir-version>6.8.3</hapi-fhir-version>
         <herasaf-version>2.0.4</herasaf-version>
         <ipf-gazelle-version>2.3.0</ipf-gazelle-version>
@@ -890,7 +890,7 @@
 
     <organization>
         <name>Open eHealth Foundation</name>
-        <url>http://www.openehealth.org/</url>
+        <url>https://github.com/oehf</url>
     </organization>
 
     <developers>
@@ -969,9 +969,7 @@
         <developer>
             <id>thopap</id>
             <name>Thomas Papke</name>
-            <email>thomas.papke@x-tention.de</email>
-            <organization>x-tention Informationstechnologie GmbH</organization>
-            <organizationUrl>https://x-tention.com/</organizationUrl>
+            <email>ipf@thopap.de</email>
             <roles>
                 <role>Developer</role>
             </roles>
@@ -987,7 +985,7 @@
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
diff --git a/modules/hl7-kotlin/src/test/kotlin/org/openehealth/ipf/modules/hl7/kotlin/SegmentTest.kt b/modules/hl7-kotlin/src/test/kotlin/org/openehealth/ipf/modules/hl7/kotlin/SegmentTest.kt
index 30317a8964..08fdeaca00 100644
--- a/modules/hl7-kotlin/src/test/kotlin/org/openehealth/ipf/modules/hl7/kotlin/SegmentTest.kt
+++ b/modules/hl7-kotlin/src/test/kotlin/org/openehealth/ipf/modules/hl7/kotlin/SegmentTest.kt
@@ -60,7 +60,7 @@ class SegmentTest {
 
     @Test
     fun testSet() {
-        val msg = msg1.copy()
+        val msg = msg1.copy() as ADT_A01
         msh[3] = "SAP-XXX"
         assertEquals("SAP-ISH", msg.msh[3].value)
         msg.msh.from(msh)
@@ -155,7 +155,7 @@ class SegmentTest {
 
     @Test
     fun testCompositeSetAt() {
-        val nk1Copy = msg1.copy().getNK1(0)
+        val nk1Copy = (msg1.copy() as ADT_A01).getNK1(0)
         nk1Copy[4][4] = "XY"
         assertEquals("NW", nk1[4][4].value)
         nk1[4] = nk1Copy[4]