diff --git a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java
index 0335a6abb8c18032d239c6f07d1bbe09a5654e1f..5849cf8e8f9e1f9ad90bb87fa28ef75ed75d71cd 100644
--- a/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java
+++ b/fim-adapter/src/main/java/de/ozgcloud/eingang/fim/FimBasedAdapter.java
@@ -63,7 +63,7 @@ public class FimBasedAdapter implements EngineBasedSemantikAdapter {
     }
 
     private Optional<String> getEntryPoint(final FormHeader formHeader) {
-        // FIXME sollte über formdata metadaten kommen statt aus dem meta file geparsed zu werden
+        // FIXME OZG-5778 sollte über formdata metadaten kommen statt aus dem meta file geparsed zu werden
         return Optional.of("Antrag.xml");
     }
 
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
index 09fe1a2a43a9fd709a87183e35718c0aa655e1ed..5711cb57e1644e1c4325421671f7cb480eda8408 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMapperHelper.java
@@ -11,7 +11,7 @@ public class XtaMapperHelper {
 
     public static String getFormEngineName(XtaMessageMetaData metaData) {
         if (StringUtils.equals(metaData.getMessageType(), XtaService.XDOMEA_0201_MESSAGE_TYPE)) {
-            // TODO verify the correct engine name
+            // TODO OZG-5778 verify the correct engine name
             return "XDOMEA";
         }
 
@@ -21,6 +21,7 @@ public class XtaMapperHelper {
         return null;
     }
 
+    // TODO OZG-6176 Check if the problem can be fixed elsewhere
     public static ZonedDateTime getCreatedAt(XtaMessageMetaData metaData) {
         if (metaData.getOrigin() != null) {
             return metaData.getOrigin();
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
index 203cff44770add307aeab236f0bc9388427b9563..4fccd8d8a8cf29f762e97b775aeae9a72c66bb76 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaService.java
@@ -1,6 +1,6 @@
 package de.ozgcloud.eingang.xta;
 
-import static java.util.Collections.*;
+import static java.util.Collections.emptyList;
 
 import java.util.List;
 import java.util.Spliterators;